From 2cbdc7477c196477f6509df49c3593ed7b9f0add Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 10 Dec 2022 17:30:31 +0000 Subject: [PATCH] Use the built-in default textures --- .../client/hdskins/PonyPreview.java | 24 ++++++++---------- .../client/render/entity/SeaponyRenderer.java | 5 ++-- .../minelittlepony/textures/mob/noskin.png | Bin 1960 -> 0 bytes .../textures/mob/noskin_alex.png | Bin 1273 -> 0 bytes .../textures/mob/noskin_seapony.png | Bin 2338 -> 0 bytes 5 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 src/main/resources/assets/minelittlepony/textures/mob/noskin.png delete mode 100644 src/main/resources/assets/minelittlepony/textures/mob/noskin_alex.png delete mode 100644 src/main/resources/assets/minelittlepony/textures/mob/noskin_seapony.png diff --git a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java index 7df40774..1c622690 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java @@ -7,13 +7,15 @@ import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.api.pony.IPonyData; -import com.minelittlepony.api.pony.TriggerPixelType; +import com.minelittlepony.api.pony.*; +import com.minelittlepony.api.pony.meta.TriggerPixel; import com.minelittlepony.client.MineLittlePony; +import com.minelittlepony.client.render.entity.SeaponyRenderer; import com.minelittlepony.common.client.gui.dimension.Bounds; import com.minelittlepony.hdskins.client.dummy.*; +import com.minelittlepony.hdskins.client.resources.DefaultSkinGenerator; +import com.minelittlepony.hdskins.client.resources.TextureLoader; import com.minelittlepony.hdskins.profile.SkinType; -import com.minelittlepony.settings.PonyLevel; import java.util.List; import java.util.Optional; @@ -21,10 +23,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; class PonyPreview extends PlayerPreview { - public static final Identifier NO_SKIN_STEVE_PONY = new Identifier("minelittlepony", "textures/mob/noskin.png"); - public static final Identifier NO_SKIN_ALEX_PONY = new Identifier("minelittlepony", "textures/mob/noskin_alex.png"); - public static final Identifier NO_SKIN_SEAPONY = new Identifier("minelittlepony", "textures/mob/noskin_seapony.png"); - @Override protected DummyPlayer createEntity(ClientWorld world, PlayerSkins textures) { return new DummyPony(world, textures); @@ -32,18 +30,18 @@ class PonyPreview extends PlayerPreview { @Override public Identifier getDefaultSkin(SkinType type, boolean slim) { - if (MineLittlePony.getInstance().getConfig().ponyLevel.get() == PonyLevel.PONIES) { - if (type == SkinType.SKIN) { - return slim ? NO_SKIN_ALEX_PONY : NO_SKIN_STEVE_PONY; - } - } if (type == MineLPHDSkins.seaponySkinType) { - return NO_SKIN_SEAPONY; + return DefaultSkinGenerator.generateGreyScale(SeaponyRenderer.TEXTURE, SeaponyRenderer.TEXTURE, getExclusion()); } return super.getDefaultSkin(type, slim); } + @Override + protected TextureLoader.Exclusion getExclusion() { + return TriggerPixel::isTriggerPixelCoord; + } + @Override public void renderWorldAndPlayer(Optional thePlayer, Bounds frame, diff --git a/src/main/java/com/minelittlepony/client/render/entity/SeaponyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/SeaponyRenderer.java index 9cb6ae26..574a02bc 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/SeaponyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/SeaponyRenderer.java @@ -19,8 +19,7 @@ import net.minecraft.entity.mob.GuardianEntity; import net.minecraft.util.Identifier; public class SeaponyRenderer extends GuardianEntityRenderer { - - public static final Identifier SEAPONY = new Identifier("minelittlepony", "textures/entity/seapony.png"); + public static final Identifier TEXTURE = new Identifier("minelittlepony", "textures/entity/seapony.png"); private final Proxy ponyRenderer; @@ -31,7 +30,7 @@ public class SeaponyRenderer extends GuardianEntityRenderer { ponyRenderer = new Proxy(features, context, ModelType.GUARDIAN) { @Override public Identifier getTexture(GuardianEntity entity) { - return SEAPONY; + return TEXTURE; } @Override diff --git a/src/main/resources/assets/minelittlepony/textures/mob/noskin.png b/src/main/resources/assets/minelittlepony/textures/mob/noskin.png deleted file mode 100644 index 150cb19cee60da547d19a72ea2dfe58a76e33f99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1960 zcmV;Z2UqxsP);A|lllfl0Z3X^4M7lKdwV;x|3;(1 zFb2+@J14Tn*Hq;JpwsE#?c2AJFZjNXQmF*PFe3LEWAeFe+w!k%+fpV70)$~0`NXkb z|Kni4@r^v4lu9K4faiJ8bv;q$)vH&L_Nh~+2Z@uInfi3i4iFSe7NPJSqQ^$V*QUgzLq3hE|(+LQZ30jAE0U$R9T`R zy^LWPWA{Jq_*z~+;+zjyG7HUSGcoWG9aTz>(*LkX8$Z$1Y8C(h&N(d0g75qAJP(}n z2usN4vy2y4Ol{}sf1DtgHNKHW|Fj^Y>w3gLRT?KzFiyj`{C@q9>jGKhvxS8PK{=N( z2F4gH%aW9&FX_6De!maSIW$d!VHglX$f&LBIy}#V5JL7v${l2$AKO4`LkI!GFyMI} zG);qPn&|iYlBT6n3B_U&0I;{WC#lu%_YnjEbX}LqCFOadeLB`1$iE7-MKO8hG^R5xU*3WQ7m{nx-KPLkJ;czCGwXKh_!{2m)xD zhC-nLUDqY`P1A&Fnz(iA7K9LJwOaW8{X6RQI>InStJT7lD_5i(v4rwCEj7uwl;e49AWg!<#p6aR2^&%+Aij zvMj8xuVZa(4V-h?j}T%a>xhGf41$a?gkcENG;!g=1=MOawA*deYBek@ETCL2IY?w|(2q&y!40qXVoZw&-&adA-uK>))r zaQgIVoIQIMp69`JU9{V6%+Jq5(=;?1jmQ_P)hfE(F52xjY} zeTHEe$@A1Mm&=F40N1Wv69C{i4qVs8+}s>I&qKG{MYGwIzUw%S3}h74y4@~(-$$)h zgX1`nA2^(IxULHTXt&z~KbFp)KM&is@%ZuM-)n$-_wI@KqC~~RhYus|j~_oW0JwSc zrtp1Vt_2=Ec)$Q)V`D@7`0*ogu-VyJyng*U^MzJdSHT#QYYAP~A%sA`-$$WPK)qg< zli|9qWGhYJ%aXs?3{Bj#>UF; zw4zkkB-FPMVq`^A^|*ZbvH*ZqtA&}F87wU=MFhTl`68bIh&*>)7n_@#k@oT9$D!*w zDwPW6=jZY5+cyBf?(QxCU}tA%Ae*QLBbOrOld_MxXp28Tdh}?d{p86Lwl4!(t=34^ za~uboo1192+pT*U8$`qrOK=Rp2UJPXU;@6Yfqdw5s~@y=~HAAXK`^c9s`DF z0Hqf~R*X=UiElfpiVWIrX-jF;3$78AzVK{hB~S1OfEL6S?`t)-V%gI%#$l<6#Omg9L|4Wj#Pk5{Wz z?CtFh7-DB<2i0md)kP8+kfxxzph-fdQh^Wxl}ZJzRtw9^%ZWjiHdoabtyC&lT3V6; zx7+PX8Phc3I8Lg;Nl9Wx7DEnn9gxRW9LJIShQu^g)^Qv-jwAOOmY0_Yf~`8cY1v?k zDW;fWiYca;Vu~rIm|}`4rkElRCVn{K zf1f>jHqm$14%>`Oy8i#i86aMHQfEK@?5{LHmN5=x3>fx&LA6?qQ2X7xcM*9imvheH z`~JYz_OSK;{qW09ERqqD{93IA_`W|-{?4iv{}C=QOl66bjvtXB1O4?eK&=$#Jz4hK zT|o8mVFTMi*Z+SR1JpAF@$&_F5HD@zsp}mY2G9wTJPVlkvv}=~YJO=(QjIfA8T_|r zfixFMD{7K*SYkpSa>#vs*5gCH*HABPQko uqnp%0LJ%1M00000ZlSQEc zH>F6SbW`c3E(Bdv$YLlivI@acgy00FMBjCi3`{rP%bm&OXUx<+kQG@xuT$w$*B}YeEPBuwyhD1ptVm2wm4rZG$4P{Bah;1T``k z46<`d3hxO3AW0G?CMI0He*ggT`MiWD8V!U(A$JM*=DQyS0MIlIrGNevhN%I(%Ui_|0GiDv?(Xi~CE(r8m&^m^ z;vX5q)Br0nRu32(8-pZC?rVT7%ixd0%mTd8v`yG*=&}zyM+9ck8nCpq1WA%msZ?-%eGNrX7?ZSZe0+Q$W3R5R zb_pS<)oLJwfDqDV8~~i3pJQcZ1pu(SyKCFOu&@B@T>SO?{5(RT5YEodSX)mI*x1+r z0Aw;5%*@OH0OIjDYdbhN7{~+YTZ=}cP*v5|-TPhl)A{IJdIzY8A0q4Ap8C00aQo-`}^bvo|+4h3DK) z==FRQTbUgG{NooxmSvI*BZHEcN~NHj z9vO}apl_IJLNb{g%1)9Klu9KmE-s>2EJBuLq*5uAN~Qi*f{*UihH|-#i;D}E8HR;U z&(|$`iK58bx_Uq?7UM4sUip*Br11FmhxX>}p07|SFnt4n!^1;U#i&nl)-##SbW-+%tWRI$E#^H%Vb2Uy=aPsqq`i4pSNyGZ$QMG^qR0~j zEPwVzTe_#I&{Nf5dy&-eN;TMMTMx8aO>bxbHT2b+w*nvk!Jy;~4WNcvSB7*o=m`(d zv<6zOCSI<+7Whoy84cjE_W4%=uLrJIgZX@(eM7vwyzKe?-tF;D;psH!6Yv}a^z;4x z{~X^7f*Ub!ZR_E2DjKVd)w=|UcN zu3QS%g&>OHLgZBt+NzcLXicY?By-=*doDL=l1ZCswLS+zbLZaNn{)0tzjN+6DLeC@ z|MJ)WOfvkRE?l_4PoF+bO+0=26ae75E^@h?xCa2vIi{wjkVGphE8BkScDqm%1)k?& zb#*my{{*_)z9KUZ0Gpeec>DHk-~rclQ7jgrXFOp{dER?jqvaqngP18iP*~I+(JSQ!XcSn{aO;9Wr1%qiQpU;cSbzLZm z(%1QSyS~xp(ZowDiXwKFz-}5|y zm@_jon4O(PKA%USP{8fmxAE!ICoslvHUCX_rwQJWn09clVdcBU};bAzAgLb=(Mx!BY*Rm`DWCUvMb{nqiVsLN}mSqJFIKJ{(8NRuV23g z+DDHbg{rD3m&+I#8Nv7O-vI#Y>+6xnZqqaa0wa?m=A*oi9JGb|M@L5k?I%y3uqf3h zJWz=F-4N}BZQHPI8!#kz$!o&y(q0wjrb~tK$6w&W;f>jQ;!@@|SDD=|cuW+t3=k{Kg)mB-M1)K10;B@CpcQYnzd z-l-`lao`qqHG~n=M^{u5lk9eDYb(}H<>zROY~Li5B%07QGG$4%43#>U1rK{T69P_>KD{@b^2B1nqVfH(%}_c$t- z%ix@&TrQ*4YGHD6G7?lNxhlVCxm?D?#DoCccDpUc=(-NevSI~JOp<0KX$VD#Bn0vX zl}cqUa~zPyR4mI9c|+1Pc`N}c1iH5VC*#OdQeTGQmM=-dzE!P2p*wUt1T-1$hsah=H=jM+i9?$S=T?6`NT+2-u1st z1H#8)p#kz2-tw-~efSITgX{@LM@Pj~sZ{2ABKY+5G*7DEojG$RFh2Y}!S(Cc1MPeF z?j^2y<;s;nB)Yn~8i+&soqy<=5qk0B1?yG6>nH7ZB$_HE)~kNkPYPF_AhwsUX_pCzT~yC;W*F3Fx;8V81?cmW7)3 z%d$)+aP#I((dbow9~v6kR)1ewS_;_sPJyjo_5Umyz{6Lw*%bGsQi-RjzsuhcgugFH zL*dd^(*H2^RRfZ0YDx8XLUgimSpZ1^Ot>#x`=gp)oRFf{@0%CsSN(k_Kp3|Hv_?{2 zUqLWQ&C}H1vwURHYmKy@!0bu@z3T5#FG(ucY&NmJzTUHh4nT~ff2g1519#jNK#N>LI{*Lx07*qo IM6N<$g0jzGjsO4v