From 2ab6085489a6b927c8e19d0be0bccd1864ec3b2d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 17 Jun 2014 20:19:56 +0800 Subject: [PATCH] Added recipe and GUI for powered spawner. --- .../enderio/textures/gui/poweredSpawner.png | Bin 0 -> 2080 bytes .../enderio/conduit/ConduitRecipes.java | 9 ++++-- .../enderio/machine/MachineRecipes.java | 8 +++-- .../machine/spawner/BlockPoweredSpawner.java | 8 +++++ .../spawner/ContainerPoweredSpawner.java | 18 +++++++++++ .../machine/spawner/GuiPoweredSpawner.java | 29 ++++++++++++++++++ .../enderio/material/MaterialRecipes.java | 4 +++ 7 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 resources/assets/enderio/textures/gui/poweredSpawner.png create mode 100644 src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java create mode 100644 src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java diff --git a/resources/assets/enderio/textures/gui/poweredSpawner.png b/resources/assets/enderio/textures/gui/poweredSpawner.png new file mode 100644 index 0000000000000000000000000000000000000000..53aecc8d8068b5ec09eac282e93343ade52aa3b6 GIT binary patch literal 2080 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kAt50nBcrCKW}d3_GBxQP+H%MB6|Wg7-|%t$zm4JlfBEk2?qkP} z{r~?TsAUw4hQRO$0sD8wU7(Co666;QOxq(FFa&>RR|Uo@XMsm#F#`kN4iIL{a{L+% z6qG7)jVKAuPb(=;EJ|evNX*PD(erZ+Q7ALkGu1ORF!)lm5Ll$Nc)B=-RK&f#b+>4? zfrxA3t7ShoGw%I=`jYY<-p=(+6QiE&z2;M8wCh8`z6VR3FZl*v_q%M;`}|{AjTpQ2 z>t%XdgE@Mp>loC>v(WBJ{xQ1|Egd= zq7Kxxh^)B`f@lf|YhDHazPg{M(Zg#fZ zgR+^o(u?0Rzp&bR{@FZ+2UQD!-17_u@hiXGyc5ju#QQ2x75{@>pJKl;oRocVl;gqE z=^?&m!A?;1m8eR@M>eR9L=fBP72-4}bXZNKh;N#Ab96f>;Pe=k3OzWn?A^|unz z!I`h>s|>>}J0=HrcTl;H0&+JPgZX=_@=ol}3$wBc`pU>B$G~uf^@9AV`&Rel&xEsI z;Abe^6a848;ZI}{>yNcy^(8fPAm*&#*^t8Z!PLHCJ^zs+D?7ifjC}G?8$uW_O#ZOd zvG}e1d=7`}v1?cz{{N2la<>N6IABn6_b3yL&9LMDTo0h+N}dJJ^|D3hzs*?p_r(&k zhId<*cA0-pR)?u;ShqU@#%5snI`7F8E3&j)a08kGGR&O8wmNq8kDBn}x9;j&8NXak zTlt88%W*%rC9&lj;cSLiwr6!qgCrO9GB6yFeh|W(@aofRvtZVSm6x-(2Ymc%?68M- x*2}7ks;fUt%4Ka>mdlWFi*4{xX?zC0^^AWPSx=wf&U+u^J5N_Xmvv4FO#o&_wA%mx literal 0 HcmV?d00001 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