From 406dd93a2fffb79bcc2fdef5d88acfdf70e53fa9 Mon Sep 17 00:00:00 2001 From: Forstride Date: Wed, 17 May 2017 01:37:45 -0400 Subject: [PATCH] Added branches to the bush/berry bush texture --- .../common/block/BlockBOPPlant.java | 2 +- .../assets/biomesoplenty/models/block/bush.json | 6 ++++-- .../assets/biomesoplenty/models/item/bush.json | 2 +- .../biomesoplenty/textures/blocks/berrybush.png | Bin 639 -> 599 bytes .../textures/blocks/berrybush_berry.png | Bin 244 -> 351 bytes .../biomesoplenty/textures/blocks/bush.png | Bin 585 -> 551 bytes .../textures/blocks/bush_branch.png | Bin 0 -> 457 bytes .../biomesoplenty/textures/items/berrybush.png | Bin 662 -> 687 bytes .../biomesoplenty/textures/items/bush.png | Bin 0 -> 630 bytes 9 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/items/bush.png diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java index 9f06b85fc..7af1ae49b 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java @@ -167,7 +167,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo switch ((BOPPlants) state.getValue(BlockBOPPlant.this.variantProperty)) { - case BERRYBUSH: case SHRUB: + case BUSH: case BERRYBUSH: case SHRUB: return 0xFFFFFF; default: diff --git a/src/main/resources/assets/biomesoplenty/models/block/bush.json b/src/main/resources/assets/biomesoplenty/models/block/bush.json index c30c1560d..f01a69447 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/bush.json +++ b/src/main/resources/assets/biomesoplenty/models/block/bush.json @@ -1,6 +1,8 @@ { - "parent": "block/tinted_cross", + "parent": "biomesoplenty:block/cross_with_overlay", "textures": { - "cross": "biomesoplenty:blocks/bush" + "colored": "biomesoplenty:blocks/bush_branch", + "greyscale": "biomesoplenty:blocks/bush", + "particle": "biomesoplenty:blocks/bush" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/bush.json b/src/main/resources/assets/biomesoplenty/models/item/bush.json index 21a850e52..fddb94e4b 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/bush.json +++ b/src/main/resources/assets/biomesoplenty/models/item/bush.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:blocks/bush" + "layer0": "biomesoplenty:items/bush" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png index 1a300e896e26e74965a14b3bb97a248c8a8fdda4..0b6a8300d61d65bb54899a5c4c145a8da7fdb8cf 100644 GIT binary patch delta 550 zcmV+>0@?ll1lI(RJb%9c01m$aI0aKA0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@JHbiN!^#A|?)Ja4^R5(w4Qp>7=VHEwJ#N>>PyT1PY@4eUBYkhsndz{Z_na}64-G6Qc|D(}JPN$RX_j}oF zHms?}@pya;%w{tZOePaK91gNttz@xSuy?s!)JdAnCWnT@pf#~ zigvr5OsCT)5sLUW8VxCxN+M>n;`8~WSS$)GbvhmCcDww75Ja_F?M48Jkc#cWU{FM- zQ+~8s<@@VPDSwyC++HXY2*~I2f+d+u=D8gMl}d#K>-CyLHI0V7bUH1|<&sKFCKHuq zvsr?H;SeSNc?MZD8WpG0DY00Ln;<)tO1&s^yWNt@PEVSEg357ypu~`i-Kt6Iv1PGU>*Xtjaa7Q5Vcsx%P7`EH(1mf~A zNbo;PMx#;uen0y!4+#Mb%7 delta 590 zcmV-U0H;LN@>a0sBcrK~y+TeN)M5YC#mdUy@DM`ICT4!Hv3b1W_Z-1LB0@gocO% z4hZ6eqEUi^f8a)3i0*ygabBu?8hl93ru+7(s#Ddr%KvpboquFLpUY;m5qytEBRL+A zvfJ%sy=;b^2|wZAqb&bt#%QBMOel3 zP$(qw`l|eSd4EwppP!YFj}J~Sl}aQOi$%eZTrT%B9e_%uLV?w4MNsYOiM?z#E6e4Q zP7DSEo#pd+lEEPema!r;#NzR|I2;a1Bodqi+nG$}&Y8>Ql0u=tbBZ8ByWN&>I4mZU ziIePhyF?-pNhXsr7z_x6GxVd;D9Nc*>LP$bey`ViH-8Ck5D6l!R*M6Gg;Si9h{7b~ z#U5EP2{r?P0H@*Nuty)()9JL}t=uB?dOdD1v0AMP>|=kmh)61x>J|xi1QCzNa}huR zY_r)&#N`2~)oSk|>GgW?`~B?SJtP#!uw*uy`B2{8-bAO)Wx_qyPW_07*qoM6N<$g0yWFegFUf diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png index 4e5e7b86b6850ba8d1b9c15f0afcc82a800cfb8d..adf81296a8d8a5ea9d0b14d2fb51e316a6ce6334 100644 GIT binary patch delta 300 zcmV+{0n`5U0p9|UJb%6b01mzZ>O!%=0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@JHbiN!^#A|>+(|@1R5(v#`2YVuMHs6fDHy9@l&e0FLKO>l(!me|VGIEaYqHL|cJ1SEsrCZ_M%fpW<%_6vk8s!WaVnRx1DF yy-fb61{nP>j3u%D5AsT=gVujPOKf5Ap8){v_0%w{#;p(l0000! delta 192 zcmV;x06+iV0`vipJb%Fe01m+cxRGn^0000QbVXQnQ*UN;cVTj608n9RZgehAMN}Ym zGcGkQF)>H;LN@>a0B}h}K~y+TwUN6GfG`XNnIui>Y?3*$6Kk*&b37s>3gb(_LKG+K zT~he7NcsfI2q+_t=DTi91gFed9&HffA06YT`m{f@At}m znhS2Xn`>CDRw7s|7IwW}ZMWOmX0uW4`FzUz=7L_Yr>5<8`#PEjsMF~PJef?CD02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005FNkl-;os?XNd;ep0&#Pr0(wo zmy7N9d*wdH?RI-NtX3-#EEWs9Uaz*>?QFBzsP=q5Ka=!&JvD8&TQvacbUFf0CKKg& z$ID02>tXvk0#TN-9^!t6w<#Ga(LoJ`rE9ZOxh^Q9|1%auPS0oY%6&$5h zDy8OXwJH*nxzmeN=dMU5lLB&QBsL5nlgWsbufm-=*2(d&yhmWOoXm!G)S2IZQNckd z6nc*o2n0kDi9}um1Vx|Erv(9~k#|)1DggX`zr|uP)qnj+gwyQtcmxOrgXVU-H4ct= z=%E)Pfj)&(gdm+x%PvGHN2bZe?^J zG%heMF*ZbLuk`=`0Y*tgK~y+TU6Rd81TheV=Uwz5Du|00SJYKdWDl;etPB1N>dAv5 zdfAh2;M>k`rkx6WnPd(%o$gdsr<2L*y3WijbIy5aEl_XUHtcJy*fdS3d7?HDC_+}A z=eduF5E4TIB)mD>>6U%2xIEnsHO$n^FJuxMu||wQd0CcORaJqT5I8;r42DMHF|z-F zq9}Zf1sEa#nEB83$(BhZK$MVN5py6@nfQc`;BmUwg}#&a?=MD1SDAB9{v$$cf(X*E zfx1&mHiWoKT$f;ewBb*om!O`IVsIDn`*SbkLg+M%Li|I;Z;y#$C{kd4iGQ9aT{$%p z)Pzw(5wP*~aA<$4rD=rkr(@$}8Z9y4I4bhCAGc#KUcH^$@B7qVX1g7wzZdw5VKx~F zv+=s=KX|G+Gurd{r@b+q)3oO9VfZ_C`Vtg@+100000NkvXXu0mjf_;SSI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png index ff09dc4b411d27eda1a9d52a190d26791fd62e6a..6094936d3c908a031958c45f5e285e3fb3c10687 100644 GIT binary patch delta 610 zcmV-o0-gPq1+N8=Sbx9(01m(bYSxJf0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@JHbiN!^#A|@5J^NqR5(w4Qrk`wQ52mwwKLP1YBe#WrFKdg+K#0yCPFP%6AV_g zM1{(&NQ7z(DoF5>dLzbn9v~4P{RIEX?^vF-PfDq2*vVwhWq+^RImh_FD!-yAeu?1P zkMrPs^rMT)Q55BaD8{}=WUX)A_}OhJe%1tqwu|y%6s5fgN?-L}_4md8B)K<^G>v|6 zu{f0nm9wwH0?xm8(YT$HIoHScFQD+r?Gka3|J-W_nHOQ8)k1R4#E2R*Qt;Nn)g4Fv zBqR|(0n;L_Qh(ihVgWNV_!|WH<9W!u42$~6a}DrYHYnmhv%BhSU?T~525dTt$E9Id zHI}|b#7S&AB+mSG4JL+vgO=xSWhEQQhE^;j>L!MomMGEo@S5G@Eb-8UzhTR|kT629 z?Z8{G5WB0D2J0cD)I8m^g?MGUD9*T_TCxP3UOf?o`G1p-%^oGXVI-0STUvmjP zSyW<*3(LzZ{;{bepg>36|RVTx&7Eci`|XBA*nN5viCJZvE>8n@YHMji!0px@>}}StUM~oU_NC#ps!yb_ wS{uX0Y!TbbWr;FZ&EUbf2USMr(`6X{09_zSt;7sjk^lez07*qoM6N<$f?bs)_5c6? delta 585 zcmV-P0=E6H1(pSnSbxI+01m?e$8V@)0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@RY%_jN0005_Nkl`mpaV_ruVso6y-}~DpgS$4TL6WuagD*XA;v&_mPBJNJ<;t1v>zMG++jRj}wLSbZhuV-4ZjRNvBcFy$0ZpSzE~P z0Hz;A8!V+CMJ2yv259aZJ|u!-BxR;z`sTR>N74_YlAX4e+V8jMQ!3Ud)S_llyQBgB zY0y62B0{-&BO8_171ttIHeQVyz$hxbu+vAr0&W^{725ACL)nD X*ZD8MDXa5U00000NkvXXu0mjfQ&JP)N2bZe?^J zG%heMF*ZbLuk`=`0rN>jK~y+TRZ_`L0znX+GcYhH9*r9!f{K8~2%>1BF(is{-UA?5E_T>ScfGBpsJ~K6@jHuYe*!o}j$K&vO|E?I;FL&DppkVOE1$N^hrfxg!oxh$<7+2?a!31X2w7Gd$!TdnFb2iZVl zemH7RLjw^#^vWdIhCmzF$iTF&dBkPgmZ@xDh0Ze{h1N|WZ{&JpT4=+RGq_tDPbeqc z4>1vB^zFaUvglEbze&MmkATBPC4$MQfvv8E99;4U5j9rA9f;LcC5pd-dS);z*5!=f zioF7E78$$2I;LZPOu_$$gT`sMy;5VIYbH0%y8l-|vth!eE{Mqh;z3~w9D&e~cTw}a zTl$WNga8@f`kYG$AYX4~?HaCt5iAR7o-Lq5H!s#RR4FaU3Rjy$GFecNpUXyQvcHAfPAm}_zfe*QKp1M& Qy#N3J07*qoM6N<$f`4)Y`v3p{ literal 0 HcmV?d00001