mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2025-02-13 16:24:23 +01:00
Make all the HDSkins classes package private so it's clear they're not meant to be referenced anywhere else
This commit is contained in:
parent
0af45cf388
commit
937e6a2af6
9 changed files with 22 additions and 10 deletions
|
@ -4,7 +4,8 @@ import net.fabricmc.api.ClientModInitializer;
|
||||||
import net.fabricmc.fabric.api.event.client.ClientTickCallback;
|
import net.fabricmc.fabric.api.event.client.ClientTickCallback;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
import net.minecraft.client.MinecraftClient;
|
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 com.minelittlepony.common.client.IModUtilities;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
@ -21,7 +22,7 @@ public class FabMod implements ClientModInitializer, ClientTickCallback, IModUti
|
||||||
ClientTickCallback.EVENT.register(this);
|
ClientTickCallback.EVENT.register(this);
|
||||||
|
|
||||||
if (FabricLoader.getInstance().isModLoaded("hdskins")) {
|
if (FabricLoader.getInstance().isModLoaded("hdskins")) {
|
||||||
mlp = new MineLPHDSkins(this);
|
mlp = IndirectHDSkins.getConstructor().apply(this);
|
||||||
} else {
|
} else {
|
||||||
mlp = new MineLPClient(this);
|
mlp = new MineLPClient(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ import com.minelittlepony.client.settings.ClientPonyConfig;
|
||||||
import com.minelittlepony.hdskins.HDSkins;
|
import com.minelittlepony.hdskins.HDSkins;
|
||||||
import com.minelittlepony.settings.PonyLevel;
|
import com.minelittlepony.settings.PonyLevel;
|
||||||
|
|
||||||
public class ClientPonyConfigHDSkins extends ClientPonyConfig {
|
class ClientPonyConfigHDSkins extends ClientPonyConfig {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPonyLevel(PonyLevel ponylevel) {
|
public void setPonyLevel(PonyLevel ponylevel) {
|
||||||
|
@ -15,5 +15,4 @@ public class ClientPonyConfigHDSkins extends ClientPonyConfig {
|
||||||
|
|
||||||
super.setPonyLevel(ponylevel);
|
super.setPonyLevel(ponylevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
|
||||||
/**
|
/**
|
||||||
* Dummy model used for the skin uploading screen.
|
* Dummy model used for the skin uploading screen.
|
||||||
*/
|
*/
|
||||||
public class DummyPony extends DummyPlayer {
|
class DummyPony extends DummyPlayer {
|
||||||
|
|
||||||
public boolean wet = false;
|
public boolean wet = false;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ import java.util.List;
|
||||||
/**
|
/**
|
||||||
* Skin uploading GUI. Usually displayed over the main menu.
|
* Skin uploading GUI. Usually displayed over the main menu.
|
||||||
*/
|
*/
|
||||||
public class GuiSkinsMineLP extends GuiSkins {
|
class GuiSkinsMineLP extends GuiSkins {
|
||||||
|
|
||||||
private IPonyManager ponyManager = MineLittlePony.getInstance().getManager();
|
private IPonyManager ponyManager = MineLittlePony.getInstance().getManager();
|
||||||
|
|
||||||
|
|
|
@ -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<IModUtilities, MineLPClient> getConstructor() {
|
||||||
|
return MineLPHDSkins::new;
|
||||||
|
}
|
||||||
|
}
|
|
@ -22,7 +22,7 @@ import java.util.Map;
|
||||||
/**
|
/**
|
||||||
* All the interactions with HD Skins.
|
* 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_VALHALLA_SERVER = "http://skins.minelittlepony-mod.com";
|
||||||
|
|
||||||
private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com";
|
private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com";
|
||||||
|
|
|
@ -10,7 +10,7 @@ import com.minelittlepony.pony.IPony;
|
||||||
import com.minelittlepony.pony.meta.Race;
|
import com.minelittlepony.pony.meta.Race;
|
||||||
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
|
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_PONY = new Identifier("minelittlepony", "textures/mob/noskin.png");
|
||||||
public static final Identifier NO_SKIN_SEAPONY = new Identifier("minelittlepony", "textures/mob/noskin_seapony.png");
|
public static final Identifier NO_SKIN_SEAPONY = new Identifier("minelittlepony", "textures/mob/noskin_seapony.png");
|
||||||
|
|
|
@ -11,7 +11,7 @@ import net.minecraft.util.Identifier;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class PonySkinParser implements ISkinParser {
|
class PonySkinParser implements ISkinParser {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void parse(GameProfile profile, MinecraftProfileTexture.Type type, Identifier resource,
|
public void parse(GameProfile profile, MinecraftProfileTexture.Type type, Identifier resource,
|
||||||
|
|
|
@ -21,7 +21,7 @@ import net.minecraft.util.Identifier;
|
||||||
/**
|
/**
|
||||||
* Renderer used for the dummy pony model when selecting a skin.
|
* Renderer used for the dummy pony model when selecting a skin.
|
||||||
*/
|
*/
|
||||||
public class RenderDummyPony extends RenderDummyPlayer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
|
class RenderDummyPony extends RenderDummyPlayer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
|
||||||
|
|
||||||
protected final RenderPony<DummyPony, ClientPonyModel<DummyPony>> renderPony = new RenderPony<>(this);
|
protected final RenderPony<DummyPony, ClientPonyModel<DummyPony>> renderPony = new RenderPony<>(this);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue