diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java index f56abf1..6192f41 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemBaseFocus.java @@ -23,7 +23,7 @@ public abstract class ItemBaseFocus extends Item implements IWandFocus { public ItemBaseFocus(String unlocName, String textureName) { super(); - setUnlocalizedName(ModInformation.modid + ".module.base.focus." + unlocName); + setUnlocalizedName(ModInformation.modid + ".module." + unlocName); setTextureName(ModInformation.texturePath + ":" + textureName); setCreativeTab(ElectroMagicTools.tabEMT); setMaxDamage(1); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java index 0cc2a7d..772fa08 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java @@ -26,7 +26,7 @@ public class ItemChristmasFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); public ItemChristmasFocus() { - super("focus.christmas", "focus_christmas"); + super("base.focus.christmas", "focus_christmas"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java index e1ab84e..8578cab 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java @@ -26,7 +26,7 @@ public class ItemExplosionFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); public ItemExplosionFocus() { - super("focus.explosion", "focus_explosion"); + super("base.focus.explosion", "focus_explosion"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java index eae3e1d..a359fae 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java @@ -27,7 +27,7 @@ public class ItemShieldFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); public ItemShieldFocus() { - super("focus.shield", "focus_shield"); + super("base.focus.shield", "focus_shield"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java index 64a38bd..62c763a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java @@ -29,7 +29,7 @@ public class ItemChargeFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); public ItemChargeFocus() { - super("focus.charge", "focus_charge"); + super("ic2.focus.charge", "focus_charge"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java index 2d6ef8c..8f3883e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java @@ -14,7 +14,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); public ItemWandChargingFocus() { - super("focus.charge.wand", "focus_wandCharge"); + super("ic2.focus.charge.wand", "focus_wandCharge"); } @Override diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 5421ab0..8a07ceb 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -94,11 +94,11 @@ item.EMT.chainsaw.stream.name=Chainsaw of the Stream item.EMT.drill.rockbreaker.name=Drill of the Rockbreaker item.EMT.hoeofgrowth.electric.name=Electric Hoe of Growth -item.EMT.focus.explosion.name=Wand Focus: Explosion -item.EMT.focus.christmas.name=Wand Focus: Kris-tmas -item.EMT.focus.shield.name=Wand Focus: Shield -item.EMT.focus.charge.name=Wand Focus: Charging -item.EMT.focus.charge.wand.name=Wand Focus: Wand Charging +item.EMT.module.base.focus.explosion.name=Wand Focus: Explosion +item.EMT.module.base.focus.christmas.name=Wand Focus: Kris-tmas +item.EMT.module.base.focus.shield.name=Wand Focus: Shield +item.EMT.module.ic2.focus.charge.name=Wand Focus: Charging +item.EMT.module.ic2.focus.charge.wand.name=Wand Focus: Wand Charging item.EMT.drill.wood.name=Wooden Drill item.EMT.drill.stone.name=Stone Drill