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 150cb19c..00000000 Binary files a/src/main/resources/assets/minelittlepony/textures/mob/noskin.png and /dev/null differ diff --git a/src/main/resources/assets/minelittlepony/textures/mob/noskin_alex.png b/src/main/resources/assets/minelittlepony/textures/mob/noskin_alex.png deleted file mode 100644 index daf35fe6..00000000 Binary files a/src/main/resources/assets/minelittlepony/textures/mob/noskin_alex.png and /dev/null differ diff --git a/src/main/resources/assets/minelittlepony/textures/mob/noskin_seapony.png b/src/main/resources/assets/minelittlepony/textures/mob/noskin_seapony.png deleted file mode 100644 index 34fe5ed1..00000000 Binary files a/src/main/resources/assets/minelittlepony/textures/mob/noskin_seapony.png and /dev/null differ