From 51c009189d477a7ec94f620cad66358f3b7a10b1 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Tue, 20 Oct 2020 18:34:13 +0300
Subject: [PATCH] Underwater features fix

---
 .../features/UnderwaterPlantScatter.java      |   3 ++-
 .../textures/block/end_lotus_planks.png       | Bin 1833 -> 2249 bytes
 .../textures/block/end_lotus_stem.png         | Bin 4012 -> 4008 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java b/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java
index bb8aa417..1436c576 100644
--- a/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java
+++ b/src/main/java/ru/betterend/world/features/UnderwaterPlantScatter.java
@@ -2,6 +2,7 @@ package ru.betterend.world.features;
 
 import java.util.Random;
 
+import net.minecraft.block.Blocks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockPos.Mutable;
 import net.minecraft.world.StructureWorldAccess;
@@ -23,7 +24,7 @@ public abstract class UnderwaterPlantScatter extends ScatterFeature {
 	
 	@Override
 	public boolean canGenerate(StructureWorldAccess world, Random random, BlockPos center, BlockPos blockPos, float radius) {
-		return !world.getFluidState(blockPos).isEmpty();
+		return world.getBlockState(blockPos).isOf(Blocks.WATER);
 	}
 	
 	@Override
diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png b/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png
index b543902e807a2a8287ec7056d002b131402951d4..584650b40d4a4ab517659f7b7db6e6ca01b3d3ee 100644
GIT binary patch
delta 887
zcmZ3<cT#YI1ryukjaE~bSdEOWOe`i}W>SN){xMl98=0n=7^PY2T9~Az=%yr_r0QB)
zTA1i2nHicUrWvIe8YEh5j$*E3tS?GQv&zX-C@yg=E3ryUF3HT#vsEfiEK5yMf(mBl
z6_+IDC8v72*eX@z7U*SWrdXMqBpVqdrx@raCa0L{nx&ZljkYuaa+AzWjVw(pjg8GM
zVfxE6Qh`Pq85kMp8XD*t8H5;GSOJ}EY_4r!Y&Cf%i*-HJqU4Oky!6x*TP1xZeLDpk
z@?4fggwN4jCWP)ZU}#Qdu@}T}*5u19arOJAFkEI}V7%k$;uxZF-gMIGJYhqTw*K|T
zoQ_kuy1BS+e&EsxIJ){{UaZ261IimRq&2icJXDM~9v8PeKVfmklN-<fm`B%Etk}+e
zGwSD#$*awa_Iih}e{;Qg&)cVI`ub+==l37}{rvfSxhHpT&e!h`y{`2=ur1L`vo&DX
zIlo-ZdN0F(DM801zB$kE(wwy^Y|FFdPebl)pE)NoV^{IHYgzB-K5q!+D4n(BJ@4As
z<u98*r|K`|uqn8BBv4b7t!-<u*7HM>>;cls<%|FLOz=5(GVjc?(Byr$w{LY@T^#V4
zReIZ}UniB$7}oFHCLR~Dp?Ig^d7mo@i~rwFmOIYEpf@wJ{@KTdp4qi7mcQ5R=ijPn
zBlr0m&$TmRY%2sN<>;6htSU{rTrE?^#<uIZ#;Nrw4zH?<lwWfh*E%c-+aVgWb;_LV
zgM!*=4Luvbp1swv;%%{4+lhbkg?we0ErU((dnmP8-j{NUSbtq+?h>}zR{;kS%730_
z-*ENRAp@Sn{R^J&4(F+Uye8r{3xlWN7aiH@YX5Wf4_I!mUA4<^+JY}xsbXJi-Y4%C
zc%o-M)!3@Ppy?>{+`H=Ba{DEW&%ZgOymF`dwI@7Q&%ON^`jg+CvtB#-8LxkED_?@s
r^QT4^zJL1`kmRD<u~wihx#utQ6#XzQv+heF3_#%N>gTe~DWM4fR8weu

delta 550
zcmV+>0@?k^5vdN4I06Lou{x9jlaK@rliLCwlaK@rlLiAZlTidEvs?pw0h4$JS${D)
zqlN$g0o+MMK~yNuJ(AyQ6fqRWlT4DCT`Rrlg#{Ojk0K(1;6wNvitg+6RuJ??q}~1z
zx9!b#c9Kkz{*u&&VK{U0opZkLJ0rjT%Q*|Jg>%^$DW#a_@;Ob>m@Xy3bxLWm=zyK=
zg#7d;UwfgH2tmY{j8Vj(yRM6|ynlr#^)#X&ge=#aJdOd>Fm&_=@cTBN9D+_HY2U^&
z%KJzp-<{?eU_DxEW5j+xuMXsP?!YmMMlqHNJPeoXo9tWy-S>)sme7E-){3qS458d!
zdv$D+wMxGE9{OIBqD{MIEM>!>yf2Dt3&qt7Lz$3Y?s5pTwHi&Ey?FKPv415K$h1RH
z$W&JH!v+n2=9h!`JC{*3b8c?jFb#C$MsgUm{I<>1!G~-J!CHfE4qaLvbFJ-aCZFG@
zvWK%>Q3C=fx{2$)Kt$#&7P^)df4xug^LB?yrep5KKCYG;i>$T0*@JUV)iX^K7<`v+
zf8DgD@<DKH*}n%tJ;~*AIeU&HEOT{$_v0S$<iFh1`~lC(SlpFUC(mUSS+*qK|D>R3
z<+GUxLu-p%tgMyd^`SVw=MM;slIyFxC(@f;Tpg4(_kE9J1g)L}Ly}06AAj7!7y<3y
oJnH=An43N_Ado>N1;EHW0IOhMhsaFIbpQYW07*qoM6N<$f(oPz{{R30

diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_stem.png b/src/main/resources/assets/betterend/textures/block/end_lotus_stem.png
index a1778ce3f79a036fb62a0b7531745fa709d0a99b..7f7a1b87f2734896282895bc24ff0ada298fe824 100644
GIT binary patch
delta 632
zcmZ1@ze0WkCo{W+m9dePvH4^HW)(Qwn%P3dA~D&*+{D0GHzheSN!P^KBvscU*)&Dh
z!Zb0>z|cI^)YRBu^K|AWcA`{H-p?WhH~s;O{pPvcQcU&bF>D(c7#Od5x;TbdoSr&)
zcb>4LNZbCKbN5zl-lm+WDaa}4v87}W1Fz~H*8D`RiiKPDFf3ZGBqR_yvGvjIs`bX!
zJ?>3irAIQC&9MCcQ$PJk_xJZcyYC7474bcPb5peUji;M>NVn?x*DDWPtFe0?uPSd_
z-xVf%wa(p6ZuhhB`h5FOKjkLr%RgB5IHK~9cVKR>y7Q^K=X~u<_S+n7v<ndmzL?qk
zg(q>A#jW;}^K*)q>|tlLIsd)WQdywiF>?uP@cyuGZb7d#uV?10n;mV;v0zu9+nvBG
z_c<2L*rj1O&;J2;(`4I;5lW8>W;Dusv|RM7j#T?{a_QB1iic-x)4N!2#(X)m&tQYl
z6X6$AQ}-^qe|N%D(cNdeOit%+KGffo$e?Mu^;h4kg{!kJ**IU_nq1)Fe$4RcHVMCl
z*BPDWNB+-?<%){7+#IZ=DdTan>*Ld(2F!cf&iyHolUV9;E`8dx4P88E_bJTvxp|q7
z`Ab-`#PX2U95Z7Aa<1oX+IWoXp>>I5q@Cp^_Mk<(kGZDJVpV?Qwl3Ud@f-cghl_Zb
zGG05rh~06brMKjBa-(JxdyrU}_w?^CHp!V8a+oZQxS{HGL;rn+@h+j9H)o%npDgpI
rM#3R&<zIodXKRvDk9^qru>O^KG4~z!U5b9O3_#%N>gTe~DWM4fxqA;m

delta 636
zcmZ1>zeauoCo{Xbm8qqbk=bMcW)(Qwn%P1n(a6j&#lXN^H_gD@K-bv9#8lTJ)iO~x
z&BWZuG|9}&G|@C|^K|AWcA`{H-p?WhH~s;O{pPvcQcU&RvhPo1U|_uI>Eak-aeC^+
zy?Iw0BwWu|9Dn>VzbsfspjBYOf&~sv9pVcXwrqbOnc>8$KV_P@!<P^R!9}cVoyy*R
zJ%2;4dWA=;aN+CUva+?|HkIFxmELADJ^x}G>*@C6TZ&YAf@fWwH9bv{!Ozd{NBEuq
z_B(aIW_-Bz=hcs+uj~0wq~~+;PrD;>{%8A*a}PXSr;4`}o?7l*v5(((>uy1Xr#~jw
zbxfG2+@TCK<iqD`yD)2}*LQOsXtqA%+h@U&J+b+4T+V^XGZGJGF1edo{Z5VX?7AhQ
z`!&vn*T^QFl6rpjLpqcFT8<-9E3a;GoU)X|T;P~ysH9<=yGdwM$gFeqS9q9W?0uL|
zDY=}kHi%05mw)W8`J^?8)AKtf@m!BiYpm~e3`%@c{)Qtqw__7aHcwDyPWptXVDYD4
zxR&{GUXd%aQ14J~Tc;fJPS~R{WY#R+YIpX_Y*x1}?v`&U?0Q{&s9ANMNYAy4VX7Bv
z99_+MSA1exsyxfLq32z&SoD%h6&B_SM|f^aPRgnK%jJCk(Q?ssw#sgS`Q|KzMX8t8
zT)W(`?PS2cSgT;=n)!cnTD7fTy=~i-^Wyq+o~<+M7G1JzHu&M_QM&P2XpPQ^#y|P0
t&5>rjGwiDzV)HsDS=Oz3=zaSC6MhzvE3QmJoAeogz|+;wWt~$(69Akf4uk*z