diff --git a/src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java b/src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java index 4c7442e..fd1e2ad 100644 --- a/src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java +++ b/src/main/java/tombenpotter/emt/common/commands/CommandOutputs.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; +import tombenpotter.emt.common.util.TextHelper; import java.util.Collection; import java.util.List; @@ -47,16 +48,15 @@ public class CommandOutputs extends CommandBase { } } - @Override public void processCommand(ICommandSender command, String[] astring) { - text = "EU Ouput per Essentia: "; + text = TextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": "; Collection aspectCollection = Aspect.aspects.values(); for (Aspect aspect : aspectCollection) { String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EssentiasOutputs.outputs.get(aspect.getTag())) + "\n")); text = text2; } - addOutputsBook("Essentia Outputs Book", text, command, astring); + addOutputsBook(TextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring); } public void addOutputsBook(String title, String text, ICommandSender command, String[] astring) { diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTItems.java b/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTItems.java index 9de77e9..140915d 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTItems.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTItems.java @@ -131,23 +131,23 @@ public class ItemEMTItems extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":clusteruranium"); - this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":crushedamber"); - this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":purifiedamber"); - this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":crushedcinnabar"); - this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":purifiedcinnabar"); - this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":thaumiumplate"); - this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":lightningsummoner"); - this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":feathermesh"); - this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":glue"); - this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":ducttape"); - this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":rubberball"); - this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":cardboard"); - this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":feathercarboardwing"); - this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":denseironsheet"); - this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":taintedfeather"); - this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":thaumiumWing"); - this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":uumatterdrop"); + this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":materials/clusteruranium"); + this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":materials/crushedamber"); + this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":materials/purifiedamber"); + this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":materials/crushedcinnabar"); + this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":materials/purifiedcinnabar"); + this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumplate"); + this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":materials/lightningsummoner"); + this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":materials/feathermesh"); + this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/glue"); + this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/ducttape"); + this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/rubberball"); + this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboard"); + this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboardsheet"); + this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/denseironsheet"); + this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/taintedfeather"); + this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumWing"); + this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":materials/uumatterdrop"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/module/base/items/ItemFeatherWing.java index 0f54f05..eb52d86 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/ItemFeatherWing.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/ItemFeatherWing.java @@ -30,7 +30,7 @@ public class ItemFeatherWing extends ItemArmor { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":featherwings"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_feather"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/ItemThaumiumReinforcedWing.java b/src/main/java/tombenpotter/emt/common/module/base/items/ItemThaumiumReinforcedWing.java index bb82ecd..060fe2d 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/ItemThaumiumReinforcedWing.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/ItemThaumiumReinforcedWing.java @@ -36,7 +36,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumwings"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_thaumium"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java index a8ed931..fa8d16f 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java @@ -24,6 +24,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.IWandFocus; import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.ModInformation; import java.util.List; @@ -31,12 +32,15 @@ public abstract class ItemBaseFocus extends Item implements IWandFocus { private IIcon ornament, depth; - public ItemBaseFocus() { + public ItemBaseFocus(String unlocName, String textureName) { super(); - this.setMaxDamage(1); - this.setNoRepair(); - this.setMaxStackSize(1); - this.setCreativeTab(ElectroMagicTools.tabEMT); + + setUnlocalizedName(ModInformation.modid + "." + unlocName); + setTextureName(ModInformation.texturePath + ":" + textureName); + setCreativeTab(ElectroMagicTools.tabEMT); + setMaxDamage(1); + setNoRepair(); + setMaxStackSize(1); } boolean hasOrnament() { diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemChristmasFocus.java index b17ca6b..4223b94 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemChristmasFocus.java @@ -12,9 +12,6 @@ package tombenpotter.emt.common.module.base.items.foci; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,14 +20,13 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ModInformation; public class ItemChristmasFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); public ItemChristmasFocus() { - super(); + super("focus.christmas", "focus_christmas"); } @Override @@ -38,12 +34,6 @@ public class ItemChristmasFocus extends ItemBaseFocus { return 99999999; } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":christmasfocus"); - } - @Override public AspectList getVisCost() { return visCost; diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemExplosionFocus.java index 69f18ec..aa03b3a 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemExplosionFocus.java @@ -12,9 +12,6 @@ package tombenpotter.emt.common.module.base.items.foci; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; @@ -22,7 +19,6 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.module.base.entities.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { @@ -30,13 +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(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":explosionfocus"); + super("focus.explosion", "focus_explosion"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemShieldFocus.java index 407ab71..b41e798 100644 --- a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemShieldFocus.java @@ -12,9 +12,6 @@ package tombenpotter.emt.common.module.base.items.foci; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -23,7 +20,6 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { @@ -31,13 +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(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":shieldfocus"); + super("focus.shield", "focus_shield"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java b/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java index 1d702d8..1e6dbc1 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java @@ -87,71 +87,72 @@ public class IC2ModuleItemRegistry { emtBauble = new ItemEMTBaubles().setUnlocalizedName(ModInformation.modid + ".emtbauble"); GameRegistry.registerItem(emtBauble, "EMTBaubles"); - electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".electricgoggles"); + electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); - nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".nanothaumichelmet"); + nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano"); GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing"); - quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".quantumthaumichelmet"); + quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum"); GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing"); - solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".solarhelmetrevealing"); + solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar"); GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); - electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".electricboots"); + electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric"); GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); - nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".nanobootstraveller"); + nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano"); GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); - quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".quantumbootstraveller"); + quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum"); GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); - electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".electricscribingtools"); + electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric"); GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools"); - featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".featherwing"); + featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather"); GameRegistry.registerItem(featherWing, "FeatherWing"); - thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".thaumiumwing"); + thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium"); GameRegistry.registerItem(thaumiumWing, "ThaumiumWing"); - nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".nanowing"); + nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano"); GameRegistry.registerItem(nanoWing, "NanosuitWing"); - quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".quantumwing"); + quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum"); GameRegistry.registerItem(quantumWing, "QuantumWing"); - taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName(ModInformation.modid + ".taintedthorhammer"); + taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.broken"); GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir"); - thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammerthor"); + thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer"); GameRegistry.registerItem(thorHammer, "Mjolnir"); - electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".electricthorhammer"); + electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric"); GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir"); - thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".thaumiumdrill"); + thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium"); GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill"); - diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".diamondchainsaw"); + + diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw"); - thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".thaumiumchainsaw"); + thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium"); GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw"); - ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".ironomnitool"); + ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); GameRegistry.registerItem(ironOmnitool, "Omnitool"); - diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".diamondomnitool"); + diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); - thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".thaumiumomnitool"); + thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium"); GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool"); - streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".streamchainsaw"); + streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream"); GameRegistry.registerItem(streamChainsaw, "ChainsawStream"); - rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".rockbreakerdrill"); + rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker"); GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker"); - electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".electrichoeofgrowth"); + electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric"); GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth"); - explosionFocus = new ItemExplosionFocus().setUnlocalizedName(ModInformation.modid + ".laserfocus"); + explosionFocus = new ItemExplosionFocus(); GameRegistry.registerItem(explosionFocus, "ExplosionFocus"); - christmasFocus = new ItemChristmasFocus().setUnlocalizedName(ModInformation.modid + ".christmasfocus"); + christmasFocus = new ItemChristmasFocus(); GameRegistry.registerItem(christmasFocus, "ChristmasFocus"); - shieldFocus = new ItemShieldFocus().setUnlocalizedName(ModInformation.modid + ".shieldfocus"); + shieldFocus = new ItemShieldFocus(); GameRegistry.registerItem(shieldFocus, "ShieldFocus"); - chargeFocus = new ItemChargeFocus().setUnlocalizedName(ModInformation.modid + ".chargefocus"); + chargeFocus = new ItemChargeFocus(); GameRegistry.registerItem(chargeFocus, "ChargingFocus"); - wandChargeFocus = new ItemWandChargingFocus().setUnlocalizedName(ModInformation.modid + ".wandchargefocus"); + wandChargeFocus = new ItemWandChargingFocus(); GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus"); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java index 659efb8..59ff845 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java @@ -85,7 +85,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":electricboots"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_electric"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java index 8a0f570..365214f 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java @@ -44,7 +44,7 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":nanobootstravel"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_nano"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java index b6701cb..99c26f9 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java @@ -44,7 +44,7 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":quantumbootstravel"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_quantum"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java index 7905139..cf8d50f 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java @@ -55,7 +55,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":electricgoggles"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_electric"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java index ebdcc00..b972ad7 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java @@ -44,7 +44,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":nanothaumichelmet"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_nano"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java index 77ba064..16b212e 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java @@ -56,7 +56,7 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":quantumthaumichelmet"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_quantum"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java index 63e7c05..83cb0fe 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java @@ -68,6 +68,12 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { potionCost.put(Integer.valueOf(Potion.confusion.id), Integer.valueOf(5000)); } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_solar"); + } + @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layerType) { return ModInformation.texturePath + ":textures/models/solarrevealinghelmet.png"; @@ -182,10 +188,4 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { public static int tickRate() { return 128; } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":solarrevealinghelmet"); - } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java index 2a5e510..eb82465 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java @@ -41,7 +41,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":nanowings"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_nano"); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java index 461c359..37549a2 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java @@ -27,7 +27,7 @@ public class ItemQuantumWing extends ItemNanoWing { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":quantumwings"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_quantum"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java index bb3051a..3a55952 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java @@ -12,11 +12,8 @@ package tombenpotter.emt.common.module.ic2.items.foci; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; @@ -24,7 +21,6 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus; import tombenpotter.emt.common.util.ConfigHandler; @@ -33,13 +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(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":chargefocus"); + super("focus.charge", "focus_charge"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java index 9b30539..7cb5f2c 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java @@ -1,30 +1,20 @@ package tombenpotter.emt.common.module.ic2.items.foci; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus; import tombenpotter.emt.common.util.ConfigHandler; public class ItemWandChargingFocus extends ItemBaseFocus { - AspectList visCost = new AspectList(); + 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(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":wandchargefocus"); + super("focus.charge.wand", "focus_wandCharge"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java index d192d53..28910e8 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java @@ -27,7 +27,7 @@ import java.util.List; public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectricItem { - public IIcon icon; + public IIcon icon; public int maxCharge = 1000000; public int growthCost = 1000; public int tillCost = 100; @@ -38,12 +38,12 @@ public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectric this.setMaxStackSize(1); } - /** - * @SideOnly(Side.CLIENT) - * @Override public void registerIcons(IIconRegister iconRegister) { - * this.icon = iconRegister.registerIcon("electromagictools:electrichoegrowth"); - * } - */ +// Why this no work? :( +// @SideOnly(Side.CLIENT) +// @Override +// public void registerIcons(IIconRegister iconRegister) { +// this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth"); +// } @SuppressWarnings({"rawtypes", "unchecked"}) @SideOnly(Side.CLIENT) diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java index 491df7f..bf2ba7b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -53,7 +53,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":diamondchainsaw"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_diamond"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java index 65b55d1..73dd824 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java @@ -56,7 +56,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":streamchainsaw"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_stream"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java index e6a5465..7a8e710 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java @@ -40,7 +40,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumchainsaw"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_thaumium"); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java index e8f2f49..4eac11f 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java @@ -72,7 +72,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":rockbreakerdrill"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drill_rockbreaker"); } private boolean isEffectiveAgainst(Block block) { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java index 3b61b8c..c04d4c7 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java @@ -55,7 +55,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumdrill"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drill_thaumium"); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java index 4fcbf97..095a441 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java @@ -33,7 +33,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron { this.efficiencyOnProperMaterial = 16F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (ConfigHandler.toolsInBore == false) { + if (!ConfigHandler.toolsInBore) { this.setMaxDamage(27); } else { this.setMaxDamage(350); @@ -45,12 +45,12 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":diamondomnitool"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_diamond"); } @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (ConfigHandler.toolsInBore == false) { + if (!ConfigHandler.toolsInBore) { cost = 200; } else { cost = 1; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java index 7465b6d..8edf1e6 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java @@ -46,7 +46,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { this.efficiencyOnProperMaterial = 13F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (ConfigHandler.toolsInBore == false) { + if (!ConfigHandler.toolsInBore) { this.setMaxDamage(27); } else { this.setMaxDamage(200); @@ -56,7 +56,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":ironomnitool"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_iron"); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -77,7 +77,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (ConfigHandler.toolsInBore == false) { + if (!ConfigHandler.toolsInBore) { cost = 100; } else { cost = 1; @@ -148,7 +148,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { @Override public int getItemEnchantability() { - if (ConfigHandler.enchanting == false) { + if (!ConfigHandler.enchanting) { return 0; } else { return 4; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java index ec81a5f..545597c 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java @@ -33,7 +33,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { this.efficiencyOnProperMaterial = 21F; this.setCreativeTab(ElectroMagicTools.tabEMT); this.setMaxStackSize(1); - if (ConfigHandler.toolsInBore == false) { + if (!ConfigHandler.toolsInBore) { this.setMaxDamage(27); } else { this.setMaxDamage(467); @@ -45,12 +45,12 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":thaumiumomnitool"); + this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_thaumium"); } @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (ConfigHandler.toolsInBore == false) { + if (!ConfigHandler.toolsInBore) { cost = 300; } else { cost = 1; diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java index dd11a4e..5e4d114 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java +++ b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java @@ -51,44 +51,44 @@ public class VanillaItemsRegistry { public static Item.ToolMaterial bronzeMaterial = EnumHelper.addToolMaterial("bronzeToolMaterial", 2, 350, 7.0F, 3.0F, 16); public static void registerItems() { - craftingComponent = new ItemCraftingComponent().setUnlocalizedName(ModInformation.modid + ".craftingComponent"); + craftingComponent = new ItemCraftingComponent().setUnlocalizedName(ModInformation.modid + ".material"); GameRegistry.registerItem(craftingComponent, "craftingComponents"); - woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, ":woodenDrill", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".woodenDrill"); + woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, ":drill_wood", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".drill.wood"); GameRegistry.registerItem(woodenDrill, "woodenDrill"); - stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, ":stoneDrill", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".stoneDrill"); + stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, ":drill_stone", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".drill.stone"); GameRegistry.registerItem(stoneDrill, "stoneDrill"); - ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, ":ironDrill", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".ironDrill"); + ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, ":drill_iron", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.iron"); GameRegistry.registerItem(ironDrill, "ironDrill"); - goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, ":goldenDrill", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".goldenDrill"); + goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, ":drill_gold", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.gold"); GameRegistry.registerItem(goldenDrill, "goldenDrill"); - diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, ":diamondDrill", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".diamondDrill"); + diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, ":drill_diamond", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".drill.diamond"); GameRegistry.registerItem(diamondDrill, "diamondDrill"); - copperDrill = new ItemVanillaDrill(copperMaterial, 450, ":copperDrill", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".copperDrill"); + copperDrill = new ItemVanillaDrill(copperMaterial, 450, ":drill_copper", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.copper"); GameRegistry.registerItem(copperDrill, "copperDrill"); - tinDrill = new ItemVanillaDrill(tinMaterial, 350, ":tinDrill", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".tinDrill"); + tinDrill = new ItemVanillaDrill(tinMaterial, 350, ":drill_tin", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.tin"); GameRegistry.registerItem(tinDrill, "tinDrill"); - leadDrill = new ItemVanillaDrill(leadMaterial, 400, ":leadDrill", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".leadDrill"); + leadDrill = new ItemVanillaDrill(leadMaterial, 400, ":drill_lead", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.lead"); GameRegistry.registerItem(leadDrill, "leadDrill"); - bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, ":bronzeDrill", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".bronzeDrill"); + bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, ":drill_bronze", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.bronze"); GameRegistry.registerItem(bronzeDrill, "bronzeDrill"); - woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenChainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".woodenChainsaw"); + woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenChainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".chainsaw.wood"); GameRegistry.registerItem(woodenChainsaw, "woodenChainsaw"); - stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stoneChainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".stoneChainsaw"); + stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stoneChainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".chainsaw.stone"); GameRegistry.registerItem(stoneChainsaw, "stoneChainsaw"); - ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironChainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".ironChainsaw"); + ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironChainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.iron"); GameRegistry.registerItem(ironChainsaw, "ironChainsaw"); - goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenChainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenChainsaw"); + goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenChainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".chainsaw.gold"); GameRegistry.registerItem(goldenChainsaw, "goldenChainsaw"); - diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondChainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".diamondChainsaw"); + diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondChainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); GameRegistry.registerItem(diamondChainsaw, "diamondChainsaw"); - ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironOmnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".ironOmnitool"); + ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironOmnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); GameRegistry.registerItem(ironOmnitool, "ironOmnitool"); - goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenOmnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenOmnitool"); + goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenOmnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.gold"); GameRegistry.registerItem(goldenOmnitool, "goldenOmnitool"); - diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondOmnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".diamondOmnitool"); + diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondOmnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); GameRegistry.registerItem(diamondOmnitool, "diamondOmnitool"); } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java b/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java index ff2c0e6..db2424f 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java +++ b/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java @@ -14,9 +14,9 @@ import java.util.List; public class ItemCraftingComponent extends Item { - public IIcon[] icon = new IIcon[500]; - public final String drillTop = "DrillTop"; - public final String chainsawTop = "ChainsawTop"; + public IIcon[] icon = new IIcon[17]; + public final String drillTop = "drillTop"; + public final String chainsawTop = "chainsawTop"; public ItemCraftingComponent() { this.setMaxDamage(0); @@ -32,75 +32,67 @@ public class ItemCraftingComponent extends Item { name = "nothing"; break; case 0: { - name = "wooden" + drillTop; + name = drillTop + ".wood"; break; } case 1: { - name = "stone" + drillTop; + name = drillTop + ".stone"; break; } case 2: { - name = "iron" + drillTop; + name = drillTop + ".iron"; break; } case 3: { - name = "golden" + drillTop; + name = drillTop + ".gold"; break; } case 4: { - name = "diamond" + drillTop; + name = drillTop + ".diamond"; break; } case 5: { - name = "copper" + drillTop; + name = drillTop + ".copper"; break; } case 6: { - name = "tin" + drillTop; + name = drillTop + ".tin"; break; } case 7: { - name = "lead" + drillTop; + name = drillTop + ".lead"; break; } case 8: { - name = "tin" + drillTop; + name = chainsawTop + ".wood"; break; } case 9: { - name = "wooden" + chainsawTop; + name = chainsawTop + ".stone"; break; } case 10: { - name = "stone" + chainsawTop; + name = chainsawTop + ".iron"; break; } case 11: { - name = "iron" + chainsawTop; + name = chainsawTop + ".gold"; break; } case 12: { - name = "golden" + chainsawTop; + name = chainsawTop + ".diamond"; break; } case 13: { - name = "diamond" + chainsawTop; + name = chainsawTop + ".copper"; break; } case 14: { - name = "copper" + chainsawTop; + name = chainsawTop + ".tin"; break; } case 15: { - name = "tin" + chainsawTop; - break; - } - case 16: { - name = "lead" + chainsawTop; - break; - } - case 17: { - name = "tin" + chainsawTop; + name = chainsawTop + ".lead"; break; } } @@ -109,25 +101,23 @@ public class ItemCraftingComponent extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":wooden" + drillTop); - this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":stone" + drillTop); - this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":iron" + drillTop); - this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":golden" + drillTop); - this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":diamond" + drillTop); - this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":copper" + drillTop); - this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":tin" + drillTop); - this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":lead" + drillTop); - this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":bronze" + drillTop); + this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "wood"); + this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "stone"); + this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "iron"); + this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "gold"); + this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "diamond"); + this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "copper"); + this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "tin"); + this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "lead"); - this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":wooden" + chainsawTop); - this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":stone" + chainsawTop); - this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":iron" + chainsawTop); - this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":golden" + chainsawTop); - this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":diamond" + chainsawTop); - this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":copper" + chainsawTop); - this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":tin" + chainsawTop); - this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":lead" + chainsawTop); - this.icon[17] = ri.registerIcon(ModInformation.texturePath + ":bronze" + chainsawTop); + this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "wood"); + this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "stone"); + this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "iron"); + this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "gold"); + this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "diamond"); + this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "copper"); + this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "tin"); + this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "lead"); } @SideOnly(Side.CLIENT) @@ -137,7 +127,7 @@ public class ItemCraftingComponent extends Item { @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { - for (int i = 0; i <= 32; i++) { + for (int i = 0; i <= 15; i++) { list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 29eee18..c2afa0b 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -9,6 +9,8 @@ gui.EMT.config.title=Electro-Magic Tools Configuration gui.EMT.etherealMacerator.title=Ethereal Processor gui.EMT.wandRecharge.title=Industrial Wand Recharge Station gui.EMT.inventory=Inventory +gui.EMT.book.aspect.output.eu.title=Essentia Outputs Book +gui.EMT.book.aspect.output.essentia.eu=EU Ouput per Essentia #=============Tooltips============= #This comes after a player name. The 's is depicting ownership. @@ -32,36 +34,11 @@ tooltip.EMT.output.double.lava=when lava is on top tooltip.EMT.output.double.half.height=when the block is over Y = 160 tooltip.EMT.output.double.half.low=when the block is under Y = 10 - #=============Enity Names============= entity.EMT.entityLaser.name=Laser entity.EMT.entityArcher.name=Guardian Snowman #=============Item Names============= -item.EMT.thaumiumdrill.name=Thaumium Drill -item.EMT.thaumiumchainsaw.name=Thaumium Chainsaw -item.EMT.quantumthaumichelmet.name=Quantum Goggles of Revealing -item.EMT.diamondchainsaw.name=Diamond Chainsaw -item.EMT.ironomnitool.name=Omnitool -item.EMT.diamondomnitool.name=Diamond Omnitool -item.EMT.thaumiumomnitool.name=Thaumium Omnitool -item.EMT.nanothaumichelmet.name=Nanosuit Goggles of Revealing -item.EMT.laserfocus.name=Wand Focus: Explosion -item.EMT.christmasfocus.name=Wand Focus: Kris-tmas -item.EMT.shieldfocus.name=Wand Focus: Shield -item.EMT.electricgoggles.name=Electric Goggles of Revealing -item.EMT.streamchainsaw.name=Chainsaw of the Stream -item.EMT.rockbreakerdrill.name=Drill of the Rockbreaker -item.EMT.solarhelmetrevealing.name=Quantum Solar Helmet of Revealing -item.EMT.hammerthor.name=Mjolnir -item.EMT.taintedthorhammer.name=Broken Relic of Mjolnir -item.EMT.electricthorhammer.name=Supercharged Mjolnir -item.EMT.electricboots.name=Electric Boots of the Traveller -item.EMT.nanobootstraveller.name=Nanosuit Boots of the Traveller -item.EMT.quantumbootstraveller.name=Quantum Boots of the Traveller -item.EMT.electricscribingtools.name=Electric Scribing Tools -item.EMT.electrichoeofgrowth.name=Electric Hoe of Growth -item.EMT.chargefocus.name=Wand Focus: Charging item.EMT.emtitems.oreClusterUranium=Uranium Native Cluster item.EMT.emtitems.crushedOreAmber.name=Crushed Amber Ore item.EMT.emtitems.purifiedOreAmber.name=Purified Amber Ore @@ -79,14 +56,87 @@ item.EMT.emtitems.denseIronSheet.name=Dense Iron Sheet item.EMT.emtitems.taintedFeather.name=Tainted Feather item.EMT.emtitems.thaumiumWing.name=Thaumium Reinforced Wing item.EMT.emtitems.uumatterDrop.name=Crystallized UU-Matter Drop + item.EMT.emtbauble.euMaker.armor.name=Armor Charging Ring item.EMT.emtbauble.euMaker.inventory.name=Inventory Charging Ring item.EMT.emtbauble.oneRing.name=The One Ring -item.EMT.wandchargefocus.name=Wand Focus: Wand Charging -item.EMT.featherwing.name=Feather Duct-Taped Wings -item.EMT.thaumiumwing.name=Thaumium Reinforced Wings -item.EMT.nanowing.name=Nanosuit Wings -item.EMT.quantumwing.name=Quantum Wings + +item.EMT.goggles.electric.name=Electric Goggles of Revealing +item.EMT.goggles.nano.name=Nanosuit Goggles of Revealing +item.EMT.goggles.quantum.name=Quantum Goggles of Revealing +item.EMT.goggles.solar.name=Solar Goggles of Revealing + +item.EMT.boots.traveller.electric.name=Electric Boots of the Traveller +item.EMT.boots.traveller.nano.name=Nanosuit Boots of the Traveller +item.EMT.boots.traveller.quantum.name=Quantum Boots of the Traveller + +item.EMT.scribingtools.electric.name=Electric Scribing Tools + +item.EMT.wing.feather.name=Feather Duct-Taped Wings +item.EMT.wing.thaumium.name=Thaumium Reinforced Wings +item.EMT.wing.nano.name=Nanosuit Wings +item.EMT.wing.quantum.name=Quantum Wings + +item.EMT.hammer.broken.name=Broken Relic of Mjolnir +item.EMT.hammer.name=Mjolnir +item.EMT.hammer.electric.name=Supercharged Mjolnir + +item.EMT.drill.thaumium.name=Thaumium Drill + +item.EMT.chainsaw.diamond.name=Diamond Chainsaw +item.EMT.chainsaw.thaumium.name=Thaumium Chainsaw + +item.EMT.omnitool.iron.name=Iron Omnitool +item.EMT.omnitool.diamond.name=Diamond Omnitool +item.EMT.omnitool.thaumium.name=Thaumium Omnitool + +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.drill.wood.name=Wooden Drill +item.EMT.drill.stone.name=Stone Drill +item.EMT.drill.iron.name=Iron Drill +item.EMT.drill.gold.name=Golden Drill +item.EMT.drill.diamond.name=Diamond Drill +item.EMT.drill.copper.name=Copper Drill +item.EMT.drill.tin.name=Tin Drill +item.EMT.drill.lead.name=Lead Drill +item.EMT.drill.bronze.name=Bronze Drill + +item.EMT.chainsaw.wood.name=Wooden Chainsaw +item.EMT.chainsaw.stone.name=Stone Chainsaw +item.EMT.chainsaw.iron.name=Iron Chainsaw +item.EMT.chainsaw.gold.name=Golden Chainsaw +item.EMT.chainsaw.diamond.name=Diamond Chainsaw + +item.EMT.omnitool.iron.name=Iron Omnitool +item.EMT.omnitool.gold.name=Golden Omnitool +item.EMT.omnitool.diamond.name=Diamond Omnitool + +item.EMT.material.drillTop.wood.name=Wooden Drill Top +item.EMT.material.drillTop.stone.name=Stone Drill Top +item.EMT.material.drillTop.iron.name=Iron Drill Top +item.EMT.material.drillTop.gold.name=Golden Drill Top +item.EMT.material.drillTop.diamond.name=Diamond Drill Top +item.EMT.material.drillTop.tin.name=Tin Drill Top +item.EMT.material.drillTop.copper.name=Copper Drill Top +item.EMT.material.drillTop.lead.name=Lead Drill Top + +item.EMT.material.chainsawTop.wood.name=Wooden Chainsaw Top +item.EMT.material.chainsawTop.stone.name=Stone Chainsaw Top +item.EMT.material.chainsawTop.iron.name=Iron Chainsaw Top +item.EMT.material.chainsawTop.gold.name=Golden Chainsaw Top +item.EMT.material.chainsawTop.diamond.name=Diamond Chainsaw Top +item.EMT.material.chainsawTop.tin.name=Tin Chainsaw Top +item.EMT.material.chainsawTop.copper.name=Copper Chainsaw Top +item.EMT.material.chainsawTop.lead.name=Lead Chainsaw Top #=============Block Names============= tile.EMT.shield.name=Shield Block diff --git a/src/main/resources/assets/electromagictools/textures/items/electricboots.png b/src/main/resources/assets/electromagictools/textures/items/armor/boots_electric.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electricboots.png rename to src/main/resources/assets/electromagictools/textures/items/armor/boots_electric.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electricboots_ALT.png b/src/main/resources/assets/electromagictools/textures/items/armor/boots_electric_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electricboots_ALT.png rename to src/main/resources/assets/electromagictools/textures/items/armor/boots_electric_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/nanobootstravel.png b/src/main/resources/assets/electromagictools/textures/items/armor/boots_nano.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/nanobootstravel.png rename to src/main/resources/assets/electromagictools/textures/items/armor/boots_nano.png diff --git a/src/main/resources/assets/electromagictools/textures/items/quantumbootstravel.png b/src/main/resources/assets/electromagictools/textures/items/armor/boots_quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/quantumbootstravel.png rename to src/main/resources/assets/electromagictools/textures/items/armor/boots_quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electricgoggles.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electricgoggles.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electricgoggles_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electricgoggles_alt.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_electric_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/nanothaumichelmet.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/nanothaumichelmet.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano.png diff --git a/src/main/resources/assets/electromagictools/textures/items/nanothaumichelmet_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/nanothaumichelmet_alt.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_nano_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/quantumthaumichelmet.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/quantumthaumichelmet.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/items/quantumthaumichelmet_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/quantumthaumichelmet_alt.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_quantum_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar.png diff --git a/src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet_alt.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet_alt.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet_alt2.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet_alt2.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt2.png diff --git a/src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet_alt3.png b/src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/solarrevealinghelmet_alt3.png rename to src/main/resources/assets/electromagictools/textures/items/armor/goggles_solar_alt3.png diff --git a/src/main/resources/assets/electromagictools/textures/items/featherwings.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_feather.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/featherwings.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_feather.png diff --git a/src/main/resources/assets/electromagictools/textures/items/featherwings_flat.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_feather_flat.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/featherwings_flat.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_feather_flat.png diff --git a/src/main/resources/assets/electromagictools/textures/items/nanowings.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/nanowings.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png diff --git a/src/main/resources/assets/electromagictools/textures/items/quantumwings.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_quantum.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/quantumwings.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_quantum.png diff --git a/src/main/resources/assets/electromagictools/textures/items/wings_random.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_random.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/wings_random.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_random.png diff --git a/src/main/resources/assets/electromagictools/textures/items/wings_random2.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_random2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/wings_random2.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_random2.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumwings.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_thaumium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumwings.png rename to src/main/resources/assets/electromagictools/textures/items/armor/wing_thaumium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamonddrill.png b/src/main/resources/assets/electromagictools/textures/items/drill_diamond.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamonddrill.png rename to src/main/resources/assets/electromagictools/textures/items/drill_diamond.png diff --git a/src/main/resources/assets/electromagictools/textures/items/goldendrill.png b/src/main/resources/assets/electromagictools/textures/items/drill_gold.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/goldendrill.png rename to src/main/resources/assets/electromagictools/textures/items/drill_gold.png diff --git a/src/main/resources/assets/electromagictools/textures/items/irondrill.png b/src/main/resources/assets/electromagictools/textures/items/drill_iron.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/irondrill.png rename to src/main/resources/assets/electromagictools/textures/items/drill_iron.png diff --git a/src/main/resources/assets/electromagictools/textures/items/stonedrill.png b/src/main/resources/assets/electromagictools/textures/items/drill_stone.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/stonedrill.png rename to src/main/resources/assets/electromagictools/textures/items/drill_stone.png diff --git a/src/main/resources/assets/electromagictools/textures/items/woodendrill.png b/src/main/resources/assets/electromagictools/textures/items/drill_wood.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/woodendrill.png rename to src/main/resources/assets/electromagictools/textures/items/drill_wood.png diff --git a/src/main/resources/assets/electromagictools/textures/items/feathercardboardwing.png b/src/main/resources/assets/electromagictools/textures/items/feathercardboardwing.png deleted file mode 100644 index f5edebf..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/items/feathercardboardwing.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/items/chargefocus.png b/src/main/resources/assets/electromagictools/textures/items/focus_charge.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/chargefocus.png rename to src/main/resources/assets/electromagictools/textures/items/focus_charge.png diff --git a/src/main/resources/assets/electromagictools/textures/items/chargefocus.png.mcmeta b/src/main/resources/assets/electromagictools/textures/items/focus_charge.png.mcmeta similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/chargefocus.png.mcmeta rename to src/main/resources/assets/electromagictools/textures/items/focus_charge.png.mcmeta diff --git a/src/main/resources/assets/electromagictools/textures/items/christmasfocus.png b/src/main/resources/assets/electromagictools/textures/items/focus_christmas.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/christmasfocus.png rename to src/main/resources/assets/electromagictools/textures/items/focus_christmas.png diff --git a/src/main/resources/assets/electromagictools/textures/items/explosionfocus.png b/src/main/resources/assets/electromagictools/textures/items/focus_explosion.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/explosionfocus.png rename to src/main/resources/assets/electromagictools/textures/items/focus_explosion.png diff --git a/src/main/resources/assets/electromagictools/textures/items/shieldfocus.png b/src/main/resources/assets/electromagictools/textures/items/focus_shield.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/shieldfocus.png rename to src/main/resources/assets/electromagictools/textures/items/focus_shield.png diff --git a/src/main/resources/assets/electromagictools/textures/items/shieldfocus_alt.png b/src/main/resources/assets/electromagictools/textures/items/focus_shieldAlt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/shieldfocus_alt.png rename to src/main/resources/assets/electromagictools/textures/items/focus_shieldAlt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/wandchargefocus.png b/src/main/resources/assets/electromagictools/textures/items/focus_wandCharge.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/wandchargefocus.png rename to src/main/resources/assets/electromagictools/textures/items/focus_wandCharge.png diff --git a/src/main/resources/assets/electromagictools/textures/items/OLDlightningsummoner.png b/src/main/resources/assets/electromagictools/textures/items/materials/OLDlightningsummoner.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/OLDlightningsummoner.png rename to src/main/resources/assets/electromagictools/textures/items/materials/OLDlightningsummoner.png diff --git a/src/main/resources/assets/electromagictools/textures/items/cardboard.png b/src/main/resources/assets/electromagictools/textures/items/materials/cardboard.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/cardboard.png rename to src/main/resources/assets/electromagictools/textures/items/materials/cardboard.png diff --git a/src/main/resources/assets/electromagictools/textures/items/feathercarboardwing.png b/src/main/resources/assets/electromagictools/textures/items/materials/cardboardsheet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/feathercarboardwing.png rename to src/main/resources/assets/electromagictools/textures/items/materials/cardboardsheet.png diff --git a/src/main/resources/assets/electromagictools/textures/items/clusteruranium.png b/src/main/resources/assets/electromagictools/textures/items/materials/clusteruranium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/clusteruranium.png rename to src/main/resources/assets/electromagictools/textures/items/materials/clusteruranium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/crushedamber.png b/src/main/resources/assets/electromagictools/textures/items/materials/crushedamber.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/crushedamber.png rename to src/main/resources/assets/electromagictools/textures/items/materials/crushedamber.png diff --git a/src/main/resources/assets/electromagictools/textures/items/crushedcinnabar.png b/src/main/resources/assets/electromagictools/textures/items/materials/crushedcinnabar.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/crushedcinnabar.png rename to src/main/resources/assets/electromagictools/textures/items/materials/crushedcinnabar.png diff --git a/src/main/resources/assets/electromagictools/textures/items/denseironsheet.png b/src/main/resources/assets/electromagictools/textures/items/materials/denseironsheet.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/denseironsheet.png rename to src/main/resources/assets/electromagictools/textures/items/materials/denseironsheet.png diff --git a/src/main/resources/assets/electromagictools/textures/items/ducttape.png b/src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/ducttape.png rename to src/main/resources/assets/electromagictools/textures/items/materials/ducttape.png diff --git a/src/main/resources/assets/electromagictools/textures/items/feathermesh.png b/src/main/resources/assets/electromagictools/textures/items/materials/feathermesh.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/feathermesh.png rename to src/main/resources/assets/electromagictools/textures/items/materials/feathermesh.png diff --git a/src/main/resources/assets/electromagictools/textures/items/glue.png b/src/main/resources/assets/electromagictools/textures/items/materials/glue.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/glue.png rename to src/main/resources/assets/electromagictools/textures/items/materials/glue.png diff --git a/src/main/resources/assets/electromagictools/textures/items/glueball.png b/src/main/resources/assets/electromagictools/textures/items/materials/glueball.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/glueball.png rename to src/main/resources/assets/electromagictools/textures/items/materials/glueball.png diff --git a/src/main/resources/assets/electromagictools/textures/items/lightningsummoner.png b/src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/lightningsummoner.png rename to src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner.png diff --git a/src/main/resources/assets/electromagictools/textures/items/lightningsummoner_alt.png b/src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/lightningsummoner_alt.png rename to src/main/resources/assets/electromagictools/textures/items/materials/lightningsummoner_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/purifiedamber.png b/src/main/resources/assets/electromagictools/textures/items/materials/purifiedamber.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/purifiedamber.png rename to src/main/resources/assets/electromagictools/textures/items/materials/purifiedamber.png diff --git a/src/main/resources/assets/electromagictools/textures/items/purifiedcinnabar.png b/src/main/resources/assets/electromagictools/textures/items/materials/purifiedcinnabar.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/purifiedcinnabar.png rename to src/main/resources/assets/electromagictools/textures/items/materials/purifiedcinnabar.png diff --git a/src/main/resources/assets/electromagictools/textures/items/rubberball.png b/src/main/resources/assets/electromagictools/textures/items/materials/rubberball.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/rubberball.png rename to src/main/resources/assets/electromagictools/textures/items/materials/rubberball.png diff --git a/src/main/resources/assets/electromagictools/textures/items/taintedfeather.png b/src/main/resources/assets/electromagictools/textures/items/materials/taintedfeather.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/taintedfeather.png rename to src/main/resources/assets/electromagictools/textures/items/materials/taintedfeather.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumWing.png b/src/main/resources/assets/electromagictools/textures/items/materials/thaumiumWing.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumWing.png rename to src/main/resources/assets/electromagictools/textures/items/materials/thaumiumWing.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumplate.png b/src/main/resources/assets/electromagictools/textures/items/materials/thaumiumplate.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumplate.png rename to src/main/resources/assets/electromagictools/textures/items/materials/thaumiumplate.png diff --git a/src/main/resources/assets/electromagictools/textures/items/uumatterdrop.png b/src/main/resources/assets/electromagictools/textures/items/materials/uumatterdrop.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/uumatterdrop.png rename to src/main/resources/assets/electromagictools/textures/items/materials/uumatterdrop.png diff --git a/src/main/resources/assets/electromagictools/textures/items/chainsaw.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/chainsaw.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamondchainsaw.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamondchainsaw.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamondchainsaw_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamondchainsaw_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_diamond_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/streamchainsaw.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/streamchainsaw.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png diff --git a/src/main/resources/assets/electromagictools/textures/items/streamchainsaw.png.mcmeta b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png.mcmeta similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/streamchainsaw.png.mcmeta rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_stream.png.mcmeta diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumchainsaw.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumchainsaw.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumchainsaw_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumchainsaw_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumchainsaw_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumchainsaw_alt.png rename to src/main/resources/assets/electromagictools/textures/items/tools/chainsaw_thaumium_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/drill.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/drill.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamonddrill_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_diamond_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamonddrill_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_diamond_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/rockbreakerdrill.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/rockbreakerdrill.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker.png diff --git a/src/main/resources/assets/electromagictools/textures/items/rockbreakerdrill_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/rockbreakerdrill_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_rockbreaker_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumdrill.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumdrill.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumdrill_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumdrill_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumdrill_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumdrill_alt.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumdrill_alt2.png b/src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumdrill_alt2.png rename to src/main/resources/assets/electromagictools/textures/items/tools/drill_thaumium_alt2.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electrichoe_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_electric_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electrichoe_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_electric_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electrichoegrowth.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electrichoegrowth.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_32x.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_32x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_32x.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_32x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_alt.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_alt32x.png b/src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt_32x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/electrichoegrowth_alt32x.png rename to src/main/resources/assets/electromagictools/textures/items/tools/hoe_growth_alt_32x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamondomnitool.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamondomnitool.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamondomnitool_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamondomnitool_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/diamondomnitool_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/diamondomnitool_alt.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_diamond_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/ironomnitool.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/ironomnitool.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron.png diff --git a/src/main/resources/assets/electromagictools/textures/items/ironomnitool_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/ironomnitool_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_iron_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool_16X.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_16x.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool_16X.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_16x.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool_alt.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool_alt.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt.png diff --git a/src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool_alt2.png b/src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png similarity index 100% rename from src/main/resources/assets/electromagictools/textures/items/thaumiumomnitool_alt2.png rename to src/main/resources/assets/electromagictools/textures/items/tools/omnitool_thaumium_alt2.png