From 937e6a2af6f8779d5c2622c9743b056b360136b9 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 30 Jun 2019 13:00:29 +0200 Subject: [PATCH] Make all the HDSkins classes package private so it's clear they're not meant to be referenced anywhere else --- src/main/java/com/minelittlepony/client/FabMod.java | 5 +++-- .../client/gui/hdskins/ClientPonyConfigHDSkins.java | 3 +-- .../minelittlepony/client/gui/hdskins/DummyPony.java | 2 +- .../client/gui/hdskins/GuiSkinsMineLP.java | 2 +- .../client/gui/hdskins/IndirectHDSkins.java | 12 ++++++++++++ .../client/gui/hdskins/MineLPHDSkins.java | 2 +- .../client/gui/hdskins/PonyPreview.java | 2 +- .../client/gui/hdskins/PonySkinParser.java | 2 +- .../client/gui/hdskins/RenderDummyPony.java | 2 +- 9 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java diff --git a/src/main/java/com/minelittlepony/client/FabMod.java b/src/main/java/com/minelittlepony/client/FabMod.java index 5142fd45..c86a835d 100644 --- a/src/main/java/com/minelittlepony/client/FabMod.java +++ b/src/main/java/com/minelittlepony/client/FabMod.java @@ -4,7 +4,8 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.event.client.ClientTickCallback; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; -import com.minelittlepony.client.gui.hdskins.MineLPHDSkins; + +import com.minelittlepony.client.gui.hdskins.IndirectHDSkins; import com.minelittlepony.common.client.IModUtilities; import javax.annotation.Nullable; @@ -21,7 +22,7 @@ public class FabMod implements ClientModInitializer, ClientTickCallback, IModUti ClientTickCallback.EVENT.register(this); if (FabricLoader.getInstance().isModLoaded("hdskins")) { - mlp = new MineLPHDSkins(this); + mlp = IndirectHDSkins.getConstructor().apply(this); } else { mlp = new MineLPClient(this); } diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/ClientPonyConfigHDSkins.java b/src/main/java/com/minelittlepony/client/gui/hdskins/ClientPonyConfigHDSkins.java index 4775909d..ec9de0eb 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/ClientPonyConfigHDSkins.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/ClientPonyConfigHDSkins.java @@ -4,7 +4,7 @@ import com.minelittlepony.client.settings.ClientPonyConfig; import com.minelittlepony.hdskins.HDSkins; import com.minelittlepony.settings.PonyLevel; -public class ClientPonyConfigHDSkins extends ClientPonyConfig { +class ClientPonyConfigHDSkins extends ClientPonyConfig { @Override public void setPonyLevel(PonyLevel ponylevel) { @@ -15,5 +15,4 @@ public class ClientPonyConfigHDSkins extends ClientPonyConfig { super.setPonyLevel(ponylevel); } - } diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/DummyPony.java b/src/main/java/com/minelittlepony/client/gui/hdskins/DummyPony.java index 7d35ab58..0e49b3ad 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/DummyPony.java @@ -8,7 +8,7 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; /** * Dummy model used for the skin uploading screen. */ -public class DummyPony extends DummyPlayer { +class DummyPony extends DummyPlayer { public boolean wet = false; diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java index 68c21807..517de1b5 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java @@ -20,7 +20,7 @@ import java.util.List; /** * Skin uploading GUI. Usually displayed over the main menu. */ -public class GuiSkinsMineLP extends GuiSkins { +class GuiSkinsMineLP extends GuiSkins { private IPonyManager ponyManager = MineLittlePony.getInstance().getManager(); diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java b/src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java new file mode 100644 index 00000000..aade8482 --- /dev/null +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java @@ -0,0 +1,12 @@ +package com.minelittlepony.client.gui.hdskins; + +import com.minelittlepony.client.MineLPClient; +import com.minelittlepony.common.client.IModUtilities; + +import java.util.function.Function; + +public final class IndirectHDSkins { + public static Function getConstructor() { + return MineLPHDSkins::new; + } +} diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java index 5bb2d574..23b3bc14 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java @@ -22,7 +22,7 @@ import java.util.Map; /** * All the interactions with HD Skins. */ -public class MineLPHDSkins extends MineLPClient implements ISkinCacheClearListener { +class MineLPHDSkins extends MineLPClient implements ISkinCacheClearListener { private static final String MINELP_VALHALLA_SERVER = "http://skins.minelittlepony-mod.com"; private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com"; diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/PonyPreview.java b/src/main/java/com/minelittlepony/client/gui/hdskins/PonyPreview.java index d21ec55c..f4868a15 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/PonyPreview.java @@ -10,7 +10,7 @@ import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -public class PonyPreview extends PlayerPreview { +class PonyPreview extends PlayerPreview { public static final Identifier NO_SKIN_PONY = new Identifier("minelittlepony", "textures/mob/noskin.png"); public static final Identifier NO_SKIN_SEAPONY = new Identifier("minelittlepony", "textures/mob/noskin_seapony.png"); diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/PonySkinParser.java b/src/main/java/com/minelittlepony/client/gui/hdskins/PonySkinParser.java index be8e1862..45ea6351 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/PonySkinParser.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/PonySkinParser.java @@ -11,7 +11,7 @@ import net.minecraft.util.Identifier; import java.util.Map; -public class PonySkinParser implements ISkinParser { +class PonySkinParser implements ISkinParser { @Override public void parse(GameProfile profile, MinecraftProfileTexture.Type type, Identifier resource, diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java b/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java index aac04568..bc1ab5e4 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java @@ -21,7 +21,7 @@ import net.minecraft.util.Identifier; /** * Renderer used for the dummy pony model when selecting a skin. */ -public class RenderDummyPony extends RenderDummyPlayer> implements IPonyRender> { +class RenderDummyPony extends RenderDummyPlayer> implements IPonyRender> { protected final RenderPony> renderPony = new RenderPony<>(this);