From cbcadfbba7b02eee0e03f4db8b47649b3634fc9d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 20 Mar 2016 15:15:58 +0100 Subject: [PATCH] Add greenhouse recipes --- lang | 2 +- .../blocks/BlockArbFenceGate.java | 4 - .../core/items/ItemCraftingMaterial.java | 8 +- .../forestry/greenhouse/PluginGreenhouse.java | 120 ++++++++++++++++++ .../blocks/BlockGreenhouseType.java | 2 +- .../models/item/camouflagedPaneling.json | 13 ++ .../textures/items/camouflagedPaneling.png | Bin 0 -> 15556 bytes .../textures/items/scentedPaneling.png | Bin 181 -> 14656 bytes 8 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/forestry/models/item/camouflagedPaneling.json create mode 100644 src/main/resources/assets/forestry/textures/items/camouflagedPaneling.png diff --git a/lang b/lang index 9fde9895a..5b23a9d8f 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 9fde9895a6777f42d007f584da1516cbe583f99a +Subproject commit 5b23a9d8fdc89cc45ec95b47d54e56ca1d795aee diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java index 7019cfe66..e75d7215e 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java @@ -18,7 +18,6 @@ import forestry.arboriculture.WoodHelper.WoodMeshDefinition; import forestry.core.proxy.Proxies; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockPlanks.EnumType; -import net.minecraft.block.properties.PropertyBool; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -29,9 +28,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class BlockArbFenceGate extends BlockFenceGate implements IWoodTyped, IItemModelRegister, IStateMapperRegister { - public static final PropertyBool OPEN = PropertyBool.create("open"); - public static final PropertyBool POWERED = PropertyBool.create("powered"); - public static final PropertyBool IN_WALL = PropertyBool.create("in_wall"); private final boolean fireproof; private final EnumWoodType woodType; diff --git a/src/main/java/forestry/core/items/ItemCraftingMaterial.java b/src/main/java/forestry/core/items/ItemCraftingMaterial.java index 78ce0049b..6e3defb93 100644 --- a/src/main/java/forestry/core/items/ItemCraftingMaterial.java +++ b/src/main/java/forestry/core/items/ItemCraftingMaterial.java @@ -23,7 +23,7 @@ import forestry.api.core.IModelManager; public class ItemCraftingMaterial extends ItemForestry { - private final String[] definition = new String[]{"pulsatingDust", "pulsatingMesh", "silkWisp", "wovenSilk", "dissipationCharge", "iceShard", "scentedPaneling"}; + private final String[] definition = new String[]{"pulsatingDust", "pulsatingMesh", "silkWisp", "wovenSilk", "dissipationCharge", "iceShard", "scentedPaneling", "camouflagedPaneling" }; public ItemCraftingMaterial() { super(); @@ -61,7 +61,7 @@ public class ItemCraftingMaterial extends ItemForestry { @Override public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - for (int i = 0; i < 7; i++) { + for (int i = 0; i < definition.length; i++) { itemList.add(new ItemStack(this, 1, i)); } } @@ -93,4 +93,8 @@ public class ItemCraftingMaterial extends ItemForestry { public ItemStack getScentedPaneling() { return new ItemStack(this, 1, 6); } + + public ItemStack getCamouflagedPaneling() { + return new ItemStack(this, 1, 7); + } } diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index c7b483207..f42a55b21 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -10,10 +10,17 @@ ******************************************************************************/ package forestry.greenhouse; +import forestry.api.core.ForestryAPI; import forestry.api.greenhouse.GreenhouseManager; import forestry.api.greenhouse.IGreenhouseAccess; +import forestry.api.recipes.RecipeManagers; +import forestry.core.PluginCore; import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; +import forestry.core.items.EnumElectronTube; import forestry.core.network.IPacketRegistry; +import forestry.core.recipes.RecipeUtil; +import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.blocks.BlockRegistryGreenhouse; import forestry.greenhouse.logics.GreenhouseLogicGreenhouseDoor; import forestry.greenhouse.logics.GreenhouseLogicGreenhouseEffect; @@ -57,6 +64,119 @@ public class PluginGreenhouse extends BlankForestryPlugin { blocks = new BlockRegistryGreenhouse(); } + @Override + public void registerRecipes() { + + ItemStack greenhousePlainBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN); + RecipeUtil.addRecipe(greenhousePlainBlock, + "###", + "#X#", + "###", + 'X', Blocks.brick_block, + '#', PluginCore.items.craftingMaterial.getCamouflagedPaneling()); + + ItemStack greenhouseGlassBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS); + RecipeUtil.addRecipe(greenhouseGlassBlock, + "###", + "#X#", + "###", + 'X', "blockGlass", + '#', PluginCore.items.craftingMaterial.getCamouflagedPaneling()); + + ItemStack greenhouseHatchInputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_INPUT); + RecipeUtil.addRecipe(greenhouseHatchInputBlock, + "TXT", + "#H#", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + 'H', Blocks.trapdoor, + '#', "gearTin", + 'T', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1)); + + ItemStack greenhouseHatchOutputBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HATCH_OUTPUT); + RecipeUtil.addRecipe(greenhouseHatchOutputBlock, + "#H#", + "TXT", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + 'H', Blocks.trapdoor, + '#', "gearTin", + 'T', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1)); + + ItemStack greenhouseControlBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.CONTROL); + RecipeUtil.addRecipe(greenhouseControlBlock, + " X ", + "#T#", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + '#', "dustRedstone", + 'T', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1)); + + ItemStack greenhouseGearBoxBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.GEARBOX); + RecipeUtil.addRecipe(greenhouseGearBoxBlock, + " X ", + "###", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + '#', "gearTin"); + + ItemStack greenhouseValveBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.VALVE); + RecipeUtil.addRecipe(greenhouseValveBlock, + " X ", + "#G#", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + '#', "blockGlass", + 'G', "gearTin"); + + ItemStack greenhouseHeaterBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HEATER); + RecipeUtil.addRecipe(greenhouseHeaterBlock, + "T#T", + "#X#", + "T#T", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + '#', "ingotGold", + 'T', PluginCore.items.tubes.get(EnumElectronTube.GOLD, 1)); + + ItemStack greenhouseFanlock = blocks.getGreenhouseBlock(BlockGreenhouseType.FAN); + RecipeUtil.addRecipe(greenhouseFanlock, + "T#T", + "#X#", + "T#T", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + '#', "ingotTin", + 'T', PluginCore.items.tubes.get(EnumElectronTube.TIN, 1)); + + ItemStack greenhouseDryerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DRYER); + RecipeUtil.addRecipe(greenhouseDryerBlock, + "T#T", + "#X#", + "T#T", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), + '#', "ingotBronze", + 'T', PluginCore.items.tubes.get(EnumElectronTube.BLAZE, 1)); + + ItemStack greenhouseSprinklerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.SPRINKLER); + RecipeUtil.addRecipe(greenhouseSprinklerBlock, + "TXT", + " I ", + "III", + 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS), + 'I', "ingotIron", + 'T', PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1)); + + ItemStack greenhouseDoorBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DOOR); + RecipeUtil.addRecipe(greenhouseDoorBlock, + true, + "GG ", + "GG ", + "GG ", + 'G', blocks.getGreenhouseBlock(BlockGreenhouseType.GLASS)); + if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + RecipeManagers.carpenterManager.addRecipe(50, Fluids.BIOMASS.getFluid(500), null, PluginCore.items.craftingMaterial.getCamouflagedPaneling(), + " A ", "###", "RPR", + '#', "plankWood", + 'A', "dustAsh", + 'R', "dustRedstone", + 'P', "pulpWood"); + } + } + @Override public void doInit() { super.doInit(); diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java index bc68d873d..912d1286e 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java @@ -103,7 +103,7 @@ public enum BlockGreenhouseType { case GEARBOX: return sprites.get(BlockGreenhouseSprites.GEARS); case VALVE: - return sprites.get(BlockGreenhouseSprites.VALUES); + return sprites.get(BlockGreenhouseSprites.VALVE); case FAN: if(state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) { return sprites.get(BlockGreenhouseSprites.FAN_OFF); diff --git a/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json b/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json new file mode 100644 index 000000000..558a63796 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/camouflagedPaneling" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/textures/items/camouflagedPaneling.png b/src/main/resources/assets/forestry/textures/items/camouflagedPaneling.png new file mode 100644 index 0000000000000000000000000000000000000000..f8a230f26bce92895be1e2b3a302b069066b6c01 GIT binary patch literal 15556 zcmeI3Ux*t;9LKj(q@F#rDy>-mtSOb2cC)+L-6Xpv>0K{v@1&{MyOgGawUgaRZhOgY zn%!%1C-|qOSYN6r!ck5U6m2UMeHLp$3i?tX1QF>&AAIo-_CY~QAL{IG{_IV1!>JWf zCXnp@<~zUNZ}u}Yzui3S%j0`?4Gugoz%b0<*l2bF9q;zOt8PcXkNk2Ipu-)t(E|>{ z+UZ0!RRU@)3GmvU(C_ojufNfSQmZLS(5kIbm&b?+n z!unm@>2ze+OUM>-p4nu9taHRaIVy@v#_(dT`FH<$@+>IU9l? z?KoNJ=ykK^nzqGyaY50Zanq5Am#Fh;U01c%Nn|-Kc8DV11T|ia3Vc5&L+|+1X6hAx zXok+i3amoQb&#Lf*RM8ZyS6iBFOjk%FPRw4NiNsP-FLjzYTwk3yW=QA&_deR)5*`) zAU^>ed#0|#9Y@inZ0L9Ou373%&Z0=3vgFud(_F&MQvx@CDFic=Lf5K|)FE)~dfv7x znP8QTw-K@gc~RCxL6hWgj8IQJ2HHOcaKW;og!_i#7`j%n>s8=p%ql2D zzGjtEe77;wv$LwS5xZj7(Xe1fO7Z=gLtg$$)5a{v1(puSvKiD6HBAE{661oHjByaC zItPG^eo9G$OB%YI)JuXPlvE#LE*Ez137xg|8E?0s&_Q7_Y#oK~4oiTdp(rBYAXE)b z6rsWuMMLC_Qc+3*BuI+VP815(ljzC1iRvDxg!*{bVxVL|k#s>x#JPls@+4Fla3Bdw zoD5^KAxdhpXvpmpeZusl8Z{lXT4zJ67_DW$vQ5Gxi(A`5#q=vw4b&az?Z0%Sy#YHV zty8f)AAcWfK=*1}M)$S{G*bMc*6y%6o-H@CcRH7cAc!AwUphx)3RD8Egi(M zOKtLY=v$%wy=myKVtoo&WoTsh_La38{!25ryn6W8Hqifd=7OELxF)vi zY;O%sd5;wus=uff0Ke{uDZZzzyJmv^1+R`)X8it%n1DXK=>4`_!!quAfb1HUao4Wr zKFf47XwUis#hOE2-m_0|W1d8h=`a&l6baqd@Mhd&+-$;1A#0*LsN>xU#CXdG7y3FL zSjsUZv>bz}3O!K!)iY>CkL&240^j+o&{J4D_n%vN(!HWv85N5~lVCu|CdEbOgQ*l3 z283)-8(& z|LEtl^F!%t3ispSTfd#UDj)l5{zhbI?c}SQFU}p`_05MbeV5$&_J!TU1!m*9FDolA zUthI;TlTDUN8!lB%m}#pGJ9q9nuUXF@0$MU`P1)S cSiwB{#iYYh8Imsryt@QB* zk~w?t|D1E@ch0>#FZ1H~*zS!(TZRxq8%GQI339zN_^w|^ejoVbszxriJB4Wvp*!vl zzPF&)Puz#lj)%Z9BtGbqDDyF*>E&{9{b!Zo-?fsf92eHo->UM zzc*17i%t$#%)*k3Czr-b`qI3fHu#;{A+@2905$AuT%%UCJf)H0!?+5ugJFT^LWw`0 z;dccIxvAnfm$O~WC8EiQE+$i4Djk&)sZ>1m7$=KTLJ(s@OpM4eB`zv)nQMLc>=3b3 z*C;C!`H@yS@>hnh_`ahELcLy()?-oIofD*VIxUE@Aj=V=h{5kIM~pHs1Y+pE|EQnsfDCMGp07TdY|uD4d}o7(e-_Y(vyq6hXu!)Q-#hT zP`0~D$=OxgCCkFum@4!e23}#ODWjI>YnF~j^I0+wHBCbijRYp!FcwK_vpV4y7bEFd zIvz1ZP2M5NdU-Zo4j~qc(0x_tysa+;yQLM{xWUlCeO2hEU6Y)2S`}!5)!%4}K4Dg+ zDwrPW&qdI;q zst}z1RkOPg&C%}qtaR+^daA*prjTAB>(as+NUE@EtdqH^p9*SPT?q9lStK7p3VvIz zaJtuZ`r58=y4SVixyLg7tlY}hGYq_flec*+Op=ELoJ}SYv4kr04)=PDn+;r@%9~{W zdO=r8$(B#=L|@10L5^Ue<=8A0_;(&wvN=i~7RYmo(0)+qE^>P#++?G3M>jbz49Ai{ z8dRI%q9TF8Ps5ZkzMFa&57oQ4v7_!v$$jZH9}A2nrZ3NP}uKTvS9*z;HntRGZj3(}z43>Os<6fj(n z2GwS`sED9|;es@%Hp4|l1O*Hiq(QYAE-E4@V7MR+s?Bgw5kUdN1!+)ihKq^_3K%X( zgK9HeR76m~a6uYWo8h7&f&zvM(xBQ57Zni{FkFxZ)n>S;h@gPsf;6c1HE|7fUj4%s zdEc*2UhMl|xu%ns0y(`fQAB9zVT6_sA@uiEa=nbuf{4&BGYBcKA#|_(>T?%Hi1yfM zepjjS{fVRRZv2qju=etsmBQvHM}A*ZcuOAnXTwLwrY}t%Sf2Xi4d=jxAAhZh_0LA0 zxo7Lavz6yBj(w-z|MjV#ovn`_JiGpfQ-AJR<}Y%SX!wPr$s@1awR`QE8oLF<)mxs?ixXwO);bh|F eoyEy3=kG0%G&($%KmEka!T$hG6XlTr delta 165 zcmX?5w3Ts!L_G^L0|Ud`yN`l^lu&?Ah-kM^Yc|MyLb+IiM2 z{bH;|k=a7Gn1&C}SX!j!h}f}nC9p1F=wjkvy%2m*E?1t*#{RPSIki7x{rpCU?}z&U P4QKFl^>bP0l+XkK&PzDw