Rename dwarfish to dwarven (#4288)

No migration needed as tools autorebuild, so nothing should have the old name anymore
SlimeKnights · Apr 3, 2021 · bf06b8f · bf06b8f
1 parent d8804af
commit bf06b8f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/generated/resources/data/tconstruct/materials/definition/copper.json b/src/generated/resources/data/tconstruct/materials/definition/copper.json
@@ -8,7 +8,7 @@
   "temperature": 500,
   "traits": [
     {
-      "name": "tconstruct:dwarfish",
+      "name": "tconstruct:dwarven",
       "level": 1
     }
   ]

diff --git a/src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java b/src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java
@@ -36,7 +36,7 @@
 import slimeknights.tconstruct.tools.modifiers.shared.ReinforcedModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.CultivatedModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.DamageSpeedTradeModifier;
-import slimeknights.tconstruct.tools.modifiers.traits.DwarfishModifier;
+import slimeknights.tconstruct.tools.modifiers.traits.DwarvenModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.HeavyModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.InsatibleModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.LaceratingModifier;
@@ -155,7 +155,7 @@ public final class TinkerModifiers extends TinkerModule {
   // traits - tier 2
   // reinforced is also an upgrade
   public static final RegistryObject<SearingModifier> searing = MODIFIERS.register("searing", SearingModifier::new);
-  public static final RegistryObject<DwarfishModifier> dwarfish = MODIFIERS.register("dwarfish", DwarfishModifier::new);
+  public static final RegistryObject<DwarvenModifier> dwarven = MODIFIERS.register("dwarven", DwarvenModifier::new);
   public static final RegistryObject<OvergrowthModifier> overgrowth = MODIFIERS.register("overgrowth", OvergrowthModifier::new);
   // traits - tier 3
   public static final RegistryObject<OvercastModifier> overcast = MODIFIERS.register("overcast", OvercastModifier::new);

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/Materials.java b/src/main/java/slimeknights/tconstruct/tools/data/Materials.java
@@ -48,7 +48,7 @@ final class Materials {
   public static final IMaterial bone  = mat(MaterialIds.bone,  1, ORDER_SPECIAL, true, 0xede6bf, TinkerModifiers.fractured);
   // tier 2
   public static final IMaterial iron        = mat(MaterialIds.iron,        2, ORDER_GENERAL, TinkerFluids.moltenIron, false, 0xcacaca, TinkerModifiers.reinforced);
-  public static final IMaterial copper      = mat(MaterialIds.copper,      2, ORDER_HARVEST, TinkerFluids.moltenCopper, true, 0xfba165, TinkerModifiers.dwarfish);
+  public static final IMaterial copper      = mat(MaterialIds.copper,      2, ORDER_HARVEST, TinkerFluids.moltenCopper, true, 0xfba165, TinkerModifiers.dwarven);
   public static final IMaterial searedStone = mat(MaterialIds.searedStone, 2, ORDER_WEAPON,  TinkerFluids.searedStone, false, 0x3f3f3f, TinkerModifiers.searing);
   public static final IMaterial slimewood   = mat(new DataMaterial(MaterialIds.slimewood, 2, ORDER_SPECIAL, false, 0x82c873, getOverslimeTrait(TinkerModifiers.overgrowth)));
   // tier 3

diff --git a/...ls/modifiers/traits/DwarfishModifier.java → ...ols/modifiers/traits/DwarvenModifier.java b/...ls/modifiers/traits/DwarfishModifier.java → ...ols/modifiers/traits/DwarvenModifier.java
@@ -4,13 +4,13 @@
 import slimeknights.tconstruct.library.modifiers.Modifier;
 import slimeknights.tconstruct.library.tools.nbt.IModifierToolStack;
 
-public class DwarfishModifier extends Modifier {
+public class DwarvenModifier extends Modifier {
   /** Baseline height where boost is 1 */
   private static final int SEA_LEVEL = 64;
   /** Max percentage bonus per level when y = 0 */
   private static final float BOOST_AT_0 = 0.2f;
 
-  public DwarfishModifier() {
+  public DwarvenModifier() {
     super(0xed9f07);
   }
 

diff --git a/src/main/resources/assets/tconstruct/lang/en_us.json b/src/main/resources/assets/tconstruct/lang/en_us.json
@@ -1098,9 +1098,9 @@
     "modifier.tconstruct.searing": "Searing",
     "modifier.tconstruct.searing.flavor": "Harness the Smeltery!",
     "modifier.tconstruct.searing.description": "Tool does bonus fire damage in hot areas, but less overall damage in cold ones",
-    "modifier.tconstruct.dwarfish": "Dwarfish",
-    "modifier.tconstruct.dwarfish.flavor": "Miner's Friend!",
-    "modifier.tconstruct.dwarfish.description": "Tool mines faster the deeper you mine, just don't mine too deep",
+    "modifier.tconstruct.dwarven": "Dwarven",
+    "modifier.tconstruct.dwarven.flavor": "Miner's Friend!",
+    "modifier.tconstruct.dwarven.description": "Tool mines faster the deeper you mine, just don't mine too deep",
     "modifier.tconstruct.overgrowth": "Overgrowth",
     "modifier.tconstruct.overgrowth.flavor": "Fungal!",
     "modifier.tconstruct.overgrowth.description": "Tool slowly grows overslime",