From 6e30c8bf85ae939348da3311362a5f9ddff1185a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 17 Jul 2015 22:49:00 +0200 Subject: [PATCH] Preparing for the Update: Added Crafting Recipes and Textures for the new Items --- .../config/values/ConfigCrafting.java | 6 +++ .../crafting/BlockCrafting.java | 11 ++++- .../crafting/ItemCrafting.java | 40 ++++++++++++++++++ .../textures/items/itemBatteryDouble.png | Bin 0 -> 560 bytes .../textures/items/itemBatteryQuadruple.png | Bin 0 -> 597 bytes .../textures/items/itemBatteryQuintuple.png | Bin 0 -> 590 bytes .../textures/items/itemBatteryTriple.png | Bin 0 -> 579 bytes .../textures/items/itemMiscBatWing.png | Bin 0 -> 389 bytes .../textures/items/itemWingsOfTheBats.png | Bin 0 -> 485 bytes 9 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemBatteryDouble.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuadruple.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuintuple.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemBatteryTriple.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemMiscBatWing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemWingsOfTheBats.png diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 4a081dc62..574f74759 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -5,6 +5,7 @@ import ellpeck.actuallyadditions.config.ConfigCategories; public enum ConfigCrafting{ COMPOST("Compost", ConfigCategories.BLOCKS_CRAFTING), + XP_SOLIDIFIER("Experience Solidifier", ConfigCategories.BLOCKS_CRAFTING), WOOD_CASING("Wood Casing", ConfigCategories.BLOCKS_CRAFTING), STONE_CASING("Stone Casing", ConfigCategories.BLOCKS_CRAFTING), FISHING_NET("Fishing Net", ConfigCategories.BLOCKS_CRAFTING), @@ -103,6 +104,11 @@ public enum ConfigCrafting{ DRILL_PLACING("Drill Placing Upgrade", ConfigCategories.ITEMS_CRAFTING), DRILL_SILK_TOUCH("Drill Silk Touch Upgrade", ConfigCategories.ITEMS_CRAFTING), BATTERY("Battery", ConfigCategories.ITEMS_CRAFTING), + DOUBLE_BATTERY("Double Battery", ConfigCategories.ITEMS_CRAFTING), + TRIPLE_BATTERY("Triple Battery", ConfigCategories.ITEMS_CRAFTING), + QUADRUPLE_BATTERY("Quadruple Battery", ConfigCategories.ITEMS_CRAFTING), + QUINTUPLE_BATTERY("Quintuple Battery", ConfigCategories.ITEMS_CRAFTING), + BAT_WINGS("Wings Of The Bats", ConfigCategories.ITEMS_CRAFTING), ENERGIZER("Energizer", ConfigCategories.BLOCKS_CRAFTING), ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index a83558b32..35fe3649f 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -7,6 +7,7 @@ import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -25,6 +26,14 @@ public class BlockCrafting{ 'W', "plankWood", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()))); + //XP Solidifier + if(ConfigCrafting.XP_SOLIDIFIER.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier), + "XXX", "DCD", "XXX", + 'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()), + 'D', "blockDiamond", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + //Charcoal Block GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()), "CCC", "CCC", "CCC", @@ -309,7 +318,7 @@ public class BlockCrafting{ //Greenhouse Glass if(ConfigCrafting.GREENHOUSE_GLASS.isEnabled()) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3), "GSG", "SDS", "GSG", 'G', "blockGlass", 'D', Blocks.obsidian, diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 635abf082..543158abc 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -140,6 +140,46 @@ public class ItemCrafting{ 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + //Double Battery + if(ConfigCrafting.DOUBLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryDouble), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBattery), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Triple Battery + if(ConfigCrafting.TRIPLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBatteryDouble), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Quadruple Battery + if(ConfigCrafting.QUADRUPLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuadruple), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBatteryTriple), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Quintuple Battery + if(ConfigCrafting.QUINTUPLE_BATTERY.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuintuple), + " R ", "ICI", "III", + 'R', new ItemStack(InitItems.itemBatteryQuadruple), + 'I', "ingotIron", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + + //Bat Wings + if(ConfigCrafting.BAT_WINGS.isEnabled()) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), + "WNW", "WDW", "WNW", + 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), + 'D', "blockDiamond", + 'N', new ItemStack(Items.nether_star))); + //Quartz if(ConfigCrafting.QUARTZ.isEnabled()) GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryDouble.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryDouble.png new file mode 100644 index 0000000000000000000000000000000000000000..d4b1ae9f18b3de90d57ee33176086768885d52c7 GIT binary patch literal 560 zcmV-00?+-4P)WFU8GbZ8()Nlj2>E@cM*00ERqL_t(I%e~XTOPfI) z$MN@Le6EBiO_V%}A*Nvb5siqYLqH`2bm^Q{G{GVNfq#OyD;Zr}L_4H^LkC3*of^v1 z4sDWlvBhYbhy<5=$T7hcsw38 z;g6C|rDJSl4wnS4!-EF?baUvA7WD`sPMuce9$-6HoccOcijs`bZ5| z$yH4D&ceJ2FOl8JcHhBle5{2x0@ncKDkiz}dAvc%=kK3dYqgFzVv?C`;#_42P<;IR z8Yv}GN^B`97phn%CC%kLvxzPQKW~Hdi8^a$1*`7nTWttw+Yc~+%MqB+5xPJKLGc_t3$+$*Wze3s&;>7q;9Vfknt27l;XfY-r3jaWD%MF+bG(Ber@uAB zFjOF7pts=<7lSk!jVAu(#EuY`-!CY0+=neC$&s%d{fQ!N*%f!Zg+wx@yg_#}Fk4dY yfjc$;h`pUt-cdK@VioJSJMLL?i3#;AKlKihNvnS>;78m50000IqP)WFU8GbZ8()Nlj2>E@cM*00Fs4L_t(I%e~W0YZE~j z!14b!;?5po6Wj*HG>2?ow4pW8gV`R$gMv^iy-1rVNa(qxr5~X5UMTtjycCN$_8V9a zqSBz7Hi%XdL0k%rQlyueL&ihtk`TAv`kaPm<~J|T%)nX1;Haxl+B1bmy1nn*fAN^B zlj$t+cuWtbdMOr*T)R4=mzP%zfS%Lv(3q=}P8Q3uSa|rJgFgnT{(k1?7g$_c)Br{} z9@j}HODVrWB+^46@tbnf=EduKWQH!Wwz_779^qu=QhtLcmk$9bH*Ge*&JndG?<&<` zY}XEkue(=X(EJ$B?OZL z&zZIl09f~XS+6|BZ+O(&a4^9a@2wGw#dXZdBHHlF{Wz^w>loKPYL%_7nsp@ZPd(O& zR0bs#51ePb@@A1r;nzP=tGxN=m3JlYPR{5Hb{eG=N=bg!y-*zbkn(pXbkt7cfA^?u jhvQQtbMv-7lb`w*pw6k-yW?1l00000NkvXXu0mjf1ONe^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuintuple.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryQuintuple.png new file mode 100644 index 0000000000000000000000000000000000000000..54ecbdb1616236ee35181f81b59753157725f43c GIT binary patch literal 590 zcmV-U0WFU8GbZ8()Nlj2>E@cM*00FW|L_t(I%e|A&OB+EH z$3JUC*ad6MrqV*QxTwiST0FNDHXdRWrI%7-LN6YLB3hxB9&FFG_&>BrNsrYErQpF( zD7pC~3LXkdT1t(!haPr31; zQUc|}TkLJGHJTW8QexRIx~}^JG~WF($@HBvb^94gc@3~HAsSCfq`w9m28OOP5nm)7 zJ^|qEj~-UPJg0P=r&tI3CLSJq(n29qOtaeL0$%;uOQlk&!bf?EJ8MmzH6$h z?x8%zxbu|vg%`f&;?DY|SKgFNP0q@-;7H9dueS4g%lC3=;qLvcbO%THe%u~z8^d>| c-y2h12nT>t<807*qoM6N<$f{Ok5xBvhE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryTriple.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBatteryTriple.png new file mode 100644 index 0000000000000000000000000000000000000000..739fc4f15c62a0f73a79c3f5cbacb5eabcd9b5aa GIT binary patch literal 579 zcmV-J0=)f+P)WFU8GbZ8()Nlj2>E@cM*00E~-L_t(I%e~XFOItx4 z!13?vlXuC`q=h6#%M18Sz=TE-F~wpB(OPk^Rwy>X!J+?$bgyK0=ulC}AogEqK^;1T z5=&J~6BqlyC}N%NAm?EFFeE`If75YypC7;9?>M-R=o?P!|Lb?zxBBK;$E`S%*4=T3 zU@)NLQJY*YN3t)amzF*lw4KWZ;k^h))UqLdH_V7a2IRJ%Ph>gk&fv9Br$9M0p(Gn*d z7W=Ppp%w--8`T+(}_O!tPG7X=V)@FXyIpxW`6G#cO+$^}R`? zQf+a|R~Vapr30N2l#(bV`Eyupi(4iDcs4PrA4bEtzpG6>-#MO+4C;INsaJr9sob

!dCdj_E%p;cGnB5J%KE_k z8c*=A5Ic9!&~<{#+qH8azdQ3LtNelgVx1}a+)w8hUfKI7Z}!i7ylX!3GH926n(1{j zy!O+DgzaaKc}8V_@@4GgW{tlzH_E}y&%}FCM0T$s+g~x8rIw#H(;4o4mHNAj@9V9^ zwXQBV!fO{jd*p3i@RDuT;>G`^7&4;R?|q!Kd^_W_ZS57TI!F2isxP{@c)S;!mw3*T zan08Kb%j?}6!?A&nl0bGwCuk79P2I)hRZS`-yD`*`gpWk=7{dH|Gb_yRSo^ue3`a9 c`CA;rn7*iS!h)c`lAzG=boFyt=akR{09j?5X#fBK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemWingsOfTheBats.png b/src/main/resources/assets/actuallyadditions/textures/items/itemWingsOfTheBats.png new file mode 100644 index 0000000000000000000000000000000000000000..3e746b7cd1ceea75407373597c8b033aa99b2192 GIT binary patch literal 485 zcmVWFU8GbZ8()Nlj2>E@cM*00Bu!L_t(I%k7fQP8(4S zg+KewWWxNhE~?rD1wu&xA>RKfShST|s)Rm4ks>m4eceTr5mANMc7a#N^09S%bl|-X zDyaHfoKc=1aC88we!aLvL|#2o6op^T&&jgP|2dFSBBjL5aslA_LQUH=URRaRrW4#9 z+z%CGS?0?x7nm8I5&*YXOPad&rmp?;^CzCSTe1-7`kwjOjB!yoKn9>9jPiV^!W|Jo zM3_w{m>Fh<03if|8LCP&13;>>^x1TRrNm~l;n(_+yPIoLN~kJb-=nGsaR2oii}^W- zpdvi1)~Kq|$H0l