diff --git a/resources/assets/enderio/textures/gui/poweredSpawner.png b/resources/assets/enderio/textures/gui/poweredSpawner.png new file mode 100644 index 00000000..53aecc8d Binary files /dev/null and b/resources/assets/enderio/textures/gui/poweredSpawner.png differ diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index ca405152..50d116df 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -4,11 +4,13 @@ import static crazypants.enderio.ModObject.*; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadePainterRecipe; import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.recipe.OreDictionaryRecipeInput; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.Material; @@ -58,9 +60,10 @@ public class ConduitRecipes { GameRegistry.addShapedRecipe(basicFilter, " p ","php"," p ", 'p', Items.paper, 'h', Blocks.hopper); ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1); - GameRegistry.addShapedRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', new ItemStack(Items.skull, 1, 0), 'r', Items.redstone); - GameRegistry.addShapedRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', new ItemStack(Items.skull, 1, 2), 'r', Items.redstone); - GameRegistry.addShapedRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', new ItemStack(Items.skull, 1, 4), 'r', Items.redstone); +// GameRegistry.addShapedRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', new ItemStack(Items.skull, 1, 0), 'r', Items.redstone); +// GameRegistry.addShapedRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', new ItemStack(Items.skull, 1, 2), 'r', Items.redstone); +// GameRegistry.addShapedRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', new ItemStack(Items.skull, 1, 4), 'r', Items.redstone); + GameRegistry.addRecipe(new ShapedOreRecipe(advFilter, "rpr","php","rpr", 'p', Items.paper, 'h', "itemSkull", 'r', Items.redstone)); ItemStack exFilt = new ItemStack(EnderIO.itemExistingItemFilter); GameRegistry.addShapedRecipe(exFilt, "rpr","pcp","rpr", 'p', Items.paper, 'c', new ItemStack(Items.comparator, 1, 0), 'r', Items.redstone); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index d1623b1c..2850e921 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -30,7 +30,7 @@ public class MachineRecipes { ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); ItemStack silicon = new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal()); ItemStack pulCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); - ItemStack vidCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); ItemStack electricSteel = new ItemStack(EnderIO.itemAlloy,1,Alloy.ELECTRICAL_STEEL.ordinal()); ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); ItemStack phasedGold = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()); @@ -57,6 +57,10 @@ public class MachineRecipes { ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); GameRegistry.addShapedRecipe(crafter, "iti", "imi", "ici", 'i', Items.iron_ingot, 't', Blocks.crafting_table, 'm', machineChassi, 'c', capacitor); + //Powered Spawner + ItemStack poweredSpawner = new ItemStack(EnderIO.blockPoweredSpawner); + GameRegistry.addRecipe(new ShapedOreRecipe(poweredSpawner, "ese","eme","vcv",'e', electricSteel, 's', "itemSkull", 'v', vibCry,'m',machineChassi, 'c', capacitor)); + //reservoir ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); Object glassSides; @@ -112,7 +116,7 @@ public class MachineRecipes { } else { GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "glassHardened", 'p', silicon, 'e', energeticAlloy, 'c', electricSteel)); - GameRegistry.addRecipe(new ShapedOreRecipe(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vidCry, 'e', + GameRegistry.addRecipe(new ShapedOreRecipe(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', phasedIron)); } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 8ef4abba..c9e849f5 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -133,11 +133,19 @@ public class BlockPoweredSpawner extends AbstractMachineBlock