diff --git a/BuildScripts/cos.gradle b/BuildScripts/cos.gradle index a67869d..2fb8669 100644 --- a/BuildScripts/cos.gradle +++ b/BuildScripts/cos.gradle @@ -36,13 +36,21 @@ String getKey(String filename) { name, filename ) - if (filename.endsWith(".jar")) - return String.format( - "libraries/customskinloader/%s/%s/%s", - name.substring(0, name.indexOf('-')), - name.substring(name.indexOf('-') + 1), - filename - ) + if (filename.endsWith(".jar")){ + if (filename.contains("Fabric") || filename.contains("Forge")){ + return String.format( + "mods/%s", + filename + ) + }else{ + return String.format( + "libraries/customskinloader/%s/%s/%s", + name.substring(0, name.indexOf('-')), + name.substring(name.indexOf('-') + 1), + filename + ) + } + } return filename } diff --git a/Forge1.14/Forge1.14.srg b/Forge1.14/Forge1.14.srg deleted file mode 100644 index 1ce9fc0..0000000 --- a/Forge1.14/Forge1.14.srg +++ /dev/null @@ -1,6 +0,0 @@ -CL: net/minecraft/client/renderer/ImageBufferDownload net/minecraft/client/renderer/DownloadImageBuffer -CL: net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/client/renderer/texture/DownloadingTexture -CL: net/minecraft/client/renderer/ThreadDownloadImageData$1 net/minecraft/client/renderer/texture/DownloadingTexture$1 -CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/client/resources/SkinManager$ISkinAvailableCallback -MD: net/minecraft/client/resources/SkinManager$SkinAvailableCallback/func_180521_a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V net/minecraft/client/resources/SkinManager$SkinAvailableCallback/onSkinTextureAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lqs;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V -MD: net/minecraft/client/Minecraft/addScheduledTask (Ljava/lang/Runnable;)V net/minecraft/client/Minecraft/execute (Ljava/lang/Runnable;)V \ No newline at end of file diff --git a/Forge1.14/build.gradle b/Forge1.14/build.gradle deleted file mode 100644 index 2295372..0000000 --- a/Forge1.14/build.gradle +++ /dev/null @@ -1,100 +0,0 @@ -buildscript { - repositories { - mavenCentral() - jcenter() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - } -} -apply plugin: 'net.minecraftforge.gradle.forge' - -ext.configFile = file "build.properties" -configFile.withReader { - def prop = new Properties() - prop.load(it) - project.ext.config = new ConfigSlurper().parse prop -} -apply from: rootProject.file("BuildScripts/version.gradle") - -archivesBaseName = "CustomSkinLoader_Forge1.14" -version = getCSLVersion() -group = "customskinloader" - -sourceCompatibility = targetCompatibility = 1.6 -compileJava { - sourceCompatibility = targetCompatibility = 1.6 -} -jar { - exclude 'net/minecraft/client/renderer/texture/NativeImage.class' - exclude 'net/minecraft/client/Minecraft.class' - exclude 'net/minecraftforge/fml/common/Mod.class' -} -sourceSets { - main { - java { - //Common - srcDir '../Common/source' - //Forge 1.14 - srcDir 'source' - } - resources { - //Common - srcDir '../Common/resource' - exclude 'Profile.json' - //Forge - srcDir '../Forge/resource' - exclude 'mcmod.info' - } - } -} - -minecraft { - version = config.forge_mc_version + "-" + config.forge_version - runDir = "run" - mappings = config.mappings_version - - replace '@MOD_VERSION@', rootProject.ext.config.version - replace '@MOD_FULL_VERSION@', project.version - replaceIn 'CustomSkinLoader.java' -} - -processResources { - filesNotMatching("**/*.js"){ - expand([ - modVersion : rootProject.ext.config.version, - modFullVersion: project.version, - mcVersion : config.minecraft_version, - mcFullVersions: config.minecraft_full_versions, - forgeVersion : config.forge_version, - gitVersion : System.getenv("CIRCLE_SHA1"), - buildUrl : System.getenv("CIRCLE_BUILD_URL") - ])} -} - -apply from: rootProject.file("BuildScripts/remap.gradle") -task afterBuild { - doLast { - //renameSrgJar - def file0 = file("build/libs/${archivesBaseName}-${version}.jar") - def file1 = file("build/libs/${archivesBaseName}-${version}-srg.jar") - file0.renameTo(file1) - - //reobfSrgToNotch - reobfSrgToNotch() - - //copyBuildFile - copy { - from 'build/libs' - into '../build/libs' - include '**/*.jar' - exclude '**/*-sources.jar' - exclude '**/*-srg.jar' - } - } -} -build.finalizedBy afterBuild diff --git a/Forge1.14/build.properties b/Forge1.14/build.properties deleted file mode 100644 index 34179e9..0000000 --- a/Forge1.14/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -minecraft_version=1.14.2 -minecraft_full_versions=1.14.2 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=Forge1.14.srg \ No newline at end of file diff --git a/Forge1.14/source/customskinloader/forge/ForgeMod.java b/Forge1.14/source/customskinloader/forge/ForgeMod.java deleted file mode 100644 index a8aa816..0000000 --- a/Forge1.14/source/customskinloader/forge/ForgeMod.java +++ /dev/null @@ -1,10 +0,0 @@ -package customskinloader.forge; - -import net.minecraftforge.fml.common.Mod; - -/** - * Forge Mod Container - */ -@Mod("customskinloader") -public class ForgeMod { -} \ No newline at end of file diff --git a/Forge1.14/source/net/minecraft/client/Minecraft.java b/Forge1.14/source/net/minecraft/client/Minecraft.java deleted file mode 100644 index 0449b00..0000000 --- a/Forge1.14/source/net/minecraft/client/Minecraft.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.minecraft.client; - -import com.mojang.authlib.minecraft.MinecraftSessionService; -import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.util.Session; - -import java.io.File; - -public class Minecraft { - public File gameDir = null; - - public static Minecraft getMinecraft() { - return null; - } - - public SkinManager getSkinManager() { - return null; - } - - public TextureManager getTextureManager() { - return null; - } - - public MinecraftSessionService getSessionService() { - return null; - } - - public Session getSession() { - return null; - } - - public ServerData getCurrentServerData() { - return null; - } - - public void addScheduledTask(Runnable r) { - } -} diff --git a/Forge1.14/source/net/minecraftforge/fml/common/Mod.java b/Forge1.14/source/net/minecraftforge/fml/common/Mod.java deleted file mode 100644 index 354dadd..0000000 --- a/Forge1.14/source/net/minecraftforge/fml/common/Mod.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.minecraftforge.fml.common; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -//https://github.com/MinecraftForge/MinecraftForge/blob/1.13.x/src/main/java/net/minecraftforge/fml/common/Mod.java -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Mod { - String value(); -}