diff --git a/src/main/java/emt/ElectroMagicTools.java b/src/main/java/emt/EMT.java similarity index 73% rename from src/main/java/emt/ElectroMagicTools.java rename to src/main/java/emt/EMT.java index 13d6bda..ea8b688 100644 --- a/src/main/java/emt/ElectroMagicTools.java +++ b/src/main/java/emt/EMT.java @@ -27,25 +27,34 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @Mod( - modid = ModInformation.MODID, - name = ModInformation.NAME, - version = ModInformation.VERSION, - guiFactory = ModInformation.GUI_FACTORY, - dependencies = ModInformation.DEPEND + modid = EMT.MOD_ID, + name = EMT.NAME, + version = EMT.VERSION, + guiFactory = EMT.GUI_FACTORY, + dependencies = EMT.DEPENDS ) -public class ElectroMagicTools { - +public class EMT { + public static final String NAME = "Electro-Magic Tools"; + public static final String MOD_ID = "EMT"; + public static final String VERSION = "1.2.6"; + public static final String TEXTURE_PATH = "emt"; + public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory"; + public static final String CLIENT_PROXY = "emt.proxy.ClientProxy"; + public static final String COMMON_PROXY = "emt.proxy.CommonProxy"; + public static final String CHANNEL = "EMT"; + public static final String DEPENDS = "required-after:Thaumcraft ; required-after:IC2"; + @SidedProxy( - clientSide = ModInformation.CLIENT_PROXY, - serverSide = ModInformation.COMMON_PROXY + clientSide = CLIENT_PROXY, + serverSide = COMMON_PROXY ) public static CommonProxy proxy; - public static final CreativeTabs TAB = new EMTCreativeTab(ModInformation.MODID + ".creativeTab"); - public static final Logger LOGGER = LogManager.getLogger(ModInformation.NAME); - public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(ModInformation.CHANNEL); + public static final CreativeTabs TAB = new EMTCreativeTab(MOD_ID + ".creativeTab"); + public static final Logger LOGGER = LogManager.getLogger(NAME); + public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(CHANNEL); - @Instance(ModInformation.MODID) - public static ElectroMagicTools instance; + @Instance(MOD_ID) + public static EMT instance; @EventHandler public void preInit(FMLPreInitializationEvent event) { diff --git a/src/main/java/emt/ModInformation.java b/src/main/java/emt/ModInformation.java deleted file mode 100644 index f9287bf..0000000 --- a/src/main/java/emt/ModInformation.java +++ /dev/null @@ -1,13 +0,0 @@ -package emt; - -public class ModInformation { - public static final String NAME = "Electro-Magic Tools"; - public static final String MODID = "EMT"; - public static final String VERSION = "1.2.6"; - public static final String TEXTURE_PATH = "emt"; - public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory"; - public static final String CLIENT_PROXY = "emt.proxy.ClientProxy"; - public static final String COMMON_PROXY = "emt.proxy.CommonProxy"; - public static final String CHANNEL = "EMT"; - public static final String DEPEND = "required-after:Thaumcraft ; required-after:IC2"; -} diff --git a/src/main/java/emt/block/BlockBase.java b/src/main/java/emt/block/BlockBase.java index 546b019..7182f0d 100644 --- a/src/main/java/emt/block/BlockBase.java +++ b/src/main/java/emt/block/BlockBase.java @@ -1,7 +1,6 @@ package emt.block; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -11,11 +10,11 @@ public abstract class BlockBase extends Block { public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { super(material); name = unlocName; - setBlockName(ModInformation.MODID + ".block." + unlocName); + setBlockName(EMT.MOD_ID + ".block." + unlocName); if (textureName != null) { - setBlockTextureName(ModInformation.TEXTURE_PATH + ":" + textureName); + setBlockTextureName(EMT.TEXTURE_PATH + ":" + textureName); } - setCreativeTab(ElectroMagicTools.TAB); + setCreativeTab(EMT.TAB); setStepSound(soundType); setHardness(hardness); } diff --git a/src/main/java/emt/block/BlockBaseContainer.java b/src/main/java/emt/block/BlockBaseContainer.java index 25d9433..c13a321 100644 --- a/src/main/java/emt/block/BlockBaseContainer.java +++ b/src/main/java/emt/block/BlockBaseContainer.java @@ -2,8 +2,7 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.tile.TileEntityEMT; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -25,8 +24,8 @@ public abstract class BlockBaseContainer extends BlockContainer { public BlockBaseContainer(String unlocName, Material material, SoundType soundType, float hardness) { super(material); - setBlockName(ModInformation.MODID + "." + unlocName); - setCreativeTab(ElectroMagicTools.TAB); + setBlockName(EMT.MOD_ID + "." + unlocName); + setCreativeTab(EMT.TAB); setStepSound(soundType); setHardness(hardness); } diff --git a/src/main/java/emt/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java index 237f105..0b4a40e 100644 --- a/src/main/java/emt/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -3,7 +3,7 @@ package emt.block; import java.util.List; import java.util.Random; -import emt.ModInformation; +import emt.EMT; import emt.tile.TileElectricCloud; import net.minecraft.block.material.Material; import net.minecraft.client.particle.EffectRenderer; @@ -51,7 +51,7 @@ public class BlockElectricCloud extends BlockBase { @Override public void registerBlockIcons(IIconRegister ir) { - icon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":empty"); + icon = ir.registerIcon(EMT.TEXTURE_PATH + ":empty"); } @Override diff --git a/src/main/java/emt/block/BlockEssentiaGenerators.java b/src/main/java/emt/block/BlockEssentiaGenerators.java index db516b9..96b98c4 100644 --- a/src/main/java/emt/block/BlockEssentiaGenerators.java +++ b/src/main/java/emt/block/BlockEssentiaGenerators.java @@ -2,7 +2,7 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.tile.generator.*; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -28,25 +28,25 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister ri) { - this.blockIcon = ri.registerIcon(ModInformation.TEXTURE_PATH + ":machines/top"); + this.blockIcon = ri.registerIcon(EMT.TEXTURE_PATH + ":machines/top"); for (int i = 0; i <= 5; i++) { - this.top[i] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/top"); + this.top[i] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/top"); } for (int i = 0; i <= 5; i++) { - this.bottom[i] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/top"); + this.bottom[i] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/top"); } for (int i = 0; i <= 5; i++) { - this.side[i] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/side"); + this.side[i] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/side"); } - this.frontOff[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/potentiafront"); - this.frontOff[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/ignisfront"); - this.frontOff[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/auramfront"); - this.frontOff[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/arborfront"); - this.frontOff[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/aerfront"); + this.frontOff[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/potentiafront"); + this.frontOff[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/ignisfront"); + this.frontOff[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/auramfront"); + this.frontOff[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/arborfront"); + this.frontOff[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/aerfront"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/block/BlockMachines.java b/src/main/java/emt/block/BlockMachines.java index 226e17b..7d6c097 100644 --- a/src/main/java/emt/block/BlockMachines.java +++ b/src/main/java/emt/block/BlockMachines.java @@ -19,8 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.tile.TileEntityEtherealMacerator; import emt.tile.TileEntityIndustrialWandRecharge; @@ -33,22 +32,22 @@ public class BlockMachines extends BlockBaseContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister ir) { - this.blockIcon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/top"); + this.blockIcon = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/top"); - this.top[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/top"); - this.top[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmaceratortop"); + this.top[0] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/top"); + this.top[1] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/etherealmaceratortop"); - this.bottom[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/side"); - this.bottom[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmacerator"); + this.bottom[0] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/side"); + this.bottom[1] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/etherealmacerator"); - this.side[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/side"); - this.side[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmacerator"); + this.side[0] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/side"); + this.side[1] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/etherealmacerator"); - this.frontOff[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/wandcharger"); - this.frontOff[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmaceratorfront"); + this.frontOff[0] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/wandcharger"); + this.frontOff[1] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/etherealmaceratorfront"); - this.frontOn[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/wandcharger"); - this.frontOn[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmaceratorfrontactive"); + this.frontOn[0] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/wandcharger"); + this.frontOn[1] = ir.registerIcon(EMT.TEXTURE_PATH + ":machines/etherealmaceratorfrontactive"); } @SideOnly(Side.CLIENT) @@ -71,10 +70,10 @@ public class BlockMachines extends BlockBaseContainer { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityIndustrialWandRecharge) { - player.openGui(ElectroMagicTools.instance, 0, world, x, y, z); + player.openGui(EMT.instance, 0, world, x, y, z); } else if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityEtherealMacerator) { - player.openGui(ElectroMagicTools.instance, 1, world, x, y, z); + player.openGui(EMT.instance, 1, world, x, y, z); } return true; } diff --git a/src/main/java/emt/block/BlockPortableNode.java b/src/main/java/emt/block/BlockPortableNode.java index 9e30ca0..9004a44 100644 --- a/src/main/java/emt/block/BlockPortableNode.java +++ b/src/main/java/emt/block/BlockPortableNode.java @@ -2,8 +2,7 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.tile.TileEntityPortableNode; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -25,8 +24,8 @@ public class BlockPortableNode extends BlockAiry { public IIcon texture; public BlockPortableNode(String name) { - this.setCreativeTab(ElectroMagicTools.TAB); - setBlockName(ModInformation.MODID + "." + name); + this.setCreativeTab(EMT.TAB); + setBlockName(EMT.MOD_ID + "." + name); setBlockUnbreakable(); } @@ -65,7 +64,7 @@ public class BlockPortableNode extends BlockAiry { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister ri) { - texture = ri.registerIcon(ModInformation.TEXTURE_PATH + ":portablenode"); + texture = ri.registerIcon(EMT.TEXTURE_PATH + ":portablenode"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/block/BlockShield.java b/src/main/java/emt/block/BlockShield.java index dba98fc..ade2674 100644 --- a/src/main/java/emt/block/BlockShield.java +++ b/src/main/java/emt/block/BlockShield.java @@ -2,8 +2,7 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,8 +18,8 @@ public class BlockShield extends Block { public BlockShield(String name) { super(Material.rock); - setBlockName(ModInformation.MODID + "." + name); - this.setCreativeTab(ElectroMagicTools.TAB); + setBlockName(EMT.MOD_ID + "." + name); + this.setCreativeTab(EMT.TAB); this.setHardness(1F); this.setResistance(10000000000000000000000000000000000000F); } @@ -39,7 +38,7 @@ public class BlockShield extends Block { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":shield"); + this.blockIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":shield"); } @Override diff --git a/src/main/java/emt/block/BlockSolars.java b/src/main/java/emt/block/BlockSolars.java index 5a33d8e..341a0cf 100644 --- a/src/main/java/emt/block/BlockSolars.java +++ b/src/main/java/emt/block/BlockSolars.java @@ -2,7 +2,7 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.tile.solar.air.TileEntityAirSolar; import emt.tile.solar.compressed.TileEntityCompressedSolar; import emt.tile.solar.compressed.TileEntityDoubleCompressedSolar; @@ -39,73 +39,73 @@ public class BlockSolars extends BlockBaseContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister ri) { - this.top[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop"); - this.top[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop"); - this.top[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop"); - this.top[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop"); - this.top[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop"); - this.top[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop"); - this.top[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop"); - this.top[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop"); - this.top[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop"); - this.top[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop"); - this.top[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); + this.top[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop"); + this.top[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop"); + this.top[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop"); + this.top[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop"); + this.top[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop"); + this.top[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop"); + this.top[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop"); + this.top[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop"); + this.top[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop"); + this.top[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop"); + this.top[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); - this.bottom[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); + this.bottom[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); - this.frontOff[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side"); - this.frontOff[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side"); - this.frontOff[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side"); - this.frontOff[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside"); - this.frontOff[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside"); - this.frontOff[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside"); - this.frontOff[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside"); - this.frontOff[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside"); - this.frontOff[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside"); - this.frontOff[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside"); - this.frontOff[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside"); - this.frontOff[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside"); - this.frontOff[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside"); - this.frontOff[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside"); - this.frontOff[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside"); - this.frontOff[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside"); + this.frontOff[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side"); + this.frontOff[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side"); + this.frontOff[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side"); + this.frontOff[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside"); + this.frontOff[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside"); + this.frontOff[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside"); + this.frontOff[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside"); + this.frontOff[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside"); + this.frontOff[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside"); + this.frontOff[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside"); + this.frontOff[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside"); + this.frontOff[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside"); + this.frontOff[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside"); + this.frontOff[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside"); + this.frontOff[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside"); + this.frontOff[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside"); - this.side[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side"); - this.side[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side"); - this.side[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side"); - this.side[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside"); - this.side[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside"); - this.side[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside"); - this.side[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside"); - this.side[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside"); - this.side[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside"); - this.side[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside"); - this.side[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside"); - this.side[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside"); - this.side[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside"); - this.side[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside"); - this.side[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside"); - this.side[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside"); + this.side[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side"); + this.side[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side"); + this.side[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side"); + this.side[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside"); + this.side[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside"); + this.side[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside"); + this.side[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside"); + this.side[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside"); + this.side[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside"); + this.side[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside"); + this.side[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside"); + this.side[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside"); + this.side[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside"); + this.side[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside"); + this.side[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside"); + this.side[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/block/BlockSolars2.java b/src/main/java/emt/block/BlockSolars2.java index 9b2846c..a57417a 100644 --- a/src/main/java/emt/block/BlockSolars2.java +++ b/src/main/java/emt/block/BlockSolars2.java @@ -2,7 +2,7 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.tile.solar.air.TileEntityDoubleAirSolar; import emt.tile.solar.air.TileEntityTripleAirSolar; import emt.tile.solar.earth.TileEntityDoubleEarthSolar; @@ -28,29 +28,29 @@ public class BlockSolars2 extends BlockBaseContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister ri) { - this.top[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop"); - this.top[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop"); - this.top[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop"); + this.top[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop"); + this.top[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop"); + this.top[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop"); - this.bottom[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); - this.bottom[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom"); + this.bottom[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); + this.bottom[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom"); - this.frontOff[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside"); - this.frontOff[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside"); - this.frontOff[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside"); - this.frontOff[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside"); - this.frontOff[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside"); + this.frontOff[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside"); + this.frontOff[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside"); + this.frontOff[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside"); + this.frontOff[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside"); + this.frontOff[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside"); - this.side[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside"); - this.side[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside"); - this.side[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside"); - this.side[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside"); - this.side[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside"); + this.side[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside"); + this.side[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside"); + this.side[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside"); + this.side[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside"); + this.side[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/emt/client/gui/GuiEtherealMacerator.java index d98405f..3a989eb 100644 --- a/src/main/java/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/emt/client/gui/GuiEtherealMacerator.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import emt.ModInformation; +import emt.EMT; import emt.client.gui.container.ContainerEtheralMacerator; import emt.tile.TileEntityEtherealMacerator; import emt.util.EMTTextHelper; @@ -19,7 +19,7 @@ public class GuiEtherealMacerator extends GuiContainer { ySize = 165; } - public static final ResourceLocation texture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/guis/etherealmacerator.png"); + public static final ResourceLocation texture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/guis/etherealmacerator.png"); @Override public void drawGuiContainerBackgroundLayer(float f, int j, int i) { diff --git a/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java index 10d90f7..5529b0d 100644 --- a/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import emt.ModInformation; +import emt.EMT; import emt.client.gui.container.ContainerIndustrialWandRecharge; import emt.tile.TileEntityIndustrialWandRecharge; import emt.util.EMTTextHelper; @@ -19,7 +19,7 @@ public class GuiIndustrialWandRecharger extends GuiContainer { ySize = 165; } - public static final ResourceLocation texture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/guis/wandcharger.png"); + public static final ResourceLocation texture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/guis/wandcharger.png"); @Override public void drawGuiContainerBackgroundLayer(float f, int j, int i) { diff --git a/src/main/java/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/emt/client/gui/config/EMTGuiConfig.java index 9957f74..5d7bf80 100644 --- a/src/main/java/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/emt/client/gui/config/EMTGuiConfig.java @@ -2,7 +2,7 @@ package emt.client.gui.config; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; -import emt.ModInformation; +import emt.EMT; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.ConfigCategory; @@ -17,7 +17,7 @@ import java.util.Locale; public class EMTGuiConfig extends GuiConfig { public EMTGuiConfig(GuiScreen parentScreen) { - super(parentScreen, getConfigElements(parentScreen), ModInformation.MODID, false, false, StatCollector.translateToLocal("gui." + ModInformation.MODID + ".config.title")); + super(parentScreen, getConfigElements(parentScreen), EMT.MOD_ID, false, false, StatCollector.translateToLocal("gui." + EMT.MOD_ID + ".config.title")); } @SuppressWarnings("rawtypes") diff --git a/src/main/java/emt/client/renderer/RenderEnergyBall.java b/src/main/java/emt/client/renderer/RenderEnergyBall.java index 8fc962d..2369d86 100644 --- a/src/main/java/emt/client/renderer/RenderEnergyBall.java +++ b/src/main/java/emt/client/renderer/RenderEnergyBall.java @@ -63,8 +63,9 @@ public class RenderEnergyBall extends Render { tess.startDrawing(GL_LINE_STRIP); tess.setColorRGBA(255, 255, 255, 255); + float lenRat = ball.ticksAlive <= 40 ? ball.ticksAlive / 40f : (60 - ball.ticksAlive) / 20f; for (Point point : bolt.points) { - tess.addVertex(point.x / (60 / ball.ticksAlive), point.y / 4, point.z / (60 / ball.ticksAlive)); + tess.addVertex(point.x * lenRat, (point.y / 3f) * (ball.ticksAlive / 60f), point.z * lenRat); } tess.draw(); diff --git a/src/main/java/emt/client/renderer/RenderLaser.java b/src/main/java/emt/client/renderer/RenderLaser.java index 5e938f4..00bfd6b 100644 --- a/src/main/java/emt/client/renderer/RenderLaser.java +++ b/src/main/java/emt/client/renderer/RenderLaser.java @@ -7,12 +7,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import emt.ModInformation; +import emt.EMT; import emt.entity.EntityLaser; public class RenderLaser extends Render { - private static final ResourceLocation laserTexture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/models/lasermodel.png"); + private static final ResourceLocation laserTexture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/lasermodel.png"); @Override public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) { diff --git a/src/main/java/emt/client/renderer/RenderShield.java b/src/main/java/emt/client/renderer/RenderShield.java index 186fffb..94437c7 100644 --- a/src/main/java/emt/client/renderer/RenderShield.java +++ b/src/main/java/emt/client/renderer/RenderShield.java @@ -5,7 +5,7 @@ import static org.lwjgl.opengl.GL11.*; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import emt.ModInformation; +import emt.EMT; import emt.entity.EntityLaser; import emt.entity.EntityShield; import net.minecraft.client.Minecraft; @@ -18,7 +18,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; public class RenderShield extends Render { - private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/models/shield.png"); + private static final ResourceLocation shieldTexture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/shield.png"); static int glCallList; static { diff --git a/src/main/java/emt/init/EMTBlocks.java b/src/main/java/emt/init/EMTBlocks.java index b6cc481..9277ac8 100644 --- a/src/main/java/emt/init/EMTBlocks.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -1,7 +1,6 @@ package emt.init; import cpw.mods.fml.common.registry.GameRegistry; -import emt.ModInformation; import emt.block.BlockElectricCloud; import emt.block.BlockEssentiaGenerators; import emt.block.BlockMachines; diff --git a/src/main/java/emt/init/EMTEntities.java b/src/main/java/emt/init/EMTEntities.java index 0722144..8c6eb7c 100644 --- a/src/main/java/emt/init/EMTEntities.java +++ b/src/main/java/emt/init/EMTEntities.java @@ -1,7 +1,7 @@ package emt.init; import cpw.mods.fml.common.registry.EntityRegistry; -import emt.ElectroMagicTools; +import emt.EMT; import emt.entity.EntityArcher; import emt.entity.EntityEnergyBall; import emt.entity.EntityLaser; @@ -32,10 +32,10 @@ public class EMTEntities { } public static void registerEMTEntities() { - EntityRegistry.registerModEntity(EntityLaser.class, "laser", entityIDs++, ElectroMagicTools.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityArcher.class, "archer", entityIDs++, ElectroMagicTools.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityLaser.class, "laser", entityIDs++, EMT.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityArcher.class, "archer", entityIDs++, EMT.instance, 80, 3, true); registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685); - EntityRegistry.registerModEntity(EntityShield.class, "shield", entityIDs++, ElectroMagicTools.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityEnergyBall.class, "energyBall", entityIDs++, ElectroMagicTools.instance, 80, 60, true); + EntityRegistry.registerModEntity(EntityShield.class, "shield", entityIDs++, EMT.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityEnergyBall.class, "energyBall", entityIDs++, EMT.instance, 80, 60, true); } } diff --git a/src/main/java/emt/init/EMTItems.java b/src/main/java/emt/init/EMTItems.java index 065e0e4..ac01af0 100644 --- a/src/main/java/emt/init/EMTItems.java +++ b/src/main/java/emt/init/EMTItems.java @@ -2,7 +2,7 @@ package emt.init; import ic2.core.init.InternalName; import cpw.mods.fml.common.registry.GameRegistry; -import emt.ModInformation; +import emt.EMT; import emt.item.ItemElectricScribingTools; import emt.item.ItemIC2Baubles; import emt.item.ItemMaterials; @@ -93,84 +93,84 @@ public class EMTItems { OreDictionary.registerOre("plateThaumium", new ItemStack(itemEMTItems, 1, 5)); OreDictionary.registerOre("slimeball", new ItemStack(itemEMTItems, 1, 8)); - emtBauble = new ItemIC2Baubles().setUnlocalizedName(ModInformation.MODID + ".bauble"); + emtBauble = new ItemIC2Baubles().setUnlocalizedName(EMT.MOD_ID + ".bauble"); GameRegistry.registerItem(emtBauble, "EMTBaubles"); onering = new ItemOneRing(); GameRegistry.registerItem(onering, "BaseBaubles"); - quantumArmor = new ItemInfusedQuantumChestplate(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.MODID + ".quantum"); + quantumArmor = new ItemInfusedQuantumChestplate(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(EMT.MOD_ID + ".quantum"); - electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.electric"); + electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(EMT.MOD_ID + ".goggles.electric"); GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); - nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.nano"); + nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(EMT.MOD_ID + ".goggles.nano"); GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing"); - quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.quantum"); + quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(EMT.MOD_ID + ".goggles.quantum"); GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing"); - solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.solar"); + solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(EMT.MOD_ID + ".goggles.solar"); GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); - electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.MODID + ".boots.traveller.electric"); + electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.electric"); GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); - nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.MODID + ".boots.traveller.nano"); + nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.nano"); GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); - quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.MODID + ".boots.traveller.quantum"); + quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(EMT.MOD_ID + ".boots.traveller.quantum"); GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); - electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.MODID + ".scribingtools.electric"); + electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(EMT.MOD_ID + ".scribingtools.electric"); GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools"); - featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.feather"); + featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(EMT.MOD_ID + ".wing.feather"); GameRegistry.registerItem(featherWing, "FeatherWing"); - thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.thaumium"); + thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(EMT.MOD_ID + ".wing.thaumium"); GameRegistry.registerItem(thaumiumWing, "ThaumiumWing"); - nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.nano"); + nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(EMT.MOD_ID + ".wing.nano"); GameRegistry.registerItem(nanoWing, "NanosuitWing"); - quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.quantum"); + quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(EMT.MOD_ID + ".wing.quantum"); GameRegistry.registerItem(quantumWing, "QuantumWing"); - thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.MODID + ".hammer"); + thorHammer = new ItemThorHammer().setUnlocalizedName(EMT.MOD_ID + ".hammer"); GameRegistry.registerItem(thorHammer, "Mjolnir"); - taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.MODID + ".hammer.broken"); + taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(EMT.MOD_ID + ".hammer.broken"); GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir"); - electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.MODID + ".hammer.electric"); + electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(EMT.MOD_ID + ".hammer.electric"); GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir"); - thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.MODID + ".drill.thaumium"); + thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(EMT.MOD_ID + ".drill.thaumium"); GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill"); - diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.MODID + ".chainsaw.diamond"); + diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(EMT.MOD_ID + ".chainsaw.diamond"); GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw"); - thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.MODID + ".chainsaw.thaumium"); + thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(EMT.MOD_ID + ".chainsaw.thaumium"); GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw"); - ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.MODID + ".omnitool.iron"); + ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(EMT.MOD_ID + ".omnitool.iron"); GameRegistry.registerItem(ironOmnitool, "Omnitool"); - diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.MODID + ".omnitool.diamond"); + diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(EMT.MOD_ID + ".omnitool.diamond"); GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); - thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.MODID + ".omnitool.thaumium"); + thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(EMT.MOD_ID + ".omnitool.thaumium"); GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool"); - streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.MODID + ".chainsaw.stream"); + streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(EMT.MOD_ID + ".chainsaw.stream"); GameRegistry.registerItem(streamChainsaw, "ChainsawStream"); - rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.MODID + ".drill.rockbreaker"); + rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(EMT.MOD_ID + ".drill.rockbreaker"); GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker"); - electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.MODID + ".hoeofgrowth.electric"); + electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(EMT.MOD_ID + ".hoeofgrowth.electric"); GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth"); explosionFocus = new ItemExplosionFocus(); diff --git a/src/main/java/emt/init/EMTRecipes.java b/src/main/java/emt/init/EMTRecipes.java index 7bbad4c..2c9004c 100644 --- a/src/main/java/emt/init/EMTRecipes.java +++ b/src/main/java/emt/init/EMTRecipes.java @@ -2,7 +2,7 @@ package emt.init; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import emt.ElectroMagicTools; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTCraftingAspects; import static emt.util.EMTRandomHelper.*; @@ -360,7 +360,7 @@ public class EMTRecipes { IRecipeInput input = it.next(); if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { it.remove(); - ElectroMagicTools.LOGGER.info("Removing conflicting amber macerating recipe(s)"); + EMT.LOGGER.info("Removing conflicting amber macerating recipe(s)"); } } @@ -368,7 +368,7 @@ public class EMTRecipes { IRecipeInput input = it.next(); if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { it.remove(); - ElectroMagicTools.LOGGER.info("Removing Conflicting cinnabar macerating recipe(s)"); + EMT.LOGGER.info("Removing Conflicting cinnabar macerating recipe(s)"); } } } diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java index a29eb03..2e745fc 100644 --- a/src/main/java/emt/init/EMTResearches.java +++ b/src/main/java/emt/init/EMTResearches.java @@ -1,6 +1,6 @@ package emt.init; -import emt.ModInformation; +import emt.EMT; import emt.client.EMTKeys; import emt.util.EMTConfigHandler; import emt.util.EMTResearchAspects; @@ -20,13 +20,13 @@ public class EMTResearches { } public static void addResearchTab() { - ResourceLocation background = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/misc/background.png"); - ResearchCategories.registerCategory("EMT", new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/misc/emt.png"), background); + ResourceLocation background = new ResourceLocation(EMT.TEXTURE_PATH, "textures/misc/background.png"); + ResearchCategories.registerCategory("EMT", new ResourceLocation(EMT.TEXTURE_PATH, "textures/misc/emt.png"), background); } public static void addResearch() { /** Research that can't be disabled **/ - new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation(EMT.TEXTURE_PATH, "textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); new EMTResearchItem("Diamond Chainsaw", 5, -6, 0, new ItemStack(EMTItems.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.diamondChainsaw)); new EMTResearchItem("Thaumium Plate", 6, -6, 0, new ItemStack(EMTItems.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumPlate)); new EMTResearchItem("Macerating Native Ore Clusters", 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); @@ -94,7 +94,7 @@ public class EMTResearches { } if (!EMTConfigHandler.energyBallFocusResearch) { - new EMTResearchItem("EnergyBall Focus", EMTResearchAspects.energyBallFocusResearch, 1, 3, 2, new ItemStack(EMTItems.energyBallFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Energy Ball Focus", EMTResearchAspects.energyBallFocusResearch, 1, 3, 2, new ItemStack(EMTItems.energyBallFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("")); } if (!EMTConfigHandler.shieldFocusResearch) { diff --git a/src/main/java/emt/item/ItemBase.java b/src/main/java/emt/item/ItemBase.java index 97161c9..75ebaff 100644 --- a/src/main/java/emt/item/ItemBase.java +++ b/src/main/java/emt/item/ItemBase.java @@ -1,7 +1,7 @@ package emt.item; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -11,15 +11,15 @@ public class ItemBase extends Item { public ItemBase(String unlocName, String textureName) { super(); - setUnlocalizedName(ModInformation.MODID + unlocName); - setTextureName(ModInformation.TEXTURE_PATH + ":" + textureName); - setCreativeTab(ElectroMagicTools.TAB); + setUnlocalizedName(EMT.MOD_ID + unlocName); + setTextureName(EMT.TEXTURE_PATH + ":" + textureName); + setCreativeTab(EMT.TAB); } public ItemBase(String unlocName) { super(); - setUnlocalizedName(ModInformation.MODID + ".item." + unlocName); - setCreativeTab(ElectroMagicTools.TAB); + setUnlocalizedName(EMT.MOD_ID + ".item." + unlocName); + setCreativeTab(EMT.TAB); } public String getItemStackDisplayName(ItemStack stack) { diff --git a/src/main/java/emt/item/ItemElectricScribingTools.java b/src/main/java/emt/item/ItemElectricScribingTools.java index 0c3f64e..813188c 100644 --- a/src/main/java/emt/item/ItemElectricScribingTools.java +++ b/src/main/java/emt/item/ItemElectricScribingTools.java @@ -2,7 +2,7 @@ package emt.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; +import emt.EMT; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.creativetab.CreativeTabs; @@ -18,7 +18,7 @@ public class ItemElectricScribingTools extends ItemInkwell implements IElectricI public static int maxCharge = 400; public ItemElectricScribingTools() { - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(400); this.setMaxStackSize(1); } diff --git a/src/main/java/emt/item/ItemIC2Baubles.java b/src/main/java/emt/item/ItemIC2Baubles.java index 4c0826f..f1faa77 100644 --- a/src/main/java/emt/item/ItemIC2Baubles.java +++ b/src/main/java/emt/item/ItemIC2Baubles.java @@ -4,7 +4,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -55,8 +55,8 @@ public class ItemIC2Baubles extends ItemBase implements IBauble { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":armoreumaker"); - this.icon[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":inventoryeumaker"); + this.icon[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":armoreumaker"); + this.icon[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":inventoryeumaker"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java index 98c10e4..289fc67 100644 --- a/src/main/java/emt/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -2,8 +2,8 @@ package emt.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -34,7 +34,7 @@ public class ItemMaterials extends Item { public IIcon[] icon = new IIcon[25]; public ItemMaterials() { - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(0); this.setMaxStackSize(64); setHasSubtypes(true); @@ -96,27 +96,27 @@ public class ItemMaterials extends Item { name = "nothing"; break; } - return "item." + ModInformation.MODID + "." + name; + return "item." + EMT.MOD_ID + "." + name; } @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/clusteruranium"); - this.icon[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/crushedamber"); - this.icon[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/purifiedamber"); - this.icon[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/crushedcinnabar"); - this.icon[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/purifiedcinnabar"); - this.icon[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/thaumiumplate"); - this.icon[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/lightningsummoner"); - this.icon[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/feathermesh"); - this.icon[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/glue"); - this.icon[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/ducttape"); - this.icon[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/rubberball"); - this.icon[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/cardboard"); - this.icon[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/cardboardsheet"); - this.icon[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/taintedfeather"); - this.icon[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/thaumiumWing"); - this.icon[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/uumatterdrop"); + this.icon[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/clusteruranium"); + this.icon[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/crushedamber"); + this.icon[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/purifiedamber"); + this.icon[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/crushedcinnabar"); + this.icon[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/purifiedcinnabar"); + this.icon[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/thaumiumplate"); + this.icon[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/lightningsummoner"); + this.icon[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/feathermesh"); + this.icon[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/glue"); + this.icon[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/ducttape"); + this.icon[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/rubberball"); + this.icon[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/cardboard"); + this.icon[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/cardboardsheet"); + this.icon[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/taintedfeather"); + this.icon[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/thaumiumWing"); + this.icon[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":materials/uumatterdrop"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/ItemOneRing.java b/src/main/java/emt/item/ItemOneRing.java index bb5bf32..b774f46 100644 --- a/src/main/java/emt/item/ItemOneRing.java +++ b/src/main/java/emt/item/ItemOneRing.java @@ -4,7 +4,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -46,12 +46,12 @@ public class ItemOneRing extends ItemBase implements IBauble { name = "nothing"; break; } - return "item." + ModInformation.MODID + ".bauble." + name; + return "item." + EMT.MOD_ID + ".bauble." + name; } @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":onering"); + this.icon[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":onering"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index dcc58e2..8cad262 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -3,8 +3,8 @@ package emt.item.armor.boots; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; @@ -45,7 +45,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt super(ArmorMaterial.DIAMOND, par3, par4); this.setMaxDamage(27); this.setMaxStackSize(1); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); MinecraftForge.EVENT_BUS.register(this); } @@ -65,7 +65,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/boots_electric"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/boots_electric"); } @Override @@ -160,7 +160,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/electricboots.png"; + return EMT.TEXTURE_PATH + ":textures/models/electricboots.png"; } @Override diff --git a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java index 900ccf5..566bc7e 100644 --- a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java @@ -2,7 +2,7 @@ package emt.item.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -23,11 +23,11 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/boots_nano"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/boots_nano"); } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/nanobootstravel.png"; + return EMT.TEXTURE_PATH + ":textures/models/nanobootstravel.png"; } } diff --git a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java index 54642cf..c329ff4 100644 --- a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java @@ -2,7 +2,7 @@ package emt.item.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -23,11 +23,11 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/boots_quantum"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/boots_quantum"); } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/quantumbootstravel.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantumbootstravel.png"; } } diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index b171953..c7065ca 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -4,8 +4,8 @@ import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.client.model.ModelSpecialArmor; import emt.client.model.ModelWings; import emt.init.EMTItems; @@ -87,23 +87,23 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { public ItemInfusedQuantumChestplate(InternalName internalName, int armorType) { super(internalName, InternalName.quantum, armorType, 2000000, 12000.0D, 4); MinecraftForge.EVENT_BUS.register(this); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); rnd = new Random(); } @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - iconNONE = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest"); - iconJETPACK = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_jetpack"); - iconTHAUMIUM = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_t"); - iconNANO = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_n"); - iconQUANTUM = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_q"); + iconNONE = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/armor_quantum_chest"); + iconJETPACK = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/armor_quantum_chest_jetpack"); + iconTHAUMIUM = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_t"); + iconNANO = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_n"); + iconQUANTUM = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_q"); } @Override public String getUnlocalizedName(ItemStack itemstack) { - return "item." + ModInformation.MODID + ".chestplates.infusedQuantum"; + return "item." + EMT.MOD_ID + ".chestplates.infusedQuantum"; } public String getItemStackDisplayName(ItemStack stack) @@ -393,15 +393,15 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { switch (wing) { case JETPACK: - return ModInformation.TEXTURE_PATH + ":textures/models/quantum_jetpack.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantum_jetpack.png"; case THAUMIUM: - return ModInformation.TEXTURE_PATH + ":textures/models/quantum_wings_t.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantum_wings_t.png"; case NANO: - return ModInformation.TEXTURE_PATH + ":textures/models/quantum_wings_n.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantum_wings_n.png"; case QUANTUM: - return ModInformation.TEXTURE_PATH + ":textures/models/quantum_wings_q.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantum_wings_q.png"; default: - return ModInformation.TEXTURE_PATH + ":textures/models/quantum.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantum.png"; } } diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index b734bfe..ab9bdc6 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -2,8 +2,8 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; @@ -37,18 +37,18 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi public ItemElectricGoggles(ArmorMaterial material, int par3, int par4) { super(material, par3, par4); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); } @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_electric"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/goggles_electric"); } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/electricgoggles.png"; + return EMT.TEXTURE_PATH + ":textures/models/electricgoggles.png"; } @Override diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 9131705..4e5b2ba 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -2,8 +2,8 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,9 +17,9 @@ import net.minecraft.world.World; public class ItemNanoGoggles extends ItemElectricGoggles { - public ItemNanoGoggles(ArmorMaterial material, int par3, int par4) { - super(material, par3, par4); - this.setCreativeTab(ElectroMagicTools.TAB); + public ItemNanoGoggles(ArmorMaterial material, int renderIndex, int armorType) { + super(material, renderIndex, armorType); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(27); this.setMaxStackSize(1); visDiscount = 6; @@ -32,12 +32,12 @@ public class ItemNanoGoggles extends ItemElectricGoggles { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_nano"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/goggles_nano"); } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/thaumicnanohelmet.png"; + return EMT.TEXTURE_PATH + ":textures/models/thaumicnanohelmet.png"; } @Override diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index deb8d68..de7fb38 100644 --- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -2,8 +2,8 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,9 +25,9 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { private static final Map potionCost = new HashMap(); - public ItemQuantumGoggles(ArmorMaterial material, int par3, int par4) { - super(material, par3, par4); - this.setCreativeTab(ElectroMagicTools.TAB); + public ItemQuantumGoggles(ArmorMaterial material, int renderIndex, int armorType) { + super(material, renderIndex, armorType); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(27); this.setMaxStackSize(1); maxCharge = 10000000; @@ -44,12 +44,12 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_quantum"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/goggles_quantum"); } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/thaumicquantumhelmet.png"; + return EMT.TEXTURE_PATH + ":textures/models/thaumicquantumhelmet.png"; } @Override diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index e269351..398f09d 100644 --- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -2,8 +2,8 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -40,7 +40,7 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { super(material, par3, par4); this.setMaxDamage(27); this.setMaxStackSize(1); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.maxCharge = 1000000; this.genDay = 256; this.genNight = 128; @@ -58,12 +58,12 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_solar"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/goggles_solar"); } @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layerType) { - return ModInformation.TEXTURE_PATH + ":textures/models/solarrevealinghelmet.png"; + return EMT.TEXTURE_PATH + ":textures/models/solarrevealinghelmet.png"; } @SuppressWarnings("unchecked") diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index 0b0e271..5140612 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -7,8 +7,8 @@ import ic2.core.IC2; import ic2.core.util.StackUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.client.model.ModelWings; import emt.util.EMTConfigHandler; import net.minecraft.client.Minecraft; @@ -31,7 +31,7 @@ public class ItemFeatherWing extends ItemArmor { super(material, par3, par4); this.setMaxStackSize(1); this.setMaxDamage(120); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.isDamageable(); rnd = new Random(); } @@ -39,13 +39,13 @@ public class ItemFeatherWing extends ItemArmor { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_feather"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/wing_feather"); } @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/featherwing.png"; + return EMT.TEXTURE_PATH + ":textures/models/featherwing.png"; } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 184c903..45a8586 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -2,8 +2,8 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.item.armor.wings.ItemThaumiumReinforcedWing; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; @@ -34,14 +34,14 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri super(material, par3, par4); this.setMaxStackSize(1); this.setMaxDamage(27); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); visDiscount = 5; } @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_nano"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/wing_nano"); } @SideOnly(Side.CLIENT) @@ -60,7 +60,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/nanowing.png"; + return EMT.TEXTURE_PATH + ":textures/models/nanowing.png"; } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index c43e92d..a8ebf9d 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -2,8 +2,7 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +18,7 @@ public class ItemQuantumWing extends ItemNanoWing { super(material, par3, par4); this.setMaxStackSize(1); this.setMaxDamage(27); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); visDiscount = 6; transferLimit = 10000; energyPerDamage = 1000; @@ -28,13 +27,13 @@ public class ItemQuantumWing extends ItemNanoWing { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_quantum"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/wing_quantum"); } @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/quantumwing.png"; + return EMT.TEXTURE_PATH + ":textures/models/quantumwing.png"; } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index b848f92..df9dd3a 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -2,8 +2,8 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import net.minecraft.client.Minecraft; @@ -27,7 +27,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD super(material, par3, par4); this.setMaxStackSize(1); this.setMaxDamage(250); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.isDamageable(); visDiscount = 4; } @@ -40,13 +40,13 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_thaumium"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":armor/wing_thaumium"); } @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return ModInformation.TEXTURE_PATH + ":textures/models/thaumiumwing.png"; + return EMT.TEXTURE_PATH + ":textures/models/thaumiumwing.png"; } @Override diff --git a/src/main/java/emt/item/block/ItemBlockElectricCloud.java b/src/main/java/emt/item/block/ItemBlockElectricCloud.java index 42fc44d..767c6ef 100644 --- a/src/main/java/emt/item/block/ItemBlockElectricCloud.java +++ b/src/main/java/emt/item/block/ItemBlockElectricCloud.java @@ -1,6 +1,6 @@ package emt.item.block; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,7 +25,7 @@ public class ItemBlockElectricCloud extends ItemBlock{ @Override public void registerIcons(IIconRegister ir) { - icon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":" + "electric_cloud"); + icon = ir.registerIcon(EMT.TEXTURE_PATH + ":" + "electric_cloud"); } @Override diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index 276a38f..f0d314e 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -18,8 +18,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; public abstract class ItemBaseFocus extends ItemFocusBasic { @@ -28,8 +27,8 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { public ItemBaseFocus(String unlocName) { super(); - setUnlocalizedName(ModInformation.MODID + ".focus." + unlocName); - setCreativeTab(ElectroMagicTools.TAB); + setUnlocalizedName(EMT.MOD_ID + ".focus." + unlocName); + setCreativeTab(EMT.TAB); setMaxDamage(1); setNoRepair(); setMaxStackSize(1); @@ -38,7 +37,7 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { - this.icon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":" + "focus_" + textureName); + this.icon = ir.registerIcon(EMT.TEXTURE_PATH + ":" + "focus_" + textureName); } boolean hasDepth() { diff --git a/src/main/java/emt/item/focus/ItemChristmasFocus.java b/src/main/java/emt/item/focus/ItemChristmasFocus.java index 653becc..0ef86f6 100644 --- a/src/main/java/emt/item/focus/ItemChristmasFocus.java +++ b/src/main/java/emt/item/focus/ItemChristmasFocus.java @@ -2,8 +2,7 @@ package emt.item.focus; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index 83c6150..4964680 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -5,7 +5,7 @@ import java.util.LinkedList; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import emt.ElectroMagicTools; +import emt.EMT; import emt.entity.EntityShield; import emt.init.EMTBlocks; import ic2.core.IC2; diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index 3d87f0e..edf6c85 100644 --- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -2,8 +2,7 @@ package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.block.Block; @@ -33,14 +32,14 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { public ItemElectricHoeGrowth() { super(ToolMaterial.EMERALD); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxStackSize(1); this.growthCost = 10000; } @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.icon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/hoe_growth"); + this.icon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/hoe_growth"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/tool/ItemElectricThorHammer.java b/src/main/java/emt/item/tool/ItemElectricThorHammer.java index 577d5c7..09599f2 100644 --- a/src/main/java/emt/item/tool/ItemElectricThorHammer.java +++ b/src/main/java/emt/item/tool/ItemElectricThorHammer.java @@ -2,8 +2,7 @@ package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.entity.EntityArcher; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; @@ -32,7 +31,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { public ItemElectricThorHammer() { super(ToolMaterial.EMERALD); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(27); this.setMaxStackSize(1); } @@ -40,7 +39,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":hammer/electricthorhammer"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":hammer/electricthorhammer"); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/emt/item/tool/ItemThorHammer.java b/src/main/java/emt/item/tool/ItemThorHammer.java index 0f63c0a..a46a5e1 100644 --- a/src/main/java/emt/item/tool/ItemThorHammer.java +++ b/src/main/java/emt/item/tool/ItemThorHammer.java @@ -2,8 +2,7 @@ package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -26,14 +25,14 @@ public class ItemThorHammer extends ItemSword implements IRepairable { public ItemThorHammer() { super(ToolMaterial.EMERALD); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(2000); } @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":hammer/thorhammer"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":hammer/thorhammer"); } @Override diff --git a/src/main/java/emt/item/tool/ItemThorHammerBroken.java b/src/main/java/emt/item/tool/ItemThorHammerBroken.java index 6bf6103..a16f7e9 100644 --- a/src/main/java/emt/item/tool/ItemThorHammerBroken.java +++ b/src/main/java/emt/item/tool/ItemThorHammerBroken.java @@ -2,8 +2,7 @@ package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -25,14 +24,14 @@ public class ItemThorHammerBroken extends ItemSword implements IRepairable { public ItemThorHammerBroken() { super(ToolMaterial.EMERALD); - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(1000); } @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":hammer/taintedthorhammer"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":hammer/taintedthorhammer"); } @Override diff --git a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java index bef3010..d6aee4e 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java @@ -2,8 +2,7 @@ package emt.item.tool.chainsaw; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -49,7 +48,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { public ItemDiamondChainsaw() { super(ToolMaterial.EMERALD); this.efficiencyOnProperMaterial = 16F; - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(27); this.setMaxStackSize(1); } @@ -57,7 +56,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/chainsaw_diamond"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/chainsaw_diamond"); } @Override diff --git a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java index eaa9573..a863436 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java @@ -3,8 +3,7 @@ package emt.item.tool.chainsaw; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.audio.AudioSource; @@ -35,7 +34,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { this.efficiencyOnProperMaterial = 25F; alternateServer = false; alternateClient = false; - setCreativeTab(ElectroMagicTools.TAB); + setCreativeTab(EMT.TAB); this.maxStackSize = 1; this.setMaxDamage(27); maxCharge = 900000; @@ -47,7 +46,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/chainsaw_stream"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/chainsaw_stream"); } @Override diff --git a/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java index ec86007..20148c7 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java @@ -2,8 +2,7 @@ package emt.item.tool.chainsaw; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.audio.AudioSource; @@ -21,7 +20,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { public ItemThaumiumChainsaw() { this.efficiencyOnProperMaterial = 21F; - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxDamage(27); this.setMaxStackSize(1); maxCharge = 60000; @@ -32,7 +31,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/chainsaw_thaumium"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/chainsaw_thaumium"); } @Override @@ -49,7 +48,6 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { return false; } - /* IC2 API METHODS */ @Override public double getTransferLimit(ItemStack itemStack) { return 600; diff --git a/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java index e4829e2..327d17d 100644 --- a/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java @@ -2,8 +2,7 @@ package emt.item.tool.drill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; @@ -44,7 +43,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { public ItemRockbreakerDrill() { side = 0; - setCreativeTab(ElectroMagicTools.TAB); + setCreativeTab(EMT.TAB); this.efficiencyOnProperMaterial = 25F; this.setMaxStackSize(1); if (EMTConfigHandler.toolsInBore == false) { @@ -61,7 +60,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/drill_rockbreaker"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/drill_rockbreaker"); } private boolean isEffectiveAgainst(Block block) { diff --git a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java index 5e0904b..6632996 100644 --- a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java @@ -2,8 +2,7 @@ package emt.item.tool.drill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTRandomHelper; import ic2.api.item.ElectricItem; @@ -23,122 +22,126 @@ import java.util.List; public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { - public int maxCharge = 60000; - public int cost; - public int tier = 2; - public double transferLimit = 100; + public int maxCharge = 60000; + public int cost; + public int tier = 2; + public double transferLimit = 100; - public ItemThaumiumDrill() { - super(ToolMaterial.EMERALD); - this.efficiencyOnProperMaterial = 20F; - this.setCreativeTab(ElectroMagicTools.TAB); - this.setMaxStackSize(1); - if (EMTConfigHandler.toolsInBore == false) { - this.setMaxDamage(27); - } else { - this.setMaxDamage(240); - } - } + public ItemThaumiumDrill() { + super(ToolMaterial.EMERALD); + this.efficiencyOnProperMaterial = 20F; + this.setCreativeTab(EMT.TAB); + this.setMaxStackSize(1); + if (EMTConfigHandler.toolsInBore == false) { + this.setMaxDamage(27); + } + else { + this.setMaxDamage(240); + } + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/drill_thaumium"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/drill_thaumium"); + } - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (EMTConfigHandler.toolsInBore == false) { - cost = 250; - } else { - cost = 1; - } - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { + if (EMTConfigHandler.toolsInBore == false) { + cost = 250; + } + else { + cost = 1; + } + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } + else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { - return true; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { + return true; + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (EMTConfigHandler.enchanting == false) { - return 0; - } else { - return 4; - } - } + @Override + public int getItemEnchantability() { + if (EMTConfigHandler.enchanting == false) { + return 0; + } + else { + return 4; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - return EMTConfigHandler.enchanting; - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + return EMTConfigHandler.enchanting; + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public double getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public double getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return tier; - } + @Override + public int getTier(ItemStack itemStack) { + return tier; + } - @Override - public double getTransferLimit(ItemStack itemStack) { - return transferLimit; - } + @Override + public double getTransferLimit(ItemStack itemStack) { + return transferLimit; + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java index e2929cd..56b92b5 100644 --- a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java @@ -2,8 +2,7 @@ package emt.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; @@ -19,7 +18,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron { public ItemOmnitoolDiamond() { super(); this.efficiencyOnProperMaterial = 16F; - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxStackSize(1); if (!EMTConfigHandler.toolsInBore) { this.setMaxDamage(27); @@ -34,7 +33,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/omnitool_diamond"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/omnitool_diamond"); } @Override diff --git a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java index 05736af..c9f102c 100644 --- a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java @@ -2,8 +2,7 @@ package emt.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -33,7 +32,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { public ItemOmnitoolIron() { super(ToolMaterial.EMERALD); this.efficiencyOnProperMaterial = 13F; - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxStackSize(1); if (!EMTConfigHandler.toolsInBore) { this.setMaxDamage(27); @@ -46,7 +45,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/omnitool_iron"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/omnitool_iron"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java index 895dab3..85d3c64 100644 --- a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java @@ -2,8 +2,7 @@ package emt.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; @@ -19,7 +18,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { public ItemOmnitoolThaumium() { super(); this.efficiencyOnProperMaterial = 21F; - this.setCreativeTab(ElectroMagicTools.TAB); + this.setCreativeTab(EMT.TAB); this.setMaxStackSize(1); if (!EMTConfigHandler.toolsInBore) { this.setMaxDamage(27); @@ -34,7 +33,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/omnitool_thaumium"); + this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":tools/omnitool_thaumium"); } @Override diff --git a/src/main/java/emt/util/EMTClientEventHandler.java b/src/main/java/emt/util/EMTClientEventHandler.java index a81dc2a..c6bc747 100644 --- a/src/main/java/emt/util/EMTClientEventHandler.java +++ b/src/main/java/emt/util/EMTClientEventHandler.java @@ -4,7 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.relauncher.Side; -import emt.ElectroMagicTools; +import emt.EMT; import emt.client.EMTKeys; import emt.init.EMTItems; import emt.network.PacketEMTKeys; @@ -25,7 +25,7 @@ public class EMTClientEventHandler { @SubscribeEvent public void clientTick(ClientTickEvent e) { if (EMTKeys.keyUnequip.getIsKeyPressed()) { - ElectroMagicTools.INSTANCE.sendToServer(new PacketEMTKeys()); + EMT.INSTANCE.sendToServer(new PacketEMTKeys()); } } diff --git a/src/main/java/emt/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java index 3f4dbf9..75f46b6 100644 --- a/src/main/java/emt/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -2,22 +2,26 @@ package emt.util; import java.util.Random; +import baubles.api.BaublesApi; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; -import emt.ElectroMagicTools; -import emt.ModInformation; +import emt.EMT; import emt.client.EMTKeys; import emt.init.EMTItems; import emt.network.PacketEMTKeys; import emt.proxy.ClientProxy; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; public class EMTEventHandler { @@ -38,9 +42,25 @@ public class EMTEventHandler { @SubscribeEvent public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.modID.equals(ModInformation.MODID)) { + if (event.modID.equals(EMT.MOD_ID)) { EMTConfigHandler.syncConfig(); - ElectroMagicTools.LOGGER.info("Refreshing configuration file."); + EMT.LOGGER.info("Refreshing configuration file."); + } + } + + @SubscribeEvent + public void onSetEntityAttack(LivingSetAttackTargetEvent e) { + if (e.entityLiving != null && e.target != null && e.entityLiving instanceof EntityLiving && e.target instanceof EntityPlayer) { + IInventory inventory = BaublesApi.getBaubles((EntityPlayer) e.target); + + for(int i = 0; i < inventory.getSizeInventory(); i++) { + ItemStack stack = inventory.getStackInSlot(i); + + if(stack != null && stack.getItem() == EMTItems.onering) { + ((EntityLiving)e.entityLiving).setAttackTarget(null); + } + } + } } } diff --git a/src/main/resources/assets/emt/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang index ade9218..7873894 100644 --- a/src/main/resources/assets/emt/lang/en_US.lang +++ b/src/main/resources/assets/emt/lang/en_US.lang @@ -131,10 +131,14 @@ emt.rsname.Electric Magic Tools=Electric Magic Tools emt.tag.Electric Magic Tools=Who says magic and technology can't go together? emt.text.Electric Magic Tools=Who says magic can't work with technology? Our researchers have collaborated with the top mages of the school of Thaumaturgy to bring you the effectiveness of magic coupled with the convenience of electric tools. +emt.rsname.Energy Ball Focus=Energy Ball Focus +emt.tag.Energy Ball Focus=notag +emt.text.Energy Ball Focus=notext + emt.rsname.Electric Cloud=Electric Cloud emt.tag.Electric Cloud=Still the same Nitor emt.text.Electric Cloud.1=All thaumaturges (except Crimson ones, I guess) enjoy the shine and heat of the magic flame called Nitor, aren't they? You desided to make it more... energetic. Well, you did it.

You have created a new kind of magic flame — the Electric Cloud. It behaves and looks like normal Nitor, but it has purple colour and creates light-purple lightning charges around itself. -emt.text.Electric Cloud.2=emt:textures/researches/electricCloud.png:0:0:255:255:0.6 +emt.text.Electric Cloud.2=emt:textures/researches/electric_cloud.png:0:0:255:255:0.6 emt.rsname.Thaumium Drill=Thaumium Drill emt.tag.Thaumium Drill=Magical mining diff --git a/src/main/resources/assets/emt/lang/ru_RU.lang b/src/main/resources/assets/emt/lang/ru_RU.lang index a52ddae..1d6ce32 100644 --- a/src/main/resources/assets/emt/lang/ru_RU.lang +++ b/src/main/resources/assets/emt/lang/ru_RU.lang @@ -131,10 +131,14 @@ emt.rsname.Electric Magic Tools=Electric Magic Tools emt.tag.Electric Magic Tools=Кто сказал что магия и технология не дружат вместе? emt.text.Electric Magic Tools=Кто сказал, что магия не может дружить с технологией? Наши исследователи сотрудничали с лучшими магами школы тауматургов, чтобы приподнести Вам эффективность магии, в сочетании с удобством электроинструментов. +emt.rsname.Energy Ball Focus=Energy Ball Focus +emt.tag.Energy Ball Focus=notag +emt.text.Energy Ball Focus=notext + emt.rsname.Electric Cloud=Наэлектризованное облако emt.tag.Electric Cloud=Всё тот же Нитор emt.text.Electric Cloud.1=Наверное, каждому Тауматургу нравится пламя, которое ещё называют Нитором. Вы, решив сделать его более "живым", сумели наэлектризовать его.

Теперь, это всё тот же Нитор, но от него ещё и исходят электрические искровые разряды. -emt.text.Electric Cloud.2=emt:textures/researches/electricCloud.png:0:0:255:255:0.6 +emt.text.Electric Cloud.2=emt:textures/researches/electric_cloud.png:0:0:255:255:0.6 emt.rsname.Thaumium Drill=Таум-бур emt.tag.Thaumium Drill=Магическая добыча