From be263eec8545070fc38dfb3f0cca1d33c0778b88 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Wed, 10 Jul 2019 21:23:58 -0400 Subject: [PATCH] Move skin server definition to be resource based instead of config. --- .../client/hdskins/MineLPHDSkins.java | 21 ++----------------- .../minelittlepony/settings/PonySettings.java | 1 - .../assets/hdskins/skins/servers.json | 7 +++++++ .../assets/minelittlepony/lang/de_de.json | 1 - .../assets/minelittlepony/lang/en_us.json | 1 - .../assets/minelittlepony/lang/fr_fr.json | 1 - .../assets/minelittlepony/lang/ru_ru.json | 1 - 7 files changed, 9 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/assets/hdskins/skins/servers.json diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index 62dbb2ee..baa29b50 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -11,32 +11,15 @@ import net.minecraft.client.MinecraftClient; import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.hdskins.HDSkins; -import com.minelittlepony.hdskins.net.LegacySkinServer; -import com.minelittlepony.hdskins.net.SkinServer; -import com.minelittlepony.hdskins.net.ValhallaSkinServer; /** * All the interactions with HD Skins. */ class MineLPHDSkins { - 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_GATEWAY = "http://minelpskinmanager.voxelmodpack.com"; - - public MineLPHDSkins() { + MineLPHDSkins() { SkinsProxy.instance = new HDSkinsProxy(); - SkinServer legacy = new LegacySkinServer(MINELP_LEGACY_SERVER, MINELP_LEGACY_GATEWAY); - SkinServer valhalla = new ValhallaSkinServer(MINELP_VALHALLA_SERVER); - // Register pony servers - HDSkins.getInstance().addSkinServer(legacy); - HDSkins.getInstance().addSkinServer(valhalla); - - SkinServer.defaultServers.add(legacy); - // And make valhalla the default - SkinServer.defaultServers.add(0, valhalla); - ClientReadyCallback.EVENT.register(this::postInit); // Preview on the select skin gui @@ -51,6 +34,6 @@ class MineLPHDSkins { manager.addClearListener(ponyManager::onSkinCacheCleared); // Ponify the skins GUI. - manager.setSkinsGui(GuiSkinsMineLP::new); + manager.getSkinServerList().setSkinsGui(GuiSkinsMineLP::new); } } diff --git a/src/main/java/com/minelittlepony/settings/PonySettings.java b/src/main/java/com/minelittlepony/settings/PonySettings.java index 3c8f3e67..ae8becfe 100644 --- a/src/main/java/com/minelittlepony/settings/PonySettings.java +++ b/src/main/java/com/minelittlepony/settings/PonySettings.java @@ -9,7 +9,6 @@ import com.minelittlepony.settings.Config.Setting; public enum PonySettings implements Setting { SIZES, SNUZZLES, - HD, FILLYCAM, SHOWSCALE, FPSMAGIC, diff --git a/src/main/resources/assets/hdskins/skins/servers.json b/src/main/resources/assets/hdskins/skins/servers.json new file mode 100644 index 00000000..6504ded8 --- /dev/null +++ b/src/main/resources/assets/hdskins/skins/servers.json @@ -0,0 +1,7 @@ +{ + "servers": [{ + "type": "legacy", + "address": "http://minelpskins.voxelmodpack.com", + "gateway": "http://minelpskinmanager.voxelmodpack.com" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/minelittlepony/lang/de_de.json b/src/main/resources/assets/minelittlepony/lang/de_de.json index d906d956..3281a8ff 100644 --- a/src/main/resources/assets/minelittlepony/lang/de_de.json +++ b/src/main/resources/assets/minelittlepony/lang/de_de.json @@ -5,7 +5,6 @@ "minelp.options.ponylevel.humans": "Nur Menschen", "minelp.options.ponylevel.both": "Beides", "minelp.options.options": "Pony Einstellungen", - "minelp.options.hd": "Enable MineLP skin server", "minelp.options.sizes": "Alle größen erlauben", "minelp.options.snuzzles": "Zeige Schnauze auf Pony's", "minelp.options.showscale": "Nutze Größe aus der Serie", diff --git a/src/main/resources/assets/minelittlepony/lang/en_us.json b/src/main/resources/assets/minelittlepony/lang/en_us.json index 9a77af97..0e58fe77 100644 --- a/src/main/resources/assets/minelittlepony/lang/en_us.json +++ b/src/main/resources/assets/minelittlepony/lang/en_us.json @@ -6,7 +6,6 @@ "minelp.options.ponylevel.humans": "Humans Only", "minelp.options.ponylevel.both": "Both", "minelp.options.options": "Pony Options", - "minelp.options.hd": "Enable MineLP skin server", "minelp.options.sizes": "Allow all different sizes of pony", "minelp.options.snuzzles": "Display snuzzles on ponies", "minelp.options.fillycam": "Enable Filly Cam", diff --git a/src/main/resources/assets/minelittlepony/lang/fr_fr.json b/src/main/resources/assets/minelittlepony/lang/fr_fr.json index f0cf5305..a6cb3d44 100644 --- a/src/main/resources/assets/minelittlepony/lang/fr_fr.json +++ b/src/main/resources/assets/minelittlepony/lang/fr_fr.json @@ -5,7 +5,6 @@ "minelp.options.ponylevel.humans": "Seuls Humains", "minelp.options.ponylevel.both": "Deux", "minelp.options.options": "Options Poney", - "minelp.options.hd": "Activer MineLP serveur de skin", "minelp.options.sizes": "Autoriser tous les différentes tailles de poney", "minelp.options.snuzzles": "Afficher museau sur les poneys", "minelp.options.showscale": "Utiliser échelle fidéle á MLP", diff --git a/src/main/resources/assets/minelittlepony/lang/ru_ru.json b/src/main/resources/assets/minelittlepony/lang/ru_ru.json index 696ce8d6..c440198c 100644 --- a/src/main/resources/assets/minelittlepony/lang/ru_ru.json +++ b/src/main/resources/assets/minelittlepony/lang/ru_ru.json @@ -5,7 +5,6 @@ "minelp.options.ponylevel.humans": "Только люди", "minelp.options.ponylevel.both": "И то и другое", "minelp.options.options": "Опции", - "minelp.options.hd": "Включить скин-сервер Mine Little Pony", "minelp.options.sizes": "Разрешить пони разных размеров и рас", "minelp.options.snuzzles": "Показывать объёмные мордочки", "minelp.options.showscale": "Более каноничные размеры пони",