From a856ac8fcec49fb0254aa391950351c67277cf09 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 17 Aug 2020 21:34:54 +0200 Subject: [PATCH] Ponify the piglin brutes --- .../client/model/entity/PiglinPonyModel.java | 9 ++++----- .../render/entity/PonyPiglinRenderer.java | 9 +++++++++ .../entity/piglin/piglin_brute_pony.png | Bin 0 -> 3903 bytes .../textures/entity/piglin/piglin_pony.png | Bin 2948 -> 3012 bytes 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/minelittlepony/textures/entity/piglin/piglin_brute_pony.png diff --git a/src/main/java/com/minelittlepony/client/model/entity/PiglinPonyModel.java b/src/main/java/com/minelittlepony/client/model/entity/PiglinPonyModel.java index 8af39780..98e1a336 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/PiglinPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/PiglinPonyModel.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.model.entity; import net.minecraft.client.model.ModelPart; +import net.minecraft.entity.mob.AbstractPiglinEntity; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.mob.PiglinActivity; -import net.minecraft.entity.mob.PiglinEntity; import net.minecraft.util.math.MathHelper; import com.minelittlepony.api.pony.IPony; @@ -30,9 +30,8 @@ public class PiglinPonyModel extends ZomponyModel { leftArmPose = ArmPose.EMPTY; rightArmPose = entity.getMainHandStack().isEmpty() ? ArmPose.EMPTY : ArmPose.ITEM; - if (entity instanceof PiglinEntity) { - PiglinEntity piglinEntity = (PiglinEntity)entity; - activity = piglinEntity.getActivity(); + if (entity instanceof AbstractPiglinEntity) { + activity = ((AbstractPiglinEntity)entity).getActivity(); if (activity == PiglinActivity.CROSSBOW_HOLD) { rightArmPose = ArmPose.CROSSBOW_HOLD; @@ -73,6 +72,6 @@ public class PiglinPonyModel extends ZomponyModel { @Override protected boolean isZombified(HostileEntity entity) { - return !(entity instanceof PiglinEntity); + return !(entity instanceof AbstractPiglinEntity); } } diff --git a/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java index 069d9275..0496d6a1 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java @@ -1,6 +1,7 @@ package com.minelittlepony.client.render.entity; import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.AbstractPiglinEntity; import net.minecraft.entity.mob.HostileEntity; @@ -25,6 +26,14 @@ public class PonyPiglinRenderer extends PonyRenderer.Caster^B%A>93OeU8t)zIL8a zitkTC+;h*lkKFJ5o$nlTgYPU7{&@6z*s|wW902t0drsh^g&5%dD6v=p02bX4ip$N2 zbq7#fZUz9vx&z>&g*f^5H<1nR^(HXgP>kMi3^jVSipXPwm^aLL*ghe-m0bcw-l};lix*Y6BvYAUIeZD|H z0ARYI7kR2G#^BY+|LEdU_oaRY$j_^&+!WFo5gA;tzd@yR(~pdY>A7yw|` z<9R4s&6x;kn|u$sPw{p43DOvV_y9_h&pLtQf!%DxPrjd^CIArq0Ad2HH4gYYJovKL zhr%Kat|f+%S5zQs1%E(M1CajFu;t+g)9g3-+xTeVE$7rtnGZlXo@E3!0#ITEy~zRq zhy;0w2>^hG-Tj!kH-Jb{y1$?)$cM(F$8ae7Hu6t}2#&9ilG;*A-5Z)_27~~^q{Qx9mW2f94$rljflm4-2 zkXzmd2zlHRJLx^sf{Q^Ov+rLCK3WJt5WsO9uyF_e^wKW@0MBmRfqfk@2!ep~Fa81m zaPh;#(3>o%Sh$$pizHBhR5-~>{{ZiY#-c~?$XN~mIuA5*rWNyrU}HO{yKknz#{N+z z-jAMW;{ZT+-%LS>4k32R&5{0VcMc2koI&(N8&|kuz5oCkiyq`j>mUdM_I1Rlq`&fcl=czglgytqmQMFANR&Z9h%avwB4nh3w!F>W z*HTeNvx&hYXF2(^b2bW)YXR1gizlu^$8i$7&n4UO#8o<0&HyRtPo-m7CXh48jX+Q zm^WvZWc&c{N66!*#3x|yO*8`;v+?~eR0g;i5<$K|KYW3H*pf*c$NX<1lJvu)Wz2>SN_3&(Y9p^4w!o1}5p0od>_mM+>Z>2FRz9J1!<#Y(E9+-_!TD#HP z8^Zbp(`l#Epux7LF3AO#yF6JXcGI`MA>8G%0RXzfgK!!&lKpHp(F7hw!XMea{iM@-k9F6ci(dYAWn2uI*pjV?sux@0gz|2=`lP4ESOUcn@ta= zK|_h(6&@V-4ee$ly268KcKe|9wV~PVliZU?KZ!C3@d+ak;`7l$basWtl$jip1DL#5 zrirecH34@jx!Td#c0}B@?37%e@FKr}+GYl3O-oovI(rL!?I z0=(bYj;(h)sI*QLg!m+s)SE1L0Kf-sAF2Vk-R*F>YT-T8LQMh72t)(0=3t`IPb8k) zOWw|TA7K9v?-8c!btzjJiGpntkWh{d{RVhH_P={PZS3m#RcY6}bN2FtUXZOFAlk)l zHqx5HMJ{_*ZS>fxrIP9i}a~pVF9lk2Hzzq1z>Dqv&SZjwO#(21pXW z(rE;o3#saabD<=OBTwiksZhJw2&X}VO}pN}p3RRU)*YY(aT;uC1Sb_knV{6qI;Zk} zQh(6w_Q7s8Qo_d=!jram{9tY~fRef=s*+9Tk|Yjcf)a~0O$($X4_Ljxg`-D4!mK%U zii9H=t!7VN(nSbMOn?%@kTIv-J?J}jJZbZnB>f4t-K1&&CCO%q&Jwy};o_{SzuE1R zFhN&%5V+7v3GXy$&=Zi39j#^$05&WUnP_iQD=j7==l3?XO8N;CkTLQycQP}XYO4&8 z)q9rPepc-(nSf@u553_Stp(={)44hcK;>VO@>hko=FQ?bVJ}Ri_rEWC9W14ucHf~e>P;Lv#^ChHG12#9OVPw}L)7uBbRJi;fm5Xcl$^N6pn$$ZVKnT1 zSjHIXV;_3>5oBA7$G*>4-;Yd98yzlKbjDO_`AyOBv*<9XwDK**04XQWn&vFA*)y^- zh9!Q9#j5DU*-c^@xZPxsdGyN2wh|}X`zeiQ)xXFTL(E!-$)}cYNhgq%K&i82r4pIR z@srzh;sBBr!Q_7cbX9PsTtcS0{mk!&wDC%dKBqFZe9JMwcYnK|HYzH_k}t0}fbZNp z3l}>4@OlG^{RDUDuca{ro1$fjujDfjiDgU1SWNc){`J$x=qhI=?Uw5pcOJal?i93I zEpFFF=z9N-X%&b>!idM?=`aVCN?As&wd0CqhkuJ>QCa^$8azFH43#SB0+K*Me?>R%1vcC8+t zMsU+Ifm#nR#Xi7Tar?r>5?lT0nU;*tinh%a`VNJ$>}7Fc>ey3Jl&vv9H}gDKQ$0(N zYagvvi+DT^pT7r{&g!h%>fpu|YCXX9WB`^x1bV#zkw|#db8H_A;!|WAPhc$>fyE?U zZq5h$;U7rt8}Rvme$Pz(rcVoV6%VQ=U@8%h#}SXm;XU;dO#_#$F<`;UaMtlesatjo zbZ6B$^aSg`2SFvD5T6_y(Tbj69UUL}XcOGgrVRA}RsiQ!2AB*80RiBt$BigkW5A|W z1&BpAqoJ|@uXTz9YN#wg-=T2YH6)xQee5xjYT`fC8Vy1*+F-99MkwIJTPMTZ+ItPc zTPMRD0Ia>&AOL{f+zPu%yjHCTxIrd>@%P+hqswLI4K{{$1Q z7f?08IPjx6C20KdHSBrUMbDAE{bctSP;ry{03=sW_WnH@yA4`xDsv~_6-31?rUByd zI9|Ch0JmVK89fraclUI0tOih#19^bS?k{kx`4c*3BJ2MT_vK5NlW3{2)(c$k8pfOo z1C{m{V7G?Lw7Tb-TJrGr&~tFTfIZtn2?x zwZjMn3dFjAKpU>~i`wChh6HrAZj{tnX+g+9tN6TVy9STGR)iU)K76b)z!a(e4ChNM zR>?N9N<^Q``hOrb4ZMC01i%NQc^JCd5|q?QXZuoZKju~Qst1Vcmxns$|MDk6v~4cU2r6v|rJH$P%@9t72AJ&r0^Tz%lUo13uBKSr z?3$5gUt$CUt$r%?at)xX9i&=gXKO?a11D?$C$qo6M6PGo|L^OFDH3pNyIIiH4pO^c zlH99`Fvh+Pzp4SIf&nJGzd(v1Cc6G#8P!`n+!s3?0`UV_`(M4qqY{6rd;s!Gno9HQ z>~8}pIe{!jo1f1#b(`xy{P>kKK$X)$ovn$i-;#yB_jtxcSGjv<4FW&yDd!AP_M z8w12NhN_8fLKID{(2DkJg=w8cHP%(y*bk-(CRS-;2u(2UqutgHO3OzTv}G_5VkwX` z06;KLprOTv)JOykEj9o^Y9sI7Dq4X3`4+J7H zde3gRVZ4b)REj`ooe#->7hx%Znx+Q$?*!2LDJQK5fPcwkT2Vh8h$3qVbe>>`|Jo(Q zd?LnN9<;f62xcC@1pO`mAm$SRfGPobwh~ZNNT_XYe#V`sg-`BawU9>GOIP$*rCi3}B$>yZ!X!yG85w zZrcnM1Aovm`7Xv>9)-aD*De77c$cU06o8BnqUr3&VL_&Z=|C7@`@tZ3ejP&)76711 zFfJuvZ+F2|Ta9pa1XEK}h)NMWNKexGs`}czeo6gwXh))G{XD^*oeJy<<^ys9&kTl~ zf)L?X0t;v=K%1MV^rsg3Y(W^nX>CL(J&I;WgMWenTpexj-5dsIuEUef4w!1IF(Qs+ zgg-e&>$NaGIW_I)4`mgu2o!UEj`@^|Pri?Nf?ZY#o~tMYAU1&3$Y+hf*}!Sz@!hRy zIt2h3JAh09_I4M-Lq7Z`7(!jW2@lefsH(5cutGSZ$pEB&I_%xHSuuaJ)0~v7L+9={ zIDhCE1#JML@vI`S9)Ol2SgZm7AQ6=mQvd*LKRAlTM~t3nr6kg~d-s zc#Ee6VROAanM_mVVC$!&crBwHCaxg@`Ujtzl+`hVzw+tb?XJFS%5X4cts%!?$_> z0H=S|3ulKVFCCk?;CHX+LVH`_^h>;1Myv0=G-vw5|hJ`bQ89#_;0OW?JcPG~u<2 zUd02qy*>^A`VYOTxZk<^4FJII&wpB8>2Ux6yzz0k8%>J;mo&%g2^dh>5>*W92U46 zO;q^a`1q_lblP}$%WB_LSDzwn0 z+bN)PkprI$OK5ZQSbzR>E4-0W#i&(7J@VD}4&m&LVqg->~qAx1o*r$jK z48dvRso+zL;7K`iy;o7QRyj$pc+ zJ#|VK5iFSkv=oN4xhe*5_sqHMoZp?bC)n~ug8{TgHY;>i(5=f>6s7(?F{Drer;W$0 z8~uuyKp;|Fz*^YVomq4`aNNNKs@hIq& zmURV{Wt}Sk8RfIdi!U~Eg7Fjr(Kvu6{OFf;?BPmNOFk4;6(w40!YUz_`!5evU5i;^SRLSiHzYVm{C?(xuO)H*v=R>dZykPLq?jG5$Ci5>(_YUv^E0B zU4IW1c!^>=amwGhGr{b2C_l7Zkw#$QoiTPgA`2OQ>N%Z6=g5{YHc&%$1s94X6w2G5 z<<6bFcYK(k<%&~)ul(c~Ewr{~Qoj8D2)^`%r*LB^48K33Sx@j;%Y!_HxGDw|Tfm9% zwQL45V%d~27UjO*U%t14?sC>*H@!nQaer_lA3z&bdig_*d;py?fHEJzSPh(UB(PFo zOaYGpWdFO&@@@XoF4wxb*t7C9&l*#}Tn7=L)|&qR@>zocD#ZO$ z2Z7kK-cJarcsG#Uj5;QT^U8)1Sm7}80d&p)!`>KO%b34@Ei9|wqxXz}kPZ}}&40~P ze?ONGz#B0Dy-WdQ8Zhz!bgTeIK7hdhMm~U^-N0dQEYB4*jKB;YdJyFG&Ck&D`HP(| zPzcX;wkXc`pXvU819OA{$~|Aez+Qg}s=$HWv=)eXj_k4jfeOG9kQuhBJ`r9Xl zO)yv7z*5f_C};n_fjOc8rJgTvReua<+7XmdrrG~*;1Mgp!#rPr73@s+{~MSCMqsh? z1=!QW*=rWNx;yC}|6n|Yt6~7bc#7U*>)AF2=9mq@qEP<5`h0<1-JNCa|Nnjeh#|#C zsQ~5fE-rWfzkx@r0Og)9p!Z+yG#H?S=PT)#J0E)mDEEAUoI>dHmpd!M2sbR}e1YQ6 z=TL0_zk$+Gb{KVm+eMdeOWD8AqLk;2<>B)1Ur3kTBcJ&6k^lez07*qoM6N<$f`iu3 A7ytkO delta 2941 zcmV-@3xf2-7lap(B!5duL_t(|+U;F^Y*W`2|2bbaaqJiS)h13n+aaTbW&vd#f{|!~ zZmdwIF;q=-69P1qp%v|qX@zN>L^ak`+L$z^3MN*mVhBxi+DE&s9gr5%ifGN~h)|XS zp&8Gf9UFUgVmmfYg7N;a@6CPB&rV{q5&YgyLioOW-}TEo=YO8Bd(O3H>dmgqFV24% z2ao+w0|0@O&u7AkI!uN`Xy7dX0A4?h`erkdV-eIhn*jjHu?WJ6I=ugfGbo040x2{Z z>k)`0(S|riVL+G527e@qKrD$1b{B$m!rH(WPKtlGWTO>I+6D002$Kdf3by0AL`cs8;|0$^_)zNBdmh393!;2nrVOXLqW9C8+w*!T3pQ-!AQ|(`|0a%741K` zV=E*QfPc2hyO^}QLHADNWbhUZ&lK#2ShIrBb2HuiW1s0Ly17-=HT@14f zLWo}pQb3jgoDPnPKPk}{3L*h)CL@BW2{c*jMSl{&-tL6=x*HmO9Uf`2LR(vnF<~rA z{FyZEm&4Rddd}}3%`sdNh;;s}EzM4e8Hd#M>z>1wl5Arz670Hl8|9Ne*0q`z4;7f#fnWBav)zI<=%p_7Gi=V9U zW>+&pdR=BFk)q7O_Rl5a<&0K238zF<$w>h6vKFHM3Gt<$1F>Y*>Ngo-)m77LfmjlU zpW8!4c{-g&tzHL9n;o@!9cmiu5u1q4tABqkFM#OnaH5X>Q<2kO1Bdr!Sbtw`rAz() zLehX`3b|MU%RGb#J%9RhQ9s{%-Ca_QV7_DBuU}GCK%Q945s24gPU6cEzF52<&yWkp zq2&!2KR2Xt?&!&oI6(44LF3ccWr+Jn`rPM+Gyve!*JTp#jZor|el&8hwAmpYTYsn1 zQsR^Tm?{9EIseT~nU>XSL_ThOJdE}Yn*jiiJ@;dThgM*Tt_EpgCjg+@bsBe4cfohw zz(>b_006k&cNPW{59wUQU6Rwkli?6H_kV!#9H9Wf^kip-Z7&q{pK)cRF#|I1Od^F^ zy-sw!obRd_8-VCYHi~z>?`(E;-+$}?-+2T2M?XSxERvN7%ZKsEsu3h_c2MGz$e$$4 znn!fvWfUSnxdf3TKAD$qSxTdcY0)c5g88c_B_hSpW4np8Q4+0N~tfmtbo* zx7-*N4}VAkv^wmWEl;%L%J3Khfhe9`)kHfTMlD|K_lRz|%`3eAF^PX>u>;>>_(T&MiA^nd zLYtX`CpLuvA&4cx5ex`H(VS%U6EA}hpD+TuHS6|7=M|ZpmjRfYtI$T5VpTxLaw|S| zhvBqw=z6RLp2&n~)k+~<`O@phPyZGGu=k;T1y2XK5-=tCLT`!xF7_v41gfqgv+%YzN?q1DqtC*SaQZfK~_AOOWIbv4RGpf z>oZLT{j9ExC&0D|h%3jsev{!4PW|;_-q>xOt$FvnIdrR}2Y+O92gnw(&CJo9!Y-Gs z;JyAx6uY);6lFIN2|%ED36Mu*uYgtSSHtaz(!@vNx{shleGxqS)r~Y}@ckDr zQlgat_C8`@0$g67+?Y>2)1Q3~{gJFRN*ti=WbU)d06F429US0TO+_ahSw zLwM58e%`8V29Oi?L{zfjTp|ew6U^q)$*nwK+bS1+bm9%{+OkoWa0GMZ>`7C)2w{l| zkYgA!W>E0scJIZU&hO6I6KuO*l>l-pnJ~j5N(XKlxK-fTGs3RQI!DUrq&()i_XVq*-F2AUpMkp(Y|ho`dP!1cobBnOlOHL}*(q$X2AjG~Qrw*m4of#}L^5#z|2)%OkbxD)08y_{ zQe{jrBh5b^1JH=yoqrX{!~xuXBZjvJJ+PUK3x2>-pN~yN%Z{6-hM&`MQH=)PF9{%L z#I>0;*tEfe-oES$-+6QgdQ2KXX6(~DobBjh;y>W5`OAGvfT?G4%F1uxWz_Hq&0_v%CZ-R*6%7<<2xy>rj4Zxgw3g!j&-= zx*`i1eo`YY5KH2zt`#`AJBp{eR%D}b+b3W%8EI8;p;$tpy!{1M?&Lk={R}Nv90Ppm zCx54CqopOA^5yeI@P*H2T-U45a$D^yMgnL1Xc>vd;oKPWf3fog3gPLFX3_cn^M9@X zSFuPWK)L4&sCdX3Kzb^O3I$656$-Ec$~|A8ci;*gQ%e2+vA=z++60Tm4J`G1fpY5q zRV)$)DD`}SLBTI;M^K3}NBzHw2h0HX^Lzo8u=B0|SFs3;z+&eMu&0N!pIPkd?w~dP zfmjlQf**lcl3ru`*)b{>nGL|APW<|sst$E{!04g&WD}>$~|9TmLZh+%bgWr1eSBYK=J!$QLO%7Md>IzjN0n3 n)9u?*>i1cca=*GgTps=lrq;S0rFs=T00000NkvXXu0mjfbqI*?