From 1592efdc62060699fbdc6d11172c452b41c28258 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 18:26:25 +0000 Subject: [PATCH 01/18] Reorder new grass types --- .../unused/{grassDry0.png => altGrass0.png} | Bin .../unused/{grassDry1.png => altGrass1.png} | Bin .../{grassStrained0.png => altGrass10.png} | Bin .../textures/blocks/unused/altGrass2.png | Bin 0 -> 18984 bytes .../textures/blocks/unused/altGrass3.png | Bin 0 -> 19024 bytes .../unused/{grassVivid0.png => altGrass4.png} | Bin .../unused/{grassVivid1.png => altGrass5.png} | Bin .../unused/{grassFiery0.png => altGrass6.png} | Bin .../unused/{grassFiery1.png => altGrass7.png} | Bin .../{grassInfused0.png => altGrass8.png} | Bin .../{grassInfused1.png => altGrass9.png} | Bin .../{grassStrained1.png => altgrass11.png} | Bin .../textures/items/unused/grassSeeds4.png | Bin 19470 -> 17830 bytes .../textures/items/unused/grassSeeds5.png | Bin 17783 -> 19470 bytes .../textures/items/unused/grassSeeds6.png | Bin 17758 -> 18627 bytes .../{grassSeeds3.png => grassSeeds8.png} | Bin 17830 -> 17758 bytes .../textures/items/unused/grassSeeds9.png | Bin 0 -> 17783 bytes 17 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/assets/botania/textures/blocks/unused/{grassDry0.png => altGrass0.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassDry1.png => altGrass1.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassStrained0.png => altGrass10.png} (100%) create mode 100644 src/main/resources/assets/botania/textures/blocks/unused/altGrass2.png create mode 100644 src/main/resources/assets/botania/textures/blocks/unused/altGrass3.png rename src/main/resources/assets/botania/textures/blocks/unused/{grassVivid0.png => altGrass4.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassVivid1.png => altGrass5.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassFiery0.png => altGrass6.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassFiery1.png => altGrass7.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassInfused0.png => altGrass8.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassInfused1.png => altGrass9.png} (100%) rename src/main/resources/assets/botania/textures/blocks/unused/{grassStrained1.png => altgrass11.png} (100%) rename src/main/resources/assets/botania/textures/items/unused/{grassSeeds3.png => grassSeeds8.png} (94%) create mode 100644 src/main/resources/assets/botania/textures/items/unused/grassSeeds9.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassDry0.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassDry0.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass0.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassDry1.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassDry1.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass1.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassStrained0.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassStrained0.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass10.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass2.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass2.png new file mode 100644 index 0000000000000000000000000000000000000000..f4954f186c60909557ecd719d8ec00623feebe6d GIT binary patch literal 18984 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 F{tpMkGM4}V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass3.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass3.png new file mode 100644 index 0000000000000000000000000000000000000000..57601dd1470eccb9f6862388b1abe9dbb3779784 GIT binary patch literal 19024 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 E225yCd;kCd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassVivid0.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassVivid0.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass4.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassVivid1.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassVivid1.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass5.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassFiery0.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassFiery0.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass6.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassFiery1.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassFiery1.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass7.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassInfused0.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassInfused0.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass8.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassInfused1.png b/src/main/resources/assets/botania/textures/blocks/unused/altGrass9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassInfused1.png rename to src/main/resources/assets/botania/textures/blocks/unused/altGrass9.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/grassStrained1.png b/src/main/resources/assets/botania/textures/blocks/unused/altgrass11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/grassStrained1.png rename to src/main/resources/assets/botania/textures/blocks/unused/altgrass11.png diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds4.png b/src/main/resources/assets/botania/textures/items/unused/grassSeeds4.png index abd76123bc7bf7c809e5865eed7a21872ea6f44e..a303a694bc2154952134b826d0d5f64d35f94853 100644 GIT binary patch delta 387 zcmV-}0et?Bm;t7X0kD$_0y(X-l?r$R5;8bCGBH{_FL-TmI!$k6X=Zto;0+a%G!7aC zGB`RiF|$(+Ljsdm5+<{}5Rw9uKoADAv=;I(1dByoACsy_E`I?SNklzS}KB_gRF!GuFr}tm;C1RztHvwtUWUj~?Df)jY;4htIf$KoZ90%COolX1~tp7?1jn>5^+7qPK zGE7F%XW@Hft0mRvkyyJB8%5fE4YwCnd@%Q2`IQTkN25#Yn>^gy;ckQkTSZMe@Ad>v zHlWq0;g@qH-H21Oiqtyx1jk2paV~eX-s-SY%mJ`p9WdA@@$5kPvTV5!0?5@#^rt9G hqxJgpz`uXv#{kN)V@7xzcH95}002ovPDHLkV1fRTCR^UkQ@JXbg^Z1?42`2~^eb`;tbFrRGSez2Kj0OeY{DnS3YOX& z%;(IcVrpV!Y+z_^plf1bkgRKJYGR^mnQD-vo0w)`WMYzL!|`rRW-(86>8d8YY{hB_&U;7IJ{tH2Hu~ z#bhfXE{Wuf#Ju#>6gzzz{o)eWvJxw(z+`n{brkc7aTN*XZ&nwUH)L7AGyL{sFBiRf z76nfi$B+s}1_74$zZw7k|Ia`PU?Np>J-P;xO`yyG4Euq`(bEao?8oH| zhdqL&80>w;amE%4da!`_@~S)x-@g3@OMUzN`@e)ZPdy_xg&;AkCj9vIi{b05fB&6B zB*6MUzWstrKlWh!@sshtv85b?1P>d7pcorNy{H-=X`cB0;}65d^G_Lm{QJxB_tzf= z4?zvmoM0IDoKc%mmO=P6KZ994rwUHpAPKB#p~DO8WN^^QiVJ|$;S5Hs27q)xKs^KF q9?E71jkzWe{5Nya4BVR5G(NYc~Q&t;ucLK6T#hMY10 diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds5.png b/src/main/resources/assets/botania/textures/items/unused/grassSeeds5.png index a0f186b6c7bb5298d7a6542f2622b6f1d4c46c9c..abd76123bc7bf7c809e5865eed7a21872ea6f44e 100644 GIT binary patch delta 1521 zcmey~#n?B4al>RTCR^UkQ@L!InG7u^U*@$EGB&a@G>)>-ugER1^36}lOskyyfLC;~ z37-@zSZZ@HpEHw+sfm%XfuXs9u8D;~vaYGAiHWXdszH)&Vw!=GiAidTrG-W6YIFC(3QD3v23!Wke#wgnxSQixw*M6(5;EOsU{|gx``%fDY}Mc28k)AhRG&r zNt3ID93egh>aLhoROH9o|1r?aAF077hJaM5?E#yF?`J2^+ z+*o<+ga#WAFUkwJjv{cpzq|Nk>k0+>kET#v4SWD_Ve0K|u{!DF%CAah$Qmf*vd&zPu_A!?$n0!BXEo|Nbu_&Qs5bO(94O zs|i1T{bKm~>fe9o5DBopk8i)=(vLkDfBaYAi=}NASlMhP%o;+N17+T|MbP0l+XkK DmzluF delta 509 zcmeC1!T7z4al>RTCd;*(r*hdaGntr8zRYVSWMW}uWE5qiUy)m2<(r?9nN~UZ0k7y} z6FwrtDXbQ926^a!P~T(+0k+Ls#6B6YbX0G2pS;Rlub$zhr;B4q#jT`2 z|Nq-Ft2T5tIyqD`pIUn3-*oSd6Vn`)h-k+cGcz+Q+i^#1;N17`$f*fh2akUEY|VUl z{r{Z*Pb=#TCp}?`dp4hE{=NT+0#DPD0t}K

*IKer<3h*l%vNAUcCrsGrjkp z=h`V93ufWfAMgMFn_5x!kH6VOUik3ucpjdhd3j5AI+R?icU#8l_FsNa#rXwFiXK%? zuRi=b&rrN+%?<|UeOnwfRE_NFelqTFVm#m5z{rr)>*xG_z5P!HAn!JGzWVn zI+K)<(2(7N7C{iLrEnElTGG!VaM30rN-JoQkpm?bGSf&wuEKA1INv$vs% zt5SI@?L;9J5fz7y)QR?q9(8}5bz5inTxkU-Wfh)({6t4tle3CKi&26lpfIchCJ_VZ zSh4_uG9*YxP|^AQa;R!7uA3^08{JIpiNzD~zF53RwG@dFiO3+tWCb8(<|`=6z|x69 zDAIL8O z^UJldwxXBgW2xR?Fc8RcmKuBFbmbMowkHy^U+=IY9>Fwn67tt delta 528 zcmX>+k?~#^=wLFoWedKXOM>iL@G9K5aTmsdG^o3e)1uA{rU@@E{-7;x03$+|8LK%+R)kP zWblD)LxOM$PifkZ{Z;zR$u$hj%)+1R+y1}d`7f@Mta6XFNQkE=(vXK|72E&+=i^VG zIB?#37PmxPeNw`YKa(398yS&K6#N%)CRrKfBmbWI}GEZyUT%KoOu;HVjkMJM=D2XZVYtvGq zK784KtNS|-mrxTA4-eClR>$`1^%V@Ky0{gXCik=)`SIf^`yZ~hx-=#phDB?wIm|bG Q^JV}7Pgg&ebxsLQ0C)4Z7ytkO diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds3.png b/src/main/resources/assets/botania/textures/items/unused/grassSeeds8.png similarity index 94% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds3.png rename to src/main/resources/assets/botania/textures/items/unused/grassSeeds8.png index a303a694bc2154952134b826d0d5f64d35f94853..dea69f9e3fc3c1549ba0bcf2fe03ba671881bb4d 100644 GIT binary patch delta 471 zcmZ41&3Lbial=JkCKI#Cmw7EjjI9jJtPD+}Z1gK~3#@$eQ!>*kCqLj7oovDZ9X8>X2|mFpN0KoFBiRfh6|o9jv*DdlK%YvZ_ljS(Anr@@PTbZ zf^Z5?Y1)tdRr<`yH4Mzm!k_Eg{=eb*FRqiUa*wr0h^HsgkcVd#+yDRP<4>PBaNc_s zw?tfhQo@fvlN%cw8I!d6**gM)+<8Sj-^yk=?w6%41kxD}Wt_p}`O@#87`AFj5#G$tN~MQg1&%r|}WW&i?D LS3j3^P6*kCqLj7oovD`GLYMf+gkfNJtY+$6DYG`7tYiW^apqpf#YLI4VnrLinWZ9X8>X2{a*8Y@59%SErAQNq*3F{I+wk;%Kgm=gtB_uupu6IPnN zKrK*(iz_Nht7&d)tjf~<1?v^}H6j`48F(yoXS1feX;lJ**16XJj`ohiFWn1djE~Z z&uqcf6%VHutK97f-rRM?>Kn^(_tHYW@-6pXZ3sHUxFKHF;D-9gHx55H diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds9.png b/src/main/resources/assets/botania/textures/items/unused/grassSeeds9.png new file mode 100644 index 0000000000000000000000000000000000000000..4bccf737fcae00b2d21dd6f98e9a088540bff25b GIT binary patch literal 17783 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 Date: Tue, 17 Nov 2015 19:45:29 +0000 Subject: [PATCH 02/18] Many grasses! Handle it! --- .../botania/common/block/BlockAltGrass.java | 123 ++++++++++++++++++ .../botania/common/block/ModBlocks.java | 5 +- .../common/core/BotaniaCreativeTab.java | 3 +- .../botania/common/lib/LibBlockNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 6 + .../blocks/{unused => }/altGrass0.png | Bin .../blocks/{unused => }/altGrass1.png | Bin .../blocks/{unused => }/altGrass10.png | Bin .../blocks/{unused => }/altGrass2.png | Bin .../blocks/{unused => }/altGrass3.png | Bin .../blocks/{unused => }/altGrass4.png | Bin .../blocks/{unused => }/altGrass5.png | Bin .../blocks/{unused => }/altGrass6.png | Bin .../blocks/{unused => }/altGrass7.png | Bin .../blocks/{unused => }/altGrass8.png | Bin .../blocks/{unused => }/altGrass9.png | Bin .../blocks/{unused => }/altgrass11.png | Bin .../{ => unused}/manaDetectorColor1.png | Bin .../{ => unused}/manaDetectorColor10.png | Bin .../{ => unused}/manaDetectorColor11.png | Bin .../{ => unused}/manaDetectorColor12.png | Bin .../{ => unused}/manaDetectorColor13.png | Bin .../{ => unused}/manaDetectorColor14.png | Bin .../{ => unused}/manaDetectorColor15.png | Bin .../{ => unused}/manaDetectorColor16.png | Bin .../{ => unused}/manaDetectorColor17.png | Bin .../{ => unused}/manaDetectorColor18.png | Bin .../{ => unused}/manaDetectorColor19.png | Bin .../{ => unused}/manaDetectorColor2.png | Bin .../{ => unused}/manaDetectorColor20.png | Bin .../{ => unused}/manaDetectorColor21.png | Bin .../{ => unused}/manaDetectorColor22.png | Bin .../{ => unused}/manaDetectorColor23.png | Bin .../{ => unused}/manaDetectorColor24.png | Bin .../{ => unused}/manaDetectorColor25.png | Bin .../{ => unused}/manaDetectorColor26.png | Bin .../{ => unused}/manaDetectorColor27.png | Bin .../{ => unused}/manaDetectorColor28.png | Bin .../{ => unused}/manaDetectorColor29.png | Bin .../{ => unused}/manaDetectorColor3.png | Bin .../{ => unused}/manaDetectorColor30.png | Bin .../{ => unused}/manaDetectorColor31.png | Bin .../{ => unused}/manaDetectorColor32.png | Bin .../{ => unused}/manaDetectorColor4.png | Bin .../{ => unused}/manaDetectorColor5.png | Bin .../{ => unused}/manaDetectorColor6.png | Bin .../{ => unused}/manaDetectorColor7.png | Bin .../{ => unused}/manaDetectorColor8.png | Bin .../{ => unused}/manaDetectorColor9.png | Bin .../items/{unused => }/grassSeeds4.png | Bin .../items/{unused => }/grassSeeds5.png | Bin .../items/{unused => }/grassSeeds6.png | Bin .../items/{unused => }/grassSeeds7.png | Bin 17783 -> 17783 bytes .../items/{unused => }/grassSeeds8.png | Bin .../items/{unused => }/grassSeeds9.png | Bin 55 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/BlockAltGrass.java rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass0.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass1.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass10.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass2.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass3.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass4.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass5.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass6.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass7.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass8.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altGrass9.png (100%) rename src/main/resources/assets/botania/textures/blocks/{unused => }/altgrass11.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor1.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor10.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor11.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor12.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor13.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor14.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor15.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor16.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor17.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor18.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor19.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor2.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor20.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor21.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor22.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor23.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor24.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor25.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor26.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor27.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor28.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor29.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor3.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor30.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor31.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor32.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor4.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor5.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor6.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor7.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor8.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/manaDetectorColor9.png (100%) rename src/main/resources/assets/botania/textures/items/{unused => }/grassSeeds4.png (100%) rename src/main/resources/assets/botania/textures/items/{unused => }/grassSeeds5.png (100%) rename src/main/resources/assets/botania/textures/items/{unused => }/grassSeeds6.png (100%) rename src/main/resources/assets/botania/textures/items/{unused => }/grassSeeds7.png (94%) rename src/main/resources/assets/botania/textures/items/{unused => }/grassSeeds8.png (100%) rename src/main/resources/assets/botania/textures/items/{unused => }/grassSeeds9.png (100%) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java new file mode 100644 index 000000000..4c0270d6c --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -0,0 +1,123 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [17/11/2015, 18:33:30 (GMT)] + */ +package vazkii.botania.common.block; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.Botania; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BlockAltGrass extends BlockMod { + + private static final int SUBTYPES = 6; + IIcon[] icons; + + public BlockAltGrass() { + super(Material.grass); + setHardness(0.6F); + setStepSound(soundTypeGrass); + setBlockName(LibBlockNames.ALT_GRASS); + } + + @Override + public Block setBlockName(String par1Str) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + return super.setBlockName(par1Str); + } + + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for(int i = 0; i < 6; i++) + list.add(new ItemStack(item, 1, i)); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + icons = new IIcon[SUBTYPES * 2]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + } + + @Override + public IIcon getIcon(int side, int meta) { + return side == 0 || meta >= SUBTYPES ? Blocks.dirt.getIcon(side, meta) : side == 1 ? icons[meta * 2] : icons[meta * 2 + 1]; + } + + // All from below is from BlockMycelium (adapted a bit) + + @Override + public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + if(!p_149674_1_.isRemote && p_149674_1_.getBlockLightValue(p_149674_2_, p_149674_3_ + 1, p_149674_4_) >= 9) { + for(int l = 0; l < 4; ++l) { + int i1 = p_149674_2_ + p_149674_5_.nextInt(3) - 1; + int j1 = p_149674_3_ + p_149674_5_.nextInt(5) - 3; + int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1; + Block block = p_149674_1_.getBlock(i1, j1 + 1, k1); + + if(p_149674_1_.getBlock(i1, j1, k1) == Blocks.dirt && p_149674_1_.getBlockMetadata(i1, j1, k1) == 0 && p_149674_1_.getBlockLightValue(i1, j1 + 1, k1) >= 4 && p_149674_1_.getBlockLightOpacity(i1, j1 + 1, k1) <= 2) + p_149674_1_.setBlock(i1, j1, k1, this); + } + } + } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random r) { + int meta = world.getBlockMetadata(x, y, z); + switch(meta) { + case 0: // Dry + break; + case 1: // Golden + break; + case 2: // Vivid + break; + case 3: // Scorched + if(r.nextInt(80) == 0) + world.spawnParticle("flame", x + r.nextFloat(), y + 1.1, z + r.nextFloat(), 0, 0, 0); + break; + case 4: // Infused + if(r.nextInt(100) == 0) + Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); + break; + case 5: // Mutated + if(r.nextInt(100) == 0) { + if(r.nextInt(100) > 25) + Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); + else Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 1F, 1F, 0F, r.nextFloat() * 0.2F + 1F, 5); + } + break; + } + } + +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 2f4c5c190..68c259817 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; +import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -267,6 +268,7 @@ public final class ModBlocks { public static Block shimmerrock; public static Block shimmerwoodPlanks; public static Block avatar; + public static Block altGrass; public static void init() { flower = new BlockModFlower(); @@ -358,7 +360,8 @@ public final class ModBlocks { shimmerrock = new BlockShimmerrock(); shimmerwoodPlanks = new BlockShimmerwoodPlanks(); avatar = new BlockAvatar(); - + altGrass = new BlockAltGrass(); + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b84ccba79..b2ac1818d 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -65,7 +65,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.dye); addItem(ModItems.fertilizer); addItem(ModItems.flowerBag); - addItem(ModItems.grassSeeds); addItem(ModItems.blackLotus); addItem(ModItems.twigWand); addItem(ModItems.obedienceStick); @@ -103,6 +102,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.worldSeed); addItem(ModItems.overgrowthSeed); addBlock(ModBlocks.enchantedSoil); + addItem(ModItems.grassSeeds); + addBlock(ModBlocks.altGrass); if(Botania.thaumcraftLoaded) addItem(ModItems.manaInkwell); addBlock(ModBlocks.forestDrum); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index a2cbbd04c..3d0992cb1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -105,6 +105,7 @@ public final class LibBlockNames { public static final String SHIMMERROCK = "shimmerrock"; public static final String SHIMMERWOOD_PLANKS = "shimmerwoodPlanks"; public static final String AVATAR = "avatar"; + public static final String ALT_GRASS = "altGrass"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4fa7b8feb..5fc81aa19 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1166,6 +1166,12 @@ tile.botania:shimmerwoodPlanks0Slab.name=Shimmerwood Plank Slab tile.botania:shimmerwoodPlanks0SlabFull.name=Shimmerwood Plank Slab tile.botania:shimmerwoodPlanks0Stairs.name=Shimmerwood Plank Stairs tile.botania:avatar.name=Livingwood Avatar +tile.botania:altGrass0.name=Dry Grass +tile.botania:altGrass1.name=Golden Grass +tile.botania:altGrass2.name=Vivid Grass +tile.botania:altGrass3.name=Scorched Grass +tile.botania:altGrass4.name=Infused Grass +tile.botania:altGrass5.name=Mutated Grass # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass0.png b/src/main/resources/assets/botania/textures/blocks/altGrass0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass0.png rename to src/main/resources/assets/botania/textures/blocks/altGrass0.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass1.png b/src/main/resources/assets/botania/textures/blocks/altGrass1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass1.png rename to src/main/resources/assets/botania/textures/blocks/altGrass1.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass10.png b/src/main/resources/assets/botania/textures/blocks/altGrass10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass10.png rename to src/main/resources/assets/botania/textures/blocks/altGrass10.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass2.png b/src/main/resources/assets/botania/textures/blocks/altGrass2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass2.png rename to src/main/resources/assets/botania/textures/blocks/altGrass2.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass3.png b/src/main/resources/assets/botania/textures/blocks/altGrass3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass3.png rename to src/main/resources/assets/botania/textures/blocks/altGrass3.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass4.png b/src/main/resources/assets/botania/textures/blocks/altGrass4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass4.png rename to src/main/resources/assets/botania/textures/blocks/altGrass4.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass5.png b/src/main/resources/assets/botania/textures/blocks/altGrass5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass5.png rename to src/main/resources/assets/botania/textures/blocks/altGrass5.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass6.png b/src/main/resources/assets/botania/textures/blocks/altGrass6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass6.png rename to src/main/resources/assets/botania/textures/blocks/altGrass6.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass7.png b/src/main/resources/assets/botania/textures/blocks/altGrass7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass7.png rename to src/main/resources/assets/botania/textures/blocks/altGrass7.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass8.png b/src/main/resources/assets/botania/textures/blocks/altGrass8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass8.png rename to src/main/resources/assets/botania/textures/blocks/altGrass8.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altGrass9.png b/src/main/resources/assets/botania/textures/blocks/altGrass9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altGrass9.png rename to src/main/resources/assets/botania/textures/blocks/altGrass9.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/altgrass11.png b/src/main/resources/assets/botania/textures/blocks/altgrass11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/altgrass11.png rename to src/main/resources/assets/botania/textures/blocks/altgrass11.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor1.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor1.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor1.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor10.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor10.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor10.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor11.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor11.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor11.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor12.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor12.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor12.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor13.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor13.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor13.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor14.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor14.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor14.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor15.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor15.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor15.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor16.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor16.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor16.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor16.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor17.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor17.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor17.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor17.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor18.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor18.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor18.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor18.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor19.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor19.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor19.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor19.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor2.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor2.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor2.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor20.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor20.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor20.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor20.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor21.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor21.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor21.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor21.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor22.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor22.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor22.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor22.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor23.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor23.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor23.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor23.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor24.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor24.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor24.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor24.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor25.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor25.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor25.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor25.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor26.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor26.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor26.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor26.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor27.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor27.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor27.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor27.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor28.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor28.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor28.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor28.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor29.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor29.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor29.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor29.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor3.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor3.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor3.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor30.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor30.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor30.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor30.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor31.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor31.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor31.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor31.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor32.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor32.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor32.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor32.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor4.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor4.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor4.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor5.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor5.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor5.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor6.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor6.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor6.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor7.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor7.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor7.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor8.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor8.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor8.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetectorColor9.png b/src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetectorColor9.png rename to src/main/resources/assets/botania/textures/blocks/unused/manaDetectorColor9.png diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds4.png b/src/main/resources/assets/botania/textures/items/grassSeeds4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds4.png rename to src/main/resources/assets/botania/textures/items/grassSeeds4.png diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds5.png b/src/main/resources/assets/botania/textures/items/grassSeeds5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds5.png rename to src/main/resources/assets/botania/textures/items/grassSeeds5.png diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds6.png b/src/main/resources/assets/botania/textures/items/grassSeeds6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds6.png rename to src/main/resources/assets/botania/textures/items/grassSeeds6.png diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds7.png b/src/main/resources/assets/botania/textures/items/grassSeeds7.png similarity index 94% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds7.png rename to src/main/resources/assets/botania/textures/items/grassSeeds7.png index 4bccf737fcae00b2d21dd6f98e9a088540bff25b..a0f186b6c7bb5298d7a6542f2622b6f1d4c46c9c 100644 GIT binary patch delta 471 zcmey~#rVC8al<)YRwGj@6SK*ec`aCstV}E>^Yht)8Jh$6+?Z4hOp+|jOwtT=O)SmL zbWJTyjC3tc4U=@uOj1+QEKE$3lT(u??-DR4PNArvJ#h*v1n(24uv*9g;(^TvgxU;Q zI;uCiPxf*#t55p#|Gz!6YC~tElS4K0siimmP50h7G0kC#h<1!IGc&WY9e2bA&VB!m zoSL9@@aTun*35_3|IhjVw6e}{(i5h*XY+aH-}|2^@H8zcz#uuL;@4;Sb1RaLi1kht zTEi3n|9^7D&;Gd&FV27e-@oR-I=08e@&5n6sTF1a_?u1Sg%AIZ=iv#Om$zi6L&>#zw`Htu z|K;~ooL``%=uzeL>cg+|48@z)>|kKtx5Yt2)yS^yC*%Gm#`C=mj0{P=e$MaL+y7($ N0#8>zmvv4FO#tpzxLE)I delta 471 zcmey~#rVC8al<)YRufAr1H;Lec`aCstqhDN^Yht)8Jh$6+?Z6%6I0TX4bqZyO_Gz% zbqx|t5_K)ijMH?DOf6E9%#2e_%oB|#?-DR4PNArvJ#h*v1n(24uv*9g;(^TvgxU;Q z*1tIEGTF<;tp3R4jeds`MBL8*U3n>hnML@uQitM0+Y*I?cjs={Y_MzRXD+)2{)9&d zPB|UY;dJ&~ypSi&50qyD{X)h2(Q>SrIg=iG0T-S2$W@~DUm z@3w_g?j#?3c=|u*wVFh(zHjZxSx39(b>@d3JRQrhvpyrhEVY`wqV&B`gZ6sW(w9cQ1KXy6|w`R!Jj=%rY# z?dIxIYwUK|t-t9VqryFJo-*T(533oHYCFqg^!5wH5#X diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds8.png b/src/main/resources/assets/botania/textures/items/grassSeeds8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds8.png rename to src/main/resources/assets/botania/textures/items/grassSeeds8.png diff --git a/src/main/resources/assets/botania/textures/items/unused/grassSeeds9.png b/src/main/resources/assets/botania/textures/items/grassSeeds9.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/grassSeeds9.png rename to src/main/resources/assets/botania/textures/items/grassSeeds9.png From 07bdb7ecd19080820e94099ebdc9538d5ae76fc9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 19:51:28 +0000 Subject: [PATCH 03/18] Fixed the Exoflame not using mana properly on interfaced blocks. --- .../common/block/subtile/functional/SubTileExoflame.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 91ca70e39..4b851fece 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -68,9 +68,11 @@ public class SubTileExoflame extends SubTileFunctional { IExoflameHeatable heatable = (IExoflameHeatable) tile; if(heatable.canSmelt() && mana > 2) { - if(heatable.getBurnTime() == 0) + if(heatable.getBurnTime() == 0) { heatable.boostBurnTime(); - mana = Math.max(0, mana - cost); + mana = Math.max(0, mana - cost); + } + if(ticksExisted % 2 == 0) heatable.boostCookTime(); From 9b91af6210ca5e93273f565271a2f01d6d714d40 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 19:55:41 +0000 Subject: [PATCH 04/18] Removed the "lore" pages after some flowers' recipes, as interesting as they are, they served no practical purpose and only confused people. --- .../vazkii/botania/common/lexicon/LexiconData.java | 8 ++++---- src/main/resources/assets/botania/lang/en_US.lang | 13 ------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 301c42f93..f2b6b983e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -454,7 +454,7 @@ public final class LexiconData { dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.dreadthorneRecipe)); heiseiDream = new ALexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); - heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe), new PageText("2")); + heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe)); tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tigerseyeRecipe)); @@ -469,7 +469,7 @@ public final class LexiconData { if(ConfigHandler.fallenKanadeEnabled) { fallenKanade = new BLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); - fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe), new PageText("2")); + fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe)); } exoflame = new BLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); @@ -535,7 +535,7 @@ public final class LexiconData { primusLoci.setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); - daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText(ConfigHandler.hardcorePassiveGeneration > 0 ? "1a" : "1"), new PageImage("3", LibResources.ENTRY_DIMINISHING_RETURNS), new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe), new PageText("4"), new PageText("5")); + daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText(ConfigHandler.hardcorePassiveGeneration > 0 ? "1a" : "1"), new PageImage("3", LibResources.ENTRY_DIMINISHING_RETURNS), new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe)); nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); nightshade.setLexiconPages(new PageText(ConfigHandler.hardcorePassiveGeneration > 0 ? "0a" :"0"), new PagePetalRecipe("1", ModPetalRecipes.nightshadeRecipe)); @@ -562,7 +562,7 @@ public final class LexiconData { kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.kekimurusRecipe)); gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); - gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe), new PageText("4"), new PageText("5"), new PageText("6")); + gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe)); narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.narslimmusRecipe)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 5fc81aa19..4f929963e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2247,12 +2247,6 @@ botania.page.elvenLenses8=Celebratory Lens botania.page.elvenLenses9=The &1Flare Lens&0 takes over a &1Mana Spreader&0's functionality, preventing it from firing any bursts. Instead, the spreader becomes a continuous particle burst of the color the lens is dyed, in the direction the spreader is firing.
There's surely plenty of decorative uses for this. botania.page.elvenLenses10=Flare Lens -# -- WARP LENS -botania.entry.warpLens=Warp Lens -botania.tagline.warpLens=A Mana Lens to combine with the Force Relay for burst teleporting -botania.page.warpLens0= -botania.page.warpLens1=Hakase Quarries - # -- MANA PRISM botania.entry.prism=Mana Prism botania.tagline.prism=Switch a Mana Burst's effective Lens on the fly @@ -2324,7 +2318,6 @@ botania.entry.heiseiDream=Heisei Dream botania.tagline.heiseiDream=Turns mobs against each other botania.page.heiseiDream0=The &1Heisei Dream&0 will, by utilizing &4Mana&0, awaken feelings of anger and revenge in any nearby &4mobs&0, turning them against eachother. botania.page.heiseiDream1=&oA pleasant era will murder people&r. -botania.page.heiseiDream2=&oHeisei, was broken, broken. Who was the one who lied about peace? See, it's forgotten, forgotten, even the punishement blamed on the altar. Hey, it's breaking, breaking, at the end, even the meaning of shaking is killed.
Well, where shall we go? Let's go somewhere, whose ally are you? Whose replacement am I? # -- TIGERSEYE botania.entry.tigerseye=Tigerseye @@ -2350,7 +2343,6 @@ botania.tagline.fallenKanade=Powerful, short range regeneration botania.page.fallenKanade0=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby. botania.page.fallenKanade0a=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby.
Interestingly enough, &4Blood Mages&0 have been known to place odd hexes on their altars which cause this flower to malfunction, that might be something to keep in mind. botania.page.fallenKanade1=&oHand Sonic, version four&r. -botania.page.fallenKanade2=&oI'll marry you. No matter what kind of sickness you have, even if you can't walk or stand, or even if you can't have kids, I'll still marry you. No matter where or how I met you, I'll fall in love with you.
If I can meet you again, against the six billion to one odds, and even if your body can't move, I'll marry you. # -- EXOFLAME botania.entry.exoflame=Exoflame @@ -2488,8 +2480,6 @@ botania.page.daybloom1=These flowers tend to compete among themselves for what s botania.page.daybloom1a=Having any other &1Dayblooms&0 adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This only applies to &1Dayblooms&0 and &1Nightshades&0.
&1Dayblooms&0 are classified as &4passive flowers&0. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflames&0 or others might be a good idea. botania.page.daybloom3=Diminishing Returns botania.page.daybloom2=&oStarting up a brand new day&r. -botania.page.daybloom4=&oHow many of you people out there been hurt in some kind of love affair? And how many times do you swear that you'll never love again? How many lonely, sleepless nights? How many lies? How many fights? And why would you want to put yourself through all that again? "Love is pain," I hear you say. Love has a cruel and bitter way of paying you back for all the faith you ever had in your brain. (...) -botania.page.daybloom5=&oHow could it be that what you need the most can leave you feeling just like a ghost? You never want to feel so sad and lost again. One day you could be looking through an old book in rainy weather. You see a picture of her smiling at you when you were still together. You could be walking down the street and who should you chance to meet. But that same old smile that you've been thinking of all day... # -- NIGHTSHADE botania.entry.nightshade=Nightshade @@ -2552,9 +2542,6 @@ botania.page.gourmaryllis0=The &1Gourmaryllis&0 is one hungry flower. It'll eat botania.page.gourmaryllis1=The amount of time it takes to digest a delicacy depends on its nutritional value, in layman's terms, the amount of food points it restores.
So, a &1Steak&0 will take four seconds to digest, a &1Carrot&0 will take two, a loaf of &1Bread&0 will take two and a half, so on. botania.page.gourmaryllis2=The amount of &4Mana&0 created also makes use of this value, but in a way where the more nutritious the food is, the more efficient it is. For example, a single &1Steak&0 will produce more &1Mana&0 than two &1Carrots&0, both absolutely and per second. botania.page.gourmaryllis3=&oA hot pot for our new residents&r. -botania.page.gourmaryllis4=&oWell, if Men ate themselves after death, one would think of less horror and negative feeling matter. But so you know what your cruelty leads to, think, fishes, that even Men eat themselves alive like you.
Alive was Job when he said: "Why do you follow me so inhumanely, thou who are eating me alive and getting sick of my flesh?". Do you want to see a Job like this? (...) -botania.page.gourmaryllis5=&oSee a man of those who are followed by claims or accused of crimes, and behold all who are eating them. The bailiff eats him, the jailer eats him, the scribe eats him, the requestor eats him, the lawyer eats him, the inquirer eats him, the witness eats him, the judge eats him and he's not even sentenced he's already eaten. Worse are the Men than the crows. (...) -botania.page.gourmaryllis6=&oThe sad one who was hanged, only eat him the crows past his execution and death, while the one who's being judged, not even executed or sentenced and he's already eaten.
The true evil are the Man who eat eachother, and those who commit to it are the largest, those who eat the smallest. For that you, Man, vos estis sal terrae. # -- NARSLIMMUS botania.entry.narslimmus=Narslimmus From 709a8b4338f30fd344d344797d79072a7ec904ca Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 20:01:16 +0000 Subject: [PATCH 05/18] Changed the Mutated Grass texture into one that hurts your eyes less --- .../botania/textures/blocks/altGrass10.png | Bin 19408 -> 22050 bytes .../botania/textures/blocks/altgrass11.png | Bin 19553 -> 22037 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass10.png b/src/main/resources/assets/botania/textures/blocks/altGrass10.png index 238f0415f4bab48d204a8919f59fe79606839ef3..81ea55070b377fa3ac5440582d9caa836ee6051f 100644 GIT binary patch delta 1988 zcmb`Gc~BE)7{*2M3K)cdiUJe4M9e}q*((toqzRXRt;L9n$DR;}BuE0HKx09)I;hnZ z#0wRz2S!n&K)pdkIXt2x9>q?rRdHk#igJ~au1b~8bXuqF_t&@I_w4(=``hQavDvD~ zWObC~4GeQ-^LXpL5P%dTs1TL;fiQ|fs7NRggRs9?>Ms=o5~&;#%OQz5%qGZcu--6( zW>|}j8@te!KZx6#^|oWItl#R{H6wC(XbdQm!!kJpvCe$7|Kl7!0w4@1qq!CU22oM~ z0U-(?NE!n`5XNx=K~aem3Gh$TBt=EZ!#6rOMh3j!D|BRvhSnOw6;p6ZN6>OgN2)1# zQi9H)(x8 zgF~VdG=atHw!2}c7b2@D`Hh9;$A7$q2( zH3=sFHH1tL7(oazEe0qY#{h<-#&ML;08B9yjnQH$hKl>W{>}`og7EhyS?zG{Zz28z zx3_3NaQ^oY|8tka9-rXlen$E;1exOj`#xuLKRlJDLOB0${+gf+co#6aTB|qUT9W1r z&*}WsoY{#_p#B!f+kC#UcOKSPiDConFz@$Oxzzj-Bc8C|>XYhN$S!E;d#R31w{vyq zi=v|6khdKhJ*6N;!Zbz!5(tL?L;{h3j3ht+WyCTRBN>JyrEIf=s4de&DS|?s>Kqb}{F=x_@)_ zkDA}$4&Eq@QY`lf6fKMympq}o?t&YUKF`647|pxhj^Q=o&eBq2^*26O53W$gTr%CY z0}pC`lDRF3Ha=lHo;u1ep0rWWNB!eHeJl3VC`wuvoXTFjxTUDjyCZFPhiAI)E+4&O zwncN;on2mK4e0kRs-0XiH>3B#;QUKgyCa<8RbzCC3oI+I6og*B;!c_y_S4Afh#WES zCMw>vHPCRiVgqlsk?JYzt+^7I{k&mh=&uDLU}Eu_x{@3h`f}s-QB_QBa1Q0}RZ3Pi z6~uZ))@5ERy>4+pfO($;&fohbyJMfI#ZpV$>CHQ5&e~ZOQy8Rjia!G` zomf-5@j?VRf5(}F#<@L}srtxUEn&)NUoY3XJ&$b*s(Wu7HI7Y~x$qSK`!6g||`K1Af{>b+fJBx{3o>KJBeZY*}m_I}hpWUA`8+AhJ7 zzth+)*j#e)(zGSc<(UILLR`FUwDY%pX$F?5R(-z0TC(fqtJo*9qWTtP@Em2_*>1-L zjW-&*?>{u=+dls+H-1*(oz$z|k8dQEOwP}z|t^|`uzffbvl1xLg^d^nb$V!oz6<{7#nZ@fqRjuW|{X!Na# e!)I1zTMek5u(`nHmS)rdZiOqO6-R;>X8jHYz7s_N delta 1328 zcma)+OKenC7{`D2&V9{HJFm9%1?^O1VPfe_p^s@mgkS`T#2DD%0!mS0bR)!Qz&HuI z5EddCjIvN7VWE*2Vp(BKj0@r`JWL3M%BxeL(9TTfacAz#y))M%8(q3Q=j8kT-~aKQ zQ)i^hpGjv^K6%Zh)Th3WR}A$}#0KNhk;KaQ(CS1y{&aLO7GE_Gj|~ha`s4Aj)gxo^ z;mJ+@XQjz2O&%$Az4=4m(6+(Bv7yA+szhpUVC28YuLHx&cPB>2WbcL4_tCABFZR72S1$ZAdp~vl<&{Y#x_RUJZSP8il$$%s1{W7E@yYvh*sg`H+Q94qkkNuel_}>oJGa-6w)gFFCD~%Gl%*ybEb~Sf*>Z#5 z&J7@Y6z){gw0Xj~UJWf-t8>dq<8=^^K6KrSyim(xRUGU_gH|KVf|cd`*`=7C3KRQ( z#F8tRs!35Gm}35hZS&Q!zi5_Knq42VW#y^3HQLlLb;qSuZ{-nr)^5Gdo`X6^4yDPL zO&Ug0rY2C98a<4^9mjGU3Q7gJwYiNr*nzoH?njjVSSzYoQANEc=q2oB;pb<&N8bo<+>TQ>Ksc@*8l5(1dmWbH*- z)eyx-4mlF&!e?tNRC2sIu3}d6)TJ8P(mmm54ZCiW%m{lsr7%U=6xMnPXhBqDy0xgt zf@6_yn2(u#d%BG!Mu6$!4UQi!i0Ts8OH-UXk>#dv&~CV7%5x}n7mw0}(NK{#cfI6V z0#=io2#6fGPFZN2ry;qRLhEoc*ure_A$|cZLd2o>ME9fXxM!wm7o!MSOFWYE2#uMx zrl`~%Oig08yg-j2Sg;(HsqOd$(a(?l!OnxQW|P|^gIC@|Xuc`>gf<&}1 zGo`!ic|{>pO;(ZrAt{%sG)nB-m*CU~E+@}wJP>=;;p;$J*RsJ?y(-0u#S^~X$C1lc z=cy}-h+7k3J;-hIHXVA1iqfD~&ZB!YGIEJtPajHGQx7xMoAmjjEY=n%iiObyIbG78 z!6#Cmu`}Yr&jUM4x6~;%p@F36bZ9;n>hlQhuDj#v;lMY)o_I%m2W)&EXk>^k%} D^>p9T diff --git a/src/main/resources/assets/botania/textures/blocks/altgrass11.png b/src/main/resources/assets/botania/textures/blocks/altgrass11.png index 441a41a28e54496dcccd1e7b958a822eeba2eca8..a03001b486a3ac2d6d3e58a5e0d7b495376a0ae3 100644 GIT binary patch delta 2068 zcmb`Hc~BEq9LGTr5ko?hL#$#zgsLpbX73QgVYr4%K}AH7-OWa04M`xNA{g7+qEZE1 zKxT?n%21CMssmH6iVAAP3YDUwDBed^6hWt2#IegUN{<(!L@*4-d_+{;7s-0e#g~*EqOZdP-oD zln^uls2NNOaFvh%E`?M8Erlo*3X(JffozvBsQ)}Q4%uw7V>l~zwqwr<{8+`9Ku<&p zt1&fKx0K16aruZL;;e3831QEt~iWCBt#Ghj{JpdpU3*Rh7Fj|QYd*} z!0%w%hyBeR{CmLvIZNgHwacH(_K#3j2v=zJQBg7_=ZXwQ6~dW}oh9@($@`mHrb$UN zk|{J3u2gXQd^KFlz0Ym*k>UOWL&NPvL&l&w*Td;rCdD|YuHw{b&Myq8X2YE)ju_BT zv1nYE%k?gBbUz3$fxH53|iZ)|j z%#y@(3$uUc^X|=CN{-h&Y-_8zGr8I_-n{!nZmezQydv$X8jqy8yIcYtx;!@&PUu~J ziSJ>T`P9oc?pSWi$F}7`l`RJ{CM6VmM~%C@T#?bovdedXF+w2~%W9bj!mWTOy>f znV2d7!%nV$>Aw1U_l|wR3NYNGK-tk_Q`O?V&ZEh{m1#v@T-K5e{As$RV@~{Hs`-)Y zyt1gnN1{N#`g<_n z04H6$cfNHZ>3>&b+S;5nwzs)$d;V8mz%IP5zAO82-mV2b&*GcDKNGups_K#1Gu300 zcd&{jvdndYVYhh==VPv739s*rUDfP=#ihbEB1+_5{-r^-9D0_>z5v(nh?(O$j{WuA zFBhvCpNda9Oewfgm*cHhy3{|)pOs_#>6(!Jp_P|HHZH#S;C`uT^@UqIIwLI3UGXY6 zr`PtLR`M2mhYdG`*rg|}N;uXX8PpIuO-s*JkE~lWJ?7r&)+q<;zLv+|K8(RNUGCim zdqeMDzmkIBZ>vD4M^e7D_;P!qkGLtVr?hddj_p)HJD;V8iR{i`UUMfyG}2V1w9Iw;!H4CY#+~pN^?T-5N3E<1 ztGuLuCoT}i(ZsW@O=V#twM!e(p6HxyrXw>}R-Nj;DUZi?`;YZ_VtzmOG;2HQyr9HQT+kBhFyKjqu=TWmQn}Cw~B1P8c5m delta 1403 zcma)5eP|nH82{ZRmt4{&P13BX{k*Pgz;)N;lBR9yDzk2G)walJK?Y*ev=PC9BEp<# zM*r{&@q=?xK^@8v!7(Ns2-D$Egi)cclevD_&p;b%oAjEm%jbEQQtTi8;RE-+&%N*S zKEL1ZdEWQp6=G$axW?vy_1rrq1Zd0M?3cZ6{{Ik$szI$U0s<2qa0 zJGr)rQzgfUiRn@m!Ot2_@D0YJde4B%-RX47oBXrJ_Wi$K8{1fa+i+W8B;a8^qdphg z(cU`3dflE8HsJD%_?=!?ho^P;sN>w(7y9}-dw8?e%GZ}!_@|i`{%lznKg!toJ7o*S z`FGPXe%$gJUt9C(A-C7%^98(4mh12jvmRG#8{6S?2H3#p=qTs+xjbIKm!CFuPmEi7 zi9`Q~gB;yqq>OVWTQR(IzDGF;Lk&Xo^M@TZrZos8iR0jHl8l zkZR2A+(S8K1*5A1t)Vfs{Tn`bJ&dd*LQ7>q76`0mLI@`FNzf<-BUNA}H4l=23ilKD z@YzRch*=TK=@61)3{92?@%~#*sANb%h+tK`5C32eCb}Fsq%o6Q!ZU*z5Q7av5AtCcGWV86an9E^DodRh!*f1~5AeM_lO%xE7 zVkpVe_~}X=zP~IWc)k&jJt{#X)1)W@37L|mv>aMm56EjO19TTYepA5IFOAqL{Ed=A zDQx;GDCG?a8f>o^klUyUBBLhIb8-=88-eZRQn}Vi3_PUdz(dyj3FX!!ys28 zFDqToZ(%tcmD_5-Y&?YCC)4=xJG*>KfMqd^io+pX{zd?4F;+pJ)xg@YisyY45@`W> zA_K<024SHY*?bnkExElnuj&ya6FBBPh&Ntjz*L%1tzkeO_AEgtB(Sl{psC^rDrh6- zV{;ffz_ohAa}6hU81pxM)hyF6=I<(be}bn5l{4;$F~xk$b2FAW2`nd%mtZ R9;j3TdrtHpzuG-C_75qe<-`C0 From 411c14199ea58b8aef7b4fa762d182b36738a232 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 20:14:44 +0000 Subject: [PATCH 06/18] Added IFlowerPlaceable for items that can be placed by the Rannuncarpus. --- .../botania/api/item/IFlowerPlaceable.java | 27 +++++++++++++++++++ .../functional/SubTileRannuncarpus.java | 11 ++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java new file mode 100644 index 000000000..05f1f1f40 --- /dev/null +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -0,0 +1,27 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [17/11/2015, 20:10:53 (GMT)] + */ +package vazkii.botania.api.item; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.subtile.SubTileEntity; + +/** + * An Item that implements this can be placed by a Rannuncarpus. + */ +public interface IFlowerPlaceable { + + /** + * Gets the block to be placed, return null to not place anything. + */ + public Block getBlockToPlaceByFlower(ItemStack stack, SubTileEntity flower, int x, int y, int z); + + public void onBlockPlacedByFlower(ItemStack stack, SubTileEntity flower, int x, int y, int z); +} diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index d05fefa14..defa53132 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -32,6 +32,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.item.IFlowerPlaceable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -83,7 +84,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { ItemStack stack = item.getEntityItem(); Item stackItem = stack.getItem(); - if(stackItem instanceof ItemBlock || stackItem instanceof ItemReed || stackItem instanceof ItemRedstone) { + if(stackItem instanceof ItemBlock || stackItem instanceof ItemReed || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) { if(!scanned) { for(int i = -rangePlace; i < rangePlace + 1; i++) for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) @@ -102,7 +103,11 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(!validPositions.isEmpty() && !supertile.getWorldObj().isRemote) { + ChunkCoordinates coords = validPositions.get(supertile.getWorldObj().rand.nextInt(validPositions.size())); + Block blockToPlace = null; + if(stackItem instanceof IFlowerPlaceable) + blockToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords.posX, coords.posY, coords.posZ); if(stackItem instanceof ItemBlock) blockToPlace = ((ItemBlock) stackItem).field_150939_a; else if(stackItem instanceof ItemReed) @@ -111,7 +116,6 @@ public class SubTileRannuncarpus extends SubTileFunctional { blockToPlace = Blocks.redstone_wire; if(blockToPlace != null) { - ChunkCoordinates coords = validPositions.get(supertile.getWorldObj().rand.nextInt(validPositions.size())); if(blockToPlace.canPlaceBlockAt(supertile.getWorldObj(), coords.posX, coords.posY, coords.posZ)) { supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2); if(ConfigHandler.blockBreakParticles) @@ -126,6 +130,9 @@ public class SubTileRannuncarpus extends SubTileFunctional { SubTileEntity subtile = container.getSubTile(); subtile.onBlockPlacedBy(supertile.getWorldObj(), coords.posX, coords.posY, coords.posZ, null, stack); } + + if(stackItem instanceof IFlowerPlaceable) + ((IFlowerPlaceable) stackItem).onBlockPlacedByFlower(stack, this, coords.posX, coords.posY, coords.posZ); if(!supertile.getWorldObj().isRemote) { stack.stackSize--; From 18bdd6d32d8d99e28b568589ef0f322835d08ea4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 21:59:31 +0000 Subject: [PATCH 07/18] S E E D S B O Y Z --- .../botania/common/block/BlockAltGrass.java | 35 +++++++++++++----- .../block/decor/BlockFloatingFlower.java | 7 +++- .../botania/common/item/ItemGrassSeeds.java | 31 +++++++++++----- .../resources/assets/botania/lang/en_US.lang | 6 +++ .../{grassSeeds9.png => grassSeeds3.png} | Bin 17783 -> 19470 bytes .../botania/textures/items/grassSeeds4.png | Bin 17830 -> 18627 bytes .../botania/textures/items/grassSeeds5.png | Bin 19470 -> 17830 bytes .../botania/textures/items/grassSeeds6.png | Bin 18627 -> 17783 bytes .../botania/textures/items/grassSeeds7.png | Bin 17783 -> 17758 bytes .../botania/textures/items/grassSeeds8.png | Bin 17758 -> 17783 bytes 10 files changed, 58 insertions(+), 21 deletions(-) rename src/main/resources/assets/botania/textures/items/{grassSeeds9.png => grassSeeds3.png} (86%) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 4c0270d6c..0bb2f00a9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -22,7 +22,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -70,19 +75,19 @@ public class BlockAltGrass extends BlockMod { return side == 0 || meta >= SUBTYPES ? Blocks.dirt.getIcon(side, meta) : side == 1 ? icons[meta * 2] : icons[meta * 2 + 1]; } - // All from below is from BlockMycelium (adapted a bit) - @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { - if(!p_149674_1_.isRemote && p_149674_1_.getBlockLightValue(p_149674_2_, p_149674_3_ + 1, p_149674_4_) >= 9) { + public void updateTick(World world, int x, int y, int z, Random rand) { + if(!world.isRemote && world.getBlockLightValue(x, y + 1, z) >= 9) { + int meta = world.getBlockMetadata(x, y, z); for(int l = 0; l < 4; ++l) { - int i1 = p_149674_2_ + p_149674_5_.nextInt(3) - 1; - int j1 = p_149674_3_ + p_149674_5_.nextInt(5) - 3; - int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1; - Block block = p_149674_1_.getBlock(i1, j1 + 1, k1); + int i1 = x + rand.nextInt(3) - 1; + int j1 = y + rand.nextInt(5) - 3; + int k1 = z + rand.nextInt(3) - 1; + + Block block = world.getBlock(i1, j1 + 1, k1); - if(p_149674_1_.getBlock(i1, j1, k1) == Blocks.dirt && p_149674_1_.getBlockMetadata(i1, j1, k1) == 0 && p_149674_1_.getBlockLightValue(i1, j1 + 1, k1) >= 4 && p_149674_1_.getBlockLightOpacity(i1, j1 + 1, k1) <= 2) - p_149674_1_.setBlock(i1, j1, k1, this); + if(world.getBlock(i1, j1, k1) == Blocks.dirt && world.getBlockMetadata(i1, j1, k1) == 0 && world.getBlockLightValue(i1, j1 + 1, k1) >= 4 && world.getBlockLightOpacity(i1, j1 + 1, k1) <= 2) + world.setBlock(i1, j1, k1, this, meta, 1 | 2); } } } @@ -92,6 +97,16 @@ public class BlockAltGrass extends BlockMod { return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + return new ItemStack(this, 1, world.getBlockMetadata(x, y, z)); + } + + @Override + public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { + return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + } + @Override public void randomDisplayTick(World world, int x, int y, int z, Random r) { int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index b86f54c7e..fc1fae8f9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -133,8 +133,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab IslandType type = null; if(stack.getItem() == Items.snowball) type = IslandType.SNOW; - else if(stack.getItem() == ModItems.grassSeeds) - type = ItemGrassSeeds.getIslandType(stack); + else if(stack.getItem() == ModItems.grassSeeds) { + IslandType newType = ItemGrassSeeds.getIslandType(stack); + if(newType != null) + type = newType; + } if(type != null && type != flower.getIslandType()) { if(!world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 35985a50a..0ae989bd2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -28,6 +28,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.FMLCommonHandler; @@ -42,10 +43,11 @@ public class ItemGrassSeeds extends ItemMod { private static Map> blockSwappers = new HashMap(); private static final IslandType[] ISLAND_TYPES = { - IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL + IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, + null, null, null, null, null, null }; - private static final int types = 3; + private static final int SUBTYPES = 9; IIcon[] icons; public ItemGrassSeeds() { @@ -57,15 +59,15 @@ public class ItemGrassSeeds extends ItemMod { @Override public void getSubItems(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < types; i++) + for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(par1, 1, i)); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[types]; - for(int i = 0; i < types; i++) + icons = new IIcon[SUBTYPES]; + for(int i = 0; i < SUBTYPES; i++) icons[i] = IconHelper.forItem(par1IconRegister, this, i); } @@ -85,7 +87,7 @@ public class ItemGrassSeeds extends ItemMod { Block block = par3World.getBlock(par4, par5, par6); int bmeta = par3World.getBlockMetadata(par4, par5, par6); - if(block == Blocks.dirt && bmeta == 0) { + if((block == Blocks.dirt || (block == Blocks.grass && par1ItemStack.getItemDamage() != 0)) && bmeta == 0) { int meta = par1ItemStack.getItemDamage(); BlockSwapper swapper = addBlockSwapper(par3World, par4, par5, par6, meta); @@ -98,14 +100,19 @@ public class ItemGrassSeeds extends ItemMod { float r = 0F; float g = 0.4F; float b = 0F; - if(meta == 1) { + switch(meta) { + case 1: { r = 0.5F; g = 0.37F; b = 0F; - } else if(meta == 2) { + break; + } + case 2: { r = 0.27F; g = 0F; b = 0.33F; + break; + } } float velMul = 0.025F; @@ -148,6 +155,12 @@ public class ItemGrassSeeds extends ItemMod { switch(meta) { case 1 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.dirt, 2); case 2 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.mycelium, 0); + case 3 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 0); + case 4 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 1); + case 5 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 2); + case 6 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 3); + case 7 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 4); + case 8 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 5); default : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.grass, 0); } } @@ -191,7 +204,7 @@ public class ItemGrassSeeds extends ItemMod { int z1 = z + l; Block block1 = world.getBlock(x1, y, z1); int meta1 = world.getBlockMetadata(x1, y, z1); - if(block1 == Blocks.dirt && meta1 == 0) + if((block1 == Blocks.dirt || block1 == Blocks.grass) && meta1 == 0) validCoords.add(new ChunkCoordinates(x1, y, z1)); } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4f929963e..06e64218c 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1415,6 +1415,12 @@ item.botania:fertilizer.name=Floral Fertilizer item.botania:grassSeeds0.name=Pasture Seeds item.botania:grassSeeds1.name=Boreal Seeds item.botania:grassSeeds2.name=Infestation Spores +item.botania:grassSeeds3.name=Dry Pasture Seeds +item.botania:grassSeeds4.name=Golden Pasture Seeds +item.botania:grassSeeds5.name=Vivid Pasture Seeds +item.botania:grassSeeds6.name=Scorched Pasture Seeds +item.botania:grassSeeds7.name=Infused Pasture Seeds +item.botania:grassSeeds8.name=Mutated Pasture Seeds item.botania:livingwoodTwig.name=Livingwood Twig item.botania:dirtRod.name=Rod of the Lands item.botania:terraformRod.name=Rod of the Terra Firma diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds9.png b/src/main/resources/assets/botania/textures/items/grassSeeds3.png similarity index 86% rename from src/main/resources/assets/botania/textures/items/grassSeeds9.png rename to src/main/resources/assets/botania/textures/items/grassSeeds3.png index 4bccf737fcae00b2d21dd6f98e9a088540bff25b..abd76123bc7bf7c809e5865eed7a21872ea6f44e 100644 GIT binary patch delta 1531 zcmey~#n?B4al>RTCR^UkQ@JdeS&dAs3@s*K=Cu$pvNATZGBl2|(XYrYu=34M$xN%9 z{D4<uailv1` z>f~Jl<|?U)sm4i`1}VCU#s)^ZsfH%Tx|SA+2D(Y+sRn6=risSJX6BPc1?`DbSRr_y zIEB?h4p4s`5bB$JUeJ}fII(Q9q>!D8Nt&T$in+PDF3`D&x~V26iMoj6gzzz{o)eWvJxw(z+`n{brkc73K`fdIV92~P{Ptuo7rlBG1y2{pkP1cy0haf_8UO$P&p-)aB2{xex(1R>pv(Xa`+>&M z(+Sw@$K?b^4{-+PP-(D-J%Xhe?0v;?#uf{Duz>jTsyqzezWoMEef#|Tzl1nXJtH=S zATg{a{P^{Y;p?k^|D8i5!1_ME{enwB_F(++lkvZ?r5u9<4;zD^7#l;qs2U$>p7{Rb z55vXtPZ@sv`^)h6*B=HCK@HNJU>NtDQJYbgLHIR4gIPVN3QpZ139MRTCd;*(r*c^`vzl0185mB!%xfWHY-M0%Wn>g(qhFC*VC9>il9^UH z`2nx!WD`CKcBtg$U_NIi74yWDv}A*{Bwdr_WOH4EM3Y2a3p3+1T_aPAlq56bR1@<= zp1(=L<9dg$#1vHL@&i^Z8uk!T4T4v zZv9Q~7!~e$^OPBPd|1tpRNGk|EAMdV#b>Ri0#8>zmvv4F Gj7Tk08_nwy)L>nIo*7@F!E80#Aw=o%SY znHX4^7;X08c4lG$NlfnItrIs7F|@EUG_f+ah_cbI$Stt)%}>cptDO9RS9G!opC}hX zeseINGn0zBL0XEriLsHcS&DIzZi|=6i7EL> zsa7fZ$(bou1sVAz`NbLe1y*ThMkyvnCZ@U;DW+z+hK8v?mVv3MZd#H_vWdB2Qj&>z z>Sj?vOQy-^1znko6U!z`3fZZcq#0VKn46pHrWzzA>ZY2QBMRV zq$MR!t`>4&H8!#`G@g7wsA95}5SK)9Mq*xiYKon{jec>7YgvgERA92YusVwQM0u)O z$eI%#8k6@6c|ih^L)ZYXWt-K7qCtGJWfph@%5Yj;r97rJbgmdKI;Vst0Gc-1>i_@% delta 430 zcmV;f0a5GBF@GIW93ZG&wObEFdy4F*7eQFfTGW zEio}VG&ediHnT_zLjsc=6AP1@4RVvt4F&`_Ix;bn7Y;X*&J6|xI65*hvsey80+VVI zCX>MsEt6jnG_x=fF#@y37Wgm(i$z@@lfp+Xe*qXtL_t(|+QgH)N&{gKg}>QL784?y zpe9iy3JO|UDuSJbT_mNCpsyjmf?#3oD_H6a*jj{0Op%DjT#fs0b}YnBxaO2i8Rz4JQZUS8w!jHFZ0zG&JlF!-c~3F+Ng9o_Z>AXAyM zeYsz6QtHMOh(aX;d^AO zCDrGVSi2A#McRE0w-;4>F!x>gl?#(cqf6_XJlx#jZiEC|MNK;I_5@Bgpw+11mvbcD zh*PtQ)H?PA$47N>E_bxv>abGG0kB^kFxV&Y>_GXlY`G8u$kj>orzlIK_4@O`zklP$ Y0LrmrMtB=`+yDRo07*qoM6N<$f~Uy17XSbN diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds5.png b/src/main/resources/assets/botania/textures/items/grassSeeds5.png index abd76123bc7bf7c809e5865eed7a21872ea6f44e..a303a694bc2154952134b826d0d5f64d35f94853 100644 GIT binary patch delta 387 zcmV-}0et?Bm;t7X0kD$_0y(X-l?r$R5;8bCGBH{_FL-TmI!$k6X=Zto;0+a%G!7aC zGB`RiF|$(+Ljsdm5+<{}5Rw9uKoADAv=;I(1dByoACsy_E`I?SNklzS}KB_gRF!GuFr}tm;C1RztHvwtUWUj~?Df)jY;4htIf$KoZ90%COolX1~tp7?1jn>5^+7qPK zGE7F%XW@Hft0mRvkyyJB8%5fE4YwCnd@%Q2`IQTkN25#Yn>^gy;ckQkTSZMe@Ad>v zHlWq0;g@qH-H21Oiqtyx1jk2paV~eX-s-SY%mJ`p9WdA@@$5kPvTV5!0?5@#^rt9G hqxJgpz`uXv#{kN)V@7xzcH95}002ovPDHLkV1fRTCR^UkQ@JXbg^Z1?42`2~^eb`;tbFrRGSez2Kj0OeY{DnS3YOX& z%;(IcVrpV!Y+z_^plf1bkgRKJYGR^mnQD-vo0w)`WMYzL!|`rRW-(86>8d8YY{hB_&U;7IJ{tH2Hu~ z#bhfXE{Wuf#Ju#>6gzzz{o)eWvJxw(z+`n{brkc7aTN*XZ&nwUH)L7AGyL{sFBiRf z76nfi$B+s}1_74$zZw7k|Ia`PU?Np>J-P;xO`yyG4Euq`(bEao?8oH| zhdqL&80>w;amE%4da!`_@~S)x-@g3@OMUzN`@e)ZPdy_xg&;AkCj9vIi{b05fB&6B zB*6MUzWstrKlWh!@sshtv85b?1P>d7pcorNy{H-=X`cB0;}65d^G_Lm{QJxB_tzf= z4?zvmoM0IDoKc%mmO=P6KZ994rwUHpAPKB#p~DO8WN^^QiVJ|$;S5Hs27q)xKs^KF q9?E71jkzWe{5Nya4BVR5G(NYc~Q&t;ucLK6T#hMY10 diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds6.png b/src/main/resources/assets/botania/textures/items/grassSeeds6.png index 53ce0f6ffd6e88eeaceaa3db80a212c2df5b8d6b..a0f186b6c7bb5298d7a6542f2622b6f1d4c46c9c 100644 GIT binary patch delta 554 zcmX>+k@0&M6)3OrleVzm?kHuCQsfkps!PrTcDScnPNqh1`R=b z;!N%qyic6MJ|Sn2j{-z0Hg6E)Gi2$g-snF0kh^~UOHUWakcwMLfByfsXI5?KY;6});8&SrY=KhL#OIu^{rt3TfV z|2MUw>>q!#iM;UP-|;*=LG$vK>~tu(R`0fq)$PCho{IAeloUOxoL+tSb)KPk)0!O& r%=@-DXs8<5)%|4L-^6&nw}Fu%sn^f>{d)VK3_#%N>gTe~DWM4fop#R_ delta 743 zcma)3O-NKx6n188vhjD`WX-ISRNQoX_r81IyE9L7@Q*aeMH*2N&bxEpYh2W54)#iP zCMhGKA-e@Ff*@K;;jSz#>1PqRXcG~n6|~4mq0B;N8Y#$C_^l4-JLi0S-}y1>m>F~2 z6&~lFYH{6@uGT;lYP5oeb|aNiLU&at5UDc6GKN6GI)OS-CRz)docU{n7%krGL_zVY zSlv!LQBX%j$H60YvVEdQ-yi4Q))_HZTrNmSx#u50(NWUmtfJ83lwbvD95cWb5(Nw^ z7C=yi1Th3P#>D+HSvPo`nL3Y0ySd&IizniJv3QSeX$mI_Q9+Qa8bHX*RZvxd#YmJ; z#2BHbDEEe|OvA)11UWD;RDg*H2BDw<0i!0gkZNG8QDJ-EZESErYFaZqEv3b*x5d?G z^oxL0Ur8(!;*?TgLS_Jy5Ca&*;s9yT;3|p|i;1&R!zQfg2E(S$}?GSq(_F>q5?nwEg)}fe-#yZKB4v1LYTNO)QCh&2sW#TXRFF z{f4b(vtd_t>e9JJC>7nfR+&j2NC&&!iKngT<@i{tHxTgqGlHkao|L-hzfSqr@MtiS zDOJzgt|6SU?8Vfl?9Eg2*`gehUGJB77HW^>?Cb0U|2^gHh_RJ{nU$eQl#PBxZh@6=eoAIq<>UvvqLWSdB-o*nn}hkBnN$qZ z%uEc-ObvC7OcN7z(=1I4bdxNMOmr=hjZ;j`lg!L4Op+$=5-=xDp{SreaSAI0?-QkP zbG6WELzZX%EbJ$Hx#-tl@N{tuskoK&=l_3uX4QtyMkj+0Y#S1UQ+P_#e(bN(XHKqR zU}hHnT;KNp4bOjZon)1JtVKdRJ&}eyJgeCL|34pp`ow|r-m|zR;_8zUe*Br-*x1OJ zq|MLXnfT#3d-KMfZ|mEZ+y6J7_T=yX`&JVtsxbHX=KN2;dCOQLI?~7>?ar6h>?|vg_V&}l#PBxZh@6=eoAIq<>UvvqLWSdB-o*nn}hkBnN$o+ zk}S+j(hPJ>EX~byO)X7~bS+H{lXT5YQd80_OiYuLQvK@EC2F`u|j+~mHb@1qi&(_R`*ZJt|KGpnz&gI=+;zr(QY-#-KCR!c!hX8` zT>X#3lGze}5|aO|PdR$5;MI$8Hq(3md9Iz(v0xTn{qg?)zo`{v|M;6t*kCqLj7oovD<%>t6y z9L(p;q+*_!l9p_cmZWQvoNTUZkZ6*qYhh-brfXzsk&X2`Ps#YvaRUM~9eFFjoxLn>|^nY_{OP=bit`M)bK1u(M+ zzgFr{d}v#uaPaQj4Vw*i?flGT*TA3f=)ftbLpq$!o{JaqgnCLR%_^#8O#XBDfcd?L z&uY}acdgpw&r|*E1NWT!ZL<5FuUZ}zk>TC8aLS$JV-HXN=e$;v$kq3)Jvr-W*SyaB z@Pnsg8Ftp!X9Sp~RaIfR+QxgsR<0QY`DiggFtF_%+U22Wp4!iX?y<=3k=gm`Q-0@*GLsD&L nd91v{p%*kCqLj7oovD<%>t6y z9L(p;q+*z6W@2DwYN%^unwY4YW@%!en`B{RqHB?CoMLL8WM*bzk~DdjfH`prMFs7N zQ&=H*pE!lpLJklgZ9X8>X2|mFpN0KoFBkp#3!W~HAr-fh{`~)M&#cHJ`pn5S49v{JpX=NHzv1~Wu9K{CkF`jMrzg^ohi4Vr|NrOXPoFq&-g_3e zL|lDR!jC_b8yg!LleGESI}<-VXK&uP^KE_Ga{K?r)1LhOf8T22L>1;9-<<#HH*XnB zL`NDKq}|zd;DE&AZ}V03=h&9FCf+hnYuj9&XJD}5qoI%RAO9$cDei02QldV5*?+71 zI}evo6Aup$(~?%l_UrW(45zxd6__UXv>f^I<0< Date: Tue, 17 Nov 2015 22:13:15 +0000 Subject: [PATCH 08/18] Proper seed colors --- .../botania/common/item/ItemGrassSeeds.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 0ae989bd2..40ee55673 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -113,6 +113,42 @@ public class ItemGrassSeeds extends ItemMod { b = 0.33F; break; } + case 3: { + r = 0.4F; + g = 0.5F; + b = 0.05F; + break; + } + case 4: { + r = 0.75F; + g = 0.7F; + b = 0F; + break; + } + case 5: { + r = 0F; + g = 0.5F; + b = 0.1F; + break; + } + case 6: { + r = 0.75F; + g = 0F; + b = 0F; + break; + } + case 7: { + r = 0F; + g = 0.55F; + b = 0.55F; + break; + } + case 8: { + r = 0.4F; + g = 0.1F; + b = 0.4F; + break; + } } float velMul = 0.025F; From c828461c0cab53b13608138e9a201a519f376632 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 22:19:28 +0000 Subject: [PATCH 09/18] Holding shift on a recipe page with multiple recipes will pause the recipe changing code. It'll also stop petals/rune pieces from rotating. --- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 1 + .../botania/common/lexicon/page/PageCraftingRecipe.java | 3 +++ .../botania/common/lexicon/page/PageElvenRecipe.java | 3 +++ .../common/lexicon/page/PageManaInfusionRecipe.java | 3 +++ .../botania/common/lexicon/page/PagePetalRecipe.java | 7 ++++--- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 502ea23d0..1b5480c6b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -305,6 +305,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeTeruTeruBozu; public static IRecipe recipeAvatar; public static IRecipe recipeSextant; + public static List recipesAltGrassSeeds; // Garden of Glass public static IRecipe recipeRootToSapling; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 69794f323..fdded50c7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -108,6 +108,9 @@ public class PageCraftingRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 5d87a62a0..12921c3ed 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -100,6 +100,9 @@ public class PageElvenRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b959bb773..bdb94278d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -139,6 +139,9 @@ public class PageManaInfusionRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index f22c9680e..b3822be5c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -68,7 +68,7 @@ public class PagePetalRecipe extends PageRecipe { List inputs = recipe.getInputs(); int degreePerInput = (int) (360F / inputs.size()); - float currentDegree = ConfigHandler.lexiconRotatingItems ? (float) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) : 0; + float currentDegree = ConfigHandler.lexiconRotatingItems ? (GuiScreen.isShiftKeyDown() ? ticksElapsed : (float) (ticksElapsed + ClientTickHandler.partialTicks)) : 0; for(Object obj : inputs) { Object input = obj; @@ -95,8 +95,6 @@ public class PagePetalRecipe extends PageRecipe { return new ItemStack(ModBlocks.altar); } - - @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { // NO-OP @@ -105,6 +103,9 @@ public class PagePetalRecipe extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void updateScreen() { + if(GuiScreen.isShiftKeyDown()) + return; + if(ticksElapsed % 20 == 0) { recipeAt++; From 68ee5145f4a9f671d5b18c3211f0dca8faf71b04 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 22:41:32 +0000 Subject: [PATCH 10/18] New Grass Seeds' recipe/docs --- .../botania/common/crafting/ModCraftingRecipes.java | 9 +++++++++ .../java/vazkii/botania/common/lexicon/LexiconData.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 1b5480c6b..8a9d85ede 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2054,6 +2054,15 @@ public final class ModCraftingRecipes { 'I', LibOreDict.MANA_STEEL); recipeSextant = BotaniaAPI.getLatestAddedRecipe(); + // Alternate Pasture Seed Recipes + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 3), new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.deadbush)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 4), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.wheat)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 5), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.dye, 1, 2)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 6), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.blaze_powder)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 7), new ItemStack(ModItems.grassSeeds), new ItemStack(ModItems.manaResource, 1, 10)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 8), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.spider_eye)); + recipesAltGrassSeeds = BotaniaAPI.getLatestAddedRecipes(6); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index f2b6b983e..23aa13750 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -672,7 +672,7 @@ public final class LexiconData { manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); grassSeeds = new BLexiconEntry(LibLexicon.TOOL_GRASS_SEEDS, categoryTools); - grassSeeds.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes)); + grassSeeds.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesAltGrassSeeds)); dirtRod = new BLexiconEntry(LibLexicon.TOOL_DIRT_ROD, categoryTools); dirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtRod)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 06e64218c..c1479ba36 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2847,6 +2847,8 @@ botania.page.grassSeeds0=Watching grass spread is seldom a fun activity. By infu botania.page.grassSeeds1=&1Pasture Seeds&0 for grass botania.page.grassSeeds2=&1Boreal Seeds&0 for podzol botania.page.grassSeeds3=&1Infestation Spores&0 for mycelium +botania.page.grassSeeds4=An aditional six types of &1Pasture Seeds&0 can be created, for alternative grass types with various textures.
These spread to dirt like normal and can sustain any plant a block of grass can. Similarly, they may only be picked up with &4Silk Touch&0. However, they do not decay back into dirt if there's a block above them. +botania.page.grassSeeds5=The alternate &1Pasture Seeds&0 # -- ROD OF THE LANDS botania.entry.dirtRod=Rod of the Lands From 95b256fd155f1a3eedf2baa3467e58c863716776 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 23:00:32 +0000 Subject: [PATCH 11/18] Build 234 --- build.properties | 8 ++++---- version/1.7.10.txt | 2 +- web/changelog.txt | 22 ++++++++++++++++++++++ web/versions.ini | 3 ++- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index 5643b6291..35524d4d7 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Thu Nov 12 23:30:17 GMT 2015 +#Tue Nov 17 22:57:23 GMT 2015 version=r1.7 dir_output=../Build Output/Botania/ -dir_repo=./ -forge_version=10.13.2.1291 mc_version=1.7.10 -build_number=234 +forge_version=10.13.2.1291 +dir_repo=./ +build_number=235 mod_name=Botania diff --git a/version/1.7.10.txt b/version/1.7.10.txt index d5eda311b..6ae4fff3e 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.7-233 \ No newline at end of file +r1.7-234 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 84982a732..1cddb8a2e 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,25 @@ +r1.7 234 +*Added 3 new lenses:
  • Mana Lens: Redirectory - Bursts that have this lens fired from a spreader will, when colliding with another spreader, rotate the collided spreader to point towards the one that shot. It also gives bursts the Phantom effect.
  • Mana Lens: Celebratory - When it collides with a block it'll make a firework of the color of the burst.
  • Mana Lens: Flare - Spreader only. Prevents the spreader from firing any mana bursts. Instead, the spreader fires a continuous beam of particles of the color of the lens. (demo 1 | demo 2)
+*Added 6 new types of decorative grass (and six new types of pasture seeds to make them) that don't turn into dirt if there's anything above. +*Bellethornes now kill Witches properly. +*Changed armor item icons to match the new armor models. +*Condensed the Paintslinger Lens and Warp Lens entries as well as the 3 new lenses in this version into an "Elven Lenses" page. +*Fixed botania Panes having weird lighting in corners. +*Fixed bursts with the Entropic lens exploding in contact with a full spreader. +*Fixed the Exoflame not using mana properly on interfaced blocks. +*Fixed white tinted mana lens not being able to be crafted. +*Holding shift on a recipe page with multiple recipes will pause the recipe changing. It'll also stop petals/rune pieces from rotating if it's a petal/rune recipe. +*Luminizers and Agricarnations are now quieter. +*Pasture Seeds for blocks other than Grass can now be used on Grass. +*Removed the "lore" pages after some flowers' recipes, as interesting as they are, they served no practical purpose and only confused people. +*Renamed the Talent Shredder achievement to a much more fitting name. +*The bottom side of Mana Pools is now solid (so you can put stuff like levers now, if you want to do that for some reason :V) +*Tweaked armor textures and models a bit. +*[API] Added IDirectioned and IRedirectable to work with the new lens. +*[API] Added IFlowerPlaceable for items that can be placed by the Rannuncarpus. +*[API] Added ILensControl for lenses that control a spreader's behaviour. +*[API] Increased version number to 68. +*[API] Stripped getRotationX() and getRotationY from IManaSpreader and moved it to IDirectioned (which IManaSpreader extends now). r1.7 233 *Fixed items that take damage when used in a crafting recipe taking damage purely by being put in the grid. *Fixed the Lexica Botania's main page making the screen dark on lower end (and integrated) graphics cards. diff --git a/web/versions.ini b/web/versions.ini index 600eb15a9..339ed93c1 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -230,4 +230,5 @@ r1.7-229=1.7.10 r1.7-230=1.7.10 r1.7-231=1.7.10 r1.7-232=1.7.10 -r1.7-233=1.7.10 \ No newline at end of file +r1.7-233=1.7.10 +r1.7-234=1.7.10 \ No newline at end of file From b124a7c12fe16df460fee17a9fb88e3eba0c60d9 Mon Sep 17 00:00:00 2001 From: OJwithC Date: Wed, 18 Nov 2015 10:29:50 -0500 Subject: [PATCH 12/18] Update en_US.lang Aditional Dadelifeons --- 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 c1479ba36..67bc4286b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2579,7 +2579,7 @@ botania.page.dandelifeon0=The &1Dandelifeon&0 is a flower not recommended for th botania.page.dandelifeon1=This flower makes use of a cellular automata known as &4Conway's Game of Life&0. The area for this procedure is a 25x25 square centered around the &1Dandelifeon&0 itself.
While the flower has a redstone signal, twice every second it'll step the game once. botania.page.dandelifeon2=The game is executed with the concept of &4Cells&0. The 25x25 area can be seen as a grid of 25 by 25 cells
Cells may be live or dead, live if the block in that position is a &1Cellular Block&0 (read on) or dead if it's anything else. &4Neighbours&0 are the eight blocks in the same plane around any one cell. botania.page.dandelifeon3=Every step of the game, the following transitions might happen: &41)&0 Any live cell with fewer than two or more than three live neighbours dies. &42)&0 Any live cell with exactly two or three live neigbours lives on. &43)&0 Any dead cell with exactly three live neigbours becomes a live cell. -botania.page.dandelifeon4=All of the transitions happen at the same time.
Aside from those, a few aditional rules not present in a typical simulation of &4Conway's Game of Life&0 are also present in the &1Dadelifeon&0 procedures, listed in the following pages. +botania.page.dandelifeon4=All of the transitions happen at the same time.
Aside from those, a few additional rules not present in a typical simulation of &4Conway's Game of Life&0 are also present in the &1Dandelifeon&0 procedures, listed in the following pages. botania.page.dandelifeon5=All cells have an age, starting at zero. Whenever a cell lives on, by having two or three neighbours, its age inreases by one. Whenever a dead cell becomes a live cell, the age of the new live cell is equal to the age of the oldest neighbour, plus one. Any cells older than sixty generations will die during the next step. botania.page.dandelifeon6=Second off, the 3x3 zone centered around the &1Dandelifeon&0 itself is not habitable by cells. Any live cells that would exist in that area are turned into &4Mana&0 instead. The older the cell that would be created, the more &4Mana&0 it makes. Age zero cells produce no &4Mana&0. botania.page.dandelifeon10=Whenever any live cells are absorbed by the 3x3 zone in the center, all other cells in the board die.
A few other restrictions apply to cells, such as having two different &1Dandelifeon&0 flowers affect the same cell will kill it. Lastly, any cell will die if moved by any other means than the &1Dandelifeon&0 itself. @@ -2847,7 +2847,7 @@ botania.page.grassSeeds0=Watching grass spread is seldom a fun activity. By infu botania.page.grassSeeds1=&1Pasture Seeds&0 for grass botania.page.grassSeeds2=&1Boreal Seeds&0 for podzol botania.page.grassSeeds3=&1Infestation Spores&0 for mycelium -botania.page.grassSeeds4=An aditional six types of &1Pasture Seeds&0 can be created, for alternative grass types with various textures.
These spread to dirt like normal and can sustain any plant a block of grass can. Similarly, they may only be picked up with &4Silk Touch&0. However, they do not decay back into dirt if there's a block above them. +botania.page.grassSeeds4=An additional six types of &1Pasture Seeds&0 can be created, for alternative grass types with various textures.
These spread to dirt like normal and can sustain any plant a block of grass can. Similarly, they may only be picked up with &4Silk Touch&0. However, they do not decay back into dirt if there's a block above them. botania.page.grassSeeds5=The alternate &1Pasture Seeds&0 # -- ROD OF THE LANDS From 2f0edfc8015d3094e9cc6b5f364d025a3f90e36f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Nov 2015 20:07:28 +0000 Subject: [PATCH 13/18] 12 --- .../blocks/{altgrass11.png => altGrass12.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/assets/botania/textures/blocks/{altgrass11.png => altGrass12.png} (100%) diff --git a/src/main/resources/assets/botania/textures/blocks/altgrass11.png b/src/main/resources/assets/botania/textures/blocks/altGrass12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altgrass11.png rename to src/main/resources/assets/botania/textures/blocks/altGrass12.png From 9becb6607f9e4ec9c42bdad77c2516517ccb5b1b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Nov 2015 20:07:39 +0000 Subject: [PATCH 14/18] 11 --- .../blocks/{altGrass12.png => altGrass11.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/assets/botania/textures/blocks/{altGrass12.png => altGrass11.png} (100%) diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass12.png b/src/main/resources/assets/botania/textures/blocks/altGrass11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass12.png rename to src/main/resources/assets/botania/textures/blocks/altGrass11.png From 34eb04989a2f0442b8b2a8acea4ea31aaf5da845 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Nov 2015 21:10:10 +0000 Subject: [PATCH 15/18] Fixed the Crafty Crate not syncing properly. --- .../vazkii/botania/common/block/tile/TileCraftCrate.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 6d8aaa9c7..225ec081a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -21,6 +21,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; public class TileCraftCrate extends TileOpenCrate { @@ -157,6 +158,7 @@ public class TileCraftCrate extends TileOpenCrate { if(stack != null) eject(stack, false); setInventorySlotContents(i, null); + markDirty(); } } @@ -178,11 +180,18 @@ public class TileCraftCrate extends TileOpenCrate { ejectAll(); return true; } + + @Override + public void markDirty() { + super.markDirty(); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } @Override public int getSignal() { return signal; } + @Override public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) { int lastPattern = pattern; From eacfade78705dcce4876a18fac1b6dadf2e57a17 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Nov 2015 21:12:26 +0000 Subject: [PATCH 16/18] Fixed the Hopperhock not updating inventories properly. --- .../common/block/subtile/functional/SubTileHopperhock.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 25b325825..81386e0c8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -103,6 +103,7 @@ public class SubTileHopperhock extends SubTileFunctional { if(invToPutItemIn != null) { InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); + invToPutItemIn.markDirty(); item.setDead(); pulledAny = true; } From 4365522ee701322f78c466ef61f327153673d6f0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Nov 2015 21:36:46 +0000 Subject: [PATCH 17/18] If an arena for the gaia guardian fight is obstructed or has holes, there'll be a quick particle display showing you how large it needs to be. --- .../common/entity/EntityDoppleganger.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index dc82267ec..4077e0c86 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -141,9 +141,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, int par4, int par5, int par6, boolean hard) { Block block = par3World.getBlock(par4, par5, par6); - if(block == Blocks.beacon && isTruePlayer(player) && !par3World.isRemote) { + if(block == Blocks.beacon && isTruePlayer(player)) { if(par3World.difficultySetting == EnumDifficulty.PEACEFUL) { - player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + if(!par3World.isRemote) + player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return false; } @@ -155,13 +156,30 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Block blockat = par3World.getBlock(x, y, z); int meta = par3World.getBlockMetadata(x, y, z); if(blockat != ModBlocks.pylon || meta != 2) { - player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + if(!par3World.isRemote) + player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return false; } } if(!hasProperArena(par3World, par4, par5, par6)) { - player.addChatMessage(new ChatComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + for(int i = 0; i < 360; i += 8) { + float r = 1F; + float g = 0F; + float b = 1F; + float m = 0.15F; + float mv = 0.35F; + + float rad = i * (float) Math.PI / 180F; + double x = par4 + 0.5 - Math.cos(rad) * RANGE; + double y = par5 + 0.5; + double z = par6 + 0.5 - Math.sin(rad) * RANGE; + + Botania.proxy.sparkleFX(par3World, x, y, z, r, g, b, 5F, 120); + } + + if(!par3World.isRemote) + player.addChatMessage(new ChatComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return false; } From 82051d95d9817a177f0ec62817f4f2430358b46e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Nov 2015 21:46:59 +0000 Subject: [PATCH 18/18] Build 235 --- build.properties | 8 ++++---- version/1.7.10.txt | 2 +- web/changelog.txt | 5 +++++ web/versions.ini | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index 35524d4d7..ea3b21104 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Tue Nov 17 22:57:23 GMT 2015 +#Wed Nov 18 21:40:00 GMT 2015 version=r1.7 dir_output=../Build Output/Botania/ -mc_version=1.7.10 -forge_version=10.13.2.1291 dir_repo=./ -build_number=235 +forge_version=10.13.2.1291 +mc_version=1.7.10 +build_number=236 mod_name=Botania diff --git a/version/1.7.10.txt b/version/1.7.10.txt index 6ae4fff3e..c41557e89 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.7-234 \ No newline at end of file +r1.7-235 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 1cddb8a2e..2319a3d5b 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,8 @@ +r1.7 235 +*Fixed the Crafty Crate not syncing properly, and by extension, the Wand HUD for it not being accurate. +*Fixed the Hopperhock not updating inventories properly. +*Fixed the Mutated Grass having a missing texture. +*If an arena for the gaia guardian fight is obstructed or has holes, there'll be a quick particle display showing you how large it needs to be. r1.7 234 *Added 3 new lenses:
  • Mana Lens: Redirectory - Bursts that have this lens fired from a spreader will, when colliding with another spreader, rotate the collided spreader to point towards the one that shot. It also gives bursts the Phantom effect.
  • Mana Lens: Celebratory - When it collides with a block it'll make a firework of the color of the burst.
  • Mana Lens: Flare - Spreader only. Prevents the spreader from firing any mana bursts. Instead, the spreader fires a continuous beam of particles of the color of the lens. (demo 1 | demo 2)
*Added 6 new types of decorative grass (and six new types of pasture seeds to make them) that don't turn into dirt if there's anything above. diff --git a/web/versions.ini b/web/versions.ini index 339ed93c1..4e60c6bc3 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -231,4 +231,5 @@ r1.7-230=1.7.10 r1.7-231=1.7.10 r1.7-232=1.7.10 r1.7-233=1.7.10 -r1.7-234=1.7.10 \ No newline at end of file +r1.7-234=1.7.10 +r1.7-235=1.7.10 \ No newline at end of file