From 0538b5d36a335277671f4f5845ea770be53f8845 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 26 Oct 2020 11:48:01 +0300 Subject: [PATCH] Entity render fixes --- .../ru/betterend/entity/BlockBenchModel.java | 12 ++++++++++++ .../entity/model/ModelEntityDragonfly.java | 7 +++---- .../entity/model/ModelEntityEndFish.java | 7 +++---- .../betterend/textures/entity/dragonfly.png | Bin 1263 -> 2930 bytes .../textures/entity/dragonfly_glow.png | Bin 401 -> 1912 bytes .../textures/entity/end_fish/end_fish_0.png | Bin 2467 -> 2563 bytes .../entity/end_fish/end_fish_0_glow.png | Bin 1963 -> 2033 bytes .../textures/entity/end_fish/end_fish_1.png | Bin 2460 -> 2571 bytes .../entity/end_fish/end_fish_1_glow.png | Bin 2119 -> 2178 bytes .../textures/entity/end_fish/end_fish_2.png | Bin 2574 -> 2667 bytes .../entity/end_fish/end_fish_2_glow.png | Bin 2187 -> 2244 bytes .../textures/entity/end_fish/end_fish_3.png | Bin 2601 -> 2715 bytes .../entity/end_fish/end_fish_3_glow.png | Bin 2274 -> 2347 bytes .../textures/entity/end_fish/end_fish_4.png | Bin 2608 -> 2715 bytes .../entity/end_fish/end_fish_4_glow.png | Bin 2267 -> 2347 bytes 15 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/betterend/entity/BlockBenchModel.java b/src/main/java/ru/betterend/entity/BlockBenchModel.java index a652c280..0c3ad64b 100644 --- a/src/main/java/ru/betterend/entity/BlockBenchModel.java +++ b/src/main/java/ru/betterend/entity/BlockBenchModel.java @@ -1,10 +1,22 @@ package ru.betterend.entity; +import java.util.function.Function; + import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.entity.Entity; +import net.minecraft.util.Identifier; public abstract class BlockBenchModel extends EntityModel { + public BlockBenchModel() { + super(); + } + + public BlockBenchModel(Function function) { + super(function); + } + protected void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) { modelRenderer.pitch = x; modelRenderer.yaw = y; diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java b/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java index 8f5e4e1f..764bb647 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java +++ b/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java @@ -1,8 +1,7 @@ package ru.betterend.entity.model; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import ru.betterend.entity.BlockBenchModel; @@ -21,6 +20,8 @@ public class ModelEntityDragonfly extends BlockBenchModel { private final ModelPart legs_2; public ModelEntityDragonfly() { + super(RenderLayer::getEntityCutout); + textureWidth = 64; textureHeight = 64; @@ -99,8 +100,6 @@ public class ModelEntityDragonfly extends BlockBenchModel { @Override public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { - RenderSystem.enableCull(); model.render(matrices, vertices, light, overlay); - RenderSystem.disableCull(); } } diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java b/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java index 5bf0c21f..5e0019b2 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java +++ b/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java @@ -1,8 +1,7 @@ package ru.betterend.entity.model; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import ru.betterend.entity.BlockBenchModel; @@ -17,6 +16,8 @@ public class ModelEntityEndFish extends BlockBenchModel { private final ModelPart fin_left; public ModelEntityEndFish() { + super(RenderLayer::getEntityCutout); + textureWidth = 32; textureHeight = 32; @@ -69,8 +70,6 @@ public class ModelEntityEndFish extends BlockBenchModel { @Override public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { - RenderSystem.enableCull(); model.render(matrices, vertices, light, overlay); - RenderSystem.disableCull(); } } diff --git a/src/main/resources/assets/betterend/textures/entity/dragonfly.png b/src/main/resources/assets/betterend/textures/entity/dragonfly.png index 0d2894dbb33cfc161afc8f99eae072488e994d98..9650cddbbb5faf597256f2ed662c725f82b1faca 100644 GIT binary patch literal 2930 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 D*iTPP diff --git a/src/main/resources/assets/betterend/textures/entity/dragonfly_glow.png b/src/main/resources/assets/betterend/textures/entity/dragonfly_glow.png index 3f9b983c9096f38450697f0232e3afeb835e48da..98f7ab9373019db965a60d8a1889645dc6f6e245 100644 GIT binary patch literal 1912 zcmbVN4NMbP96zj@0d=^@3|suToU-Vkz3a6UdZD(^s%@l-rJK0u^tijy3+>%`chG`H z1Vtm_2JAyzntkYIm{ClYeJLQi;go4MqI1jUoFCCSi%NT7aAOJK34$+Kep9abYgO#`suA zjmVVL%=b_=6_klaEVJPJ5CI4Rj7-9zfS;3ykQs^b5@4;oMiDp$kt@tdfg%ttbrr)l zUS!}Ltx-ei3^<%?(&~(u2{&ZJIHt=*v0PNA*I+sVGZK0e9KR4CO{Beq+dd~Q3+&8@ zPnHD&MT5bhHmKL~VmYcanM^2#qd2Ys2#r+D$z({wNz+Cc?2JT-tRS;I2P=$Z8DA-z z5uoX?2>~HN%SmxJ0f(U>Qb2WDOfe}2q^Sf>s1*G%;WULZekQ~=@jzVyfrJQ2o?QjZh&$wgXvtG8FsPf6_)3vtW>*0&87q<51z4z{P$doYa1F%mj`7N#dK zY#8d|Y1UhPKNL55bUMP2OXzd%gMzG~NtyglFijC&UJQ`HW;Q^UGpN9oBXGi#gpK#} zA`lF;)5o-Mxd&gKRs!*=ju%AB64WEmQXzh)oV1H-gI9|K7LCEUX>iTBDuQe+Csfwvweqfnqfs#N2!Dd^v=jD5SO za!25x9Vp909|D_1Cu2C!zC_Tc_-&o-5Hu>wX)o~jexm3M!`snlG^kb=s@2vHwzjl5 zmS%@8bS>EbUGv#dIM)^V_~er2Z>NL?F7FvX;qy(kYHMp~&DSdHTs|}1+tAcBzEw>7 zHLEW=_*Pv*OOnHVSY2J)@)L-F*{FUrai>a{0#OZ0XIg#Z|ni>7AKd+B15(3LR&9(fng= zLk1)*{P-(1!qsWbEBY7ya`o_;Hm~{CtxK=&nbDl&8S5#U?7vwx{+U>OS4lmv-qZcSl{(5V&sy1VzMI##dxaGvMr;Lu0E9hu%U z$@7Q2-{Ne%d@kwb?NeuUpWe}19&tw|AHJDpQIEOS-1FM*==G(U?dn4ArNJE~YI^m` zySL9wbv`q({=(QPi(AuA^r=Gb^l(=$_3Xt)_DbEZl@_knyeZ4M$~^G;slw1F9XTzH zTc37`K@@f9+7HmVLJO9b(oqDLLR@iz1bD`9b zNTpQ^c?o46CcaNxJprj?Pe(~hHG?+tuM4!eW}kbR%Myxl4e^j@4-wD$?v`~Y{&_AP z4_wSX&7_0D>PB5yH{;x3iq6U1N8xSZyQ1vdcegW`V(@P74V+gv>2Xj7JZdlugK-Pq zZrk6}W^*K+<8Z#u*{?3DVSk0+MjpErAg8v}a4>trysn$&mM6w3X}eRms~t~NpK6)? zchaY|UXZBi6G(L%$S+9bHuz7!uOHbAy4SFE74aVo5fKp)5fKp)5fKp)5fKqluxS7Q diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0.png index 75ea4153a6f8e5526c5fe8c5c7705df25796a44a..e4a78d4da2a5431c5ac269be0ade6b60184a8308 100644 GIT binary patch delta 951 zcmZ21+$=J|l5xgHt9~YSvk*f=D`U&amzfmd?0-xaDyilMX-TH0#=1r+rk1)U1|~+j zNolEOx+bZHCT5oA$tmWk=9{CKCovJFa?38n12JXeKUWiO-r3q z{Kxm4y>EebxZCPwP4(ZlhgVC)h{P}E-WkGJXP=;QIiS|;&a^g$D`JdEhnaSCp3PYF zlcA_{4$H*IuBLFG>x?US1%FuRfr9UN4td~w;6#bdPvW?;4whhJp*DSWqO4+S2XU$FzYgfIw?0+@trNx+jmlQ;w zY2Lus;gxast;X~t_bzrN3I4ZHulW)X5In&@`a^b%%dBHxPYPEQ6tjq`@@oq^wnirP zC%w8S>C+?Iyy$PsSKDrf+5D`FL(2VrZ}WEGe`;*@Cs!uTNL6XuL?fRwOBsy6aUMOS zR(4!yGv&74!55Du!lw%LOfBvBF)^~Q^NLvFvFS(8 zv3wNzz*?%YPpE0`-;9sOFa9zILmu#GMR#a%-tUhn{v}*@GIQYwYT-B33Umxojy<6{m zeSCkrZKm@y&*e)Nmv^teWT<=TWls)Yz`Jb=i=HU)f8ld}FV|96z`NykpO zv1M=M=y}1^^F!&)4VzQN=V$%4`WD5(AUx5q%Wg}$epbtxBFA|Xd*4+AvdwIqynVTa zrIL`GJdZHH1lZ`3(|<5535&ldsUVzy$or4ZhSe$;J!8Am4AD(*(COt zP8a^^p=TVkFX;N-c`ZRg{P`y$1GL+NzXwGu&Of{?^?`lE+)42s6WR{3AFTS%00f?{ KelF{r5}E+j>ZHp6 delta 860 zcmZn`Su8xkl5ycit9~Xf;}9bQD+2>7BZJ8om=uw@KbS0343bll(o&NRbyLiZ4Rlis zO_Fsj%+oA%%`Hq*l8lT~%u+2AH-|7!Vj@cAzvC0BDUwt=1%Bm?pWoL+32<^WM!}_n~Nh8OOD6fh=d25H%t+o zkl?mvLy04gkIsP}0d9_sA}m3I7sNhg&s{a4KiRra=2OM{iPJRnmzx?!rmQ?Sh!D=Vf8Y!V%& z;tTk^GK1|HZf{}j_>?5I<>eQdhHHWg{Su#ReUR2$)&0}XM%dMFYSf1y+*;5>7vtn`LPL4N5 z4)wO%_=VUG%;?~8zxW|ij%Q)qar^h2t@lNGR;&<>&lbGY+9@iq&}PE9aU%w?+O=4+^!S()@k);;IA-xkgwKGr`^ zKTN&ptCV7;u!$jOQ)2Z)=48$j1x?3}xJ5C%*mqEZ-PuCorkTiH?x&k4gvJCEeBJsZ z(r3ok7pHe_-*8F($j-{=i(~}1+4zSWX$IaorF&w#;^TQ=7XNtP?b*>ik;i}Tqv(mp z(%+q0_~72f`QGaP1T1QQTE&Vdd2@eKJK%c!?RLL*6Y-K?`8!nQ+@hrq@PAKqGpH?f Qa%KPmPgg&ebxsLQ0ArzUfdBvi diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0_glow.png index 56d3ba09374e3e0446563befb0827aac3626b0b3..4fdeaf390ee06e6638136c5a3a67ed1dd177d93c 100644 GIT binary patch delta 356 zcmZ3@|B-*gNhU6{5JN*NV@oST!^xMK6p^|Am@HH*O^i&9%oCGzjZ@5wbd5|*Qgtnj zO%ioYEDe**&CM*0O;b%aM=?)gB1+|C2Uc-p8w}ajaeO;s!pOkD@NM#QHkxkMrt$pkB>yyD!#nW1ziLqS}FW6Gi{>;hdg!#m;+#{}H9*s?^JxO_xDeq6ZZ@SkqZh73LV%Cd=w5kiCz{IyTE6l$S$a|t&!sdLs4VXm5nXi zCi?WJaFrXi^u7_zVyegpkkfgQ*S^DFN^YqG+Y$3CAK5SHESP*zh-U(~NDKR|3ydcg zx|kYIJpAgm{WJgX>s!|E;YWP4UA4!CWGZ0k5U?kb&RU|`rV`8k_Sy@$5< zl;o@yAKON=&^f>TwXJ7Vwlm%^${qu79{5dQ}ayB&{!rU3`Gafh|S)a() z`BqWvWQpf82Zj>sBWhAi2@V%ey>$?JQIlYE`3Td3iw@f_pDL+hj{4CoX}M{_dvSsU6T^HBk8l3BSi*pg;AHT0^>bP0l+XkK*}-C_ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1.png index 903015236cedde958cf78c24a39fcce0a9eb081a..470fcd5c606596067d1f2c90ddfde98bc351a80b 100644 GIT binary patch delta 954 zcmbOu+%2-esH_wVZ*0S-{i9F(l&f+i>3u z;Xr|ZahrZ-&Qja@Bm8%=ZU{H4=of`h$0bqxRacbuYQ))83m)99u0OBpvyR-}4zWER z9~UIF-db{W()?Sw3!kJ>2aV5yvc#-+xl& z^tA1r!ljiB^W@Lh^BU~X*cZlr>L*tdqeJlLfP{m&nVb%REFHeg1tlV3SH3Z8tWMRa zTQI|;nOh*Q`;t&%!{R+rO}Wwr;@7_`GDq@qaPp~4UJ-T8E=A!<^Tt&N*I8_sHvQIo z#^9?54so5y;hM(qaNCCL?(8{HzMEnN{I10;nX5GYoU)?@EAzs`hV=!E3YX-WOOvti{Z@1-|1>-{h>+H*xhV1H zj$6eC7AD5F8z&Qg)FvKr|K&2xO2AquzoEkX*6!s(8>(kc+QZXV=KAz~`rQLLsmCn@ z+2)BXId$DTb)}Dd*QQ-(MTO#K#!uz@GO2Cj!A7ojeo9`b4~@z#)*M4)^;rmnF}+0o_0qF z$1c!SU$9o^u$SI}%KyvuUf+1#iD5=ZPvDo2^W?5@Mm}!3qbxl)^HJMw$sK=c+9oS2 zEnH!Lb>2m#x!+E>rQ1AoD3+dd*nJ!2RjtGqE+zi=LMK z{#zz{ebMu?vH|SRmuhUCm#%cQ=G|)>q0O9;LQ403+%%rT%6W#H$%`Q*T2M3p-S=H* zI#r(?@(bIw_}FVdQ&MBb@07a^+tpET3 delta 840 zcmeAcnIpX6Bomi$h>?MnfrXWc+2qSiipbo5OcpApCYA=~1|}xD#>pv(x&|pG$-0)7 zW+}QBiH0VrmX-#|iN=!m$vz5#-zL~!L3i2bzQh^Upf9^5ZtQ1zN;c|&zCjqqI;?@H7}1l@?Y_u$j1c< zt+$pOoS?s3cS=pprrkH+Y)^ss$e|zxc+LP-W)=DcV zik9tUXm6A#o$z|~>nYK`E9P?g6`VVDu3T?YJM)KEVok?Q0@xJhT&O>ASHjol(CxIx z7Y(fR{_XVF__H+N2>b3VMS*1-u4nJ4e=ZbvcVC0-(Y8>X1a`4CL4w}h;f3W7WojPg zMnwCvsEcgjEw{InZ(r81KgC>T;+-q26&TsCF6-3K34eC0ykw14)Xn^YT<0?%)6*i` z^`E?L>Ja);c50#KjvqT+LLVKf*T`#ncOxUk`@9p_~!?H)0v<$XAVCa|}t0;B5Hm6F;wrPqpu&?LCwBomieh@qjCv8k1b#pKIOipbo5Ojb&1re>*TCc4Q6W~RCZ$tIS%mPr=o zx<+X!X^F;0=Ei0g$(y5?r!WzrZn6WbIFjj`4cUAcIToGxqsqX*@N#l1yLJ7=CtCOZ z*ME4SIANnxe4~>0lyib@|8-uQVbc<1~Lg1tHOy?x&js_lu=~|91pFNg&8?{?MnfrXW+!Q{(Kipbo5Ojb%J=7xz$$+{NFscE`K$tLEyiK#{w zx<&>m7G{QtW=V!dCYz&}r!WzrZn6WbBnQl@&4z3~j2w)7OXn~!Fsz&0%5Ghsnc7(t z*gIjf`h{g(-~VT(vTt4>aDi`uZ^(9Lsgw2h_y4YVr!wK=gNx3yA{?v_u<$F@DHnU> z@Ne{3=555vwBWX)*+l^c=B}_j_DK%UnIF$o6JzLQ+ch_A*=6Yqhvd(kNc`G6@#p1U l?f>;P%M)|@n-Vz~TK{{uikF`G26O`hho`Hb%Q~loCIDcuV#ELd diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2.png index 16b866b5e855ba92e35ef0a7fcea43d0a984c762..75cc0d2eec18e999cc6b0c1d6ec9d561cc875cf0 100644 GIT binary patch delta 816 zcmeAZc`dTxBomieh@qjCv89!f;pEFqipbo5OcpB1MrO$tiRMYV#>SRrx`}Bf$-0(? z7G}Bzh9)Uy2C3%B$!6x8qnIZ#5v6jn1FJZa4Vw+wW-!*jEI-Q3z`)ez>Eaj?arkYx zV}`J!$luHBJZDW=;w#m)(lv15P7SWEMdGbaN4wjb*!{l+_{Z5)d|IX6f3JwM>cfR- zJ*NeW%v}YvY%>muWryaNdCuPEIa~Ls_5bwr-4m~KpeKweC8S_fGdms%@MwM@{M4BMJ-hLna*Ep>4c+}p@g&d3emu>u4Uo6_Be7GRs zw1Qmm3f0>upWWhWEc|kcwWD{Lf&iy;g@)dzi^T@JFH6YqGy3G5aaaOZ* z>ztol;F_3ce5LOfThbi%hesal6Vi*Uj~**0=mk8P?`|veguqxkU5T zZwT!4oh?5{cG>gB!$Q1jTh$Wz-_|VtC--(UUwq!Z$K5@@GJ2l9P*Ql2UimAujq%Or zdmNo>xId+61Ub!S3VGeh(Wp`I`-Wyh;`xh<58Qn}`$OKprJJjF7T?iZ-@K;J>1XS2 z|1X*jH`gW2v#MwF{I>6h!{qg*oKrW~JXhrDovWm-%JTNs+t(%!zuphn{`Y%-;PeCX YpBej7PMrGwmjMVoUHx3vIVCg!0Jo=W>Hq)$ delta 720 zcmaDY(kHUvBomi$h>?Mnk+GG5+2qSiipbo5Ocp9>MoFd?rm3mA#z~fzx<*MRX}U?t z#s<0;W`^cT#)igbCW)4tqnIZ#5v6jn1FIwl%(~5nY%>_^)4NX0VPIg=^mK6yi8!46 z=l_3uX1j!q*HBje@%~Pe*9iWX`Vw0W*$5$?Y{gTaxI>$I`;8<*o-HC zEk;W;~VGdB?bUe3*dXp_!Hjnho+3>@`yOnKc5JCrZZUn7vf z*m~&r@$>(RyPJe>*O#|(KbTPX&>(@ql5N^MM?0Gt@%() z#>usnG5)e>U_HhlY9O`VzcFe>kNKWUFQ&6O*!}lL?3o+$d6diP5)gT{@- zY4!g3u}H>cXef`O8~IqVD! XcSZG@c9%c%W&i?DS3j3^P6$*Cz8mZ?d)hG|J@x~7IErn(l! zX{NeH7Un6biDpTOMyaWrqnIZ#5v6jn1FJZa4Vw+wW-!)&m}1Amz`$_d)5S5w<9Kq) z0>cEEtqE6}0=W%z3Vv7E_4w+v221G~J^y_sX3o;k-O zWN{#&vh>B3(`SF*ds}1U)A_PP!D$=wiKWwCY7{bTbl$$3>BPR6TaKcaUuH1oHg{~B z=+mFVRcI9TPIY(AfxO0)C<_}C1;uYQ*SuauFqG(|&1zh(aq2H)Z_1f~V_Fu6v}G!6 rl-(^%bsN-uwU%AH7i*e$r>Bomi$h>?Mnk%^U|+2qSiipbo5Ocp8@2FYdy#^&a_DF$Z7x&{^|7P^T> zhGx2{iIz!brj~{l7Kz52qnIZ#5v6jn1FIwl%(~5nY%>_^{~k(P$H2g_%+tj&#N&8! zf&}a01d$7}J8Et0pZ^X{5mXS@@YvSqlkvyg{QbILU%4V#POx(EJu*m~K0PQ;+vtYP zKxh$S9`p@8^e`yXUq)oVcg^{)AIv3bz&0(%oX^4K7;s&3tfC;YptM zyVoXPlxFIk6q!_!k>YG*-16(&yTk9z-~X@s<5SDskjFlY&u8(0DPD)?*hKXTFgHXt kZcB9CJ;jQPO@e{p$5+o;8VQqM0G-U>>FVdQ&MBb@07<-g$^ZZW diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3.png index c055ee569b97a07c5987cf7b3938c4056846de93..12f99dbddf31202b8744901fd91bd408d15a8e64 100644 GIT binary patch delta 864 zcmZ1}GFx=RNhU6{5JN*NV@oSzi^-Rn6p^|Am@HHbEzOcmQY}q%Es~8)bW==CEOe7B zj8b$BO$<{lEi6)u(hN;EM=?)gB1+|C2Uc+;8#WuV&0wrA=cuk@U|`zj>Eaj?aro`D zXphN>6373)zxHPK@;PgkrbV8ZBDML$A+9dIl5lY+H}TjRv6Z5-9NZgUB&Z5rbro<- zxzPGhMgPsZ%?aX-C!g`8v+Ec~W`ExC{`Adx-|AkAZV!^om3sL9S!Lz^!=E4jocI6p z-kuJF$@6k{IPBDPyHa0r<*>Mf>#Y^jOfP01@y;=0xZW3i#r)a9rR&%vN>|8CdT`nIbpimtA% zj;Yzd?g7KD8u^0nuZvyml}r8>d%s~|-XtFR%g0B2XWH&|_jSMTZM(rB7vX=ECF8(CdBPS-PbaB>GJ&-$?Y@YzRv23Ol=-4jgvV_MN-vrtjE z{*3qREr~1tCe_$8&OCj!byJPGr~he*Z}Yh0GuJe3y6ZM+M$W>OGdO&iwx~yEth(Ex z+x_?45vCKjr94Zlr)v}zU-bNHuN$*4OkGiwV=lXkQKGqC;^~zEos2g!nl~R_=eOf@ ztEk}e$&c@r&j_xUn)cN-;J+XzqlPti`e~Lur#QlEJ}kb!Xlec_fi>@gW=0&Z{_*Fd z$F);^N~y7CohQRLWn6tCvgXa6i4_c2yA*Hlt-5wB?#b@X`CUh<{Im?>qZnqCH_V^# WNc?_az=JLZAn97rNhU7i5F-OCV^b>=gUOef6p^|Am@HJx%#D&wQ;dvsjf~SQbW>AI(sUCo zO_Ft!lMPZ*lZ*|F3{nj?M=?)gB1+|C2UbZAn01>C*=8`-%e*={k%589#nZ(xB;xSf zaPREkK!JbH%rY-s+2SkpNZIjXR1;@l!9tC)g*$>5E|PZSS}Gl`q}QUSwc~;lYvD_` zf``j)G}#|Gz9=Eq)i5Z-durIlpi3^fv#PgN96!_9xpvvHDOD^d+1n+b**x2Aoc^q! zbLK~Dn_Kn0hkF^n*w*iFJ`*H%FGrU5v+)}79xv`AKW`tMQuMAk??BaJCB{NMl_NVR zT<}{U))>X|uZ-oz!+oo5=FUEB<}a|?({ZV(66@WQvqM5z+@2qwvMFXBr_7;=>x3)P zmt8q%5zP{}OFwzjU+#RB?KwPNbU)bb8p}k4{(XXX`6}kQ^ja@GC#2S3)e|W?4=^{3Z#N)HQ zG%s+9GFrcjp83C1CsX-B7klKXfH~5axkHNXRY&tT`n|SwE#jP{AHKELApUu5eB(bk z+wuh~Ji6!JynFiXIDZdSc!= zg_PwRxjy}kJ9O{oqWNOeif;XGXe@Z>JAH$@TFjHustGx#KPkN2)$;w9z;8c=J#~>Fiy*qd8yU)$P7(Pts>?x6ATo4E<&P=e_)5smA-lzIgOXaikisU$!_OVuPeZAJDbV4t4ROOqm zqR&_NHk)=Zxtz6LvWP`;=TZG73r_AeneqAG|La}pr_J`*c?QZbygecM`9k8}r2hJpKOoUpz?@h+1`V6)gY0qYA~s$EKw z8CC{MorF|d7zJgrzB0~IUy;M8GOuxG`D8cCt(y$HSU)WBJZfTfYn6nAh!_LI&C9zK UJC~*@1H*yA)78&qol`;+0Jw6U;s5{u delta 340 zcmZ22^hj{SNhU7i5F-OCV>2rwlgXEv6p^|Am@HJx5-p8WQ%%fuQ&S8Kbqx$mEOaf> z(u{Od4UWP4UA4w!A54cVSB)~iRgJY!&B*y!ov7~*j} zIYEMTae~MN*_!f*zxAh7Qv?;nH9WR8`egh`UcdfNM6qxr%L!I4zDEX}0;c;H+J9Vn zP)2Izd5(?B;b)xNL#O#S%>V45@l|)hN?9F&tna(K9fUI4MVakOYY(`*wrGobptXdb zbJ0TalP3PlI)s|s)clN{HPrLg`t#W5)l_>4Z-0Mv9Xp#yt~a;B$+Kq+zi2Z@RWwPS uV>)(Zc743u|C-;w|Ib&P7UX`Aftf)h(Ls-`D=OUfZnhIi7f;-IV#_Tlv6+5+^AtT9O{VQw5xPlf0n35MKXua; z!)9N&QsX;6IqCDdU)}-o{*SL+xAv%MKmB#1p=CqywaX^)n-ZL6GWBn*tT(-psCU@a zzuE5ik!Sfgqz!cX7nE+|?R;Nw_uFsMu6Sx)HgGfH=lk{T6{pU^w}tYnl($ypEL?libYb+H zqZuow=ZWTMD4ESD@)Zbep64Q}Tw+yk!z=&warZO#ml=kY>&hM)@7b^VOPgVt3&*k} zPjb#JlyTBpx?4e8nfsWJGFPjO0mrolpEVC7J{jf;8DEq7D-Rs1ZBTz)mi%a24A)e-hQEqDygRa5O-16%tD6Zu1`!x5$`Hn3NA?1lHE;mfj3U_vsV053rc2!}{{5LKA!FzxH z`RH}c-D<+-+a5p9g>PJ0Qz*Ws`1*2rhwYD=-roE2W%9jAb*J)NYxby#M(F1ACOr>mdKI;Vst03}?7MF0Q* delta 754 zcmbO&xaNhU7i5F-OCV>2sLv&om46p^|Am@HI`jSURU4UNoolTA}CbS+IyOm!`i zjEr?tEln&eEi6rv6H^T~M=?)gB1+|C2UbZAn01>C*=8`-N2FW*VqjqM_H=O!i8%Z= z+&4qmQRLsfvfFt%@ZBh4+(b&6R??yRJ%v6^po=|KB2~7&+$LC_xG58o~EkE z@~=gmU9IKj#qNvO!|Ma0q8r~wv)>ivzo?P1Rn6e%pYKg7{M*<9hHH7*B9k1HjVZ>`19W8`lO4$S|%)K zhnkms`ui)dM!Or89EG|3O(G84H})DxvKVnYSnjFQzN@$ffG(Czy6k z`~Gj+MT5Ebf>^%1$Z1JiWVz9~m@}8-{{w%CZPO<_d$KF(+WF6dl|25j2lQN))C+Hy z{>*hx>iiO8>9gK~YON3Xf7B=1@Cu4J?3b@oxfONmL2=F0Qxh8GS1oub@BIF^fFl2` zhhMU%imYhqaWLI^rhZ-P6wZwI-#O~qeAYdcT{WTKXSL_S32TMzjjU@TB-T3}_{ekN zdEBAZnx;&r_@>|3Su1(4R55eumAi~~KfUw&XB3O2xL=YwP&_L@y@A_rX3fQ)*-fuE zo?g@<+PeP0+V3*o7MiPPmga_5%3es=H-WF+cG_*vePQyOb{8l087gib*^ji#=E#zc}-2Wrp}v&IM8b+y4JOzC!bXxbI9ouieR;r!oM6r>mdK II;Vst0Arp>82|tP diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4_glow.png index 76517568e22334549c22ddaab0993c971a68f296..cbced0eef1625d4add32b8e3f3628887ba3c9bd6 100644 GIT binary patch delta 415 zcmcaDxLRn#NhU6{5JN*NV@oR&lgXEv6p^|Am@JizjndLm4a{{7Q%zHJEsRWnM4Fj} zu4R&;iG{I|acXK}%H}BM$xOs3ob13Vj%5C3L$)W3^-}}y9A#i&_~q&17~*j}Ic0%i zg3Q*0D@}pi20B09eVC)%(r?%GNUroIFNccfB3!g!R zUG0yOr{A}pTwk9SoMffcG2tyk(aKb-Lri&TdEtuH3uF&SuoX3K!rpk0bhakDFd P;lSYO>gTe~DWM4f?{Sxx delta 332 zcmZ22bX#!4NhU7i5F-OCV>2sLEamTaXdLe zf^~6%$OYM&@```;r@~VN6~r|>wl(@>{7GK#|0m)zXC%uBRxZ9r2Al$4cP*^{wDh3w zty>$zt8Fjvc^#@c@TS4-)4OtZ_5HJIpME!8Wj(j^S|QKY1EDAE!gWI1L$f*DjBF=q zE@@dX@#GnSQ=PY;xeFhDE`2}m@{zX(I2hPOa*K^7JV|>d_iHMnuFXN7bjIXIXZLUK nuebaC_y2bR@0E)a8W