diff --git a/.gitignore b/.gitignore index c85ec15..c8e3571 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ /out/* /asm/* /bin/* -/libs/* /download/* /.settings/* /eclipse/* diff --git a/libs/Baubles-deobf-1.7.10-1.0.1.10.jar b/libs/Baubles-deobf-1.7.10-1.0.1.10.jar new file mode 100644 index 0000000..8585569 Binary files /dev/null and b/libs/Baubles-deobf-1.7.10-1.0.1.10.jar differ diff --git a/libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar b/libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar new file mode 100644 index 0000000..e11a630 Binary files /dev/null and b/libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar differ diff --git a/libs/industrialcraft-2-2.2.780-experimental-dev.jar b/libs/industrialcraft-2-2.2.780-experimental-dev.jar new file mode 100644 index 0000000..2e4dfe8 Binary files /dev/null and b/libs/industrialcraft-2-2.2.780-experimental-dev.jar differ diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 03ccfd3..ac124ce 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -19,8 +19,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import tombenpotter.emt.common.commands.CommandOutputs; -import tombenpotter.emt.common.Registry; -import tombenpotter.emt.common.entities.BaseEntityRegistry; +import tombenpotter.emt.common.init.EntityRegistry; +import tombenpotter.emt.common.init.Registry; import tombenpotter.emt.common.network.PacketEMTKeys; import tombenpotter.emt.common.util.*; import tombenpotter.emt.proxies.CommonProxy; @@ -65,7 +65,7 @@ public class ElectroMagicTools { DungeonChestGenerator.generateLoot(); ElectroMagicTools.logger.info("Registering entities"); - BaseEntityRegistry.registerEMTEntities(); + EntityRegistry.registerEMTEntities(); ElectroMagicTools.logger.info("Registering the GUI Handler"); NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java rename to src/main/java/tombenpotter/emt/common/init/BlockRegistry.java index d96f3fe..5332ac1 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.blocks; +package tombenpotter.emt.common.init; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; @@ -8,6 +8,8 @@ import tombenpotter.emt.common.blocks.BlockEMTSolars; import tombenpotter.emt.common.blocks.BlockEMTSolars2; import tombenpotter.emt.common.blocks.BlockEssentiaGenerator; import tombenpotter.emt.common.blocks.BlockEssentiaGenerators; +import tombenpotter.emt.common.blocks.BlockPortableNode; +import tombenpotter.emt.common.blocks.BlockShield; import tombenpotter.emt.common.items.blocks.ItemBlockEMTMachines; import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars; import tombenpotter.emt.common.items.blocks.ItemBlockEMTSolars2; diff --git a/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java similarity index 65% rename from src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java rename to src/main/java/tombenpotter/emt/common/init/EntityRegistry.java index 606ee15..0924f6a 100644 --- a/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java @@ -1,13 +1,14 @@ -package tombenpotter.emt.common.entities; +package tombenpotter.emt.common.init; -import cpw.mods.fml.common.registry.EntityRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.common.entities.EntityArcher; +import tombenpotter.emt.common.entities.EntityLaser; -public class BaseEntityRegistry { +public class EntityRegistry { private static int startEID = 300; private static int entityIDs = 0; @@ -30,8 +31,8 @@ public class BaseEntityRegistry { public static void registerEMTEntities() { - EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectroMagicTools.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectroMagicTools.instance, 80, 3, true); + cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectroMagicTools.instance, 80, 3, true); + cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectroMagicTools.instance, 80, 3, true); registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685); } } diff --git a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java b/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/items/ItemRegistry.java rename to src/main/java/tombenpotter/emt/common/init/ItemRegistry.java index b37d4f0..d3d25e5 100644 --- a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.items; +package tombenpotter.emt.common.init; import ic2.core.init.InternalName; import cpw.mods.fml.common.registry.GameRegistry; @@ -11,6 +11,10 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApi; import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.items.ItemElectricScribingTools; +import tombenpotter.emt.common.items.ItemIC2Baubles; +import tombenpotter.emt.common.items.ItemMaterials; +import tombenpotter.emt.common.items.ItemOneRing; import tombenpotter.emt.common.items.armor.wings.ItemFeatherWing; import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing; import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller; @@ -28,7 +32,10 @@ import tombenpotter.emt.common.items.foci.ItemChristmasFocus; import tombenpotter.emt.common.items.foci.ItemExplosionFocus; import tombenpotter.emt.common.items.foci.ItemShieldFocus; import tombenpotter.emt.common.items.foci.ItemWandChargingFocus; -import tombenpotter.emt.common.items.tools.*; +import tombenpotter.emt.common.items.tools.ItemElectricHoeGrowth; +import tombenpotter.emt.common.items.tools.ItemElectricThorHammer; +import tombenpotter.emt.common.items.tools.ItemThorHammer; +import tombenpotter.emt.common.items.tools.ItemThorHammerBroken; import tombenpotter.emt.common.items.tools.chainsaws.ItemDiamondChainsaw; import tombenpotter.emt.common.items.tools.chainsaws.ItemStreamChainsaw; import tombenpotter.emt.common.items.tools.chainsaws.ItemThaumiumChainsaw; diff --git a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/RecipeRegistry.java rename to src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java index b9b87ac..763ba3e 100644 --- a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common; +package tombenpotter.emt.common.init; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; @@ -22,9 +22,6 @@ import thaumcraft.api.crafting.ShapelessArcaneRecipe; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.blocks.BlockRegistry; -import tombenpotter.emt.common.blocks.BlockRegistry; -import tombenpotter.emt.common.items.ItemRegistry; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.CraftingAspects; import tombenpotter.emt.common.util.RandomHelper; diff --git a/src/main/java/tombenpotter/emt/common/Registry.java b/src/main/java/tombenpotter/emt/common/init/Registry.java similarity index 59% rename from src/main/java/tombenpotter/emt/common/Registry.java rename to src/main/java/tombenpotter/emt/common/init/Registry.java index e208d2e..245e4f6 100644 --- a/src/main/java/tombenpotter/emt/common/Registry.java +++ b/src/main/java/tombenpotter/emt/common/init/Registry.java @@ -1,9 +1,4 @@ -package tombenpotter.emt.common; - -import tombenpotter.emt.common.blocks.BlockRegistry; -import tombenpotter.emt.common.RecipeRegistry; -import tombenpotter.emt.common.items.ItemRegistry; -import tombenpotter.emt.common.tile.TileRegistry; +package tombenpotter.emt.common.init; public class Registry{ public static void register(){ diff --git a/src/main/java/tombenpotter/emt/common/tile/TileRegistry.java b/src/main/java/tombenpotter/emt/common/init/TileRegistry.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/tile/TileRegistry.java rename to src/main/java/tombenpotter/emt/common/init/TileRegistry.java index 260c34d..209dee4 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/TileRegistry.java @@ -1,5 +1,8 @@ -package tombenpotter.emt.common.tile; +package tombenpotter.emt.common.init; +import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.tile.TileEntityPortableNode; import tombenpotter.emt.common.tile.generators.TileEntityAerGenerator; import tombenpotter.emt.common.tile.generators.TileEntityArborGenerator; import tombenpotter.emt.common.tile.generators.TileEntityAuramGenerator; diff --git a/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java b/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java index b158b60..7773631 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java @@ -33,7 +33,7 @@ import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.model.ModelCpecialArmor; import tombenpotter.emt.client.model.ModelWings; -import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.init.ItemRegistry; import tombenpotter.emt.common.items.armor.wings.ItemNanoWing; import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing; import tombenpotter.emt.common.util.ConfigHandler; @@ -131,20 +131,20 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { } public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(itemStack); + NBTTagCompound nbt = StackUtil.getOrCreateNbtData(itemStack); - byte toggleTimer = nbtData.getByte("toggleTimer"); + byte toggleTimer = nbt.getByte("toggleTimer"); boolean ret = false; - boolean jetpack = nbtData.getBoolean("jetpack"); - boolean hoverMode = nbtData.getBoolean("hoverMode"); + boolean jetpack = nbt.getBoolean("jetpack"); + boolean hoverMode = nbt.getBoolean("hoverMode"); boolean jetpackUsed = false; - String useother = nbtData.getString("useother"); + String useother = nbt.getString("useother"); if(!world.isRemote){ if(!useother.equals("TW") && !useother.equals("NW") && !useother.equals("QW") && !useother.equals("Jetpack") && !useother.equals("None")){ - nbtData.setString("useother", "None"); + nbt.setString("useother", "None"); } if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) { @@ -152,7 +152,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { hoverMode = !hoverMode; if (IC2.platform.isSimulating()) { - nbtData.setBoolean("hoverMode", hoverMode); + nbt.setBoolean("hoverMode", hoverMode); if (hoverMode) { IC2.platform.messagePlayer(player, "Hover Mode enabled.", new Object[0]); @@ -165,57 +165,57 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if(player.inventory.getCurrentItem() != null && player.isSneaking() && toggleTimer == 0 && useother.equals("None")){ if(player.inventory.getCurrentItem().getItem() == IC2Items.getItem("electricJetpack").getItem()){ - nbtData.setBoolean("jetpack", true); + nbt.setBoolean("jetpack", true); IC2.platform.messagePlayer(player, "Jetpack enabled.", new Object[0]); - nbtData.setString("useother", "Jetpack"); + nbt.setString("useother", "Jetpack"); int charge = (int)ElectricItem.manager.getCharge(itemStack); if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < 30000){ ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); } - nbtData.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); + nbt.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing){ IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "TW"); + nbt.setString("useother", "TW"); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing){ IC2.platform.messagePlayer(player, "Nano wings enabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW"); + nbt.setString("useother", "NW"); int charge = (int)ElectricItem.manager.getCharge(itemStack); if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemNanoWing.maxCharge){ ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); } - nbtData.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); + nbt.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing){ IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW"); + nbt.setString("useother", "QW"); int charge = (int)ElectricItem.manager.getCharge(itemStack); if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemQuantumWing.maxCharge){ ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player); } - nbtData.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); + nbt.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack))); player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } } - if(player.inventory.getCurrentItem() == null && player.inventory.armorInventory[2] == itemStack && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){ + if(player.inventory.getCurrentItem() == null && nbt.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){ toggleTimer = 30; if(useother.equals("Jetpack")){ IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + nbt.setString("useother", "None"); ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem()); - if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 0) - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), 1, true, false); + if(nbt.getInteger("jetpackCharge") > 0) + ElectricItem.manager.charge(charged, nbt.getInteger("jetpackCharge"), 1, true, false); else ElectricItem.manager.charge(charged, 0, 1, true, false); player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); @@ -223,16 +223,16 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if(useother.equals("TW")){ IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + nbt.setString("useother", "None"); player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing)); } if(useother.equals("NW")){ IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + nbt.setString("useother", "None"); ItemStack charged = new ItemStack(ItemRegistry.nanoWing); - if(nbtData.getInteger("NWCharge") > 0) - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), 3, true, false); + if(nbt.getInteger("NWCharge") > 0) + ElectricItem.manager.charge(charged, nbt.getInteger("NWCharge"), 3, true, false); else ElectricItem.manager.charge(charged, 0, 3, true, false); player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); @@ -240,16 +240,16 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if(useother.equals("QW")){ IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]); - player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None"); + nbt.setString("useother", "None"); ItemStack charged = new ItemStack(ItemRegistry.quantumWing); - if(nbtData.getInteger("QWCharge") > 0) - ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), 3, true, false); + if(nbt.getInteger("QWCharge") > 0) + ElectricItem.manager.charge(charged, nbt.getInteger("QWCharge"), 3, true, false); else ElectricItem.manager.charge(charged, 0, 3, true, false); player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); } - nbtData.setBoolean("unequip", false); + nbt.setBoolean("unequip", false); } } @@ -268,7 +268,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { if ((IC2.platform.isSimulating()) && (toggleTimer > 0)) { toggleTimer = (byte) (toggleTimer - 1); - nbtData.setByte("toggleTimer", toggleTimer); + nbt.setByte("toggleTimer", toggleTimer); } if ((IC2.platform.isRendering()) && (player == IC2.platform.getPlayerInstance())) { if (lastJetpackUsed != jetpackUsed) { @@ -389,16 +389,6 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { try{ String useother = stack.stackTagCompound.getString("useother"); list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + tier); - //list.add(ElectricItem.manager.getCharge(stack) + " EU"); - //if(useother.equals("Jetpack")){ - // list.add(stack.stackTagCompound.getInteger("jetpackCharge") + " EU JETPACK"); - //} - //if(useother.equals("NW")){ - // list.add(stack.stackTagCompound.getInteger("NWCharge") + " EU NW"); - //} - //if(useother.equals("QW")){ - // list.add(stack.stackTagCompound.getInteger("QWCharge") + " EU QW"); - //} } catch(NullPointerException e){} } @@ -406,7 +396,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { public boolean useJetpack(EntityPlayer player, boolean hoverMode, ItemStack stack) { int jetpackMaxCharge = 30000; - ItemStack jetpack = player.inventory.armorInventory[2]; + ItemStack jetpack = stack; if (ElectricItem.manager.getCharge(stack) <= 0) return false; diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java index ca0267d..f7a1f3e 100644 --- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java @@ -11,7 +11,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { int y1 = 0; diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java index db66871..da2539c 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -8,6 +8,7 @@ import ic2.core.IC2; import ic2.core.audio.AudioSource; import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -35,7 +36,6 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { public int hitCost = 300; public int tier = 2; public static AudioSource audio; - int tick; public ItemDiamondChainsaw() { super(ToolMaterial.EMERALD); diff --git a/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java b/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java index a4c2f1c..7464b00 100644 --- a/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java +++ b/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java @@ -1,6 +1,6 @@ package tombenpotter.emt.common.network; -import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.init.ItemRegistry; import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java index bd25bf2..a0d9f13 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java @@ -13,8 +13,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.TileEntityEMT; -import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java index b859dc3..2be0981 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java @@ -3,7 +3,7 @@ package tombenpotter.emt.common.tile.solars.air; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java index f5a12df..210c411 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java @@ -3,7 +3,7 @@ package tombenpotter.emt.common.tile.solars.air; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleAirSolar extends TileEntityAirSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java index 5420569..5698a1e 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java @@ -3,7 +3,7 @@ package tombenpotter.emt.common.tile.solars.air; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleAirSolar extends TileEntityAirSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java index ef16231..1b5a3ed 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java index 34fa068..b07395f 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java index da425ce..047c082 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java index 54dd0b0..fc0d543 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java index cd2847a..b07f512 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java index 4b05b75..24e131d 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java index de0adf6..8e1e448 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java index b9b4a2c..9476d35 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java index 4ceee2c..2cedc81 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java index 77dd392..25c4b32 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleFireSolar extends TileEntityFireSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java index f559da3..f0d1458 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java index ffe625b..b11a2ca 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleFireSolar extends TileEntityFireSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java index 17c3013..2a845fa 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java index af0671e..1eb0f55 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java index c14b12b..7c23429 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java index 9df0407..af66005 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java index 465bbe8..cb6dbd1 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java index e20c134..8f6ead8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java @@ -2,7 +2,7 @@ package tombenpotter.emt.common.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.blocks.BlockRegistry; +import tombenpotter.emt.common.init.BlockRegistry; import tombenpotter.emt.common.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java index 2ce43f9..d94d8e2 100644 --- a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java @@ -1,9 +1,9 @@ package tombenpotter.emt.common.util; +import tombenpotter.emt.common.init.ItemRegistry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.items.ItemRegistry; public class CreativeTabEMT extends CreativeTabs { diff --git a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java b/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java index cec7d49..d817814 100644 --- a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java +++ b/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java @@ -1,9 +1,9 @@ package tombenpotter.emt.common.util; +import tombenpotter.emt.common.init.ItemRegistry; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; -import tombenpotter.emt.common.items.ItemRegistry; public class DungeonChestGenerator { diff --git a/src/main/java/tombenpotter/emt/common/EMTResearch.java b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/EMTResearch.java rename to src/main/java/tombenpotter/emt/common/util/EMTResearch.java index fe4d859..f4220ed 100644 --- a/src/main/java/tombenpotter/emt/common/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common; +package tombenpotter.emt.common.util; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; @@ -8,9 +8,9 @@ import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; import tombenpotter.emt.client.EMTKeys; -import tombenpotter.emt.common.RecipeRegistry; -import tombenpotter.emt.common.blocks.BlockRegistry; -import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.init.BlockRegistry; +import tombenpotter.emt.common.init.ItemRegistry; +import tombenpotter.emt.common.init.RecipeRegistry; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.EMTResearchItem; import tombenpotter.emt.common.util.ResearchAspects; diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index 059d0e0..759045f 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -16,7 +16,7 @@ import thaumcraft.common.entities.monster.EntityTaintChicken; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.EMTKeys; -import tombenpotter.emt.common.items.ItemRegistry; +import tombenpotter.emt.common.init.ItemRegistry; import tombenpotter.emt.common.network.PacketEMTKeys; import tombenpotter.emt.proxies.ClientProxy; diff --git a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java b/src/main/java/tombenpotter/emt/common/util/RandomHelper.java index a00ddf4..4ee6e5e 100644 --- a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java +++ b/src/main/java/tombenpotter/emt/common/util/RandomHelper.java @@ -1,7 +1,6 @@ package tombenpotter.emt.common.util; import ic2.api.item.ElectricItem; -import tombenpotter.emt.common.items.ItemRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java index b8e48af..968cb0f 100644 --- a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java @@ -1,8 +1,5 @@ package tombenpotter.emt.common.util; -import tombenpotter.emt.common.EMTResearch; - - public class RegistryHandler { public static void registerIc2PostRegistrys() {