From 12aafe32e8664362776c83e2ebd1e7706296c612 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Mon, 7 Dec 2020 12:44:56 +0300
Subject: [PATCH] Fixes

---
 .../materialmaps/{ => entity}/cubozoa.json    |   0
 .../betterend/models/hydralux_roots.json      |  76 ------------------
 .../betterend/textures/block/charnia_cyan.png | Bin 2199 -> 2236 bytes
 .../textures/block/charnia_light_blue.png     | Bin 2201 -> 2235 bytes
 .../textures/block/charnia_orange.png         | Bin 2206 -> 2243 bytes
 .../textures/block/charnia_purple.png         | Bin 2204 -> 2243 bytes
 6 files changed, 76 deletions(-)
 rename src/main/resources/assets/betterend/materialmaps/{ => entity}/cubozoa.json (100%)
 delete mode 100644 src/main/resources/assets/betterend/models/hydralux_roots.json

diff --git a/src/main/resources/assets/betterend/materialmaps/cubozoa.json b/src/main/resources/assets/betterend/materialmaps/entity/cubozoa.json
similarity index 100%
rename from src/main/resources/assets/betterend/materialmaps/cubozoa.json
rename to src/main/resources/assets/betterend/materialmaps/entity/cubozoa.json
diff --git a/src/main/resources/assets/betterend/models/hydralux_roots.json b/src/main/resources/assets/betterend/models/hydralux_roots.json
deleted file mode 100644
index 8ee64882..00000000
--- a/src/main/resources/assets/betterend/models/hydralux_roots.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
-	"textures": {
-		"particle": "betterend:block/hydralux_vine_bottom",
-		"texture": "betterend:block/hydralux_vine_bottom",
-		"roots": "betterend:block/hydralux_roots"
-	},
-	"elements": [ 	 
-		{
-			"__comment": "PlaneX1",
-			"from": [ 2.375, 0, 2.25 ],
-			"to": [ 2.376, 16, 18.25 ],
-			"rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 },
-			"shade": false,
-			"faces": {
-				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "PlaneX1",
-			"from": [ 13.75, 0, 2.25 ],
-			"to": [ 13.751, 16, 18.25 ],
-			"rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 },
-			"shade": false,
-			"faces": {
-				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "PlaneX4",
-			"from": [ 5, 0, 0.5 ],
-			"to": [ 5.001, 16, 16.5 ],
-			"rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 },
-			"shade": false,
-			"faces": {
-				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" },
-				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }
-			}
-		},
-		{
-			"__comment": "PlaneZ5",
-			"from": [ 0.5, 0, 11 ],
-			"to": [ 16.5, 16, 11.001 ],
-			"rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 },
-			"shade": false,
-			"faces": {
-				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" },
-				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }
-			}
-		},
-		{
-			"__comment": "PlaneX4",
-			"from": [ 11, 0, 0.5 ],
-			"to": [ 11.001, 16, 16.5 ],
-			"rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 },
-			"shade": false,
-			"faces": {
-				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" },
-				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }
-			}
-		},
-		{
-			"__comment": "PlaneZ5",
-			"from": [ 0.5, 0, 5 ],
-			"to": [ 16.5, 16, 5.001 ],
-			"rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 },
-			"shade": false,
-			"faces": {
-				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" },
-				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }
-			}
-		}
-	]
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/betterend/textures/block/charnia_cyan.png b/src/main/resources/assets/betterend/textures/block/charnia_cyan.png
index 21201c96fa8b6bd425bf6f8eda88b4979c3946c3..47abef6e103e005516bdce506d33dd62afe8a0ed 100644
GIT binary patch
delta 613
zcmbO(xJPiqNhVJ75JMv?6B8@r$(NXvka&NYELDsw4O1=6%}jI+jZ%$uEeuUeb(7MJ
zEp;u8&CC*0OifcQEDbhCF;8M5O66n+R&gW?4A|D!?`jDvV_;xB=;`7ZVsU!uq|^G$
zff7g0&pi>+rj?mFMd;QsWfdJA7p2&UkNgX=x%*qE#+H|DQwhtl`Ie--(ea3raDN4h
zYp`lu=(1ayO4sjLyGi)IDm4FoZu<K<@5|52I%yuQpSD2$*OXi@j-R_3qur#gnyh{C
zS;29>9B=G`-1@{r74pB7n+`u^_+M}>Jataq8t!{L3s-SBuYUc3Rs8Ep`$ea;R+bhg
zI!0=~dFLgwKKH<GahGYHEnCk_oYs|kv?yWs0T!Pbd!`F=<s1xq_rP}MiZ2H|k6#km
zYh%%PGO10)bB7)0;&pesKOEy*F61gWaV~R8^ck0>i+a3*s?}w6>;GuBY(85nB68dE
z;L&@6pSp5>@J<DqxZ*_Nlc>*ywI!!meOB0<xHE_M;^v?y$NSgpU=%h;)SBmFBH}o4
zIg^`Ky7O6ct?=T-(-^rAzkR>d^C{;!De)t7Wa_r>{$N=f`d=u0EBi8=wae06<FD3*
z2Q&Mmb^7eSt+3&_g`Awa{>lUq^DFan$}?IFR-NDK&_Dmkx%K<5usr_%e~w4O(&7()
z*L?Wv>6ftY>hbfP89u8spWPDWV&C=hbEwFoyIr?8M!w5?{r*>w@wdA@=RWK+Puk9M
Uz0^$i2?G##y85}Sb4q9e0G-bX*Z=?k

delta 573
zcmdlZI9+hVNhVIS5JM9yLsKi0$(NXvka&NYELD=tO%07r%~N%glS~bCEzC{KbuBGS
z&2`gE(#*{*Q%y}$Elf8@F;8M5O66n+Rw*{9T?TCH>o+eEOJrbRoa5=@7-G@8G}zml
zDN)4Mm@O?NYv!z3lQ^98xqdPJZThyA|I)2%YFvk6*G7eY(f`FN=+fO1_ianNt&G={
znkPQ2-%P)EcV2AS#MV}P{^_~B&+Xh2dLG*MuaHc9+Q8ZL;XBL!Acw2QoScf4``5^S
z3jgh~eu}!q{hoTKep5|}sQ5(Ly^ekyov%YfSFL!mXt#Dl_gYzvpXq%^vIAA)^4=d3
z{NQ}<nWfNwPtmhpvzs$M@0`%_&iUk1ph&OQ+q#y0OC{63S5KTKmr!guao4WalUZ%c
z)jM*uc)Rbm{k|dj>a6bznK!L-v==yTUB9^fhJ>8>t65hWURw0kPuj(=8ST)0op<x<
z-qnVy8gJfKnd7+sRdIo7*n0M$HzM~M=baY|`j~C9E$Tzi1WTd)x2+qu-aYu-$z#v0
zH5J@fyc5ihq&yYnRa4eeI$dLRmpiy8MDkwa;+L-Pq+_}_Op?kEV3&}ct-HVa_7RT7
zDZj3pi?4h2I)3i|M~nXDFS%;{;{2DjD{5|68-5O{V~_f}{Wy=iZs6@F8rt_%EVDdM
gF5B_D`SSWz@}A|)?K7jN*)aftr>mdKI;Vst0Ot?*g#Z8m

diff --git a/src/main/resources/assets/betterend/textures/block/charnia_light_blue.png b/src/main/resources/assets/betterend/textures/block/charnia_light_blue.png
index 03aff5f1ff9266c6d1bbde5901b986a31bdfa934..ff4924d827bc8352020613de82f818e65299541b 100644
GIT binary patch
delta 615
zcmbO!xLa_;NhU7y5JMv?6B8>#i^-Rn6p^|Am@HIM&6ACc(-IAJlM+oVbqx$n40SCn
zQVn!dQ`3wsk_=7KEX@-)M=?)gB1+|C2Uc-p8w}aj)r&6ooyWkyc)-)eF~s8Z(n+WF
znH^=0?>Elewkbn7^nI8UtE)#rfgrp1kyxcWE=|oYkDfh~pHMJOfIYmhP-kMCjj*c5
zE6Md$Ih$kq4a(ZSM)<xmoIdk!+P?kwpMRgL+GF@9J@D~`(p82|C+>59NL_ZZ`<O{>
zo=fk$hkFHHsi)VU`Mg11Fz095(e~AAbn?nK`@KH4Y(^r_ujdzcNto>V*Kul6>?6@*
zQ)J99eYUyr@pqtjMElXK*28c6JdbXEWcguk5wp2lex5*7ltWhDx*fv(r#R-A`2M`{
z@|xNjGwYPdV?Xcdc}YtZZrG%=LdEk?U;;0vnf1k$63ZvOE$gY;e55}3!r`l;OHxv}
znkM&_-k6j5gIDw^Tiz8Vu1PX{bJ(}HHcFd54HJ3p+q1^Rweq}|$OE>#J;6#G@7pIl
z(`=Y|Dm3n6uh#x$&rF%++Lo6$xQ6oT<r}J42A(M^tvE1GqjmKLkMqaXOl-BkeK|8B
zK6GvN$&^Kxm`}}5PS2QNbMJm<eABVXtZctIm;YL$`=xZk>&K7vrA+_-=MNMuo~ye)
zJyi7fUc2ul#cM5Ahd(se{bbm*d2hRI%pAv}Wsi$$TtfVFU;kS)^L=a&Z+Er6Q8TN7
TT4d271|aZs^>bP0l+XkKFUSfK

delta 578
zcmdljI8$)LNhU6{5JM9yLsKgw)5({a6p^|Am@HIMObwEZ4J<8n&63QGbyHJK%ylg-
zOw)9eQ!R~+(~>Pr%}fk7M=?)gB1+|C2UaO|m~Dn^>*|-~DXTItFwXOIaSX9Iy)^i=
zms6lf?02atVk>{HIK$p0lG4^Fe?j~UyJ_|XX09f;t4G|N0uE<fQ~$y$+9KRJk1aJ*
zHSF7itQcNJ|98US>-b+hY&~q1U3~sl_WRBK2PB-0=dZ|FCeQ67(DI+#<Y~jE{c4kD
zRGkRF>ip5I{fb}x&I3>H*<Jae&c67z^_hp?i=8}T-mbdlsw@7xrn$qNFW|&e3!(qr
z+8?ci9Je3u-lI~e@^7;CtErdRFTN>Ktd!8TK2fCdPdfb6ACAKddDBX(KTPsFoU>VR
z@{Y!92`zWcSu`g%9?Wum^@k^SZq<%v$0wU3Uwo-jSrqujuZL52u2{YHC2_-=t|Up-
z63aOkrnjE(&Hg!I$}VUB{|x;Tr5E4rEP2Co?!bw1&Y3?%t$fsKp4_t(+HY^yv~l_L
z@2wLm7RP-QS|RrSkJ0JVtS@eD?O5MlQC{Pn=(f&esnEG_@k*T?+m70K^GF3clq7Dd
zdUy7*anF$}r%ktCG7#g)58JV#&bGJ2^p&CRsiM1kPv@`yn%}rdeExh3EvIRnk!s8H
kEVUMGS^ht0x%$*K@ec!8B}Co#U10zMPgg&ebxsLQ0AdICi~s-t

diff --git a/src/main/resources/assets/betterend/textures/block/charnia_orange.png b/src/main/resources/assets/betterend/textures/block/charnia_orange.png
index f472920603347d8ea2d5ed7789205d22f4458a48..d5178c04c41b99b98be9e6021eae5f0c2e2ef700 100644
GIT binary patch
delta 623
zcmbOycvx`5NhU7y5JMv?6Jsk=)5({a6p^|Am@HJ1Q<F{2k_|0%Eln*=bd8KmOm!{I
zQ`2-44U*H6Qqz(X%?uMaM=?)gB1+|C2Uc-p8w}aj)z|#_qQ$_#c*4`gF~s8Z(uuph
zlO08l?caH1cE#0}1fQA$-YgbTR_Rt&R&MRD_8UYTuQ*9t?|z%3vn597$f<Kq0^0E%
z3OgR;IrIwEJk+)mnmk+j;>URtKNf~xxO(}_nTIvc|2(tqDeimUqNIN;ML)f#b}wV=
z++$h4*1h<u;ObZ3Kkt}<`IW5y{QpG`K6<vT;>y(5@_yT&Pn~&COs`dYwxElf_0uc<
zftFcKs!kD7AC#7`Z;-m@TCsukoDRF!-=FV;CWb#@p3BAQQBgbl(62C&gHH2T{Os_O
zIw#h4`{%WToHnzBXDv&7|AHsCck7KCH^oC%t$K9+o}!JVURq$`qEGctvNYb!6j&Wl
z=gt@K<TF=O!54|T_0s>HmriJC`M9L9rd+Q~he>F{hhwJ#i=~wIb}jEoU+=;!G{GQo
ziJ)!g!c9l`twU=){<pt!_dPn9J>^(Ib%%5s*HuSZOTExPx&Plx(*7eCnre0Drr*TP
zdmjCHD93wM^hB{`WJUrP*V@O=)8FWM&n{oIFy`ikFY#_6>x=ISzkc)L(JS9`isf3$
zGtVt}ef`$uyJtF#^Jct|m?{1}!bbC)%dMK9PW8o%_P!|sCxQ+4)hO=zYWnlulQ*Tw
d-p?1k6Z~n)QZ)Vb-Dn0N@O1TaS?83{1OT9>6<GiP

delta 580
zcmX>sI8SiHNhU6{5JO`tQ!^_=!^xMK6p^|Am@HHhO-xcu6BEsK4U&w^bqx(ojCGUD
zlTCF~4N}dGjZ=)0O_NMFM=?)gB1+|C2Ub}YuvLa^>+17U_`4Yx7#DlGIEGmCCja^W
z-=0~uf%DjpeHO3nm6er$vIRV0n(&rCZeQw;Z5qNy?G*}hW=)9YGJA00X*ACX6HmPx
zAum3}hkJ^hVZ5kdw`ui-*v50|mnKb5v#9#XcX)aJ{evbQ{#~nQ^u_N!y+BF(+=qv!
z%?)@T2^WcKtVwuSe?UcF@le6DXUuK=@%x)I1?EeHAH2l>_=v~e|6Z4pc+SV|O`ISk
zoVerr7tv+~e)Z<QNj!&Fm&;2WX<?CAcc=Q$f%9h%CM;Ta;)CFepgK9d1*zX9|NP=N
z*wn%K$uOq+Lr>$&|M6}74pDwS9gbcz<ljiu>6Nv)ueUc?aoWqkgR}l)bF8wu-id;z
z|BTt3LoGYR^O$o*o;^<d@#io547QK@cPh^)Xex2=i3{*PO6JzyAns7N@@v@7|9_vG
zv-y?jwLM!~eqiBc(N%xtpRB6yIm45>dVSN;H1%1)fPAmdtSoHo{OXVKikEh`-JaN=
zFi44cuG$}(lQxHO&iR%((vE>n&2xPA|NGM__&(ph*43BY;C6i7Kh|Z5Y)@}={j2}+
oOnXL~Bv(@NmDpY1S@N_QRxMzfsvUC0k^u-jUHx3vIVCg!03GG_(*OVf

diff --git a/src/main/resources/assets/betterend/textures/block/charnia_purple.png b/src/main/resources/assets/betterend/textures/block/charnia_purple.png
index c24d149cb92db32e289ada02426f98c49b537490..e9abbc243f4367941d5e6f407715e3eb500af06b 100644
GIT binary patch
delta 623
zcmbOucvx`5NhU7y5JMv?6Jsl5<H?tq6p^|Am@HH*Q&UZi(hQAslT%DAbq&o-Om!_%
z5>s?jlPnBVQcMj}Op=o}M=?)gB1+|C2Uc-p8w}aj)vLSes53Ayp73;W46!(!{OA9F
zduG)J&SMp`zW%jWR#yJW*1)hUyP+-VYD<ow@R@JN^W_cJl-}%oH~+uO&Id=<Iw$lk
zTchWA`{L1=(=2m-@n5d^bS|)M^TqOnZ9-4A#7Z-DH@HPQTC$}Uind)Y?>D|vvg6o+
zbBE3;=<2jz4P8*bfvJ_bBaJDOA@k3Vx6FrsvZqU=xIQ_U#j%r1>_JcT9{zv(KR;4q
zmbbQN78e&k{5Sl&L`>-(2|ZgY{xVT%Y3ajT)x#xzSp1M|T=$E=NK{_jzWG{>W<iKS
zY+X&Gqf>y;n<nY=>kK<SbsA21q@^~2ZNjnh_w5ZiK5`h}sV<eSU&FZM<K^%D35Ol0
z9XRxgJ3v-v%>lLslLnKzpC4yF6ueOHm9&cI#kxyVO%D`IUAakBg~y>Wa8=On|IfF-
z=UKIB7EeshorL|imET|3UyfH}GmYeBlPj~^AYriP-~a!==O6UAIi+#--02r9R&p^5
zYgkpi+h*|Z$6w|g1)Wo`)=x7`Z;ENvnO3hh_2bXq%QcdGUcCH&d;NNzlkLg}-n@4(
z<EZ)hv-4nex9p6+|6WHM{Qdeoy+!<zOYy(`|GrLgoZ>qt@!RZ`373OiHw7NKaP@4J
cE$bRShJs91pVYH!v>1TE)78&qol`;+0NO<m<NyEw

delta 567
zcmX>sI7e{9Nv6qjm^dcKvvN(o%_IqDvoRZ}SXdY)CmR?T>L#ZenCm8*n;7dRT9{hs
zrkYrorKTDf8z)+rY>r}{#6*<J$quY#liS!L>(BBmoWa1rxX{zZF~p*G>E!cXOo1ZD
z_DePg9r6sm9CTPnN!#!PV^x#ff?CJ=1)*=X7P$s=XGp%SZkVUgw8F#Vl+LMBmwL8%
z=%#y}kbZvbM1<3Swzl_m?K6w(pWi8FJtpz*bH}SkX)cLP3V&=5?&rw(e#BYkWa7?6
za$VuSJ-zEs3BQ?>=d^miQpD@%^ttQg@;pvvue1xU`Ih9~&A)r2u8nr(x+nF{s_*9J
zFW!5yd(NDvUjMAMUQNBlela!kXq`>Vo=K0r{;7w&`or=0U+S}sTOWS2V{Kn5IsGNK
z$qU~Pmb)jOT$Y%-L2*{kfe3ZQ2b@a!&l5~MIO5w3HeA%d5>el4HfPBqf%`5`f+8)>
z=G|DD=9j!?>Vz|KhqK>5FkDnP^Nxj|>x1&|byEr^+BNUoCwN}pKjx&o+Mx}zW%lSV
zd9wOz*K~)iJ{8MvtX{L=+JfUrIeq2n+p-%4Lp{R}ow=yeuge}TS)D9U!gS2Jd1|qJ
zhGgm#pWlAl{K9*6S;J1nIb6BtW+nA@hSt$T(~IkMY(ma8?y6o^aXi%5Bt<s4^N?t`
jspi_3yE8s5*z?-DzL<6Og&BL~8Gyjk)z4*}Q$iB}wfFmG