From 2e16fdd8bbd8214888182c4ca735141efb8d0f25 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 27 Nov 2020 03:20:08 +0300 Subject: [PATCH] Small fixes & animation --- .../features/bushes/TenaneaBushFeature.java | 2 +- .../world/features/trees/TenaneaFeature.java | 2 +- .../betterend/textures/block/bulb_vine.png | Bin 548 -> 2306 bytes .../textures/block/bulb_vine.png.mcmeta | 6 ++++++ .../textures/block/bulb_vine_lantern.png | Bin 2283 -> 2317 bytes 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_vine.png.mcmeta diff --git a/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java b/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java index 58e9916c..02dd1a8b 100644 --- a/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java +++ b/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java @@ -92,7 +92,7 @@ public class TenaneaBushFeature extends DefaultFeature { support.forEach((bpos) -> { int count = MHelper.randRange(3, 8, random); mut.set(bpos); - if (world.getBlockState(mut.up()).isOf(EndBlocks.TENANEA_LEAVES)) { + if (world.isAir(mut) && world.getBlockState(mut.up()).isOf(EndBlocks.TENANEA_LEAVES)) { BlocksHelper.setWithoutUpdate(world, mut, top); for (int i = 1; i < count; i++) { mut.setY(mut.getY() - 1); diff --git a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java index bed487e7..54c3f7cb 100644 --- a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java @@ -143,7 +143,7 @@ public class TenaneaFeature extends DefaultFeature { support.forEach((bpos) -> { int count = MHelper.randRange(3, 8, random); mut.set(bpos); - if (world.getBlockState(mut.up()).isOf(EndBlocks.TENANEA_LEAVES)) { + if (world.isAir(mut) && world.getBlockState(mut.up()).isOf(EndBlocks.TENANEA_LEAVES)) { BlocksHelper.setWithoutUpdate(world, mut, top); for (int i = 1; i < count; i++) { mut.setY(mut.getY() - 1); diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine.png b/src/main/resources/assets/betterend/textures/block/bulb_vine.png index ba0860cda95e2b7a9459778a496f76aee627a59f..e352087452957eb4f172c0a4ddfc230709b7ca62 100644 GIT binary patch literal 2306 zcmbVO3s4kg9ADHF2^4%J6vDcY6OX;!+k;zf^B~}mhaGposrZ^)cE5uSZuhudVfT2@Xwv%BB!{{FxJ@BjGz zvrEjWiC!L0dLRhmm7HWqhj(vyqV9v?^{FK{kHgzgd(t!+K^`CJJl&AD*7_pIV@-l3 zQ^__(qlcm3|u>36Byb9QF8TItkWTyX*8qp zk^`WTDlN{bBPf*Csnl9hM@59A6se{Ok|xv|oK!QUmeJ_Yz5|2a9K4lDH%#pF1)ua- zj-uEZf+#F3R26Dek|Uc?>vTGTqzH<_Ap)0+MTITGMLDRS!2o2=A=ni`5>Y23nL;!fwQ>%_B^x)Svrj-lBaPtE0V@Fx(F+tWuH6(W4gqd1 zHt&D)IJca$E0`ofhV?4$+Y}ifzi*W%pgoPiu$;5O^%&=@Ea0)e*TO?G@MsbA(iY|b zNcu13?uE&cRVid0AT}Fj>rpz2_$U1`JLlikKU)1Bs{ZdC_&?S6C6~)##cTj)CV@HQ zA)M2tw=~3GtJd@FzDd*%hvUt;bj?-x;F`=pgwzf=cdPGCP$S5I?~@I&mZT#mD)q}i zg7>2J@BJKI`a?y@g{J(&vwYuJ6B=H%_{k+@v%hm+U=1BS{&rABbDP0O+unRAaL2ua z79Yb*_Vlc)M^5W%V!T@2RdsX4obUfgpLP9Y(E5E{vHN4fk*F?>7@$8Qt@*}nPe=8J zV@E?@K(U>+N#ArMm+$z!GwSlLGb1b1h<|#@OC^&i{< z(;DY?haq3zx*L>oyp~?O(fNYRIs zC(_Cg(1L6N27`IBVPWM6EUsc@`0Bb#JA|=qhs~27bF+Cq&8LLd(oq-8l}*;+xj1$( z^~D_>l;^-HTjO5Y=~30Xv7@4F^K0C}>B|EBecK}Da9d+lVF!Ne-068TJ>OK)PQ@*+ zr7J5#O06{|+T!?(u?_8*`?lPR@`@YivcT3YUv;0%{A`L(+P4nGEsZTaK>vItCdGK6 z_U)NoX=&T5#!kAZ>FTUUGSkTFau0LJ`$(Jr?vs{!cao_ym0^`tN5s0Qs?f<&%bP<( z7yHx(4cTitZ>|~8&b<5_zG`~dmsRTE3jgN^|NeUUh=~Js`K75sOrOqPTE6+Ud-cQD z-Mh9bIk59o^t0T}n=_DBvC*_-^;D@bVc6;ux87Q-*=ue6ymZlsOuVCNV3Vi&xQghg zhU)?Ix0kjI(FM1M+Rl|PTbz5Qah^Foc7N&}WOPc4XSX&d`?D=&Z&+H!neL!>zZf}Y z;E9ZNzixQdtB>R;{pPgK9fJXc30fCwfpAX?p(9`#?TcX4(r|- z*nMeK{dwQJdxB4W)Eqh8J~!Y}c!!^5^jDc*o*(x4kJ>oDslllMzq-YGht0UX;iZMc x7p*K80%smdynR+0HolQ;{)GQ{)R2tpV?2}3uc#ldUg-QwNlr*L)WywS@FxnSKoS4| delta 536 zcmV+z0_XjL5~Ku>7k>~41^@s6AM^iV0005&Nklr_r|is6hVc;52egeFFL8=uOOpM}Kg~9>s&ir2dJ;=2<+6 z--30$X#kl}hd}=F&~w~Njtk^0x*f}6BzzIW4H;xZy+S@YhS^XS*0cS2jM|q3^75*W z7Y7!F;ByiA=rxSTu3$Lci_X1m=&{dW!0y3~=0V(#Pr%}(h1iTxSqo75?xFHKz@}3Y zr~O={4`&L~kqNAzs;FbgT^%@GVR)67tbm6^qWSgB?%(JJ7In8=E zlKba5=OZGubWmRL;k|PtKv&hDMcB5DR4OHq*S}XYC{()_z%Yr;^^!87Fwg22 zS(r|z1@dhHf2mfyLTo5Z3h)(}jZr{P$l&TP@Yfy~M=SJR8lA|aV;ycD$hvGvsE%OFf!0JG}JXR4>5q*Kb6IP zauQp9y-!B|YX$};1y2{p5Rc<)L-zIw8w$+ZxL2)OUC7nLbDmP>XO<8T&2@{HJ>{(6 zxTna=8tN4ku>4H+1py(x8*lo1)937ro^<)0T)A@O>#e4b^PkQBSztE%XWV-BzjgAj z$}D6QP8;1bzbn0~=ETB(e}BE?e(}2H`zbArd~S_8nTPdXcbhLz`INW4dDW_li}QNk zWo+Ec&wj62Tju`FaKWjI*ehD(b{PELzyB{&vFz7|+2?F0%Wb)qU?Qcs_1#Z{i;|hF-yMa|&;7EX^SNJ@ zg3atB8{`rm+?@X`*J$RScDXAR_uhYZc+1g}K69(p`R0QU7X5ns@rNJ(4*ppc(?tAS qrxfmUcZkuuci-e2<4l8sb4TJ6rmWKQevn_m00f?{elF{r5}E-2VM2uf delta 694 zcmeAbdM&u&6cf9Vm4T_1f#u|jOlolUKc)Z`Lt}FbqtrwT-6TU}Q(a2~lT_VAV-s^- zlN58a6cdA#SJR8lA|aV;ycD$hvGvsE%OFf!0JG}JXR4>5q*Kb6IP zauQp9eZj7e5)2HC|2$nBLp+Y34LO~6IY40U?+iKJ-l@Km_MgySuuA8LYDiS*2mc(c zYmv{yC+s?<=F4$(U)|SvJ0&MuT-oN})KgmOE_eQOPyej*&z~k3EV!8A(!S|#o@QV2 zwb^gPj@`GExfj3R=0olp)m+o18z29EyIcE`Q03mZ;CavMYZf>s9Omq6^U_*zf?H|n z3Z16d$IdD5zE(Y%^O!kyRpQ02DHoS)dC0IV{p6gP35)n9?VeIorIMx@6u;6wl;Mlk z%%wsv=d;dB?UcB~#eUL>q5GlZvB!m>W+jq3-Q{KWvN!k5Z#7Jm+b4SC>it7EteQ`z zEE4N(UA5|__2aumJ45RCu=`qcFKBvLP%-HM*Ev=D12g*y@`R%wo|(*dne|-tkqooh zviw_?y*8U;KHE2$br4=UV42|gRA*l_2(_MugeGr_;I+Zw!{Om9n> z_pEI9`y;PkGQX{Rb3%2Uwfuv>kGH$On*ZH)ZRV*>J(E;^&i}E1^SNKmg_dG2i-Z{p;jrX~k-3F%P*%sd1hu9Te<$C$^-r4^%l;6W(G-=s#KGW@P3_#%N>gTe~ HDWM4f3+6NF