From 96bee8e6d05021ff938da4893fec3a8b128a7690 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 20 Jun 2015 00:08:43 +0100 Subject: [PATCH] New Nuggets, Endoflame and Elf Portal crafting cost rebalance. --- .../subtile/generating/SubTileEndoflame.java | 4 +-- .../common/crafting/ModCraftingRecipes.java | 25 +++++++++++++++--- .../vazkii/botania/common/item/ModItems.java | 3 +++ .../item/material/ItemManaResource.java | 2 +- .../botania/common/lib/LibItemNames.java | 5 +++- .../vazkii/botania/common/lib/LibOreDict.java | 3 +++ .../resources/assets/botania/lang/en_US.lang | 5 +++- .../textures/items/elementiumNugget.png | Bin 0 -> 15479 bytes .../textures/items/manasteelNugget.png | Bin 0 -> 15492 bytes .../textures/items/terrasteelNugget.png | Bin 0 -> 15494 bytes 10 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/elementiumNugget.png create mode 100644 src/main/resources/assets/botania/textures/items/manasteelNugget.png create mode 100644 src/main/resources/assets/botania/textures/items/terrasteelNugget.png diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 6bd1aa961..8d5bc1ad0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -84,7 +84,7 @@ public class SubTileEndoflame extends SubTileGenerating { @Override public int getValueForPassiveGeneration() { - return 2; + return 3; } @Override @@ -123,7 +123,7 @@ public class SubTileEndoflame extends SubTileGenerating { @Override public int getDelayBetweenPassiveGeneration() { - return 1; + return 2; } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 3621178c3..a559893e6 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -846,13 +846,17 @@ public final class ModCraftingRecipes { // Alfheim Portal Recipe addOreDictRecipe(new ItemStack(ModBlocks.alfPortal), - "WWW", "WTW", "WWW", + "WTW", "WTW", "WTW", 'W', LibOreDict.LIVING_WOOD, - 'T', LibOreDict.TERRA_STEEL); + 'T', LibOreDict.TERRASTEEL_NUGGET); recipeAlfPortal = BotaniaAPI.getLatestAddedRecipe(); // Natura Pylon Recipe - addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 2, 1), ModBlocks.pylon, LibOreDict.TERRA_STEEL, ModBlocks.pylon); + addOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 1), + " T ", "TPT", " E ", + 'T', LibOreDict.TERRASTEEL_NUGGET, + 'P', new ItemStack(ModBlocks.pylon), + 'E', new ItemStack(Items.ender_eye)); recipeNaturaPylon = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Seas Recipe @@ -1761,7 +1765,7 @@ public final class ModCraftingRecipes { 'H', new ItemStack(ModItems.grassHorn, 1, 1)); recipeCanopyDrum = BotaniaAPI.getLatestAddedRecipe(); - // Storage Block Recipes + // Storage Block/Nugget Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", 'I', LibOreDict.MANA_STEEL); @@ -1783,6 +1787,19 @@ public final class ModCraftingRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 2), new ItemStack(ModBlocks.storage, 1, 3)); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 9), new ItemStack(ModBlocks.storage, 1, 4)); + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 0), + "III", "III", "III", + 'I', LibOreDict.MANASTEEL_NUGGET); + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 4), + "III", "III", "III", + 'I', LibOreDict.TERRASTEEL_NUGGET); + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 7), + "III", "III", "III", + 'I', LibOreDict.ELEMENTIUM_NUGGET); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 9, 17), LibOreDict.MANA_STEEL); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 9, 18), LibOreDict.TERRA_STEEL); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 9, 19), LibOreDict.ELEMENTIUM); + // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 6d6dc0218..e4c89eabe 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -402,6 +402,9 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(manaResource, 1, 14)); OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(manaResource, 1, 15)); OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaResource, 1, 16)); + OreDictionary.registerOre(LibOreDict.MANASTEEL_NUGGET, new ItemStack(manaResource, 1, 17)); + OreDictionary.registerOre(LibOreDict.TERRASTEEL_NUGGET, new ItemStack(manaResource, 1, 18)); + OreDictionary.registerOre(LibOreDict.ELEMENTIUM_NUGGET, new ItemStack(manaResource, 1, 19)); OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 4c4085589..b49519f10 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -45,7 +45,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { - final int types = 17; + final int types = 20; IIcon[] icons; public IIcon tailIcon = null; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index ebaf5af39..54eba7757 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -184,6 +184,9 @@ public final class LibItemNames { "dreamwoodTwig", "gaiaIngot", "enderAirBottle", - "manaString" + "manaString", + "manasteelNugget", + "terrasteelNugget", + "elementiumNugget" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index cb77e5ae7..c5c2bb08f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -35,6 +35,9 @@ public final class LibOreDict { public static final String GAIA_INGOT = "gaiaIngot"; public static final String ENDER_AIR_BOTTLE = "bEnderAirBottle"; public static final String MANA_STRING = "manaString"; + public static final String MANASTEEL_NUGGET = "nuggetManasteel"; + public static final String TERRASTEEL_NUGGET = "nuggetTerrasteel"; + public static final String ELEMENTIUM_NUGGET = "nuggetElvenElementium"; public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 69990c1c8..0b9637425 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1334,6 +1334,9 @@ item.botania:recordGaia2.name=Scathed Music Disc item.botania:temperanceStone.name=Stone of Temperance item.botania:incenseStick.name=Incense Stick item.botania:terraAxe.name=Terra Truncator +item.botania:manasteelNugget.name=Manasteel Nugget +item.botania:terrasteelNugget.name=Terrasteel Nugget +item.botania:elementiumNugget.name=Elementium Nugget # BREW NAMES botania.brew.fallback=Fallback @@ -1527,7 +1530,7 @@ botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 v botania.page.pool1=Making a &1Dilluted Mana Pool&0. botania.page.pool10=Infusing a normal &1Mana Pool&0 botania.page.pool2=Tossing in some resources into a normal &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
A few examples are &1Iron Ingots&0 or &1Mystical Petals&0.
&4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1Redstone Comparator&0 can also output a signal based on the contents. -botania.page.pool8=For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. +botania.page.pool8=&1Manasteel&0 Ingots and other ingots based on it, can be converted into both blocks or nuggets through the normal conversion recipes.
For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. botania.page.pool3=Infusing &1Manasteel&0 botania.page.pool4=Infusing &1Mana Pearls&0 botania.page.pool5=Infusing &1Mana Diamonds&0 diff --git a/src/main/resources/assets/botania/textures/items/elementiumNugget.png b/src/main/resources/assets/botania/textures/items/elementiumNugget.png new file mode 100644 index 0000000000000000000000000000000000000000..c4f42dfd1112f58cd09fb1860b5a567e9e62b826 GIT binary patch literal 15479 zcmeI3U5Fc16vyuhYP)VlRIrF_r>TXCPUa(-Br_&y>!vj;W?gn8-R+CLnYq~=Hklb` zW;fXtv0e2+pG1X!s)4{U=$RBPyP+vhlS3^stRY-jQ!G{UXGzy6m zN=2+VQ)t;NZ@6fFW2UNatmvwdI9wdhw>2!#L_Xx&&4%S^?Ls2d)$s3NSV(Z;6n~|V zI2t767Amvcly{7OyyYE;M7la98mNgZ z-@|dz&^Tw=_HA$39+9%=9+?=|q*CeS9(ugZ=Frrhe{2mS=pY>$=~dSqB+MbtUUhYJ zYz?2vfnjIwoArKiwkZXkk;jhO=7_Ms6NQCKA*xUwpQ|?IBIw(0)wUbOXqC-&5pq*g z+@TYuW!Nq6p1eTL?w7hRgi6pyMZ6T#yqMwTTvZk|yc*NldqqhT#h6GmlhCNxhFM?l zYAAt*q*mpWrihv>$2DRzNe#Sp4Cuohsl?~TbPQdq+iny3MY9Q)kl zV6znx-QCvfU%mDe#DtqxgL=@&ih8gYkdYU*jrI?#7ug9j2Mf3}%8`C7d~}Z1GO}nJ zDv}CkjTZ6jy5E8>I=Y0{#NTZ5NN{@ushk&rp5HM4gBo~n?cY@(Cn-54SJ&~zL3Li0 z(+XcpDUesQFoR%LMD=>ETj49JK&&05d%fs?!QWrF`ZBbZkWm!6XVe|ImMXThruPr_ zOsrztE+E%-(W1?_y#sa|_h84&2X_n_?zVX6!?4Rqd0}9zzg(jE3qjXxtcLTmvWQ=T z6nu6<<8Cr^ksca%lcD{{M=jGY%AIV)a4aggt%)wY^Y{)N6*G#GQt|>hOh(L_ZPZvO znfMCn1$|%2bYe)y(7?q}fiXuXFe+8-UO8--(I~zX$A1EZ-oJo>UfR3bT+JW-GrF3p zgceIe0HK=<7o88`Ww;0+bd%wt^C7$p7XgHBGF)^%gqPtWfY42bi_VAeGF$`@y2)_S z`4C=)ivU7587?{>!pm?GKTdb;bpi8Aas-A zqVplV3>N`}ZZceSK7^OyB7o3MhKtUJ@G@Kk5W2~5(fJTwhKm3~HyJKEAHvIU5kTlB z!$s#qco{AN2;F43=zIt-!$kn0n+zA758-9F2q1Km;iB^)ybKosgl;libUuWa;Ua+0 zO)9SO{&Tg+!VlB7@KdvIo#e~-iCa!D&s6}}I0(S$rvdowGXDMsfK?HIZ%+ZBy#l}; z_KS~wbR5rhrb|bw?F*lu-+%LIapKvpC!OanI%7Xh+<0+ve*PTV{A1VLt+W2#&2!&< z`tw0$>&ut_y!{13Idk^zmoD9PZuf-=@Y!|ihn^X;tu& w*GummnS5yCht&J0pLkP&Uu^yI6x;{SpZ(pw{_W#OaBeVtY^L-Rqdo+CCxE6nI{rwWeUpKkqGd=(}ZwlXQ zz?*Mx2H?TxtmT0P9qIXXBMSf4Hx$Yps>B=LgN4mxLGu3*~QdvAAOwSEVG!} zr&h#@JBH@1@g)!KUD{JMmJS%2nc7|&DYSHK&_Ds?T8+Bx>#brc^40P0uvtiPQJ3IA zF|{KckejYda$}B%I5n;EhA3sYoR*eUDU+8T;ABx!1W^$rg_mSq)O1PZ+OJe;1pg{{ zW=)?e?`jW+qhe}42wYtdn$2dqsiYlmPLMQB6GT~%Wghq7{Y5)~E#CIG#U>q}GV%@2 zas$h;xzHERItxKDl?n&yzS`&2aJvK9ew!VpD72s}NNG_Rlw=y+9CyL1M~7w_0;;11 zvI8IINdxoTc_(oEd1uIwU3uuhcup#n?$`s5x6v3lv>)s|h!M1r4$Snci!KtTknb#b z2HJTLpUSpDXCGL#-sG%u3YDS9j#}1`v`~rDqNNbePywH-KIS19I9}Cp>ZN#YfoQ!vK}=Qq1sTmY4HYS=8}r%;fGDC0!H~CUH-~qvDuW zZL#B_h8~hul@(o;bS0DYNc1E<@YXS5058iW**D>18hXv~8ZanX4LFAc*Pbf~y~ae( z?t;?CoVw%T!$KvcAPj0wWJQZipRoM^+6I~^mvBScvP?ZAYfuquGOtKdjhB@S;-Qw$ z^O9lCO3*-Jww8||Rw~K#KI^h$EQA}SZEa#}6Xx<+m{WOK%bC13n-O`4YX`5?OeHJl zp($ywW1UFvvwqaGaFK)cM4#~J|LG6|Z2E>8w|u-b7ZXbsFWjh%?L|+oZtVzlD=J4W z^n4U1ZE1QA5q~_Ip&EWG0 z)p$+LsQj#=LSDT7jxutm7X2^ydkfc?hxQyYOG4+2It|y-j9p&Q zyRsQubpg4yCoSH5t1DoqaQ9ctLU_lZ<7$g{K8&iIR1o^wddns5KOI)h`a;w{CyV$c zNa1HYH7S#+GxXG?Os4iSAGfWbB)3N+niE;!ZB2aP-HY$QQ7NmcidqoJW-?>aYN7gc z*}_*yKdk#www*%?0~2S4B_@P+Vmwued*!HL#;y2H9RCRry8iQWWVq;j2$kU?fY3vRi_V8o87=|{J!H7( zdQWWVq;j2$kU?fY3vRi_V8o87=|{J!H7(dQWWVq;j2$kU?fY3uK zu94nzwaCT~(>C!_v$-c-#-JeAOi5qegO1i0Nm~z zdFs<$xbLBf@{Vfj+n>HZzF}D$z2VC(@1F2Qu;rc6XOC~3yzSI0@2@%W@}|wBmC}p1 z-nDMyCvRLleEzjfN6z1K{xPt8^4QFE4}tI2J@G~Tv)5P7XNp%F4-OXD^&vzUB1Vqu<<8-hJxqVYn51zVhqo4}SPCzy|^* NcJ3*^_wfGb{{ldL$s_;( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/terrasteelNugget.png b/src/main/resources/assets/botania/textures/items/terrasteelNugget.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd348d7c6b2d67f73499af266445ed9d29c1cb4 GIT binary patch literal 15494 zcmeI3UyKt)9LJaV2R+0PH39X(rAQ)y?fz-E-Cf$kc?Ivl;&Ie)rw`n8cY3#>-CcIK zw0AxTnizT12SSLN@S-mS6BCn5M3AWOB5z=#@l6wy#3y4AXLtK&J8ef$j3JpO{qvje z{JyjMnVH{iANIubz8BVxJvGKK%-X5R;tcv;7rY;O5Pd%L+bw{;9(E?@Jce2Gc<^4u zoPKWu!)!lpmS_Fh(uhvqqpwr_ij_J|?7^2mYFoRmu4v4{db41R-V;^~5|%wqaJ6 zIv#T1A*y95rKKfJRN@}7p123vItK8;ZMnqz#(WH2tJ-cI_yw~L79j6f3pu{m80*96+^$OI3|jMpA$w zs-R;XOCPX)$u&`t1GQM6;OOskh#@uuLrt0}es#-JkP~iN4d_83E9k*qfJTn*YwaCYH?y5)4o=|hQI7m$>7&PJE<%g6 zp(3lW*Ju;ZuKG>j!tn*PCjMrdM~3|wxO0vVYJSc959YuFNB`XnD59*$N>%3+2&-uK zq-Cy>lF>fOf(!&%0amL@XNK=+2KvfTrxyJ$_<4L0IL)96!+3TP{)m*`R9H8e#veB%l{B z2A}QJxQwUHkyGO`p4!WN*)sit)E*6Mj%5Y6HPMCl0J;N*g^Vnx(De~-#xthP7Oc${ zO>~9yg1Rqe+Bvu|G;wZJVoYc!MpG5LR}Kqi)QaxJ(Vqam`!8UimUgc;ck@T@jP9l@ z=0yj=fRICqi_8a8DJ~2MIi$GAd@z;b!hn!Nii^w#Qzfl|B2n{CIlhu|GF% z-9LSPiW7**ME4t zamd~2-#C5Ym%Zn{T6y-{D?6XAZ2w^A_06mAmmWC3{*~7*r*Hgm(Rq~F^UlT3$2fKy QIuvGV*S_Mp=jY$}3kYP(4gdfE literal 0 HcmV?d00001