From 701cabeebf68dc72bf1bf5549a2fcfc437c9babc Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 8 Dec 2014 19:37:29 +0800 Subject: [PATCH] #1363 Two bugs with the new Vibrant Capacitor --- ReleaseNotes.txt | 1 + .../enderio/machine/MachineRecipes.java | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 63a94a0f..0a76b837 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -19,6 +19,7 @@ Bugs - #1348 Item conduits not connecting to tesseracts in receive only mode - #1357 Power Conduits replaced by growing tree's - #1347 Capacitor Bank energy duplication bug. +- #1268 Capacitor bank not honoring input redstone settings. ------------------------------------------------------ Version 2.2.2 diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 0d24f9b3..165e447c 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.skull.BlockEndermanSkull; +import crazypants.enderio.machine.capbank.BlockItemCapBank; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.ConvertOldRecipe; import crazypants.enderio.machine.light.BlockItemElectricLight; @@ -131,18 +132,12 @@ public class MachineRecipes { GameRegistry.addShapedRecipe(still, "eve", "tmt", "efe", 'v', Items.cauldron, 'm', machineChassi, 'e', electricSteel, 'f', Blocks.furnace, 't', basicTank); //capacitor bank - // ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0); - // if(Config.useHardRecipes) { - // GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "rcr", "ccc", "rMr", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block, 'M', - // machineChassi)); - // } else { - // GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "mcm", "crc", "mcm", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block)); - // } - ItemStack capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.SIMPLE)); + + ItemStack capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); - capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); + capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); - capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.VIBRANT)); + capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); ConvertOldRecipe convertRecipe = new ConvertOldRecipe();