From 64490f1d18fce19402acf4e07c4685bb117d4d45 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Tue, 2 Jul 2024 22:43:35 +0800 Subject: [PATCH] Support 1.21. (#297) --- .../main/java/customskinloader/Logger.java | 8 -- .../java/customskinloader/config/Config.java | 7 +- .../customskinloader/fake/FakeCapeBuffer.java | 2 +- .../fake/itf/FakeInterfaceManager.java | 1 - .../profile/ProfileCache.java | 1 - .../customskinloader/utils/HttpUtil0.java | 7 -- .../customskinloader/utils/MinecraftUtil.java | 2 +- Common/src/main/resources/BuildInfo.json | 6 +- Fabric/build.gradle | 46 +------ Fabric/build.properties | 6 +- .../fabric/MixinConfigPlugin.java | 99 +-------------- .../resources/customskinloader.accesswidener | 2 + Fabric/src/main/resources/fabric.mod.json | 3 +- .../resources/mixins.customskinloader.json | 50 ++++---- Forge/Active/build.properties | 8 -- .../java/cpw/mods/cl/JarModuleFinder.java | 15 +++ .../java/cpw/mods/jarhandling/SecureJar.java | 9 ++ .../src/main/java/java/lang/ModuleLayer.java | 13 ++ .../java/java/lang/module/Configuration.java | 19 +++ .../java/java/lang/module/ModuleFinder.java | 5 + .../java/lang/module/ModuleReference.java | 5 + .../java/java/lang/module/ResolvedModule.java | 7 ++ .../java/net/neoforged/fml/common/Mod.java | 12 ++ Forge/Legacy/build.properties | 7 -- Forge/{Legacy => V1}/build.gradle | 0 Forge/V1/build.properties | 6 + .../forge/ForgeDevTweaker.java | 0 .../java/customskinloader/forge/ForgeMod.java | 0 .../customskinloader/forge/ForgePlugin.java | 0 .../customskinloader/forge/ForgeTweaker.java | 0 .../forge/TransformerManager.java | 0 .../forge/loader/LaunchWrapper.java | 0 .../forge/platform/DefaultFMLPlatform.java | 0 .../forge/platform/IFMLPlatform.java | 0 .../FakeInterfacesTransformer.java | 4 - .../transformer/PlayerTabTransformer.java | 0 .../transformer/SkinManagerTransformer.java | 0 .../transformer/SpectatorMenuTransformer.java | 0 .../client/resources/SkinManager.java | 0 .../src/main/resources/META-INF/coremods.json | 0 .../src/main/resources/META-INF/mods.toml | 0 ...stomskinloader.forge.platform.IFMLPlatform | 0 .../src/main/resources/mcmod.info | 0 .../src/main/resources/pack.mcmeta | 0 .../src/main/resources/transformers.js | 0 Forge/{Active => V2}/Forge.tsrg | 0 Forge/{Active => V2}/build.gradle | 0 Forge/V2/build.properties | 8 ++ .../java/customskinloader/forge/ForgeMod.java | 0 .../src/main/resources/META-INF/coremods.json | 0 .../src/main/resources/META-INF/mods.toml | 0 .../src/main/resources/pack.mcmeta | 0 .../src/main/resources/transformers.js | 45 +++---- Forge/V3/Forge.tsrg | 64 ++++++++++ Forge/V3/build.gradle | 37 ++++++ Forge/V3/build.properties | 8 ++ Forge/V3/mixin.tsrg | 48 ++++++++ .../java/customskinloader/forge/ForgeMod.java | 16 +++ .../forge/MixinConfigPlugin.java | 115 ++++++++++++++++++ .../customskinloader/forge/NeoForgeMod.java | 8 ++ .../resources/META-INF/accesstransformer.cfg | 2 + .../V3/src/main/resources/META-INF/mods.toml | 35 ++++++ .../resources/META-INF/neoforge.mods.toml | 37 ++++++ .../resources/mixins.customskinloader.json | 24 ++++ Forge/V3/src/main/resources/pack.mcmeta | 6 + Vanilla/Common/build.gradle | 12 ++ Vanilla/Common/build.properties | 5 + .../mixin/MixinGuiPlayerTabOverlay.java | 0 .../mixin/MixinIImageBuffer.java | 0 .../mixin/MixinIResource.java | 0 .../mixin/MixinIResourceManager.java | 0 .../mixin/MixinLayerCape.java | 0 .../mixin/MixinMinecraft.java | 0 .../mixin/MixinRenderPlayer.java | 0 .../mixin/MixinSkinManager$1.java | 4 +- .../mixin/MixinSkinManager$CacheKey.java | 0 .../mixin/MixinSkinManager$TextureCache.java | 0 .../mixin/MixinSkinManager.java | 0 .../mixin/MixinThreadDownloadImageData.java | 0 .../mixin/core/MixinConfigPlugin.java | 104 ++++++++++++++++ .../client/resources/SkinManager$1.java | 0 .../client/resources/SkinManager.java | 4 +- build.gradle | 22 ++-- build.properties | 2 +- .../gradle/entity/CslLatest.java | 5 +- .../gradle/task/UploadBaseTask.java | 9 +- .../gradle/util/CurseForgeUtil.java | 56 --------- .../gradle/util/ModrinthUtil.java | 40 ------ .../gradle/util/VersionUtil.java | 31 +++-- settings.gradle | 11 +- 90 files changed, 733 insertions(+), 375 deletions(-) delete mode 100644 Common/src/main/java/customskinloader/Logger.java create mode 100644 Fabric/src/main/resources/customskinloader.accesswidener delete mode 100644 Forge/Active/build.properties create mode 100644 Forge/Common/src/main/java/cpw/mods/cl/JarModuleFinder.java create mode 100644 Forge/Common/src/main/java/cpw/mods/jarhandling/SecureJar.java create mode 100644 Forge/Common/src/main/java/java/lang/ModuleLayer.java create mode 100644 Forge/Common/src/main/java/java/lang/module/Configuration.java create mode 100644 Forge/Common/src/main/java/java/lang/module/ModuleFinder.java create mode 100644 Forge/Common/src/main/java/java/lang/module/ModuleReference.java create mode 100644 Forge/Common/src/main/java/java/lang/module/ResolvedModule.java create mode 100644 Forge/Common/src/main/java/net/neoforged/fml/common/Mod.java delete mode 100644 Forge/Legacy/build.properties rename Forge/{Legacy => V1}/build.gradle (100%) create mode 100644 Forge/V1/build.properties rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/ForgeDevTweaker.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/ForgeMod.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/ForgePlugin.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/ForgeTweaker.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/TransformerManager.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/loader/LaunchWrapper.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/platform/IFMLPlatform.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java (94%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java (100%) rename Forge/{Legacy => V1}/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java (100%) rename Forge/{Legacy => V1}/src/main/java/net/minecraft/client/resources/SkinManager.java (100%) rename Forge/{Active => V1}/src/main/resources/META-INF/coremods.json (100%) rename Forge/{Legacy => V1}/src/main/resources/META-INF/mods.toml (100%) rename Forge/{Legacy => V1}/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform (100%) rename Forge/{Legacy => V1}/src/main/resources/mcmod.info (100%) rename Forge/{Legacy => V1}/src/main/resources/pack.mcmeta (100%) rename Forge/{Legacy => V1}/src/main/resources/transformers.js (100%) rename Forge/{Active => V2}/Forge.tsrg (100%) rename Forge/{Active => V2}/build.gradle (100%) create mode 100644 Forge/V2/build.properties rename Forge/{Active => V2}/src/main/java/customskinloader/forge/ForgeMod.java (100%) rename Forge/{Legacy => V2}/src/main/resources/META-INF/coremods.json (100%) rename Forge/{Active => V2}/src/main/resources/META-INF/mods.toml (100%) rename Forge/{Active => V2}/src/main/resources/pack.mcmeta (100%) rename Forge/{Active => V2}/src/main/resources/transformers.js (95%) create mode 100644 Forge/V3/Forge.tsrg create mode 100644 Forge/V3/build.gradle create mode 100644 Forge/V3/build.properties create mode 100644 Forge/V3/mixin.tsrg create mode 100644 Forge/V3/src/main/java/customskinloader/forge/ForgeMod.java create mode 100644 Forge/V3/src/main/java/customskinloader/forge/MixinConfigPlugin.java create mode 100644 Forge/V3/src/main/java/customskinloader/forge/NeoForgeMod.java create mode 100644 Forge/V3/src/main/resources/META-INF/accesstransformer.cfg create mode 100644 Forge/V3/src/main/resources/META-INF/mods.toml create mode 100644 Forge/V3/src/main/resources/META-INF/neoforge.mods.toml create mode 100644 Forge/V3/src/main/resources/mixins.customskinloader.json create mode 100644 Forge/V3/src/main/resources/pack.mcmeta create mode 100644 Vanilla/Common/build.gradle create mode 100644 Vanilla/Common/build.properties rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinIImageBuffer.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinIResource.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinIResourceManager.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinLayerCape.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinMinecraft.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinRenderPlayer.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinSkinManager$1.java (99%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinSkinManager$CacheKey.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinSkinManager$TextureCache.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinSkinManager.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java (100%) create mode 100644 Vanilla/Common/src/main/java/customskinloader/mixin/core/MixinConfigPlugin.java rename {Fabric => Vanilla/Common}/src/main/java/net/minecraft/client/resources/SkinManager$1.java (100%) rename {Fabric => Vanilla/Common}/src/main/java/net/minecraft/client/resources/SkinManager.java (88%) delete mode 100644 buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java delete mode 100644 buildSrc/src/main/java/customskinloader/gradle/util/ModrinthUtil.java diff --git a/Common/src/main/java/customskinloader/Logger.java b/Common/src/main/java/customskinloader/Logger.java deleted file mode 100644 index d62a1e7..0000000 --- a/Common/src/main/java/customskinloader/Logger.java +++ /dev/null @@ -1,8 +0,0 @@ -package customskinloader; - -/** - * @deprecated From 14.16, use customskinloader.log.Logger instead. - */ -@Deprecated -public class Logger extends customskinloader.log.Logger { -} diff --git a/Common/src/main/java/customskinloader/config/Config.java b/Common/src/main/java/customskinloader/config/Config.java index 8d84398..bf3efce 100644 --- a/Common/src/main/java/customskinloader/config/Config.java +++ b/Common/src/main/java/customskinloader/config/Config.java @@ -2,7 +2,11 @@ package customskinloader.config; import java.io.File; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; import customskinloader.CustomSkinLoader; import customskinloader.loader.ProfileLoader; @@ -10,7 +14,6 @@ import customskinloader.plugin.ICustomSkinLoaderPlugin; import customskinloader.plugin.PluginLoader; import customskinloader.utils.HttpRequestUtil; import customskinloader.utils.HttpTextureUtil; -import customskinloader.utils.HttpUtil0; import customskinloader.utils.Version; import org.apache.commons.io.FileUtils; diff --git a/Common/src/main/java/customskinloader/fake/FakeCapeBuffer.java b/Common/src/main/java/customskinloader/fake/FakeCapeBuffer.java index c6261b6..9da9e23 100644 --- a/Common/src/main/java/customskinloader/fake/FakeCapeBuffer.java +++ b/Common/src/main/java/customskinloader/fake/FakeCapeBuffer.java @@ -12,7 +12,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; public class FakeCapeBuffer extends FakeSkinBuffer { - private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("textures/entity/elytra.png"); + private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("minecraft", "textures/entity/elytra.png"); private static int loadedGlobal = 0; private static FakeImage elytraImage; diff --git a/Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java b/Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java index 945c9a3..fc677dc 100644 --- a/Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java +++ b/Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java @@ -1,6 +1,5 @@ package customskinloader.fake.itf; -import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.util.Optional; diff --git a/Common/src/main/java/customskinloader/profile/ProfileCache.java b/Common/src/main/java/customskinloader/profile/ProfileCache.java index 88573a3..e7853d0 100644 --- a/Common/src/main/java/customskinloader/profile/ProfileCache.java +++ b/Common/src/main/java/customskinloader/profile/ProfileCache.java @@ -7,7 +7,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.function.Function; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; import customskinloader.CustomSkinLoader; import customskinloader.utils.TimeUtil; import org.apache.commons.io.FileUtils; diff --git a/Common/src/main/java/customskinloader/utils/HttpUtil0.java b/Common/src/main/java/customskinloader/utils/HttpUtil0.java index 8239170..083f89e 100644 --- a/Common/src/main/java/customskinloader/utils/HttpUtil0.java +++ b/Common/src/main/java/customskinloader/utils/HttpUtil0.java @@ -4,14 +4,7 @@ import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; -import java.security.cert.X509Certificate; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import org.apache.commons.lang3.StringUtils; diff --git a/Common/src/main/java/customskinloader/utils/MinecraftUtil.java b/Common/src/main/java/customskinloader/utils/MinecraftUtil.java index f37256d..e8d39bd 100644 --- a/Common/src/main/java/customskinloader/utils/MinecraftUtil.java +++ b/Common/src/main/java/customskinloader/utils/MinecraftUtil.java @@ -40,7 +40,7 @@ public class MinecraftUtil { } //version.json can be found in 1.14+ - URL versionFile = MinecraftUtil.class.getResource("/version.json"); + URL versionFile = ClassLoader.getSystemClassLoader().getResource("version.json"); if (versionFile != null) { try ( InputStream is = versionFile.openStream(); diff --git a/Common/src/main/resources/BuildInfo.json b/Common/src/main/resources/BuildInfo.json index 962930c..ad60517 100644 --- a/Common/src/main/resources/BuildInfo.json +++ b/Common/src/main/resources/BuildInfo.json @@ -2,9 +2,9 @@ "name": "CustomSkinLoader", "version": "${modVersion}", "fullVersion": "${modFullVersion}", - "mcVersion": "${mcVersion}", - "mcFullVersions": "${mcFullVersions}", - "forgeVersion": "${forgeVersion}", + "dependencies": { + "${dependencies}" + }, "gitVersion": "${gitVersion}", "buildUrl": "${buildUrl}", "buildTime": "${releaseTime}" diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 249b3fe..6a5f4cc 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -24,7 +24,6 @@ dependencies { import customskinloader.gradle.util.RemapUtil import customskinloader.gradle.util.SourceUtil -import groovy.json.JsonSlurper apply plugin: 'org.spongepowered.mixin' @@ -37,48 +36,5 @@ mixin { reobfNotchSrgFile = "build/mixin.srg" } -SourceUtil.addDependencies project, project(":Common") +SourceUtil.addDependencies project, project(":Common"), project(":Vanilla/Common") RemapUtil.remapSources project - -// Resolve snapshot versions -tasks.publishModrinth.doFirst { - def snapshot = [] - gameVersions.groupBy { v -> v.endsWith("-Snapshot") }.with { - this.tasks.publishModrinth.gameVersions = it[false] - snapshot = it[true] - } - - // The CustomSkinLoader Fabric edition should support all Minecraft snapshot edition. - def jsonSlurper = new JsonSlurper() - def officialVersionList = [] as Set - plugins.withId "net.minecraftforge.gradle.forge", { plugin -> - def currentRelease = null - // Get version manifest json. - // https://github.com/MinecraftForge/ForgeGradle/blob/fc67182a61926f0bdb0d12da5fba7f4322f64d86/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java#L229 - jsonSlurper.parse(plugin.cacheFile("McManifest.json")).versions.each { version -> - if (version.type == "snapshot") { - // If the first version is a snapshot, since Mojang no longer provides the target version for snapshots, - // we assume that new snapshots will not be supported until the next release. - if (currentRelease == null) { - return - } - } else if (version.type == "release") { - currentRelease = version.id.with { - it.toString().split($/\./$).with { "${it[0]}.${it[1]}" } - } - } else { - // We do not care about other types. - return - } - if (snapshot.contains("${currentRelease}-Snapshot".toString())) { - officialVersionList << version.id - } - } - } - jsonSlurper.parse(new URL("https://meta.fabricmc.net/v2/versions/game")).each { version -> - // Exclude experimental editions which is not support in Modrinth. - if (!version.stable && officialVersionList.contains(version.version)) { - gameVersions << version.version.replace(" ", "-").replace("Pre-Release-", "pre") // Fix the id of the earlier preview versions of 1.14. - } - } -} diff --git a/Fabric/build.properties b/Fabric/build.properties index 2da78ad..88e0ef5 100644 --- a/Fabric/build.properties +++ b/Fabric/build.properties @@ -1,6 +1,6 @@ -minecraft_version=1.14 -minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4 -java_full_versions=8,9,10,11,12,13,14,15,16,17,18,19,20,21 +dependencies=Fabric|1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21;\ + Quilt|1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21 +java_full_versions=8,9,10,11,12,13,14,15,16,17,18,19,20,21,22 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java b/Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java index 5afbc2d..d84b328 100644 --- a/Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java +++ b/Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java @@ -1,106 +1,11 @@ package customskinloader.fabric; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.nio.file.Paths; -import java.util.List; -import java.util.Set; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import customskinloader.log.LogManager; -import customskinloader.log.Logger; -import org.objectweb.asm.tree.ClassNode; -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -public class MixinConfigPlugin implements IMixinConfigPlugin { - public static Logger logger = LogManager.getLogger("Fabric"); - private long world_version; - private long protocol_version; - +public class MixinConfigPlugin extends customskinloader.mixin.core.MixinConfigPlugin { @Override public void onLoad(String mixinPackage) { - LogManager.setLogFile(Paths.get("./CustomSkinLoader/CustomSkinLoader.log")); - URL versionJson = this.getClass().getResource("/version.json"); - if (versionJson != null) { - logger.info("\"version.json\": " + versionJson.toString()); - try ( - InputStream is = versionJson.openStream(); - InputStreamReader isr = new InputStreamReader(is) - ) { - JsonObject object = new JsonParser().parse(isr).getAsJsonObject(); - String name = object.get("name").getAsString(); - this.world_version = object.get("world_version").getAsLong(); - this.protocol_version = object.get("protocol_version").getAsLong(); - logger.info("MinecraftVersion: {name='" + name + "', world_version='" + this.world_version + "', protocol_version='" + this.protocol_version + "'}"); - } catch (Throwable t) { - logger.warning("An exception occurred when reading \"version.json\"!"); - logger.warning(t); - } - } else { - logger.warning("Can't read \"version.json\"! Ignore this message if the version you start is earlier than 18w47b."); - } + super.onLoad(mixinPackage); // This mod will remap extra classes when in the development environment. DevEnvRemapper.initRemapper(); } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - boolean result = true; - if (mixinClassName.endsWith(".MixinIImageBuffer")) { - result = this.world_version <= 2204 && this.protocol_version <= 553; // 18w43b ~ 19w37a - } else if (mixinClassName.endsWith(".MixinLayerCape") || mixinClassName.endsWith(".MixinRenderPlayer")) { - result = this.world_version >= 2210 && this.protocol_version >= 558; // 19w41a+ - } else if (mixinClassName.endsWith(".MixinSkinManager$V1")) { - result = this.world_version <= 3465 && (this.protocol_version <= 763 || (this.protocol_version >= 801 && this.protocol_version <= 803) || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x4000008E)); // 18w43b ~ 1.20.1 - } else if (mixinClassName.endsWith(".MixinSkinManager$V2") || mixinClassName.endsWith(".MixinSkinManager$1") || mixinClassName.endsWith(".MixinSkinManager$CacheKey") || mixinClassName.endsWith(".MixinSkinManager$TextureCache")) { - result = this.world_version >= 3567 && ((this.protocol_version >= 764 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x40000090); // 23w31a+ - } else if (mixinClassName.endsWith(".MixinSkinManager$V3")) { - result = this.world_version >= 3684 && ((this.protocol_version >= 765 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x4000009D); // 23w42a+ - } else if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V1")) { - result = (this.world_version >= 2205 && this.world_version <= 2722) && ((this.protocol_version >= 554 && this.protocol_version <= 754) || (this.protocol_version >= 801 && this.protocol_version <= 803) || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x40000022)); // 19w38a ~ 1.17-rc1 - } else if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V2")) { - result = this.world_version >= 2723 && ((this.protocol_version >= 755 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x40000023); // 1.17-rc2+ - } - logger.info("target: " + targetClassName + ", mixin: " + mixinClassName + ", result: " + result); - return result; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } - - // To be compatible with 0.7.11 - public void preApply(String targetClassName, org.spongepowered.asm.lib.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } - - // To be compatible with 0.7.11 - public void postApply(String targetClassName, org.spongepowered.asm.lib.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } } diff --git a/Fabric/src/main/resources/customskinloader.accesswidener b/Fabric/src/main/resources/customskinloader.accesswidener new file mode 100644 index 0000000..c2c65b7 --- /dev/null +++ b/Fabric/src/main/resources/customskinloader.accesswidener @@ -0,0 +1,2 @@ +accessWidener v2 intermediary +accessible method net/minecraft/class_2960 (Ljava/lang/String;Ljava/lang/String;)V diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index fb43bb6..a73650e 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -16,5 +16,6 @@ "environment": "client", "mixins": [ "mixins.customskinloader.json" - ] + ], + "accessWidener": "customskinloader.accesswidener" } diff --git a/Fabric/src/main/resources/mixins.customskinloader.json b/Fabric/src/main/resources/mixins.customskinloader.json index 2121c44..29a47ec 100644 --- a/Fabric/src/main/resources/mixins.customskinloader.json +++ b/Fabric/src/main/resources/mixins.customskinloader.json @@ -1,27 +1,27 @@ { - "compatibilityLevel": "JAVA_8", - "mixinPriority": 1010, - "package": "customskinloader.mixin", - "client": [ - "MixinGuiPlayerTabOverlay", - "MixinIImageBuffer", - "MixinIResource", - "MixinIResourceManager", - "MixinLayerCape", - "MixinMinecraft", - "MixinRenderPlayer", - "MixinSkinManager$1", - "MixinSkinManager$CacheKey", - "MixinSkinManager$TextureCache", - "MixinSkinManager$V1", - "MixinSkinManager$V2", - "MixinSkinManager$V3", - "MixinThreadDownloadImageData$V1", - "MixinThreadDownloadImageData$V2" - ], - "refmap": "mixins.customskinloader.refmap.json", - "plugin": "customskinloader.fabric.MixinConfigPlugin", - "injectors": { - "defaultRequire": 1 - } + "compatibilityLevel": "JAVA_8", + "mixinPriority": 1010, + "package": "customskinloader.mixin", + "client": [ + "MixinGuiPlayerTabOverlay", + "MixinIImageBuffer", + "MixinIResource", + "MixinIResourceManager", + "MixinLayerCape", + "MixinMinecraft", + "MixinRenderPlayer", + "MixinSkinManager$1", + "MixinSkinManager$CacheKey", + "MixinSkinManager$TextureCache", + "MixinSkinManager$V1", + "MixinSkinManager$V2", + "MixinSkinManager$V3", + "MixinThreadDownloadImageData$V1", + "MixinThreadDownloadImageData$V2" + ], + "refmap": "mixins.customskinloader.refmap.json", + "plugin": "customskinloader.fabric.MixinConfigPlugin", + "injectors": { + "defaultRequire": 1 + } } diff --git a/Forge/Active/build.properties b/Forge/Active/build.properties deleted file mode 100644 index 68ff65f..0000000 --- a/Forge/Active/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.17.1 -minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4 -java_full_versions=16,17,18,19,20,21 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=Forge.tsrg diff --git a/Forge/Common/src/main/java/cpw/mods/cl/JarModuleFinder.java b/Forge/Common/src/main/java/cpw/mods/cl/JarModuleFinder.java new file mode 100644 index 0000000..bf383a0 --- /dev/null +++ b/Forge/Common/src/main/java/cpw/mods/cl/JarModuleFinder.java @@ -0,0 +1,15 @@ +package cpw.mods.cl; + +import java.lang.module.ModuleFinder; + +import cpw.mods.jarhandling.SecureJar; + +public class JarModuleFinder implements ModuleFinder { + public static JarModuleFinder of(SecureJar... jars) { + return null; + } + + public static class JarModuleReference { + + } +} diff --git a/Forge/Common/src/main/java/cpw/mods/jarhandling/SecureJar.java b/Forge/Common/src/main/java/cpw/mods/jarhandling/SecureJar.java new file mode 100644 index 0000000..d561f2b --- /dev/null +++ b/Forge/Common/src/main/java/cpw/mods/jarhandling/SecureJar.java @@ -0,0 +1,9 @@ +package cpw.mods.jarhandling; + +import java.nio.file.Path; + +public interface SecureJar { + static SecureJar from(final Path... paths) { + return null; + } +} diff --git a/Forge/Common/src/main/java/java/lang/ModuleLayer.java b/Forge/Common/src/main/java/java/lang/ModuleLayer.java new file mode 100644 index 0000000..adeb459 --- /dev/null +++ b/Forge/Common/src/main/java/java/lang/ModuleLayer.java @@ -0,0 +1,13 @@ +package java.lang; + +import java.lang.module.Configuration; + +public class ModuleLayer { + public static ModuleLayer boot() { + return null; + } + + public Configuration configuration() { + return null; + } +} diff --git a/Forge/Common/src/main/java/java/lang/module/Configuration.java b/Forge/Common/src/main/java/java/lang/module/Configuration.java new file mode 100644 index 0000000..04e1a19 --- /dev/null +++ b/Forge/Common/src/main/java/java/lang/module/Configuration.java @@ -0,0 +1,19 @@ +package java.lang.module; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; + +public class Configuration { + public static Configuration resolve(ModuleFinder before, List parents, ModuleFinder after, Collection roots) { + return null; + } + + public static Configuration empty() { + return null; + } + + public Optional findModule(String name) { + return null; + } +} diff --git a/Forge/Common/src/main/java/java/lang/module/ModuleFinder.java b/Forge/Common/src/main/java/java/lang/module/ModuleFinder.java new file mode 100644 index 0000000..33d461d --- /dev/null +++ b/Forge/Common/src/main/java/java/lang/module/ModuleFinder.java @@ -0,0 +1,5 @@ +package java.lang.module; + +public interface ModuleFinder { + +} diff --git a/Forge/Common/src/main/java/java/lang/module/ModuleReference.java b/Forge/Common/src/main/java/java/lang/module/ModuleReference.java new file mode 100644 index 0000000..8eeb1cc --- /dev/null +++ b/Forge/Common/src/main/java/java/lang/module/ModuleReference.java @@ -0,0 +1,5 @@ +package java.lang.module; + +public class ModuleReference { + +} diff --git a/Forge/Common/src/main/java/java/lang/module/ResolvedModule.java b/Forge/Common/src/main/java/java/lang/module/ResolvedModule.java new file mode 100644 index 0000000..f4d91c8 --- /dev/null +++ b/Forge/Common/src/main/java/java/lang/module/ResolvedModule.java @@ -0,0 +1,7 @@ +package java.lang.module; + +public class ResolvedModule { + public ModuleReference reference() { + return null; + } +} diff --git a/Forge/Common/src/main/java/net/neoforged/fml/common/Mod.java b/Forge/Common/src/main/java/net/neoforged/fml/common/Mod.java new file mode 100644 index 0000000..5f33768 --- /dev/null +++ b/Forge/Common/src/main/java/net/neoforged/fml/common/Mod.java @@ -0,0 +1,12 @@ +package net.neoforged.fml.common; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Mod { + String value(); +} diff --git a/Forge/Legacy/build.properties b/Forge/Legacy/build.properties deleted file mode 100644 index 9dd7dbf..0000000 --- a/Forge/Legacy/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -minecraft_version=1.12.2 -minecraft_full_versions=1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5 -java_full_versions=8,9,10,11,12,13,14,15,16,17,18,19,20,21 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 diff --git a/Forge/Legacy/build.gradle b/Forge/V1/build.gradle similarity index 100% rename from Forge/Legacy/build.gradle rename to Forge/V1/build.gradle diff --git a/Forge/V1/build.properties b/Forge/V1/build.properties new file mode 100644 index 0000000..3a0c982 --- /dev/null +++ b/Forge/V1/build.properties @@ -0,0 +1,6 @@ +dependencies=Forge|1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5 +java_full_versions=8,9,10,11,12,13,14,15,16,17,18,19,20,21,22 +#forge gradle needs forge version +forge_mc_version=1.12.2 +forge_version=14.23.5.2768 +mappings_version=stable_39 diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/ForgeDevTweaker.java b/Forge/V1/src/main/java/customskinloader/forge/ForgeDevTweaker.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/ForgeDevTweaker.java rename to Forge/V1/src/main/java/customskinloader/forge/ForgeDevTweaker.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/ForgeMod.java b/Forge/V1/src/main/java/customskinloader/forge/ForgeMod.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/ForgeMod.java rename to Forge/V1/src/main/java/customskinloader/forge/ForgeMod.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/ForgePlugin.java b/Forge/V1/src/main/java/customskinloader/forge/ForgePlugin.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/ForgePlugin.java rename to Forge/V1/src/main/java/customskinloader/forge/ForgePlugin.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/ForgeTweaker.java b/Forge/V1/src/main/java/customskinloader/forge/ForgeTweaker.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/ForgeTweaker.java rename to Forge/V1/src/main/java/customskinloader/forge/ForgeTweaker.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/TransformerManager.java b/Forge/V1/src/main/java/customskinloader/forge/TransformerManager.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/TransformerManager.java rename to Forge/V1/src/main/java/customskinloader/forge/TransformerManager.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/loader/LaunchWrapper.java b/Forge/V1/src/main/java/customskinloader/forge/loader/LaunchWrapper.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/loader/LaunchWrapper.java rename to Forge/V1/src/main/java/customskinloader/forge/loader/LaunchWrapper.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java b/Forge/V1/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java rename to Forge/V1/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/platform/IFMLPlatform.java b/Forge/V1/src/main/java/customskinloader/forge/platform/IFMLPlatform.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/platform/IFMLPlatform.java rename to Forge/V1/src/main/java/customskinloader/forge/platform/IFMLPlatform.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java b/Forge/V1/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java similarity index 94% rename from Forge/Legacy/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java rename to Forge/V1/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java index 092bf8b..2a08316 100644 --- a/Forge/Legacy/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java +++ b/Forge/V1/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java @@ -3,10 +3,6 @@ package customskinloader.forge.transformer; import customskinloader.forge.TransformerManager; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.InsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.VarInsnNode; public class FakeInterfacesTransformer { public static class FakeInterfaceTransformer implements TransformerManager.IClassTransformer { diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java b/Forge/V1/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java rename to Forge/V1/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java b/Forge/V1/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java rename to Forge/V1/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java diff --git a/Forge/Legacy/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java b/Forge/V1/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java similarity index 100% rename from Forge/Legacy/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java rename to Forge/V1/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java diff --git a/Forge/Legacy/src/main/java/net/minecraft/client/resources/SkinManager.java b/Forge/V1/src/main/java/net/minecraft/client/resources/SkinManager.java similarity index 100% rename from Forge/Legacy/src/main/java/net/minecraft/client/resources/SkinManager.java rename to Forge/V1/src/main/java/net/minecraft/client/resources/SkinManager.java diff --git a/Forge/Active/src/main/resources/META-INF/coremods.json b/Forge/V1/src/main/resources/META-INF/coremods.json similarity index 100% rename from Forge/Active/src/main/resources/META-INF/coremods.json rename to Forge/V1/src/main/resources/META-INF/coremods.json diff --git a/Forge/Legacy/src/main/resources/META-INF/mods.toml b/Forge/V1/src/main/resources/META-INF/mods.toml similarity index 100% rename from Forge/Legacy/src/main/resources/META-INF/mods.toml rename to Forge/V1/src/main/resources/META-INF/mods.toml diff --git a/Forge/Legacy/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform b/Forge/V1/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform similarity index 100% rename from Forge/Legacy/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform rename to Forge/V1/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform diff --git a/Forge/Legacy/src/main/resources/mcmod.info b/Forge/V1/src/main/resources/mcmod.info similarity index 100% rename from Forge/Legacy/src/main/resources/mcmod.info rename to Forge/V1/src/main/resources/mcmod.info diff --git a/Forge/Legacy/src/main/resources/pack.mcmeta b/Forge/V1/src/main/resources/pack.mcmeta similarity index 100% rename from Forge/Legacy/src/main/resources/pack.mcmeta rename to Forge/V1/src/main/resources/pack.mcmeta diff --git a/Forge/Legacy/src/main/resources/transformers.js b/Forge/V1/src/main/resources/transformers.js similarity index 100% rename from Forge/Legacy/src/main/resources/transformers.js rename to Forge/V1/src/main/resources/transformers.js diff --git a/Forge/Active/Forge.tsrg b/Forge/V2/Forge.tsrg similarity index 100% rename from Forge/Active/Forge.tsrg rename to Forge/V2/Forge.tsrg diff --git a/Forge/Active/build.gradle b/Forge/V2/build.gradle similarity index 100% rename from Forge/Active/build.gradle rename to Forge/V2/build.gradle diff --git a/Forge/V2/build.properties b/Forge/V2/build.properties new file mode 100644 index 0000000..e2d58bf --- /dev/null +++ b/Forge/V2/build.properties @@ -0,0 +1,8 @@ +dependencies=Forge|1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4;\ + NeoForge|1.20.1 +java_full_versions=16,17,18,19,20,21,22 +#forge gradle needs forge version +forge_mc_version=1.12.2 +forge_version=14.23.5.2768 +mappings_version=stable_39 +srg_notch_map=Forge.tsrg diff --git a/Forge/Active/src/main/java/customskinloader/forge/ForgeMod.java b/Forge/V2/src/main/java/customskinloader/forge/ForgeMod.java similarity index 100% rename from Forge/Active/src/main/java/customskinloader/forge/ForgeMod.java rename to Forge/V2/src/main/java/customskinloader/forge/ForgeMod.java diff --git a/Forge/Legacy/src/main/resources/META-INF/coremods.json b/Forge/V2/src/main/resources/META-INF/coremods.json similarity index 100% rename from Forge/Legacy/src/main/resources/META-INF/coremods.json rename to Forge/V2/src/main/resources/META-INF/coremods.json diff --git a/Forge/Active/src/main/resources/META-INF/mods.toml b/Forge/V2/src/main/resources/META-INF/mods.toml similarity index 100% rename from Forge/Active/src/main/resources/META-INF/mods.toml rename to Forge/V2/src/main/resources/META-INF/mods.toml diff --git a/Forge/Active/src/main/resources/pack.mcmeta b/Forge/V2/src/main/resources/pack.mcmeta similarity index 100% rename from Forge/Active/src/main/resources/pack.mcmeta rename to Forge/V2/src/main/resources/pack.mcmeta diff --git a/Forge/Active/src/main/resources/transformers.js b/Forge/V2/src/main/resources/transformers.js similarity index 95% rename from Forge/Active/src/main/resources/transformers.js rename to Forge/V2/src/main/resources/transformers.js index 7291eae..9ac12dd 100644 --- a/Forge/Active/src/main/resources/transformers.js +++ b/Forge/V2/src/main/resources/transformers.js @@ -109,8 +109,8 @@ function initializeCoreMod() { var node = iterator.next(); if (node.getOpcode() === Opcodes.INVOKESTATIC && node.owner.equals("com/google/common/collect/ImmutableList") && checkName(node.name, "of") && node.desc.equals("(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList;")) { mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP2)); - mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mojang/authlib/minecraft/MinecraftProfileTexture$Type", "values", "()[Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;")) - mn.instructions.set(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "com/google/common/collect/ImmutableList", "copyOf", "([Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList;")) + mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mojang/authlib/minecraft/MinecraftProfileTexture$Type", "values", "()[Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;")); + mn.instructions.set(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "com/google/common/collect/ImmutableList", "copyOf", "([Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList;")); } } } else if (checkName(mn.name, "m_118815_") && mn.desc.equals("(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;")) { // 1.20.1- @@ -126,7 +126,7 @@ function initializeCoreMod() { for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); if (node.getOpcode() === Opcodes.INVOKESPECIAL && node.owner.equals("net/minecraft/client/resources/SkinManager$CacheKey") && checkName(node.name, "") && node.desc.equals("(Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V")) { - mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "createProperty", "(Lcom/mojang/authlib/properties/Property;)Lcom/mojang/authlib/properties/Property;", false)) + mn.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "createProperty", "(Lcom/mojang/authlib/properties/Property;)Lcom/mojang/authlib/properties/Property;", false)); } else if (node.getOpcode() === Opcodes.INVOKEINTERFACE && node.owner.equals("com/google/common/cache/LoadingCache") && checkName(node.name, "getUnchecked") && node.desc.equals("(Ljava/lang/Object;)Ljava/lang/Object;")) { mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 1)); mn.instructions.set(node, new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinManager", "loadCache", "(Lcom/google/common/cache/LoadingCache;Ljava/lang/Object;Lcom/mojang/authlib/GameProfile;)Ljava/lang/Object;", false)); @@ -227,6 +227,27 @@ function initializeCoreMod() { return cn; } }, + 'PlayerTabOverlayTransformer': { + 'target': { + 'type': 'CLASS', + 'name': 'net/minecraft/client/gui/components/PlayerTabOverlay' + }, + 'transformer': function (cn) { + cn.methods.forEach(function (mn) { + if ((checkName(mn.name, "m_94544_") && mn.desc.equals("(Lcom/mojang/blaze3d/vertex/PoseStack;ILnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/world/scores/Objective;)V")) // 1.19.4- + || (checkName(mn.name, "m_280406_") && mn.desc.equals("(Lnet/minecraft/client/gui/GuiGraphics;ILnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/world/scores/Objective;)V"))) { // 1.20+ + for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { + var node = iterator.next(); + if (node.getOpcode() === Opcodes.INVOKEVIRTUAL && node.owner.equals("net/minecraft/client/Minecraft") && checkName(node.name, "m_91090_") && node.desc.equals("()Z")) { + mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP)); + mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1)); + } + } + } + }); + return cn; + } + }, 'RenderPlayer_LayerCapeTransformer': { 'target': { 'type': 'CLASS', @@ -318,23 +339,5 @@ function initializeCoreMod() { return mn; } }, - 'PlayerTabOverlayTransformer': { - 'target': { - 'type': 'METHOD', - 'class': 'net/minecraft/client/gui/components/PlayerTabOverlay', - 'methodName': 'm_94544_', - 'methodDesc': '(Lcom/mojang/blaze3d/vertex/PoseStack;ILnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/world/scores/Objective;)V' - }, - 'transformer': function (mn) { - for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { - var node = iterator.next(); - if (node.getOpcode() === Opcodes.INVOKEVIRTUAL && node.owner.equals("net/minecraft/client/Minecraft") && checkName(node.name, "m_91090_") && node.desc.equals("()Z")) { - mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP)); - mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1)); - } - } - return mn; - } - }, }; } diff --git a/Forge/V3/Forge.tsrg b/Forge/V3/Forge.tsrg new file mode 100644 index 0000000..129c72e --- /dev/null +++ b/Forge/V3/Forge.tsrg @@ -0,0 +1,64 @@ +customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 + func_199027_b ()Ljava/io/InputStream; getInputStream +customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 + open ()Ljava/io/InputStream; open +customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager + func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; getResource + getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource +customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft + func_195551_G ()Lnet/minecraft/resources/IResourceManager; getResourceManager +customskinloader/fake/itf/IFakeSkinManagerCacheKey customskinloader/fake/itf/IFakeSkinManagerCacheKey + profile ()Lcom/mojang/authlib/GameProfile; profile + packedTextures ()Lcom/mojang/authlib/properties/Property; packedTextures +net/minecraft/client/Minecraft net/minecraft/client/Minecraft + gameDir gameDirectory + getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; getCurrentServer + getMinecraft ()Lnet/minecraft/client/Minecraft; getInstance + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; getResourceManager + getSkinManager ()Lnet/minecraft/client/resources/SkinManager; getSkinManager + getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; getTextureManager +net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/client/gui/components/PlayerTabOverlay +net/minecraft/client/multiplayer/ServerData net/minecraft/client/multiplayer/ServerData + serverIP ip +net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType + func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; entityTranslucent +net/minecraft/client/renderer/IImageBuffer customskinloader/fake/IFakeImageBuffer + func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; process + parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; process + skinAvailable ()V onTextureDownloaded +net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/client/renderer/texture/HttpTexture +net/minecraft/client/renderer/entity/RenderPlayer net/minecraft/client/renderer/entity/player/PlayerRenderer +net/minecraft/client/renderer/entity/layers/LayerCape net/minecraft/client/renderer/entity/layers/CapeLayer +net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject +net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/NativeImage + func_195699_a (IIIIIIZZ)V copyRect + func_195700_a (III)V setPixelRGBA + func_195702_a ()I getWidth + func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V copyFrom + func_195709_a (II)I getPixelRGBA + func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; read + func_195714_b ()I getHeight + func_195715_a (IIIII)V fillRect +net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/client/renderer/texture/SimpleTexture +net/minecraft/client/renderer/texture/TextureManager net/minecraft/client/renderer/texture/TextureManager + getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; getTexture + loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z register +net/minecraft/client/resources/DefaultPlayerSkin net/minecraft/client/resources/DefaultPlayerSkin + getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; getDefaultSkin +net/minecraft/client/resources/IResource net/minecraft/server/packs/resources/Resource + getInputStream ()Ljava/io/InputStream; getInputStream +net/minecraft/client/resources/IResourceManager net/minecraft/server/packs/resources/ResourceManager + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource +net/minecraft/client/resources/SkinManager net/minecraft/client/resources/SkinManager + loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V registerSkins + loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; registerTexture +net/minecraft/client/resources/SkinManager$1 net/minecraft/client/resources/SkinManager$1 +net/minecraft/client/resources/SkinManager$CacheKey net/minecraft/client/resources/SkinManager$CacheKey +net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/client/resources/SkinManager$SkinTextureCallback + skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable +net/minecraft/client/resources/SkinManager$TextureCache net/minecraft/client/resources/SkinManager$TextureCache +net/minecraft/resources/IResource net/minecraft/server/packs/resources/Resource +net/minecraft/resources/IResourceManager net/minecraft/server/packs/resources/ResourceManager +net/minecraft/util/ResourceLocation net/minecraft/resources/ResourceLocation +net/minecraft/util/StringUtils net/minecraft/util/StringUtil + stripControlCodes (Ljava/lang/String;)Ljava/lang/String; stripColor diff --git a/Forge/V3/build.gradle b/Forge/V3/build.gradle new file mode 100644 index 0000000..54da7e5 --- /dev/null +++ b/Forge/V3/build.gradle @@ -0,0 +1,37 @@ + +jar { + manifest { + attributes([ + "Automatic-Module-Name" : "customskinloader", + "MixinConfigs": "mixins.customskinloader.json" + ]) + } + + exclude 'net/minecraft/client/resources/**' +} +sourceJar { + exclude 'com/**' + exclude 'net/**' +} + +dependencies { + implementation project(":Forge/Common") +} + +import customskinloader.gradle.util.RemapUtil +import customskinloader.gradle.util.SourceUtil + +apply plugin: 'org.spongepowered.mixin' + +apply from: rootProject.file("buildSrc/patch.gradle") +patchMixin() + +mixin { + add sourceSets.main, "mixins.customskinloader.refmap.json" + reobfSrgFile = "build/mixin.srg" + reobfNotchSrgFile = "build/mixin.srg" +} + +SourceUtil.addDependencies project, project(":Common"), project(":Vanilla/Common") +RemapUtil.remapSources project + diff --git a/Forge/V3/build.properties b/Forge/V3/build.properties new file mode 100644 index 0000000..abc1535 --- /dev/null +++ b/Forge/V3/build.properties @@ -0,0 +1,8 @@ +dependencies=Forge|1.20.6,1.21;\ + NeoForge|1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21 +java_full_versions=17,18,19,20,21,22 +#forge gradle needs forge version +forge_mc_version=1.12.2 +forge_version=14.23.5.2768 +mappings_version=stable_39 +srg_notch_map=Forge.tsrg diff --git a/Forge/V3/mixin.tsrg b/Forge/V3/mixin.tsrg new file mode 100644 index 0000000..fbc4fbe --- /dev/null +++ b/Forge/V3/mixin.tsrg @@ -0,0 +1,48 @@ +com/mojang/blaze3d/matrix/MatrixStack com/mojang/blaze3d/vertex/PoseStack +net/minecraft/client/Minecraft net/minecraft/client/Minecraft + isIntegratedServerRunning ()Z isLocalServer +net/minecraft/client/entity/AbstractClientPlayer net/minecraft/client/player/AbstractClientPlayer +net/minecraft/client/gui/Gui net/minecraft/client/gui/GuiGraphics +net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/client/gui/components/PlayerTabOverlay + renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V render + renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V render + renderPlayerlist (Lnet/minecraft/client/gui/Gui;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V render +net/minecraft/client/model/ModelRenderer net/minecraft/client/model/geom/ModelPart +net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/HttpTextureProcessor +net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/client/renderer/MultiBufferSource +net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType + getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; entitySolid +net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/client/renderer/texture/HttpTexture + processTask onDownloaded + loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; load + processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; processLegacySkin +net/minecraft/client/renderer/entity/RenderPlayer net/minecraft/client/renderer/entity/player/PlayerRenderer + renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V renderHand + renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V renderHand +net/minecraft/client/renderer/entity/layers/LayerCape net/minecraft/client/renderer/entity/layers/CapeLayer + doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V render + doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V render +net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/NativeImage +net/minecraft/client/renderer/texture/TextureManager net/minecraft/client/renderer/texture/TextureManager +net/minecraft/client/resources/PlayerSkin net/minecraft/client/resources/PlayerSkin +net/minecraft/client/resources/SkinManager net/minecraft/client/resources/SkinManager + func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V lambda$registerSkins$4 + func_210276_a (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V lambda$registerSkins$2 + getInsecureSkin (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/client/resources/PlayerSkin; getInsecureSkin + getOrLoad (Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; getOrLoad + loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V registerSkins + loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; registerTexture + loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; getInsecureSkinInformation +net/minecraft/client/resources/SkinManager$1 net/minecraft/client/resources/SkinManager$1 + lambda$load$0 (Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/client/resources/SkinManager$TextureInfo; lambda$load$0 + lambda$load$0 (Lnet/minecraft/client/resources/SkinManager$CacheKey;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lcom/mojang/authlib/minecraft/MinecraftProfileTextures; lambda$load$0 + load (Lnet/minecraft/client/resources/SkinManager$CacheKey;)Ljava/util/concurrent/CompletableFuture; load +net/minecraft/client/resources/SkinManager$CacheKey net/minecraft/client/resources/SkinManager$CacheKey +net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/client/resources/SkinManager$SkinTextureCallback +net/minecraft/client/resources/SkinManager$TextureCache net/minecraft/client/resources/SkinManager$TextureCache + type type + registerTexture (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)Ljava/util/concurrent/CompletableFuture; registerTexture +net/minecraft/client/resources/SkinManager$TextureInfo net/minecraft/client/resources/SkinManager$TextureInfo +net/minecraft/scoreboard/ScoreObjective net/minecraft/world/scores/Objective +net/minecraft/scoreboard/Scoreboard net/minecraft/world/scores/Scoreboard +net/minecraft/util/ResourceLocation net/minecraft/resources/ResourceLocation diff --git a/Forge/V3/src/main/java/customskinloader/forge/ForgeMod.java b/Forge/V3/src/main/java/customskinloader/forge/ForgeMod.java new file mode 100644 index 0000000..e30bd78 --- /dev/null +++ b/Forge/V3/src/main/java/customskinloader/forge/ForgeMod.java @@ -0,0 +1,16 @@ +package customskinloader.forge; + +import net.minecraftforge.fml.IExtensionPoint; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; + +@Mod("customskinloader") +public class ForgeMod { + public ForgeMod() { + this.setExtensionPoint(); + } + + private void setExtensionPoint() { + ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "customskinloader", (remote, isServer) -> isServer)); + } +} diff --git a/Forge/V3/src/main/java/customskinloader/forge/MixinConfigPlugin.java b/Forge/V3/src/main/java/customskinloader/forge/MixinConfigPlugin.java new file mode 100644 index 0000000..8ce51f0 --- /dev/null +++ b/Forge/V3/src/main/java/customskinloader/forge/MixinConfigPlugin.java @@ -0,0 +1,115 @@ +package customskinloader.forge; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.module.Configuration; +import java.lang.module.ModuleReference; +import java.lang.module.ResolvedModule; +import java.lang.reflect.Field; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; + +import com.google.common.collect.ImmutableList; +import cpw.mods.cl.JarModuleFinder; +import cpw.mods.jarhandling.SecureJar; +import sun.misc.Unsafe; + +public class MixinConfigPlugin extends customskinloader.mixin.core.MixinConfigPlugin { + private final static MethodHandles.Lookup IMPL_LOOKUP = ((Supplier) () -> { + try { + Field theUnsafeField = Unsafe.class.getDeclaredField("theUnsafe"); + theUnsafeField.setAccessible(true); + Unsafe theUnsafe = (Unsafe) theUnsafeField.get(null); + Field implLookupField = MethodHandles.Lookup.class.getDeclaredField("IMPL_LOOKUP"); + return (MethodHandles.Lookup) theUnsafe.getObject(theUnsafe.staticFieldBase(implLookupField), theUnsafe.staticFieldOffset(implLookupField)); + } catch (Throwable t) { + throw new RuntimeException(t); + } + }).get(); + + static { + try { + fixMixinModifyArgs(); + } catch (Throwable t) { + throw new RuntimeException(t); + } + } + + // Dynamically creates and configures a fake module to ensure the package (org.spongepowered.asm.synthetic.args) is correctly loaded. + @SuppressWarnings("unchecked") + private static void fixMixinModifyArgs() throws Throwable { + ClassLoader loader = MixinConfigPlugin.class.getClassLoader(); + Map handles = findPackageLookup(loader.getClass()); + if (handles != null) { + Map packageToOurModules = (Map) handles.get("packageLookup").invokeWithArguments(loader); + String packageName = "org.spongepowered.asm.synthetic.args"; + if (packageToOurModules.get(packageName) == null) { + Path moduleRoot = Paths.get("./CustomSkinLoader/FakeModule"); + Path classPath = Files.createDirectories(moduleRoot.resolve(packageName.replace('.', '/'))); + Path classFile = classPath.resolve("package-info.class"); + if (!Files.exists(classFile)) { + Files.createFile(classFile); + } + + Configuration config = Configuration.resolve(JarModuleFinder.of(SecureJar.from(moduleRoot)), ImmutableList.of(ModuleLayer.boot().configuration()), JarModuleFinder.of(), ImmutableList.of("FakeModule")); + ResolvedModule module = config.findModule("FakeModule").orElse(null); + packageToOurModules.put(packageName, module); + + Object configuration = handles.get("configuration").invokeWithArguments(loader); + Map nameToModule = new HashMap<>((Map) handles.get("nameToModuleGetter").invokeWithArguments(configuration)); + nameToModule.put("FakeModule", module); + handles.get("nameToModuleSetter").invokeWithArguments(configuration, nameToModule); + + MethodHandle resolvedRootsGetter = handles.get("resolvedRoots"); + if (resolvedRootsGetter != null) { + ((Map) resolvedRootsGetter.invokeWithArguments(loader)).put("FakeModule", module.reference()); + } + } + } + } + + private static Map findPackageLookup(Class cl) throws Throwable { + if (!ClassLoader.class.equals(cl)) { + Map map = new HashMap<>(); + Field[] fields = cl.getDeclaredFields(); + for (Field field : fields) { + Type type = field.getGenericType(); + if (type instanceof ParameterizedType) { + ParameterizedType paramType = (ParameterizedType) type; + if (Map.class.equals(paramType.getRawType())) { + Class classJarModuleReference = findClass("cpw.mods.cl.JarModuleFinder$JarModuleReference"); + if (Arrays.equals(new Class[] { String.class, ResolvedModule.class }, paramType.getActualTypeArguments())) { + map.put("packageLookup", IMPL_LOOKUP.findGetter(cl, field.getName(), field.getType())); // Forge & NeoForge + } else if (Arrays.equals(new Class[] { String.class, classJarModuleReference }, paramType.getActualTypeArguments())) { + map.put("resolvedRoots", IMPL_LOOKUP.findGetter(cl, field.getName(), field.getType())); // NeoForge + } + } + } else if (Configuration.class.equals(field.getType())) { + map.put("configuration", IMPL_LOOKUP.findGetter(cl, field.getName(), field.getType())); // NeoForge + map.put("nameToModuleGetter", IMPL_LOOKUP.findGetter(field.getType(), "nameToModule", Map.class)); // NeoForge + map.put("nameToModuleSetter", IMPL_LOOKUP.findSetter(field.getType(), "nameToModule", Map.class)); // NeoForge + } + } + if (!map.isEmpty()) { + return map; + } + return findPackageLookup(cl.getSuperclass()); + } + return null; + } + + private static Class findClass(String name) { + try { + return Class.forName(name); + } catch (Throwable t) { + return null; + } + } +} diff --git a/Forge/V3/src/main/java/customskinloader/forge/NeoForgeMod.java b/Forge/V3/src/main/java/customskinloader/forge/NeoForgeMod.java new file mode 100644 index 0000000..86c7e54 --- /dev/null +++ b/Forge/V3/src/main/java/customskinloader/forge/NeoForgeMod.java @@ -0,0 +1,8 @@ +package customskinloader.forge; + +import net.neoforged.fml.common.Mod; + +@Mod("customskinloader") +public class NeoForgeMod { + +} diff --git a/Forge/V3/src/main/resources/META-INF/accesstransformer.cfg b/Forge/V3/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..5281b5e --- /dev/null +++ b/Forge/V3/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,2 @@ +# 1.21+ +public net.minecraft.resources.ResourceLocation (Ljava/lang/String;Ljava/lang/String;)V diff --git a/Forge/V3/src/main/resources/META-INF/mods.toml b/Forge/V3/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..a74f0f3 --- /dev/null +++ b/Forge/V3/src/main/resources/META-INF/mods.toml @@ -0,0 +1,35 @@ +modLoader="javafml" +loaderVersion="[0,)" # The javafml version number for neoforge is 1 +license="GPL-3.0-only" +issueTrackerURL="https://github.com/xfl03/MCCustomSkinLoader/issues" +clientSideOnly=true # added by forge +[[mods]] +modId="customskinloader" +version="${modFullVersion}" +displayName="CustomSkinLoader" +displayTest="IGNORE_ALL_VERSION" # neoforge 1.20.4+ +description=''' +Custom Skin Loader for Minecraft +''' +displayURL="https://github.com/xfl03/MCCustomSkinLoader" +authors=["xfl03", "JLChnToZ"] +[[dependencies.customskinloader]] +modId="forge" +mandatory=false +type="optional" # added by neoforge 1.20.4+ +versionRange="[50,)" +ordering="NONE" +side="CLIENT" +[[dependencies.customskinloader]] +modId="neoforge" +mandatory=false +type="required" # added by neoforge 1.20.4+ +versionRange="[20.2,)" +ordering="NONE" +side="CLIENT" +[[dependencies.customskinloader]] +modId="minecraft" +mandatory=true +versionRange="[1.20.2,)" +ordering="NONE" +side="CLIENT" diff --git a/Forge/V3/src/main/resources/META-INF/neoforge.mods.toml b/Forge/V3/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..aaf9f29 --- /dev/null +++ b/Forge/V3/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,37 @@ +modLoader="javafml" +loaderVersion="[2,)" +license="GPL-3.0-only" +issueTrackerURL="https://github.com/xfl03/MCCustomSkinLoader/issues" +[[mods]] +modId="customskinloader" +version="${modFullVersion}" +displayName="CustomSkinLoader" +authors="xfl03, JLChnToZ" +displayTest="IGNORE_ALL_VERSION" +description=''' +Custom Skin Loader for Minecraft +''' + +# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded. +#[[mixins]] +#config="{mod_id}.mixins.json" + +# The [[accessTransformers]] block allows you to declare where your AT file is. +# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg +#[[accessTransformers]] +#file="META-INF/accesstransformer.cfg" + +# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json + +[[dependencies.customskinloader]] +modId="neoforge" +type="required" +versionRange="[20.5,)" +ordering="NONE" +side="CLIENT" +[[dependencies.customskinloader]] +modId="minecraft" +type="required" +versionRange="[1.20.5,)" +ordering="NONE" +side="BOTH" diff --git a/Forge/V3/src/main/resources/mixins.customskinloader.json b/Forge/V3/src/main/resources/mixins.customskinloader.json new file mode 100644 index 0000000..de74fd3 --- /dev/null +++ b/Forge/V3/src/main/resources/mixins.customskinloader.json @@ -0,0 +1,24 @@ +{ + "compatibilityLevel": "JAVA_8", + "mixinPriority": 1010, + "package": "customskinloader.mixin", + "client": [ + "MixinGuiPlayerTabOverlay", + "MixinIResource", + "MixinIResourceManager", + "MixinLayerCape", + "MixinMinecraft", + "MixinRenderPlayer", + "MixinSkinManager$1", + "MixinSkinManager$CacheKey", + "MixinSkinManager$TextureCache", + "MixinSkinManager$V2", + "MixinSkinManager$V3", + "MixinThreadDownloadImageData$V2" + ], + "refmap": "mixins.customskinloader.refmap.json", + "plugin": "customskinloader.forge.MixinConfigPlugin", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Forge/V3/src/main/resources/pack.mcmeta b/Forge/V3/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..1ec83b3 --- /dev/null +++ b/Forge/V3/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "CustomSkinLoader resources", + "pack_format": 18 + } +} diff --git a/Vanilla/Common/build.gradle b/Vanilla/Common/build.gradle new file mode 100644 index 0000000..6a2f439 --- /dev/null +++ b/Vanilla/Common/build.gradle @@ -0,0 +1,12 @@ +// This subproject is only to provide dependency for other subprojects. + +dependencies { + implementation project(':Common') + implementation 'org.spongepowered:mixin:0.8.5' +} + +compileJava { + // Disable Mixin AP + // Since 0.8.4, Mixin no longer provide the jar exclude AP, we should disable them manually + options.compilerArgs << "-proc:none" +} diff --git a/Vanilla/Common/build.properties b/Vanilla/Common/build.properties new file mode 100644 index 0000000..2c5a53a --- /dev/null +++ b/Vanilla/Common/build.properties @@ -0,0 +1,5 @@ +forge_mc_version=1.12.2 +forge_version=14.23.5.2768 +mappings_version=stable_39 +# this subproject is only to provide dependency for other subprojects. +is_real_project=false diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinIImageBuffer.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinIImageBuffer.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinIImageBuffer.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinIImageBuffer.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinIResource.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinIResource.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinIResource.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinIResource.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinIResourceManager.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinIResourceManager.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinIResourceManager.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinIResourceManager.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinLayerCape.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinLayerCape.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinLayerCape.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinLayerCape.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinMinecraft.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinMinecraft.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinMinecraft.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinMinecraft.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinRenderPlayer.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinRenderPlayer.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinRenderPlayer.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinRenderPlayer.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$1.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$1.java similarity index 99% rename from Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$1.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$1.java index 5a9ac59..b269fe1 100644 --- a/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$1.java +++ b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$1.java @@ -40,7 +40,7 @@ public abstract class MixinSkinManager$1 { @Group( name = "lambda$load$0", min = 1, - max = 1 + max = 2 ) @Redirect( method = "Lnet/minecraft/client/resources/SkinManager$1;lambda$load$0(Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/client/resources/SkinManager$TextureInfo;", @@ -59,7 +59,7 @@ public abstract class MixinSkinManager$1 { @Group( name = "lambda$load$0", min = 1, - max = 1 + max = 2 ) @Redirect( method = "Lnet/minecraft/client/resources/SkinManager$1;lambda$load$0(Lnet/minecraft/client/resources/SkinManager$CacheKey;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;", diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$CacheKey.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$CacheKey.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$CacheKey.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$CacheKey.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$TextureCache.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$TextureCache.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinSkinManager$TextureCache.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager$TextureCache.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinSkinManager.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinSkinManager.java diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java b/Vanilla/Common/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java similarity index 100% rename from Fabric/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java rename to Vanilla/Common/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java diff --git a/Vanilla/Common/src/main/java/customskinloader/mixin/core/MixinConfigPlugin.java b/Vanilla/Common/src/main/java/customskinloader/mixin/core/MixinConfigPlugin.java new file mode 100644 index 0000000..c98f259 --- /dev/null +++ b/Vanilla/Common/src/main/java/customskinloader/mixin/core/MixinConfigPlugin.java @@ -0,0 +1,104 @@ +package customskinloader.mixin.core; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.nio.file.Paths; +import java.util.List; +import java.util.Set; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import customskinloader.log.LogManager; +import customskinloader.log.Logger; +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +public class MixinConfigPlugin implements IMixinConfigPlugin { + public static Logger logger = LogManager.getLogger("Core"); + private long world_version; + private long protocol_version; + + @Override + public void onLoad(String mixinPackage) { + LogManager.setLogFile(Paths.get("./CustomSkinLoader/CustomSkinLoader.log")); + URL versionJson = ClassLoader.getSystemClassLoader().getResource("version.json"); + if (versionJson != null) { + logger.info("\"version.json\": " + versionJson); + try ( + InputStream is = versionJson.openStream(); + InputStreamReader isr = new InputStreamReader(is) + ) { + JsonObject object = new JsonParser().parse(isr).getAsJsonObject(); + String name = object.get("name").getAsString(); + this.world_version = object.get("world_version").getAsLong(); + this.protocol_version = object.get("protocol_version").getAsLong(); + logger.info("MinecraftVersion: {name='" + name + "', world_version='" + this.world_version + "', protocol_version='" + this.protocol_version + "'}"); + } catch (Throwable t) { + logger.warning("An exception occurred when reading \"version.json\"!"); + logger.warning(t); + } + } else { + logger.warning("Can't read \"version.json\"! Ignore this message if the version you start is earlier than 18w47b."); + } + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + boolean result = true; + if (mixinClassName.endsWith(".MixinIImageBuffer")) { + result = this.world_version <= 2204 && this.protocol_version <= 553; // 18w43b ~ 19w37a + } else if (mixinClassName.endsWith(".MixinLayerCape") || mixinClassName.endsWith(".MixinRenderPlayer")) { + result = this.world_version >= 2210 && this.protocol_version >= 558; // 19w41a+ + } else if (mixinClassName.endsWith(".MixinSkinManager$V1")) { + result = this.world_version <= 3465 && (this.protocol_version <= 763 || (this.protocol_version >= 801 && this.protocol_version <= 803) || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x4000008E)); // 18w43b ~ 1.20.1 + } else if (mixinClassName.endsWith(".MixinSkinManager$V2") || mixinClassName.endsWith(".MixinSkinManager$1") || mixinClassName.endsWith(".MixinSkinManager$CacheKey") || mixinClassName.endsWith(".MixinSkinManager$TextureCache")) { + result = this.world_version >= 3567 && ((this.protocol_version >= 764 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x40000090); // 23w31a+ + } else if (mixinClassName.endsWith(".MixinSkinManager$V3")) { + result = this.world_version >= 3684 && ((this.protocol_version >= 765 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x4000009D); // 23w42a+ + } else if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V1")) { + result = (this.world_version >= 2205 && this.world_version <= 2722) && ((this.protocol_version >= 554 && this.protocol_version <= 754) || (this.protocol_version >= 801 && this.protocol_version <= 803) || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x40000022)); // 19w38a ~ 1.17-rc1 + } else if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V2")) { + result = this.world_version >= 2723 && ((this.protocol_version >= 755 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x40000023); // 1.17-rc2+ + } + logger.info("target: " + targetClassName + ", mixin: " + mixinClassName + ", result: " + result); + return result; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + // To be compatible with 0.7.11 + public void preApply(String targetClassName, org.spongepowered.asm.lib.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + // To be compatible with 0.7.11 + public void postApply(String targetClassName, org.spongepowered.asm.lib.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } +} + diff --git a/Fabric/src/main/java/net/minecraft/client/resources/SkinManager$1.java b/Vanilla/Common/src/main/java/net/minecraft/client/resources/SkinManager$1.java similarity index 100% rename from Fabric/src/main/java/net/minecraft/client/resources/SkinManager$1.java rename to Vanilla/Common/src/main/java/net/minecraft/client/resources/SkinManager$1.java diff --git a/Fabric/src/main/java/net/minecraft/client/resources/SkinManager.java b/Vanilla/Common/src/main/java/net/minecraft/client/resources/SkinManager.java similarity index 88% rename from Fabric/src/main/java/net/minecraft/client/resources/SkinManager.java rename to Vanilla/Common/src/main/java/net/minecraft/client/resources/SkinManager.java index ddcbf56..3157d6f 100644 --- a/Fabric/src/main/java/net/minecraft/client/resources/SkinManager.java +++ b/Vanilla/Common/src/main/java/net/minecraft/client/resources/SkinManager.java @@ -12,8 +12,8 @@ import net.minecraft.util.ResourceLocation; public class SkinManager { public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { } public ResourceLocation loadSkin(MinecraftProfileTexture profileTexture, MinecraftProfileTexture.Type textureType) { return null; } - public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final MinecraftProfileTexture.Type textureType, final SkinManager.SkinAvailableCallback skinAvailableCallback) { return null; } - public void loadProfileTextures(final GameProfile profile, final SkinManager.SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) { } + public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final MinecraftProfileTexture.Type textureType, final SkinAvailableCallback skinAvailableCallback) { return null; } + public void loadProfileTextures(final GameProfile profile, final SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) { } public Map loadSkinFromCache(GameProfile profile) { return null; } public interface SkinAvailableCallback { diff --git a/build.gradle b/build.gradle index 9c95704..d07f449 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,6 @@ wrapper { gradleVersion = "4.9" } -import customskinloader.gradle.util.CurseForgeUtil -import customskinloader.gradle.util.ModrinthUtil import customskinloader.gradle.util.RemapUtil import customskinloader.gradle.util.VersionUtil @@ -60,11 +58,6 @@ subprojects { "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } - - exclude "com/**" - exclude "net/minecraft/client/renderer/RenderType.class" - exclude "net/minecraft/client/renderer/texture/**" - exclude "net/minecraft/resources/**" } // For real subprojects @@ -76,10 +69,7 @@ subprojects { expand([ modVersion : rootProject.ext.config.version, modFullVersion : project.version, - modShortFullVersion: shortVersion, - mcVersion : config.minecraft_version, - mcFullVersions : config.minecraft_full_versions, - forgeVersion : config.forge_version, + dependencies : VersionUtil.getDependencies(project.ext.config.dependencies.toString()), gitVersion : System.getenv("CIRCLE_SHA1") ?: System.getenv("GITHUB_SHA"), buildUrl : System.getenv("CIRCLE_BUILD_URL") ?: "https://github.com/xfl03/MCCustomSkinLoader/actions/runs/" + System.getenv("GITHUB_RUN_ID"), releaseTime : new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") @@ -87,6 +77,13 @@ subprojects { } } + jar { + exclude "com/**" + exclude "net/minecraft/client/renderer/RenderType.class" + exclude "net/minecraft/client/renderer/texture/**" + exclude "net/minecraft/resources/**" + } + task genSrgMap { doLast { if (!config.srg_notch_map.isEmpty()) { @@ -131,8 +128,5 @@ subprojects { } } build.finalizedBy afterBuild - - CurseForgeUtil.provideCurseForge project - ModrinthUtil.provideModrinth project } } diff --git a/build.properties b/build.properties index d0c2645..dc062b1 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ name=CustomSkinLoader group=customskinloader -version=14.19.3 +version=14.20 diff --git a/buildSrc/src/main/java/customskinloader/gradle/entity/CslLatest.java b/buildSrc/src/main/java/customskinloader/gradle/entity/CslLatest.java index 4869da8..11a64da 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/entity/CslLatest.java +++ b/buildSrc/src/main/java/customskinloader/gradle/entity/CslLatest.java @@ -14,8 +14,7 @@ public class CslLatest { } public String getUrl(String edition) { - String e = edition.replace("ForgeLegacy", "Forge"); - return Optional.ofNullable(downloads.get(e)) - .orElseGet(() -> launchermeta.get(e)); + return Optional.ofNullable(downloads.get(edition)) + .orElseGet(() -> launchermeta.get(edition)); } } diff --git a/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java index fae91a5..c482d7c 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java +++ b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java @@ -42,9 +42,6 @@ public abstract class UploadBaseTask extends DefaultTask { } StorageService.put(key, file); String mcversion = VersionUtil.getMcVersion(file.getName()); - if (mcversion.equals("ForgeLegacy")) { - mcversion = "Forge"; - } System.out.printf("csl-%s-%s\t%s%n", mcversion.replace(".", "").toLowerCase(), cslversion, CdnUtil.CLOUDFLARE_CDN_ROOT + key); @@ -66,9 +63,9 @@ public abstract class UploadBaseTask extends DefaultTask { .forEach(project -> { String edition = VersionUtil.getEdition(project); String url = latest.getUrl(edition); - VersionUtil.getMcMajorVersions( - ConfigUtil.getConfigString(project, "minecraft_full_versions")) - .forEach(mcMajorVersion -> detail.addDetail(mcMajorVersion, edition, url)); + VersionUtil.parseDependencies(ConfigUtil.getConfigString(project, "dependencies")) + .forEach((loader, version) -> VersionUtil.getMcMajorVersions(version) + .forEach(mcMajorVersion -> detail.addDetail(mcMajorVersion, loader, url))); }); detail.sortDetails(); diff --git a/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java b/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java deleted file mode 100644 index 35a011f..0000000 --- a/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java +++ /dev/null @@ -1,56 +0,0 @@ -package customskinloader.gradle.util; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import com.matthewprenger.cursegradle.CurseArtifact; -import com.matthewprenger.cursegradle.CurseExtension; -import com.matthewprenger.cursegradle.CurseUploadTask; -import org.gradle.api.Project; -import org.gradle.api.plugins.BasePluginConvention; - -// https://www.curseforge.com/minecraft/mc-mods/customskinloader -public class CurseForgeUtil { - public static void provideCurseForge(Project project) { - if (!project.getPlugins().hasPlugin("base")) return; - - //Fix "Extension of type 'CurseExtension' does not exist." - if (project.getExtensions().findByType(CurseExtension.class) == null) { - project.getExtensions().create("curseforge", CurseExtension.class); - } - - // We don’t use the task provided by the plugin because it adds some dependencies that we don’t need. - project.getTasks().create("publishCurseForge", CurseUploadTask.class, task -> { - task.setGroup("publish"); - task.onlyIf(task0 -> System.getenv("CURSEFORGE_API_KEY") != null); - - task.setApiKey(System.getenv("CURSEFORGE_API_KEY")); - task.setProjectId("286924"); - - CurseArtifact artifact = new CurseArtifact(); - artifact.setArtifact(project.getTasks().getByName("jar")); - List gameVersionStrings = new ArrayList<>(); - Optional.ofNullable(ConfigUtil.getConfigString(project, "minecraft_full_versions")) - .ifPresent(versions -> Collections.addAll(gameVersionStrings, versions.split(","))); // Minecraft Versions - Optional.ofNullable(ConfigUtil.getConfigString(project, "java_full_versions")) - .ifPresent(versions -> { - for (String javaVersion : versions.split(",")) { - gameVersionStrings.add("Java " + javaVersion); // Java Versions - } - }); - gameVersionStrings.addAll(VersionUtil.getLoaders(project)); - artifact.setGameVersionStrings(gameVersionStrings); - artifact.setChangelogType("text"); - artifact.setChangelog(System.getenv("GIT_COMMIT_DESC")); - artifact.setDisplayName(project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + VersionUtil.getShortVersion(project.getRootProject())); - artifact.setReleaseType(VersionUtil.isSnapshot(project.getRootProject()) ? "beta" : "release"); - task.setMainArtifact(artifact); - - task.setAdditionalArtifacts(new ArrayList<>()); - - TaskUtil.withTask(project.getRootProject(), "upload", task0 -> task0.finalizedBy(task)); - }); - } -} diff --git a/buildSrc/src/main/java/customskinloader/gradle/util/ModrinthUtil.java b/buildSrc/src/main/java/customskinloader/gradle/util/ModrinthUtil.java deleted file mode 100644 index d2857dd..0000000 --- a/buildSrc/src/main/java/customskinloader/gradle/util/ModrinthUtil.java +++ /dev/null @@ -1,40 +0,0 @@ -package customskinloader.gradle.util; - -import java.util.Optional; - -import com.modrinth.minotaur.TaskModrinthUpload; -import com.modrinth.minotaur.request.VersionType; -import org.gradle.api.Project; -import org.gradle.api.plugins.BasePluginConvention; - -// https://modrinth.com/mod/customskinloader -public class ModrinthUtil { - public static void provideModrinth(Project project) { - if (!project.getPlugins().hasPlugin("base")) return; - - project.getTasks().create("publishModrinth", TaskModrinthUpload.class, task -> { - task.setGroup("publish"); - task.onlyIf(task0 -> System.getenv("MODRINTH_TOKEN") != null); - - task.token = System.getenv("MODRINTH_TOKEN"); - task.projectId = "idMHQ4n2"; - task.versionNumber = VersionUtil.getCSLVersion(project.getRootProject()) + "-" + project.getName().replace("/", ""); - task.versionName = project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + VersionUtil.getShortVersion(project.getRootProject()); - task.changelog = System.getenv("GIT_COMMIT_DESC"); - task.uploadFile = project.getTasks().getByName("jar"); - task.versionType = VersionUtil.isSnapshot(project.getRootProject()) ? VersionType.BETA : VersionType.RELEASE; - task.failSilently = true; - task.detectLoaders = false; - - Optional.ofNullable(ConfigUtil.getConfigString(project, "minecraft_full_versions")) - .ifPresent(versions -> { - for (String gameVersion : versions.split(",")) { - task.addGameVersion(gameVersion); // Minecraft Versions - } - }); - VersionUtil.getLoaders(project).stream().map(String::toLowerCase).forEach(task::addLoader); - - TaskUtil.withTask(project.getRootProject(), "upload", task0 -> task0.finalizedBy(task)); - }); - } -} diff --git a/buildSrc/src/main/java/customskinloader/gradle/util/VersionUtil.java b/buildSrc/src/main/java/customskinloader/gradle/util/VersionUtil.java index ee76d6e..dcfb5d6 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/util/VersionUtil.java +++ b/buildSrc/src/main/java/customskinloader/gradle/util/VersionUtil.java @@ -43,9 +43,6 @@ public class VersionUtil { } public static String getMcVersion(String filename) { - if (filename.endsWith(".json")) { - return filename.substring(0, filename.indexOf('-')); - } return filename.substring(filename.indexOf('_') + 1, filename.indexOf('-')); } @@ -60,18 +57,26 @@ public class VersionUtil { } public static String getEdition(Project project) { - return project.getName().contains("Vanilla") ? - ConfigUtil.getConfigString(project, "minecraft_version") : - project.getName().replace("/", ""); + return project.getName().replace("/", ""); } - public static List getLoaders(Project project) { - String loaderName = project.getName().split("/")[0]; - List loaders = new ArrayList<>(2); - loaders.add(loaderName); - if (loaderName.equals("Fabric")) { - loaders.add("Quilt"); + public static Map parseDependencies(String dependencies) { + Map map = new LinkedHashMap<>(); + if (dependencies != null) { + String[] loaderVersions = dependencies.split(";"); + for (String loader : loaderVersions) { + String[] mcVersions = loader.split("\\|"); + map.put(mcVersions[0], mcVersions[1]); + } } - return loaders; + return map; + } + + public static String getDependencies(String dependencies) { + StringBuilder sb = new StringBuilder(); + for (Map.Entry dependency : parseDependencies(dependencies).entrySet()) { + sb.append("\"").append(dependency.getKey()).append("\": \"").append(dependency.getValue()).append("\",\n "); + } + return sb.substring(1, sb.length() - 7); } } diff --git a/settings.gradle b/settings.gradle index 184333b..baaa740 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,12 +3,17 @@ rootProject.name = "MCCustomSkinLoader" //Base Project include "Common" +//Vanilla Base Project +include "Vanilla/Common" + //Forge Base Project include "Forge/Common" //Forge Edition for [1.8,1.16.5] -include "Forge/Legacy" -//Forge Edition for [1.17,) -include "Forge/Active" +include "Forge/V1" +//Forge Edition for [1.17,1.20.4] +include "Forge/V2" +//Forge Edition for [1.20.5,) and NeoForge Edition for [1.20.2,) +include "Forge/V3" //Fabric Edition for [1.14,) include "Fabric"