From 460e8c56b401ace06fc8857c21279a69b390dee3 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Wed, 3 Jul 2019 23:40:56 -0400 Subject: [PATCH] Move hdskins back to main It wasn't going to stay there because loom doesn't support arbitrary mod configurations --- build.gradle | 12 +++--------- settings.gradle | 4 ++-- src/main/java/com/minelittlepony/client/FabMod.java | 2 +- .../minelittlepony/client/hdskins/HDSkinsProxy.java | 2 +- .../client/{gui => }/hdskins/IndirectHDSkins.java | 4 ++-- .../minelittlepony/client/hdskins/MineLPHDSkins.java | 2 +- .../minelittlepony/client/hdskins/gui/DummyPony.java | 0 .../client/hdskins/gui/GuiSkinsMineLP.java | 0 .../client/hdskins/gui/PonyPreview.java | 0 .../client/hdskins/gui/RenderDummyPony.java | 0 .../client/hdskins/gui/package-info.java | 0 .../minelittlepony/client/hdskins/package-info.java | 0 12 files changed, 10 insertions(+), 16 deletions(-) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java (92%) rename src/main/java/com/minelittlepony/client/{gui => }/hdskins/IndirectHDSkins.java (63%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java (98%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/gui/DummyPony.java (100%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java (100%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java (100%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java (100%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/gui/package-info.java (100%) rename src/{hdskins => main}/java/com/minelittlepony/client/hdskins/package-info.java (100%) diff --git a/build.gradle b/build.gradle index 97f5f92e..73e00a3b 100644 --- a/build.gradle +++ b/build.gradle @@ -39,27 +39,21 @@ if (System.env.CI) { } } -sourceSets { - hdskins -} - dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}" - modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + modApi "net.fabricmc:fabric-loader:${project.loader_version}" compileOnly "com.google.code.findbugs:jsr305:3.0.2" - hdskinsCompileOnly "com.google.code.findbugs:jsr305:3.0.2" modApi "net.fabricmc.fabric-api:fabric-api-base:0.1.0+" modApi "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.0+" modApi "net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.0+" - compile "com.minelittlepony:Kirin:${project.kirin_version}" + modCompile "com.minelittlepony:Kirin:${project.kirin_version}" include "com.minelittlepony:Kirin:${project.kirin_version}" - hdskinsCompile sourceSets.main.output - hdskinsCompile "com.minelittlepony:HDSkins:${project.hd_skins_version}" + modImplementation "com.minelittlepony:HDSkins:${project.hd_skins_version}" } // diff --git a/settings.gradle b/settings.gradle index 26bb0de8..b65613d6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,5 +9,5 @@ pluginManagement { } } rootProject.name = 'MineLittlePony' -includeBuild '../Kirin' -includeBuild '../HDSkins' \ No newline at end of file +//includeBuild '../Kirin' +//includeBuild '../HDSkins' \ No newline at end of file diff --git a/src/main/java/com/minelittlepony/client/FabMod.java b/src/main/java/com/minelittlepony/client/FabMod.java index 27521718..0edda35f 100644 --- a/src/main/java/com/minelittlepony/client/FabMod.java +++ b/src/main/java/com/minelittlepony/client/FabMod.java @@ -4,7 +4,7 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.event.client.ClientTickCallback; import net.fabricmc.loader.api.FabricLoader; -import com.minelittlepony.client.gui.hdskins.IndirectHDSkins; +import com.minelittlepony.client.hdskins.IndirectHDSkins; public class FabMod implements ClientModInitializer { diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java b/src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java similarity index 92% rename from src/hdskins/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java rename to src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java index ffae97e8..91ac7869 100644 --- a/src/hdskins/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java +++ b/src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java @@ -7,7 +7,7 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import net.minecraft.util.Identifier; -public class HDSkinsProxy extends SkinsProxy { +class HDSkinsProxy extends SkinsProxy { @Override public Identifier getSkinTexture(GameProfile profile) { diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/IndirectHDSkins.java similarity index 63% rename from src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java rename to src/main/java/com/minelittlepony/client/hdskins/IndirectHDSkins.java index e2cda20d..6a9e9f19 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/IndirectHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/IndirectHDSkins.java @@ -1,11 +1,11 @@ -package com.minelittlepony.client.gui.hdskins; +package com.minelittlepony.client.hdskins; import org.apache.logging.log4j.LogManager; public final class IndirectHDSkins { public static void initialize() { try { - Class.forName("com.minelittlepony.client.hdskins.MineLPHDSkins").getConstructor().newInstance(); + new MineLPHDSkins(); } catch (Exception e) { LogManager.getLogger().warn("Failed to initialize hooks for hdskins", e); } diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java similarity index 98% rename from src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java rename to src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index 249d3421..cb219158 100644 --- a/src/hdskins/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -18,7 +18,7 @@ import com.minelittlepony.hdskins.net.ValhallaSkinServer; /** * All the interactions with HD Skins. */ -public class MineLPHDSkins { +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"; diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/gui/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/client/hdskins/gui/DummyPony.java rename to src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java rename to src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java rename to src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java rename to src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/gui/package-info.java b/src/main/java/com/minelittlepony/client/hdskins/gui/package-info.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/client/hdskins/gui/package-info.java rename to src/main/java/com/minelittlepony/client/hdskins/gui/package-info.java diff --git a/src/hdskins/java/com/minelittlepony/client/hdskins/package-info.java b/src/main/java/com/minelittlepony/client/hdskins/package-info.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/client/hdskins/package-info.java rename to src/main/java/com/minelittlepony/client/hdskins/package-info.java