Further improvements on translations:

- Change oil naming to include "... oil" - Rename oil status to oil "Wetting" - Minor improvements
TeamLapen · Jul 28, 2024 · f0fab1f · f0fab1f
1 parent 4955f79
commit f0fab1f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 33 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/items/OilBottleItem.java b/src/main/java/de/teamlapen/vampirism/items/OilBottleItem.java
@@ -40,7 +40,7 @@ public ItemStack getDefaultInstance() {
     @Override
     public Component getName(@NotNull ItemStack stack) {
         OilContent oilContents = stack.getOrDefault(ModDataComponents.OIL, OilContent.EMPTY);
-        return oilContents.oil().unwrapKey().map(s -> Component.translatable("oil." + s.location().getNamespace() + "." + s.location().getPath()).append(" ")).orElse(Component.empty()).append(Component.translatable(this.getDescriptionId(stack)));
+        return oilContents.oil().unwrapKey().map(s -> Component.translatable("oil." + s.location().getNamespace() + "." + s.location().getPath()).append(" ")).orElse(Component.empty());
     }
 
     @Override

diff --git a/src/main/java/de/teamlapen/vampirism/items/oil/ApplicableOil.java b/src/main/java/de/teamlapen/vampirism/items/oil/ApplicableOil.java
@@ -47,9 +47,9 @@ public int getMaxDuration(ItemStack stack) {
             float perc = duration / (float) maxDuration;
             ChatFormatting status = perc > 0.5 ? ChatFormatting.GREEN : perc > 0.25 ? ChatFormatting.GOLD : ChatFormatting.RED;
             if (flag.isAdvanced()) {
-                component.append(" ").append(Component.literal(toString().formatted("%s/%s", duration, maxDuration)).withStyle(status));
+                component.append(" ").append(Component.literal("%s/%s".formatted( duration, maxDuration)).withStyle(status));
             } else {
-                component.append(" ").append(Component.translatable("text.vampirism.status").withStyle(status));
+                component.append(" ").append(Component.translatable("text.vampirism.oil.wetting_status").withStyle(status));
             }
         }
         return Optional.of(component);

diff --git a/src/main/resources/assets/vampirism/lang/en_us.json b/src/main/resources/assets/vampirism/lang/en_us.json
@@ -94,6 +94,7 @@
   "text.vampirism.blessing": "Blessing",
   "gui.vampirism.jei.category.oil_brewing": "Process Oil",
   "text.vampirism.oils.cannot_use": "You cannot handle oiled items",
+  "text.vampirism.oil.wetting_status": "Wetting",
   "text.vampirism.skills.level": "Level Skills",
   "text.vampirism.skills.lord": "Lord Skills",
   "text.vampirism.faction_exclusive": "Exclusive to %s faction",
@@ -926,14 +927,9 @@
   "item.vampirism.vampire_clothing_crown": "Crown",
   "item.vampirism.vampire_clothing_legs": "Pants",
   "item.vampirism.vampire_clothing_boots": "Boots",
-  "item.vampirism.vampires_fear": "Vampire's Fear",
   "item.vampirism.torch": "Torch",
   "item.vampirism.sunscreen": "Sunscreen",
   "item.vampirism.leech_sword": "Leech",
-  "item.vampirism.vampire_armor_helmet": "Vampire's Helmet",
-  "item.vampirism.vampire_armor_leggings": "Vampire's Leggings",
-  "item.vampirism.vampire_armor_boots": "Vampire's Boots",
-  "item.vampirism.vampire_armor_chestplate": "Vampire's Chestplate",
   "item.vampirism.minion_name_tag": "Minion Name Tag",
   "item.vampirism.gem_of_binding": "Gem of Binding",
   "item.vampirism.blood_eye": "Blood Eye",
@@ -1334,7 +1330,7 @@
   "refinement.vampirism.freeze_duration.desc": "Freeze action duration increase I",
   "refinement.vampirism.blood_charge_speed.desc": "Blood charging speedup I",
   "refinement.vampirism.sword_trained_amount.desc": "Train vampire swords faster",
-  "refinement.vampirism.crucifix_resistant.desc": "Lowers the effect of a crucifix on you",
+  "refinement.vampirism.crucifix_resistant.desc": "Reduces the effect of a crucifix on you",
   "__comment": "Refinement Sets",
   "refinement_set.vampirism.armor1": "of Armor",
   "refinement_set.vampirism.health1": "of Health",
@@ -1435,27 +1431,27 @@
   "text.vampirism.vampire_villager.decline_trade_vampire": "I do not trade with wicked Vampire Hunters",
   "text.vampirism.vampire_villager.decline_trade_normal": "Sorry, but my trades are only interesting for Vampires",
   "__comment": "Oils",
-  "oil.vampirism.empty": "Uncraftable",
-  "oil.vampirism.plant": "Plant",
-  "oil.vampirism.vampire_blood": "Activated",
-  "oil.vampirism.poison": "Poison",
-  "oil.vampirism.weakness": "Weakness",
-  "oil.vampirism.slowness": "Slowness",
-  "oil.vampirism.healing": "Healing",
-  "oil.vampirism.fire_resistance": "Fire Resistance",
-  "oil.vampirism.swiftness": "Swiftness",
-  "oil.vampirism.regeneration": "Regeneration",
-  "oil.vampirism.night_vision": "Night Vision",
-  "oil.vampirism.strength": "Strength",
-  "oil.vampirism.jump": "Jump Boost",
-  "oil.vampirism.water_breathing": "Water Breathing",
-  "oil.vampirism.invisibility": "Invisibility",
-  "oil.vampirism.slow_falling": "Slow Falling",
-  "oil.vampirism.luck": "Luck",
-  "oil.vampirism.harm": "Harm",
-  "oil.vampirism.smelt": "Smelting",
-  "oil.vampirism.teleport": "Teleport",
-  "oil.vampirism.evasion": "Evasion",
+  "oil.vampirism.empty": "Uncraftable Oil",
+  "oil.vampirism.plant": "Plant Oil",
+  "oil.vampirism.vampire_blood": "Activated Oil",
+  "oil.vampirism.poison": "Poison Oil",
+  "oil.vampirism.weakness": "Weakness Oil",
+  "oil.vampirism.slowness": "Slowness Oil",
+  "oil.vampirism.healing": "Healing Oil",
+  "oil.vampirism.fire_resistance": "Fire Resistance Oil",
+  "oil.vampirism.swiftness": "Swiftness Oil",
+  "oil.vampirism.regeneration": "Regeneration Oil",
+  "oil.vampirism.night_vision": "Night Vision Oil",
+  "oil.vampirism.strength": "Strength Oil",
+  "oil.vampirism.jump": "Jump Boost Oil",
+  "oil.vampirism.water_breathing": "Water Breathing Oil",
+  "oil.vampirism.invisibility": "Invisibility Oil",
+  "oil.vampirism.slow_falling": "Slow Falling Oil",
+  "oil.vampirism.luck": "Luck Oil",
+  "oil.vampirism.harm": "Harm Oil",
+  "oil.vampirism.smelt": "Smelting Oil",
+  "oil.vampirism.teleport": "Teleport Oil",
+  "oil.vampirism.evasion": "Evasion Oil",
   "__commend": "Oil description",
   "oil.vampirism.smelt.desc": "Can be used on Pickaxes to auto smelt destroyed blocks",
   "oil.vampirism.evasion.desc": "Increases evasion chances when applied to armor",
@@ -1476,9 +1472,9 @@
   "subtitles.vampirism.ghost.ambient": "Ghost swooshes",
   "subtitles.vampirism.ghost.death": "Ghost dies",
   "subtitles.vampirism.ghost.hurt": "Ghost hurts",
-  "subtitles.vampirism.remains_defender.ambient": "Ancient Cristal shines",
-  "subtitles.vampirism.remains_defender.death": "Ancient Cristal breaks",
-  "subtitles.vampirism.remains_defender.hit": "Ancient Cristal crumbles",
+  "subtitles.vampirism.remains_defender.ambient": "Ancient Crystal shines",
+  "subtitles.vampirism.remains_defender.death": "Ancient Crystal breaks",
+  "subtitles.vampirism.remains_defender.hit": "Ancient Crystal crumbles",
   "subtitles.vampirism.remains.death": "Remains dies",
   "subtitles.vampirism.remains.hurt": "Remains hurts",
   "__comment": "entity tags",