From 4b0752b3d20ceed462d8a6419b8e21748ee2aaa2 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 25 Feb 2015 17:50:54 +0000 Subject: [PATCH 1/3] I can type, yes. --- src/main/resources/assets/botania/lang/en_US.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 7bb3b017f..bbad15cc4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1048,7 +1048,7 @@ item.botania:ancientWill4.name=Will of Verac item.botania:ancientWill5.name=Will of Karil item.botania:corporeaSpark0.name=Corporea Spark item.botania:corporeaSpark1.name=Master Corporea Spark -item.botania:enderAirBottle.name=Ender Air Botte +item.botania:enderAirBottle.name=Ender Air Bottle item.botania:livingwoodBow.name=Livingwood Bow item.botania:crystalBow.name=Crystal Bow item.botania:cosmetic0.name=Black Bowtie @@ -1681,7 +1681,7 @@ botania.page.flasks2=Get one under the bridge # -- COMPLEX BREWING botania.entry.complexBrews=Complex Brews -botania.page.complexBrews0=Apart from the standard, run of the mill &1Brews&0 that can don't pass from mimics of the &1Potions&0 that can be made in a &1Brewing Stand&0 there's also some more complex brews which apply either a combination of effects or new, beneficial effects altogether. +botania.page.complexBrews0=Apart from the standard, run of the mill &1Brews&0 that don't pass from mimics of the &1Potions&0 that can be made in a &1Brewing Stand&0 there's also some more complex brews which apply either a combination of effects or new, beneficial effects altogether. botania.page.complexBrews1a=A brew that applies both positive and negative effects. Taking it leaves the affected individual in a state of power, but also vulnerability. botania.page.complexBrews1b=96 Herblore botania.page.complexBrews2a=An entity affected with this brew's effect will regain HP whenever they slay any other creature. From 239f7cfd093f21c8eed1af6db9e52998e40c9bd3 Mon Sep 17 00:00:00 2001 From: Tonius Date: Thu, 26 Feb 2015 16:58:01 +0100 Subject: [PATCH 2/3] Added recipe handler for crafting floating special flowers --- .../integration/nei/NEIBotaniaConfig.java | 3 + .../nei/RecipeHandlerFloatingFlowers.java | 89 +++++++++++++++++++ .../resources/assets/botania/lang/en_US.lang | 1 + 3 files changed, 93 insertions(+) create mode 100644 src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java index d8c7ad31f..e34407c96 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java @@ -18,6 +18,9 @@ public class NEIBotaniaConfig implements IConfigureNEI { @Override public void loadConfig() { + API.registerRecipeHandler(new RecipeHandlerFloatingFlowers()); + API.registerUsageHandler(new RecipeHandlerFloatingFlowers()); + API.registerRecipeHandler(new RecipeHandlerPetalApothecary()); API.registerUsageHandler(new RecipeHandlerPetalApothecary()); diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java new file mode 100644 index 000000000..779b385c7 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerFloatingFlowers.java @@ -0,0 +1,89 @@ +package vazkii.botania.client.integration.nei; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.common.block.BlockFloatingSpecialFlower; +import vazkii.botania.common.block.BlockSpecialFlower; +import vazkii.botania.common.block.ModBlocks; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.TemplateRecipeHandler; + +public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler { + + public class CachedFloatingFlowerRecipe extends CachedRecipe { + + public List inputs = new ArrayList(); + public PositionedStack output; + + public CachedFloatingFlowerRecipe(ItemStack floatingFlower, + ItemStack specialFlower, ItemStack output) { + this.inputs.add(new PositionedStack(floatingFlower, 25, 6)); + this.inputs.add(new PositionedStack(specialFlower, 43, 6)); + this.output = new PositionedStack(output, 119, 24); + this.output.setMaxSize(1); + } + + @Override + public List getIngredients() { + return this.getCycledIngredients(cycleticks / 20, this.inputs); + } + + @Override + public PositionedStack getResult() { + return this.output; + } + + } + + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("botania.nei.floatingFlowers"); + } + + @Override + public void loadTransferRects() { + transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), + "crafting")); + } + + @Override + public String getGuiTexture() { + return "textures/gui/container/crafting_table.png"; + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + if (Block.getBlockFromItem(result.getItem()) instanceof BlockFloatingSpecialFlower) { + ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, + 1, OreDictionary.WILDCARD_VALUE); + ItemStack specialFlower = new ItemStack(ModBlocks.specialFlower); + specialFlower.setTagCompound((NBTTagCompound) result + .getTagCompound().copy()); + + this.arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, + specialFlower, result.copy())); + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + if (Block.getBlockFromItem(ingredient.getItem()) instanceof BlockSpecialFlower) { + ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, + 1, OreDictionary.WILDCARD_VALUE); + ItemStack result = new ItemStack(ModBlocks.floatingSpecialFlower); + result.setTagCompound((NBTTagCompound) ingredient.getTagCompound() + .copy()); + + this.arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, + ingredient.copy(), result)); + } + } + +} diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index bbad15cc4..c63aac108 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -89,6 +89,7 @@ botaniamisc.hasCosmetic=&oHas Cosmetic Override: &r%s # NEI INTEGRATION botania.nei.brewery=Botanical Brewery botania.nei.elvenTrade=Elven Trade +botania.nei.floatingFlowers=Floating Flower Crafting botania.nei.manaPool=Mana Infusion botania.nei.petalApothecary=Petal Apothecary botania.nei.runicAltar=Runic Altar From 6e8f25d951431134c46afdc343bf058a4d4c7de8 Mon Sep 17 00:00:00 2001 From: wiiv Date: Thu, 26 Feb 2015 20:24:13 +0000 Subject: [PATCH 3/3] The Tail. --- .../textures/items/unused/tradeAmulet.png | Bin 0 -> 19354 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/unused/tradeAmulet.png diff --git a/src/main/resources/assets/botania/textures/items/unused/tradeAmulet.png b/src/main/resources/assets/botania/textures/items/unused/tradeAmulet.png new file mode 100644 index 0000000000000000000000000000000000000000..2a9f118a964723218a394e995947d09e31b958f1 GIT binary patch literal 19354 zcmeI4cT`hZx4=*6(nLj35GQ~IkyMgkVhBR0(geZ)_K-%T1R+XsWI#o+d?KQPFfgd2 zC@2;bMNqK;ih$S^6pI0Gs*HoRp1`hyJEBx=b9Ky z&{`62aQMYk_ZyRJZ58y&GUMgVFDu<=#D0n z7Z?^RUjwj+M`|jd*d?tPJ#)Ko;(O~uD_}8OVa5E!g-$9l+F)_i9_!;^u^lWXJ!P&Z z$W#Dp${BtQU?~EunfGh+BM_6`eP|;LEZ=W16_%L@;8R%fHo$)oI92uYPFvuE2HI?= z+eGjj0nm=#YzJ`m5-6_JQacY+)B)N(K5jlx*a+5?85u=@t%rcNU57XMuLZeUEhZ4D zL+8l_vx&B`%T*BTl)b%?vy3Ypbrxt7=yLSb#mJkHhh|`7aTDKk-UlEvaVj+1PC-Pa zW^QFAVNbs1YQ+2NNee#q#JUF|S0^68~II)r;|J7-pmJh%9Z5IF?g}fV&jaB4h{I}Fs zg$qAf3hXoIfEc#pzI6bsvYCyf-OIBqRRO>zGuGs+mEPwY(@l$&X5LV&y`k2>hOpIo z_U)V2TGpz}n3`{ZWtHE zPEfEaQ<*|Hco`4#+v#JpM@8pQT(`ju2ZhPIX2b8sYr7jdCE^`09y@7pF9-b&i%>b@ z_7!$l5*L*L?B@P$MfRBevFF__9;;uZ7Mw8G-D-D4?E#aINlloRnf4&`g097G!r_(& zIsOx0CQzuQ=;C+NmCbGkqLC%Htj{eposh&RKWBJKJ*PzX?9Zp<3wL~BRGkY~m>g?c zJb|DPZVji;vU2co_HljgZ~{JaHg3|(3FZ^zx4Pe)XP9)t>B8JAlX`AX_rqeg`#6{y zJ)N8|1*Nqyo_gDS_T(K@?7V`#a*pTzpgo-Y(C%Tdhf%BP$uyjUu2It6m&}0k%EbMq z@C9XYjp>cI8qFH@8Vx#@tET%cUiU}0=UZcsdux}>XwquJH7T)DuvT72Q$1dtI82*_ zPgrJs`f$F-8Taicrr_465-YY$b96d(`pAJty8b%;UEDM8_*W*qIxx#M`GNPt@>ctI z$?xPphpTIBo4Tbmo?|>CZMyPw&W!NsXHuMx&v>+JMkx(#j`@(%a%kcqo|lhFzR53B z6Yr@WSaM+Q0X-8G?PT`x?AO_9UY%a$w1ktZJU8Xqd6{`OoSg9ZV2)RI`qB@cdY+t< zi%x9M=A7WsEdPl173@&*z2$t%jrxas=DF1kMI~@G#*DlOQ-c7FoNeo4@wexmt9bFt z29v@RfqvmGi|mt!iBz*CX5M)oo%`9A$_**&x_{%lPG~XCO74u_`C9wa{I~P&UAuy)!qV1T;ZVZ`K!kbswcX_1Q`_ z>Xp;Uckt_YWPMa=&0p@+mA4jCkI@g%lk2x87F3guKC%0c-NfD8k`)cJ8-hxLN{-G| znrkrE$>qIEd#Z;^!SVUW7dbC-F0HsAP-4tIvzu9_PKya!*LSk8U+486RF< zOAV{D>9sj%^E!=#aU-5VEWw*lvXN`aFU_yuu2_~J*}nIm_@w(d20G0oB297$!GYK6 z`rA6UzfFIu*05101y!~(B=T_O&ChXJ(@r8Mo01MLc8+&lxc^TpEt3<|cF*aU5wxmzfV{n@6nzn@`PRqZ z(UuuMGf_UzVR^H!SM0b)JeZTQprY-5-o2W==D&UVUD!7H=H&W)`Ny_7c_Z|Fny;Q( zOFU0r7g?j)FjaBEwx5+wkuUGeHwk*;meb~)oEv?0Zj?(v?5Z30Hs81i3;3YsrP>s? z=|kJE%j>et-I3ke zeXuWRb^14)nEN(+B0OwBD=5m3+`b@k##c2}!j zhI!?y&sQV=nkIbuB!g)2>S|{cuj@|Nm%3@MqC@8iD$5IBgwJa~UF24@`t#y8s~6N) z+n-o2AE5%IcKr!^s`VN!NpZIVN~t{9(qKnv$C(v##BZFvG0+ z{BvL1jquuV{ZB{hCb~8L0{_)m=-+ehi|2!^zN8sRNkRqrl+J#J8KMRN@*ytGhwtO! zOk(hYkaQ-`kA;i~3W07!A)RGJ2%QnY;=}z|9B#0M;itmuhHx&^!q6Mp?#i^iCtFlZE(h`?Y-ICBz)03W&xDXP#X zawwBc^02WR8V-^y4E_215E2R%9v+SiH$(D5IVcQ~NJOErC@dBM^+1G02J`6=h~O}z zK_|n0Y*=B8P;LmH%L|5!{L=k+>-iRjhN6K+uAzAag^Uao95%!bqKJy1hoCS>H0lRN zE-uo|f`Z1i4CC8wfFc>1*|-CS(IP`wC=XT`Z+$3(WxIhD%r_b@2qt61PssYvKrtUC z1H}qt1wkfZQ1F;>LkJmu0vR#?CX5mF4`Ogf)F>;R8IV-Z*a4T~mW%}6->kb`f!NxI-Mx$MaQ z&B17=Z_Qm?NRGi_e0ng0mFofj>u6XbmP2OT@0auMAsF;O#{9=)g!{9C ze~|BkUc?=KY#+vB^TX+(EGrI_9OG?3(Ow$63kSV^YbNQQj1raPK<@v;8idg|{IeBc znnMQ{1J6L1V;4ddf`DTp{8;9A1dh!j;?YC~flcrmUg7`V6&TH3hCe-+!(viU!;>0r z_-|UYzgGqS58Gy(D*x|nn=$9s-`O$$+IkIcy>IK^a83QbUXqy%5}OwqMCVhuL39oa z6%x!LqedG?bA&v4Qc!t;yigY&lSP55^?1$WT0!51E*<?>bWV!Of7rK0MqK`_>6~v{MRkORr!q zpMo74O`>^>mFSj_B+eC2=;?$-fu<(eB-wi@H-Z)DW5b1RRKi3DE`~57opmbUqSV87>JR z(nT3A>3k%#GF%csq>D0K()mbeWw<1ONEcmEn>AB3+c> zlFmm$E5juLM7k)$C7q9iR)$Lgh;&hgOFAD3tqhk05b2@}mvlZ7S{W`0Aksw{F6n$E zv@%>0K%|Q@T+;bSXl1x0fJhf*xTN!u(8_R00Ff@ra7pJQp_Sp103uzK;gZfrLMy{1 z0Ythe!zG=MgjR-20*G``DlXO0-y5@np&uECL%$}DOIg?i{Sq0@aPV*eAZiW(F7l0u>(K>?r390i+}+wg-?Ajp%Ci&4=%ZXU@JC-@vv$@ zQBe`VU@-A(M@idvK0S>!ge@Jtz-)#REUBUstix%D`y|}&1af;TK7(ClpTrG4Jw4wU z4>v5Dr3@Z^91sSXX#hDnIq^%R8<&BD!31!*4*K6PLzl>?{?9()9BmbFueleXr^$;W z5vjjpfSax){MaQBVs(_nqYXQOL8F>1vI9R&ln0fqeIq(?1iI?-V5YjfZ~*F!nx+f} zpp}8i!9Z<$FC-7ndpHUQXIF5yxB$HQvme~3{{j<7ATsu_UI^?ARe-7@0M)HMprc0s zkW-bxoyMNg(V!?)j&LKyyQe7``Rr8_0KB7$FD-5tf&BdX-h$KrvSYB+7J2$ zgy7Pvub{5ISLp8M44#%0g2x|vfr_%Scy{6l-o1PPprE0!`ao}AFKDeS0?YuOILv;* zFa-cQdj>#DXD{d%&2{L4W(otZ{}cd4m=L__902V-azG#ufG6itfvdAK#0CcDPEirs zIXQ#+@~hzfyFRdFjyezw40=(3>;cZ&33OCl28(nRK}kz5Fx6H7YDzHBQCu06$$3G=2sEsVyhY1qG3p`|o;TBwb};1hfyEUpxS1SI&W6Xzur#yT$1(+HYn$ z5PoR%#xF3)7|Q#hOChoRFCbdulI9+m`E&)LJQVIK9}n=VtO#KH`=NcJ0Hv)wsQuVI z7=iAnvB-ylIIp1;5;?j1u3zlgTt{B0sH6nMnFSL-^MyF+DvyjRGK38bE)Ucw6qah~ Ucrq9cIwFOmt*cG0^_tE91D>1?#{d8T literal 0 HcmV?d00001