From 4c46a5a8741e02fa48e6111ce534e2016b729d95 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Mon, 14 Dec 2020 01:38:34 +0300
Subject: [PATCH] Colored Petals fix, tenanea flowers fix

---
 .../ru/betterend/blocks/BlockTenaneaFlowers.java |   2 +-
 .../models/block/block_petal_colored.json        |   2 +-
 .../betterend/models/item/tenanea_flowers.json   |   2 +-
 .../block/hydralux_petal_block_colored.png       | Bin 0 -> 1883 bytes
 .../betterend/textures/item/tenanea_flowers.png  | Bin 0 -> 2119 bytes
 5 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_petal_block_colored.png
 create mode 100644 src/main/resources/assets/betterend/textures/item/tenanea_flowers.png

diff --git a/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java b/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java
index d571f7a7..4c9c394b 100644
--- a/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java
+++ b/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java
@@ -43,7 +43,7 @@ public class BlockTenaneaFlowers extends BlockVine implements IColorProvider {
 	@Override
 	public ItemColorProvider getItemProvider() {
 		return (stack, tintIndex) -> {
-			return MHelper.color(COLORS[0].getX(), COLORS[0].getY(), COLORS[0].getZ());
+			return MHelper.color(255, 255, 255);
 		};
 	}
 	
diff --git a/src/main/resources/assets/betterend/models/block/block_petal_colored.json b/src/main/resources/assets/betterend/models/block/block_petal_colored.json
index f04180a6..60d648e6 100644
--- a/src/main/resources/assets/betterend/models/block/block_petal_colored.json
+++ b/src/main/resources/assets/betterend/models/block/block_petal_colored.json
@@ -1,6 +1,6 @@
 {
 	"parent": "betterend:block/tint_cube",
 	"textures": {
-		"texture": "betterend:block/hydralux_petal_block"
+		"texture": "betterend:block/hydralux_petal_block_colored"
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/betterend/models/item/tenanea_flowers.json b/src/main/resources/assets/betterend/models/item/tenanea_flowers.json
index 19320d6c..96e7e60c 100644
--- a/src/main/resources/assets/betterend/models/item/tenanea_flowers.json
+++ b/src/main/resources/assets/betterend/models/item/tenanea_flowers.json
@@ -1,6 +1,6 @@
 {
 	"parent": "item/generated",
 	"textures": {
-		"layer0": "betterend:block/tenanea_flowers_bottom"
+		"layer0": "betterend:item/tenanea_flowers"
 	}
 }
diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_petal_block_colored.png b/src/main/resources/assets/betterend/textures/block/hydralux_petal_block_colored.png
new file mode 100644
index 0000000000000000000000000000000000000000..de274dd3823caecd21088cfc44a0ba4204be145a
GIT binary patch
literal 1883
zcmbVNeN5bB9PU1xd}J9aq7oCkZXpoX>*sOTN@47dk24++I0X`i_S*OEI_}!8E!;uW
zC|NQUX9k;Mh8iJ?Gh>TJjZ27bM3-osWa1xFC!0pIg^0|=h*=h*Z|_SmY!WZ&_3L?`
z=lOlSzdqaCSid>1I1fRP&AtY23p^LtN6vcqe{e8T0Z+MlLx+hV`FGgII^@VJcO%Fx
zUnzlhtKI(~FKID{C~HCBNW^rAMv%(tgf2>5z(Ru{tf&HZb@CL3DzbpJIsK$x_kf7f
z&}V?wzQ%ym*ClZ>R$YZwCU{5?1D1#;Vo}xP69Sgx<>9scn845^#Oe~T8e0%;_cx;+
z%>by=QGrVoOQSB%K~<0(&F(;Hl5!EGi=Y^sq<FG|XE-$d!=RcWhxit6U0Ms?30TCk
zbe<sM@wg+-I5Z<nP#nh*Bu&sX4iUK7t6E|LSIuo11}`urL(wfoQ&F2y3~Jq$fI+9J
z5Mp|kRyEUUf(auMqE1i_(heyJl%*_A?>3@Iaakfj6vTjPnGj25v3f+aG&7>zfI9nn
zg#b*g-=Ec3)k`dvl`yT^9vDVCA*-UzK(7vn7GP@Kh6HMRpv`S|G&=7wfM{t(K+~d`
zLN#YBqaKf47&ltlrl_(OH_Mi-0bbDp0!EWGiBmLAIs+8Nvo4+@%SnbO$rRMD$x5hq
zC6r<Vu*Qs&r&mH@*T|wJ{wG+L_>gAAL>RLY6T^Ve)i8!;Gs%0jsAfQ6=#ELc@cVh6
zYFeTy0iRdEVAu{tk$DheNlIp5$AJ)ovn=bvgB<I`SpcXYDa&-w?aHk8YErjdTzh@0
z&t*-59RH}Y9L0)mM#h~S7s4fx4dI+5Q#eh!+^m~%$&yRTur(P9+-hQUIjikThK!7p
za{@QZz|}#xPuwhx2jw8Zf#~LfP{8GOhwO$<_6Xmgn6P@i=`GR<_NK3*3Yu&SUX<*1
z7cj}LGmx?LV`Y_mtVub&J{|#(^d`kmshe8Jii-xQ3B%m2rN4+9`8UO$o4a3IHB+`$
zx?iOq|EK$Oa-@i;h5?+Q1ZKxW*s~^88sgtoOTJq+mojiT?Ci_zl!Z6hISo`uZNMo!
z{Buqlf~+Hb-kLz^AQ*c0fem88zNPX5xA$)^-8fLVDL=QOA9T*tzf<_=Y3z-GgC+MC
z8AWBgcKQl(OTN3dG)?We^3e6G)AI{wW5q(%{L&Mz9$J|C@wTZy7rXxW_>oiig|~JO
zeH#9#$~V<QjpTgz^6=r@eI&DZL^#meQB?S3&*a0C8}?6JKl8NS`P|%@ANZzoBgJnY
z8yP+K{x=%yW%j#gFU>Aa6Rwdhd*=OHMn8Y505@hVdTiYJecj&odMCE3gS9`ke0iTx
zeg4?BUzoa@f#1vfz4hxieb({q>pjn$9mA=GJ@*t(??mpLI(c;aLdke^BIn}C@r#k;
z2Xl*leRH<+*8aJdhIbDgugc4R5&tWE`Rm`d&Rw|>d~Kur{D~Kumc~Xam(D*vFmuRx
k^zy*a7m3r0A5>l<%DS6AX|BHOe*5$1t8Mh2*!5Wd-@EI3t^fc4

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/betterend/textures/item/tenanea_flowers.png b/src/main/resources/assets/betterend/textures/item/tenanea_flowers.png
new file mode 100644
index 0000000000000000000000000000000000000000..50805cb467b0bf76aa3470dfe4f4e61f2f9f6038
GIT binary patch
literal 2119
zcmbVNdr%a09A9Kaz{BT^U>U4yqK@qC;~v~?oP?YN69)!3!Z;1=?d}~Lcem^90*A&!
zOJ*1?vB`1_wdoJ2$xMgRO5!1vZ@?U<%+eeMriTNBg)nm0Z;#`W2F>Z__V%~CpWo;6
z`9Ai0b?dX9i;8?A5`v(pjC6AjIL}j#@G$TjH|(RqDMCyykRWLGLgfg7_BX^p(9BDG
zUcQ`f$)p&;sis-M%Bek05uhO`DcK{^ObI8$R?g15Ovu2=HU#Eb6S7ff!7XAcSInnx
zadWv_vhtWMC5(|plGngV9tsdRIhlq%PKQgPJSN1?OM$g=8$)0}L@qHQDT*MRZ&?qg
z3T_V8sr4vBXh}HHs3!Edk<=!@Bu*q^cp^q<P@JG}J*6?ife!-I+^mhtF{cHzz?BIp
zmSvH`u=4V9b-6|@xa}BWG#W9S#7Gha2vn+Y$+QP`Ny{b~%$&ryc~RyC7pySSR-sfj
zA;9TG2u?9b>yiR#0tv%Bw1^RETnWh!WSJmNEOk5l;w*!44$jHBWC>u2AXY3EWI-wx
z9zq>_JVgMc)?x{2OzXwz3`$7yx-t+(AR*JDrMwD}!*V!DD0MU3x-wvMnG%girMfv<
z7TkG);Fv7b`bo=hYN}Eg1H5u0?_z~=Y1IRJI5RDCCWORE93@B;*X1dN17GcGTtngb
z1k@t1yscs?l+Y?rQb%dXDNxWgEG^Uj31%6}Cb*q6h?#fNb`BF=b_5P)l1ddEf*S|}
zcN)J7i-pQ?NiywXxD2xi0b#3oo~3Y&K9R7IT2#XjI@GGyT2Z5sVNfHBYiS!})Ef=D
z$^B-5DOHNA?4Rg!R$u_fKdQJ<OBfgfj<UK$D{7#%1ZpHTpwsn6Rzuo!G)?L!*|Oa{
zc-3gfgRF`x7BDha4METxhbC&Y8dR^*(x|~o7*Q>a6AY;#^`wnf8rt6@R5~w#>Qw|@
zkz8(bVCCRpe_K#AqqMsTVU#*^EE2fQPm_<wQV#4dFXjO0BZ@zvE(tcdoOW|5c96Tr
z=`ZYI{w2EX(e59wniICBx}T;W|EK#va+qS;W#_;I#SkSPOqn$krNRDPHUF~*=F%h_
z3_E2RoU-5|IHx%mpmu{PtebyqEd<S2l3`BCGn{Ac`+Uivs+M2JXW36Q$iBGwjxK!b
zS-RGGnN#_^Ui-Y}+qbwc&JE9OOgp@<Zd+YQ#Qn?OQ^!a8UiUS{E*ZzX=budIQ*Y=P
z9O+K3joA7_OqbC1$LN<Aa@DM9Wmrqn&`?w3t8+S=1`frjdNUUvT(k8w+`hbB{PXJa
z+NA!-+Tq<@cv9uq-MFmKm~BU^vsb_J)|=|i(*tpfW7kx5ir$<2(WT!Ve9<P#&HYzK
zg}*|ZLKd{-?Ap^9p}KbDu)XJa?yZ;a-Zq7{#rHtJ-SK_weaE|d<kK_#(S--ceNDqV
zqCO0Pi=MW3?Xw;@e{bMMTk^Z2;qyZ~Z(bWI+(jKO$o%=}_cK*HpW0Z}`gY~H?N^`}
zkGro|nD<e9<Jm#)cyw6RoGMR#!^!H%*hLASsp=QzutiqZitjnWCfw-1SGZ$TYbZ*g
zY2M!P!EpEQakaDS$KyLzd>#I+%KCiWApZW<pT<t~rCcmTH*F}pU1KI{eu?bHSntm4
z?sk60SFM%i1FJHRy*4^_>6zrs-^@rev{auFhlUEmgt?u*Ffv{>(AvuMywSsXMteuA
z-%~*qDHpwq@b>FI-{754LuKZV*ScyN?ia*_L;R|xVS86tE~xgaRLyg<$KqaE&<Wc*
zPM;O`hDX=5dwUU;JvMgMrU+GK+47QtvZC6tluu?q`@)K4E9crmQ+?5$OkPDA>#Gli
YPDNdBt{-VJD}VJF>$1#8))sC58=>s>cmMzZ

literal 0
HcmV?d00001