diff --git a/src/main/java/malte0811/industrialWires/IndustrialWires.java b/src/main/java/malte0811/industrialWires/IndustrialWires.java index 26cb391..f1419d6 100644 --- a/src/main/java/malte0811/industrialWires/IndustrialWires.java +++ b/src/main/java/malte0811/industrialWires/IndustrialWires.java @@ -72,9 +72,9 @@ public class IndustrialWires { public static BlockPanel panel; - public static final ItemIC2Coil coil = new ItemIC2Coil(); - public static final ItemPanelComponent panelComponent = new ItemPanelComponent(); - public static final ItemKey key = new ItemKey(); + public static ItemIC2Coil coil; + public static ItemPanelComponent panelComponent; + public static ItemKey key; public static final SimpleNetworkWrapper packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(MODID); public static Logger logger; @@ -101,6 +101,10 @@ public class IndustrialWires { jacobsLadder = new BlockJacobsLadder(); panel = new BlockPanel(); + coil = new ItemIC2Coil(); + panelComponent = new ItemPanelComponent(); + key = new ItemKey(); + GameRegistry.registerTileEntity(TileEntityIC2ConnectorTin.class, MODID + "ic2ConnectorTin"); GameRegistry.registerTileEntity(TileEntityIC2ConnectorCopper.class, MODID + "ic2ConnectorCopper"); GameRegistry.registerTileEntity(TileEntityIC2ConnectorGold.class, MODID + "ic2ConnectorGold"); @@ -122,7 +126,6 @@ public class IndustrialWires { @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { for (BlockIWBase b: blocks) { - logger.info(b.getRegistryName()); event.getRegistry().register(b); } } diff --git a/src/main/java/malte0811/industrialWires/blocks/BlockJacobsLadder.java b/src/main/java/malte0811/industrialWires/blocks/BlockJacobsLadder.java index 0becf78..6d0e96f 100644 --- a/src/main/java/malte0811/industrialWires/blocks/BlockJacobsLadder.java +++ b/src/main/java/malte0811/industrialWires/blocks/BlockJacobsLadder.java @@ -81,10 +81,8 @@ public class BlockJacobsLadder extends BlockIWBase implements IMetaEnum, IPlacem @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { - if (tab== IndustrialWires.creativeTab) { - for (int i = 0; i < LadderSize.values().length; i++) { - list.add(new ItemStack(this, 1, i)); - } + for (int i = 0; i < LadderSize.values().length; i++) { + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java b/src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java index ad7acd5..e554914 100644 --- a/src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java +++ b/src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java @@ -18,6 +18,7 @@ package malte0811.industrialWires.blocks; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; +import malte0811.industrialWires.IndustrialWires; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -42,6 +43,7 @@ public class ItemBlockIW extends ItemBlock { } hasSubtypes = true; setRegistryName(b.getRegistryName()); + setCreativeTab(IndustrialWires.creativeTab); } @Nonnull diff --git a/src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java b/src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java index 932d3df..91f50e3 100644 --- a/src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java +++ b/src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java @@ -155,10 +155,8 @@ public class BlockPanel extends BlockIWBase implements IMetaEnum { @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { - if (tab==IndustrialWires.creativeTab) { - for (int i = 0; i < BlockTypes_Panel.values().length; i++) { - list.add(new ItemStack(this, 1, i)); - } + for (int i = 0; i < BlockTypes_Panel.values().length; i++) { + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java b/src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java index f8919a3..6e0b481 100644 --- a/src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java +++ b/src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java @@ -49,10 +49,8 @@ public class BlockMechanicalConverter extends BlockIWBase implements IMetaEnum { @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { - if (tab== IndustrialWires.creativeTab) { - for (int i = 0; i < 3; i++) { - list.add(new ItemStack(this, 1, i)); - } + for (int i = 0; i < 3; i++) { + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java b/src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java index ddf60e1..c3cd877 100644 --- a/src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java +++ b/src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java @@ -72,10 +72,8 @@ public class BlockIC2Connector extends BlockIWBase implements IMetaEnum { @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { - if (tab==IndustrialWires.creativeTab) { - for (int i = 0; i < type.getAllowedValues().size(); i++) { - list.add(new ItemStack(this, 1, i)); - } + for (int i = 0; i < type.getAllowedValues().size(); i++) { + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/malte0811/industrialWires/crafting/RecipeCoilLength.java b/src/main/java/malte0811/industrialWires/crafting/RecipeCoilLength.java index 5a99de3..c8f8378 100644 --- a/src/main/java/malte0811/industrialWires/crafting/RecipeCoilLength.java +++ b/src/main/java/malte0811/industrialWires/crafting/RecipeCoilLength.java @@ -82,7 +82,7 @@ public class RecipeCoilLength extends IForgeRegistryEntry.Impl implemen if (OreDictionary.itemMatches(curr, coil, false)) { length -= ItemIC2Coil.getLength(curr); if (length < 0) { - ItemStack currStack = new ItemStack(IndustrialWires.coil, 1); + ItemStack currStack = coil.copy(); ret.set(i, currStack); ItemIC2Coil.setLength(currStack, -length); } @@ -145,7 +145,6 @@ public class RecipeCoilLength extends IForgeRegistryEntry.Impl implemen } @Override public boolean apply(@Nullable ItemStack input) { - IndustrialWires.logger.info(input); if (input == null) return false; for (ItemStack stack:getMatchingStacks()) { diff --git a/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java b/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java index 6f03f53..503a7ca 100644 --- a/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java +++ b/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java @@ -2,9 +2,10 @@ package malte0811.industrialWires.crafting.factories; import com.google.gson.JsonObject; import ic2.api.item.IC2Items; -import malte0811.industrialWires.IndustrialWires; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.common.crafting.IIngredientFactory; +import net.minecraftforge.common.crafting.IngredientNBT; import net.minecraftforge.common.crafting.JsonContext; import javax.annotation.Nonnull; @@ -15,6 +16,12 @@ public class IC2ItemFactory implements IIngredientFactory { public Ingredient parse(JsonContext context, JsonObject json) { String name = json.get("name").getAsString(); String variant = json.get("variant").getAsString(); - return Ingredient.fromStacks(IC2Items.getItem(name, variant)); + return new MyNBTIngredient(IC2Items.getItem(name, variant)); + } + private class MyNBTIngredient extends IngredientNBT { + + public MyNBTIngredient(ItemStack stack) { + super(stack); + } } } diff --git a/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java b/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java index 66175d2..118a618 100644 --- a/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java +++ b/src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java @@ -68,7 +68,7 @@ public class ItemIC2Coil extends Item implements IWireCoil { @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList subItems) { - if (tab==IndustrialWires.creativeTab) { + if (isInCreativeTab(tab)) { for (int i = 0; i < subNames.length; i++) { ItemStack tmp = new ItemStack(this, 1, i); setLength(tmp, getMaxWireLength(tmp)); @@ -228,21 +228,4 @@ public class ItemIC2Coil extends Item implements IWireCoil { public static int getMaxWireLength(ItemStack i) { return IWConfig.maxLengthOnCoil[i.getItemDamage()]; } - - public static ItemStack getUninsulatedCable(String name) { - return IC2Items.getItem("cable", "type:"+name+",insulation:0"); - /*switch (i.getMetadata()) { - case 0: - return IC2Items.getItem("cable", "type:tin,insulation:0"); - case 1: - return IC2Items.getItem("cable", "type:copper,insulation:0"); - case 2: - return IC2Items.getItem("cable", "type:gold,insulation:0"); - case 3: - return IC2Items.getItem("cable", "type:iron,insulation:0"); - case 4: - return IC2Items.getItem("cable", "type:glass,insulation:0"); - } - return null;*/ - } } diff --git a/src/main/java/malte0811/industrialWires/items/ItemKey.java b/src/main/java/malte0811/industrialWires/items/ItemKey.java index 5fe492d..cf48bde 100644 --- a/src/main/java/malte0811/industrialWires/items/ItemKey.java +++ b/src/main/java/malte0811/industrialWires/items/ItemKey.java @@ -61,7 +61,7 @@ public class ItemKey extends Item implements INetGUIItem { @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList subItems) { - if (tab==IndustrialWires.creativeTab) { + if (isInCreativeTab(tab)) { subItems.add(new ItemStack(this, 1, 0)); subItems.add(new ItemStack(this, 1, 2)); } diff --git a/src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java b/src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java index 55a8eeb..6361ab3 100644 --- a/src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java +++ b/src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java @@ -87,7 +87,7 @@ public class ItemPanelComponent extends Item implements INetGUIItem { @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList subItems) { - if (tab==IndustrialWires.creativeTab) { + if (isInCreativeTab(tab)) { for (int i = 0; i < types.length; i++) { subItems.add(new ItemStack(this, 1, i)); }