From 4daacd18e811e294fdc41146a4697b1b5bacbbd6 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Sat, 13 Mar 2021 19:46:51 +0800 Subject: [PATCH] Make it easier to build the development environment. (Phase 2) (#147) * Make it easier to build the development environment. (Phase 2) * Provide sources jar. * Add development guide. * Improve development guide. --- BuildScripts/cos.gradle | 2 +- DEVGUIDE.md | 119 ++++++++++++++++++ Fabric/build.gradle | 52 ++++++++ Forge/resource/transformers.js | 22 ++-- .../customskinloader/forge/ForgePlugin.java | 1 + .../forge/TransformerManager.java | 74 +++++++++-- .../forge/loader/LaunchWrapper.java | 5 +- .../transformer/PlayerTabTransformer.java | 12 +- .../transformer/SkinManagerTransformer.java | 11 +- .../transformer/SpectatorMenuTransformer.java | 2 +- .../TileEntitySkullTransformer.java | 3 +- README.md | 5 +- Vanilla/1.8.9/resource/Profile.json | 2 +- Vanilla/resource/Profile.json | 2 +- build.gradle | 6 +- 15 files changed, 281 insertions(+), 37 deletions(-) create mode 100644 DEVGUIDE.md diff --git a/BuildScripts/cos.gradle b/BuildScripts/cos.gradle index 43e95bf..b38c97b 100644 --- a/BuildScripts/cos.gradle +++ b/BuildScripts/cos.gradle @@ -136,7 +136,7 @@ void uploadArtifacts(String shortVersion) { String mcversion = getMcVersion(file.getName()) println(String.format("csl-%s-%s\t%s", mcversion.replace(".", "").toLowerCase(), cslversion, url)) - if (key.endsWith(".jar")) { + if (key.endsWith(".jar") && !key.endsWith("-sources.jar")) { map2.put(mcversion, url) } else if (key.endsWith(".json")) { map3.put(mcversion, url) diff --git a/DEVGUIDE.md b/DEVGUIDE.md new file mode 100644 index 0000000..81f1fc8 --- /dev/null +++ b/DEVGUIDE.md @@ -0,0 +1,119 @@ +# Development and Contribution + +## Building +1. Run `./gradlew setupDecompWorkspace clean build` command. +1. The built jars are all in `${rootprojectDir}/build/libs` folder. + +*NOTICE: The jar file with specific Minecraft version is for the vanilla edition without Forge and Fabric. The json files are launcher profiles which only work when building with our CI server.* + +## Running and Testing +For now, CustomSkinLoader is unable to run under self development environment, so it needs to add to another development environment as a library. +There are the available versions in different environments below: +| | Forge | Fabric | +|:-:|:-:|:-:| +| Runtime Environment | forge-1.8-11.14.0.1237 ~ latest | fabric-loader-0.4.3+build.134 ~ latest
Minecraft 18w43b ~ latest
*fabric-api is not required* | +| Development Environment | ForgeGradle-2.1-SNAPSHOT ~ latest
forge-1.8-11.14.3.1503 ~ 1.12.2-14.23.5.2855
forge-1.13.2-25.0.198 ~ latest | fabric-loom-(?) ~ latest
fabric-loader-0.4.9+build.160 ~ latest
Minecraft 18w49a ~ latest
*fabric-api is not required* | + +### Preliminary steps for testing local builds +1. Create a new empty minecraft development environment. +1. Add below contents to `build.gradle`: + ```gradle + repositories { + maven { + url = "file:/${projectDir}/local-repo" + } + } + ``` +1. Create these folders in the new project directory, then copy the built jar and source jar into it: + ``` + Forge: ./local-repo/mods/CustomSkinLoader_Forge/${version} + Fabric: ./local-repo/mods/CustomSkinLoader_Fabric/${version} + ``` + *`${version}` should be repalced with something like `14.13-SNAPSHOT-00` manually* +1. Create a pom file in the same folder: + Forge: `CustomSkinLoader_Forge-${version}.pom` + ```xml + + + 4.0.0 + customskinloader + CustomSkinLoader_Forge + + ${version} + + ``` + Fabric: `CustomSkinLoader_Fabric-${version}.pom` + ```xml + + + 4.0.0 + customskinloader + CustomSkinLoader_Fabric + + ${version} + + ``` + +### For ForgeGradle 2.x ( forge-1.8-11.14.3.1503 ~ forge-1.12.2-14.23.5.2847 ) +1. Add below contents to `build.gradle`: + ```gradle + dependencies { + deobfCompile "mods:CustomSkinLoader_Forge:14.13-SNAPSHOT-00" + } + + minecraft { + clientRunArgs += ["--tweakClass", "customskinloader.forge.ForgeDevTweaker", "--username", ""] + } + ``` +1. Run `./gradlew setupDecompWorkspace eclipse` command. +1. Due to the run configurations which generated by ForgeGradle 2 has not been compatible with IntelliJ IDEA 2020 and above, we recommend to install [Eclipser](https://plugins.jetbrains.com/plugin/7153-eclipser) plugin. It can convert Eclipse run configurations to IDEA. (Right click to `*.launch` file in project folder, then select `Convert with Eclipser`, then a new IDEA run configuration will be created.) +1. For IDEA, open `Run/Debug Configurations` dialog, change classpath of module to the name contains `.main`. +1. Add `--tweakClass customskinloader.forge.ForgeDevTweaker --username ` to CLI arguments in `Run/Debug Configurations` dialog. +1. Then you can debug the mod in IDE or through `./gradlew runClient` command. + +### For ForgeGradle 3.x ~ 4.x ( forge-1.12.2-14.23.5.2851 ~ latest ) +1. Add below contents to `build.gradle`: + ```gradle + dependencies { + implementation fg.deobf("mods:CustomSkinLoader_Forge:14.13-SNAPSHOT-00") + } + + minecraft { + runs { + client { + args += ["--username", ""] + args += ["--tweakClass", "customskinloader.forge.ForgeDevTweaker"] // Only required for MinecraftForge 1.12.2 + } + } + } + ``` +1. Setup the development environment and run the game as usual. + +### For fabric-loom ( fabric-loader-0.4.9+build.160 ~ latest ) +1. Add below contents to `build.gradle`: + ```gradle + dependencies { + modCompile "mods:CustomSkinLoader_Fabric:14.13-SNAPSHOT-00" + } + ``` +1. Add `--username ` to CLI arguments in `Run/Debug Configurations` dialog. +1. Run the game as usual. + +## Depend on release builds +1. Check the latest version in https://csl.littleservice.cn/latest.json . +1. Add below contents to `build.gradle`: + ```gradle + repositories { + ivy { + layout "pattern", { + artifact "[organisation]/[artifact]-[revision](-[classifier])(.[ext])" + } + url = "https://csl.littleservice.cn/" + } + } +1. Follow the same steps in **Running and Testing**. + +## Developing +- CustomSkinLoader is based on forge-1.12.2-14.23.5.2768 currently, including Fabric edition. We use custom reobfuscation mappings such as [Fabric.tsrg](Fabric/Fabric.tsrg) and [mixin.tsrg](Fabric/mixin.tsrg) to generate different editions jar and Mixin reference jsons. +- The source codes are all in `${projectDir}/sources` and resource files are in `${projectDir}/resources` instead of `src/main/java` and `src/main/resources`. +- Do not add other required mods. \ No newline at end of file diff --git a/Fabric/build.gradle b/Fabric/build.gradle index c2b7472..0f4e28d 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,10 +1,24 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath "org.cadixdev:mercury:0.1.0-rc1" + } +} + jar { exclude 'customskinloader/tweaker/**' exclude 'net/minecraft/client/renderer/RenderType.class' exclude 'net/minecraft/client/renderer/texture/**' exclude 'Profile.json' } +sourceJar { + exclude 'customskinloader/tweaker/**' + exclude 'net/minecraft/class_1**' + exclude 'Profile.json' +} repositories { maven { @@ -20,3 +34,41 @@ dependencies { // This is the minimum version number that the mod should dependent in the development environment. implementation "net.fabricmc:fabric-loader:0.4.9+build.160" } + +import net.minecraftforge.srg2source.ast.RangeExtractor +import net.minecraftforge.srg2source.util.io.InputSupplier +import org.cadixdev.lorenz.MappingSet +import org.cadixdev.lorenz.io.srg.SrgReader +import org.cadixdev.mercury.Mercury +import org.cadixdev.mercury.remapper.MercuryRemapper + +tasks.extractRangemapReplacedMain.doFirst { + // Because of https://github.com/MinecraftForge/ForgeGradle/blob/6084129e4f407eca9fee6826aaa3276fe796553e/build.gradle#L147-L240, + // ForgeGradle modified Eclipse JDT and Mercury will call related methods, + // so here must be some hacks. + RangeExtractor.INSTANCE = new RangeExtractor().with { + it.input = new InputSupplier() { + @Override String getRoot(String resource) { return null } + @Override InputStream getInput(String relPath) { return file(relPath).newInputStream() } + @Override List gatherAll(String endFilter) { return null } + @Override void close() throws IOException { } + } + it + } + + // We use Mercury to remap source jar because srg2source have a few issues. + def mercury = new Mercury() + (configurations.compileClasspath + configurations.forgeGradleMc + configurations.forgeGradleMcDeps).getFiles().each { dep -> + mercury.classPath << dep.toPath() + } + file("build/reobf.srg").withReader { reader -> + mercury.processors << MercuryRemapper.create(new SrgReader(reader).read(MappingSet.create())) + } + def source = file("build/sources/main/java"), dest = file("build/sources/main/java_tmp") + if (source.renameTo(dest)) { + mercury.rewrite(dest.toPath(), source.toPath()) + dest.deleteDir() + } + + RangeExtractor.INSTANCE = null +} diff --git a/Forge/resource/transformers.js b/Forge/resource/transformers.js index e726659..c3a5f27 100644 --- a/Forge/resource/transformers.js +++ b/Forge/resource/transformers.js @@ -7,9 +7,9 @@ var LabelNode = Java.type('org.objectweb.asm.tree.LabelNode'); var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); -// Compare method and field names, deobfName can be null if the srgName didn't exist in 1.13.2. -function checkName(name, srgName, deobfName) { - return name.equals(mapName(srgName)) || name.equals(deobfName); +// Compare method and field names, doesn't support forge-1.13.2-25.0.194 and earlier version. +function checkName(name, srgName) { + return name.equals(mapName(srgName)); } // De-obfuscate method and field names. @@ -34,10 +34,11 @@ function initializeCoreMod() { }, 'transformer': function (cn) { cn.methods.forEach(function (mn) { - if (checkName(mn.name, "func_175249_a", "render") || checkName(mn.name, "func_238523_a_", null)) { + if ((checkName(mn.name, "func_175249_a") && mn.desc.equals("(ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V")) // 1.15.2- + || (checkName(mn.name, "func_238523_a_") && mn.desc.equals("(Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V"))) { // 1.16.1+ for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); - if (node.getOpcode() === Opcodes.INVOKEVIRTUAL && checkName(node.name, "func_71387_A", "isIntegratedServerRunning")) { + if (node.getOpcode() === Opcodes.INVOKEVIRTUAL && node.owner.equals("net/minecraft/client/Minecraft") && checkName(node.name, "func_71387_A") && node.desc.equals("()Z")) { mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP)); mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1)); } @@ -56,7 +57,7 @@ function initializeCoreMod() { }, 'transformer': function (cn) { cn.methods.forEach(function (mn) { - if (checkName(mn.name, "func_174884_b", "updateGameProfile")) { + if (checkName(mn.name, "func_174884_b") && mn.desc.equals("(Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile;")) { var first = mn.instructions.getFirst(); var label = new LabelNode(); mn.instructions.insertBefore(first, new FieldInsnNode(Opcodes.GETSTATIC, "customskinloader/CustomSkinLoader", "config", "Lcustomskinloader/config/Config;")); @@ -126,10 +127,10 @@ function initializeCoreMod() { }, 'transformer': function (cn) { cn.methods.forEach(function (mn) { - if (checkName(mn.name, "func_229159_a_", null)) { + if (checkName(mn.name, "func_229159_a_") && mn.desc.equals("(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;")) { for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); - if (node.getOpcode() === Opcodes.INVOKESTATIC && checkName(node.name, "func_229163_c_", null)) { + if (node.getOpcode() === Opcodes.INVOKESTATIC && node.owner.equals("net/minecraft/client/renderer/texture/DownloadingTexture") && checkName(node.name, "func_229163_c_") && node.desc.equals("(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;")) { mn.instructions.insertBefore(node, new VarInsnNode(Opcodes.ALOAD, 0)); mn.instructions.insertBefore(node, new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/renderer/texture/DownloadingTexture", mapName("field_229155_i_"), "Ljava/lang/Runnable;")); iterator.set(new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinBuffer", "processLegacySkin", "(Lnet/minecraft/client/renderer/texture/NativeImage;Ljava/lang/Runnable;)Lnet/minecraft/client/renderer/texture/NativeImage;", false)); @@ -149,10 +150,11 @@ function initializeCoreMod() { }, 'transformer': function (cn) { cn.methods.forEach(function (mn) { - if (checkName(mn.name, "func_229145_a_", null) || checkName(mn.name, "func_225628_a_", null)) { // PlayerRenderer.renderItem || CapeLayer.render + if ((checkName(mn.name, "func_229145_a_") && mn.desc.equals("(Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/player/AbstractClientPlayerEntity;Lnet/minecraft/client/renderer/model/ModelRenderer;Lnet/minecraft/client/renderer/model/ModelRenderer;)V")) // PlayerRenderer.renderItem + || (checkName(mn.name, "func_225628_a_") && mn.desc.equals("(Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/player/AbstractClientPlayerEntity;FFFFFF)V"))) { // CapeLayer.render for (var iterator = mn.instructions.iterator(); iterator.hasNext();) { var node = iterator.next(); - if (node.getOpcode() === Opcodes.INVOKESTATIC && checkName(node.name, "func_228634_a_", null)) { // RenderType.getEntitySolid + if (node.getOpcode() === Opcodes.INVOKESTATIC && node.owner.equals("net/minecraft/client/renderer/RenderType") && checkName(node.name, "func_228634_a_") && node.desc.equals("(Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType;")) { // RenderType.getEntitySolid node.name = mapName("func_228644_e_"); // RenderType.getEntityTranslucent } } diff --git a/Forge/source/customskinloader/forge/ForgePlugin.java b/Forge/source/customskinloader/forge/ForgePlugin.java index 5e8ee71..c7634c1 100644 --- a/Forge/source/customskinloader/forge/ForgePlugin.java +++ b/Forge/source/customskinloader/forge/ForgePlugin.java @@ -25,6 +25,7 @@ public class ForgePlugin implements IFMLLoadingPlugin { @Override public void injectData(Map data) { + TransformerManager.isDevelopmentEnvironment = !(boolean) data.get("runtimeDeobfuscationEnabled"); } @Override diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index 8d3b2f8..f0fc05b 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -6,7 +6,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.HashMap; import java.util.Map; +import java.util.function.Supplier; +import customskinloader.forge.platform.IFMLPlatform; +import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; @@ -17,6 +20,8 @@ public class TransformerManager { public @interface TransformTarget { String className(); + String methodNameSrg() default ""; + String[] methodNames() default {}; String desc() default ""; @@ -30,13 +35,51 @@ public class TransformerManager { MethodNode transform(ClassNode cn, MethodNode mn); } - public Map classMap = new HashMap<>(); - public Map> map = new HashMap<>(); + public static boolean isDevelopmentEnvironment = false; + /** If true, match {@link TransformTarget#methodNames} if {@link TransformTarget#methodNameSrg} fails to match. */ + public static boolean useDeobfName = false; + private final static Remapper remapper = IFMLPlatform.FMLPlatformInitializer.getPlatform().getRemapper(); - public TransformerManager(IMethodTransformer... methodTransformers) { - this(new IClassTransformer[0], methodTransformers); + public static String mapClassName(String name) { + return remapper.mapType(name); } + public static String mapMethodName(String owner, String name, String desc) { + return remapper.mapMethodName(owner, name, desc); + } + + public static String mapMethodDesc(String desc) { + return remapper.mapMethodDesc(desc); + } + + public static boolean checkClassName(String name, String deobfName) { + if (isDevelopmentEnvironment) { + return name.equals(deobfName); + } else { + return mapClassName(name).equals(deobfName); + } + } + + public static boolean checkMethodName(String owner, String name, String desc, String srgName) { + if (isDevelopmentEnvironment) { + return mapMethodName(owner, srgName, desc).equals(name); + } else { + return mapMethodName(owner, name, desc).equals(srgName); + } + } + + public static boolean checkMethodDesc(String desc, String deobfDesc) { + if (isDevelopmentEnvironment) { + return desc.equals(deobfDesc); + } else { + return mapMethodDesc(desc).equals(deobfDesc); + } + } + + public Map classMap = new HashMap<>(); + public Map, IMethodTransformer>> srgMap = new HashMap<>(); + public Map> map = new HashMap<>(); + public TransformerManager(IClassTransformer[] classTransformers, IMethodTransformer[] methodTransformers) { for (IClassTransformer t : classTransformers) { TransformTarget tt = this.getTransformTarget(t.getClass()); @@ -69,8 +112,17 @@ public class TransformerManager { } private void addMethodTransformer(TransformTarget target, String className, IMethodTransformer transformer) { + if (!srgMap.containsKey(className)) { + srgMap.put(className, new HashMap<>()); + } + if (!target.methodNameSrg().equals("")) { + // FMLDeobfRemapper has not been setup when this line being reached. + Supplier mappedMethod = () -> (isDevelopmentEnvironment ? mapMethodName(className.replace(".", "/"), target.methodNameSrg(), target.desc()) : target.methodNameSrg()) + target.desc(); + srgMap.get(className).put(mappedMethod, transformer); + ForgeTweaker.logger.info("[CSL DEBUG] REGISTERING SRG METHOD %s::%s", className, target.methodNameSrg() + target.desc()); + } if (!map.containsKey(className)) - map.put(className, new HashMap()); + map.put(className, new HashMap<>()); for (String methodName : target.methodNames()) { map.get(className).put(methodName + target.desc(), transformer); ForgeTweaker.logger.info("[CSL DEBUG] REGISTERING METHOD %s::%s", className, methodName + target.desc()); @@ -92,11 +144,17 @@ public class TransformerManager { } public MethodNode transform(ClassNode classNode, MethodNode methodNode, String className, String methodName, String methodDesc) { - Map transMap = map.get(className); String methodTarget = methodName + methodDesc; - if (transMap != null && transMap.containsKey(methodTarget)) { + Map, IMethodTransformer> transSrgMap = srgMap.get(className); + IMethodTransformer transformer = transSrgMap == null ? null : transSrgMap.get(transSrgMap.keySet().stream().filter(s -> s.get().equals(methodTarget)).findFirst().orElse(null)); + + Map transMap = map.get(className); + if (useDeobfName && transMap != null && transformer == null) { + transformer = transMap.get(methodTarget); + } + if (transformer != null) { try { - methodNode = transMap.get(methodTarget).transform(classNode, methodNode); + methodNode = transformer.transform(classNode, methodNode); ForgeTweaker.logger.info("[CSL DEBUG] Successfully transformed method %s in class %s", methodName, className); } catch (Exception e) { ForgeTweaker.logger.warning("[CSL DEBUG] An error happened when transforming method %s in class %s", methodTarget, className); diff --git a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java index 702af41..0572967 100644 --- a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java +++ b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java @@ -3,7 +3,6 @@ package customskinloader.forge.loader; import java.util.ArrayList; import customskinloader.forge.TransformerManager; -import customskinloader.forge.platform.IFMLPlatform; import customskinloader.forge.transformer.FakeInterfacesTransformer; import customskinloader.forge.transformer.PlayerTabTransformer; import customskinloader.forge.transformer.SkinManagerTransformer; @@ -54,8 +53,8 @@ public class LaunchWrapper implements IClassTransformer { cn = transformerManager.transform(cn, className); ArrayList methods = new ArrayList<>(); for (MethodNode mn : cn.methods) { - String mappedMethodName = IFMLPlatform.FMLPlatformInitializer.getPlatform().getRemapper().mapMethodName(cn.name, mn.name, mn.desc); - String mappedMethodDesc = IFMLPlatform.FMLPlatformInitializer.getPlatform().getRemapper().mapMethodDesc(mn.desc); + String mappedMethodName = TransformerManager.isDevelopmentEnvironment ? mn.name : TransformerManager.mapMethodName(cn.name, mn.name, mn.desc); + String mappedMethodDesc = TransformerManager.isDevelopmentEnvironment ? mn.desc : TransformerManager.mapMethodDesc(mn.desc); methods.add(transformerManager.transform(cn, mn, className, mappedMethodName, mappedMethodDesc)); } cn.methods.clear(); diff --git a/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java b/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java index 018b6ab..44330ce 100644 --- a/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java @@ -12,7 +12,8 @@ import org.objectweb.asm.tree.MethodNode; public class PlayerTabTransformer { @TransformerManager.TransformTarget(className = "net.minecraft.client.gui.GuiPlayerTabOverlay", - methodNames = {"func_175249_a", "renderPlayerlist"}, + methodNameSrg = "func_175249_a", + methodNames = "renderPlayerlist", desc = "(ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V") public static class ScoreObjectiveTransformer implements TransformerManager.IMethodTransformer { //From: http://git.oschina.net/AsteriskTeam/TabIconHackForge/blob/master/src/main/java/kengxxiao/tabiconhack/coremod/TabIconHackForgeClassTransformer.java#L30-L43 @@ -20,9 +21,12 @@ public class PlayerTabTransformer { public MethodNode transform(ClassNode cn, MethodNode mn) { for (ListIterator iterator = mn.instructions.iterator(); iterator.hasNext();) { AbstractInsnNode node = iterator.next(); - if (node.getOpcode() == Opcodes.INVOKEVIRTUAL && ((MethodInsnNode) node).name.equals("func_71387_A")) { - mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP)); - mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1)); + if (node.getOpcode() == Opcodes.INVOKEVIRTUAL) { + MethodInsnNode min = (MethodInsnNode) node; + if (TransformerManager.checkClassName(min.owner, "net/minecraft/client/Minecraft") && TransformerManager.checkMethodName(min.owner, min.name, min.desc, "func_71387_A") && TransformerManager.checkMethodDesc(min.desc, "()Z")) { + mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP)); + mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1)); + } } } return mn; diff --git a/Forge/source/customskinloader/forge/transformer/SkinManagerTransformer.java b/Forge/source/customskinloader/forge/transformer/SkinManagerTransformer.java index 556e837..c945c25 100644 --- a/Forge/source/customskinloader/forge/transformer/SkinManagerTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/SkinManagerTransformer.java @@ -13,7 +13,7 @@ import org.objectweb.asm.tree.VarInsnNode; public class SkinManagerTransformer { @TransformerManager.TransformTarget(className="net.minecraft.client.resources.SkinManager", - methodNames={""}, + methodNameSrg="", desc="(Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V") public static class InitTransformer implements TransformerManager.IMethodTransformer{ @Override @@ -45,7 +45,8 @@ public class SkinManagerTransformer { } } @TransformerManager.TransformTarget(className="net.minecraft.client.resources.SkinManager", - methodNames={"func_152789_a","loadSkin"}, + methodNameSrg="func_152789_a", + methodNames="loadSkin", desc="(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;") public static class LoadSkinTransformer implements TransformerManager.IMethodTransformer{ @Override @@ -63,7 +64,8 @@ public class SkinManagerTransformer { } } @TransformerManager.TransformTarget(className="net.minecraft.client.resources.SkinManager", - methodNames={"func_152790_a","loadProfileTextures"}, + methodNameSrg="func_152790_a", + methodNames="loadProfileTextures", desc="(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V") public static class LoadProfileTexturesTransformer implements TransformerManager.IMethodTransformer{ @Override @@ -81,7 +83,8 @@ public class SkinManagerTransformer { } } @TransformerManager.TransformTarget(className="net.minecraft.client.resources.SkinManager", - methodNames={"func_152788_a","loadSkinFromCache"}, + methodNameSrg="func_152788_a", + methodNames="loadSkinFromCache", desc="(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;") public static class LoadSkinFromCacheTransformer implements TransformerManager.IMethodTransformer{ @Override diff --git a/Forge/source/customskinloader/forge/transformer/SpectatorMenuTransformer.java b/Forge/source/customskinloader/forge/transformer/SpectatorMenuTransformer.java index 4c41da3..0b9ebef 100644 --- a/Forge/source/customskinloader/forge/transformer/SpectatorMenuTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/SpectatorMenuTransformer.java @@ -15,7 +15,7 @@ import org.objectweb.asm.tree.MethodNode; */ public class SpectatorMenuTransformer { @TransformerManager.TransformTarget(className = "net.minecraft.client.gui.spectator.PlayerMenuObject", - methodNames = {""}, + methodNameSrg = "", desc = "(Lcom/mojang/authlib/GameProfile;)V") public static class PlayerMenuObjectTransformer implements TransformerManager.IMethodTransformer { diff --git a/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java b/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java index bbc63f7..1b74072 100644 --- a/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java @@ -15,7 +15,8 @@ import org.objectweb.asm.tree.VarInsnNode; public class TileEntitySkullTransformer { @TransformerManager.TransformTarget( className = "net.minecraft.tileentity.TileEntitySkull", - methodNames = {"func_174884_b", "updateGameprofile", "updateGameProfile"}, + methodNameSrg = "func_174884_b", + methodNames = {"updateGameprofile", "updateGameProfile"}, desc = "(Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile;" ) public static class UpdateGameProfileTransformer implements TransformerManager.IMethodTransformer { diff --git a/README.md b/README.md index 9764aa0..3a5851d 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,10 @@ It's not a good idea to refer to CustomSkinLoader's source code to develop your It's recommended to use CustomSkinLoader for your server directly. Furthermore, you can add your server to 'Default Load List'. You can also use 'ExtraList' which makes it easier for users to add your server into load list. - + +## Development and Contribution +See [DEVGUIDE.md](DEVGUIDE.md) + ## Copyright & LICENSE ### Binary File You could not modify binary file. diff --git a/Vanilla/1.8.9/resource/Profile.json b/Vanilla/1.8.9/resource/Profile.json index 7321155..394642a 100644 --- a/Vanilla/1.8.9/resource/Profile.json +++ b/Vanilla/1.8.9/resource/Profile.json @@ -36,7 +36,7 @@ "path": "org/spongepowered/mixin/0.7.11-SNAPSHOT/mixin-0.7.11-20180703.121122-1.jar", "sha1": "7a670207bdb97db418118ad1e9bb42424ff3776d", "size": 1017668, - "url": "https://repo.spongepowered.org/maven/org/spongepowered/mixin/0.7.11-SNAPSHOT/mixin-0.7.11-20180703.121122-1.jar" + "url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.7.11-SNAPSHOT/mixin-0.7.11-20180703.121122-1.jar" } }, "name": "org.spongepowered:mixin:0.7.11-SNAPSHOT" diff --git a/Vanilla/resource/Profile.json b/Vanilla/resource/Profile.json index 8ccb5bb..a1326e1 100644 --- a/Vanilla/resource/Profile.json +++ b/Vanilla/resource/Profile.json @@ -104,7 +104,7 @@ "path": "org/spongepowered/mixin/0.8.2/mixin-0.8.2.jar", "sha1": "1cf212283d26f706fd3074318870bebd14d2a9ed", "size": 935252, - "url": "https://repo.spongepowered.org/maven/org/spongepowered/mixin/0.8.2/mixin-0.8.2.jar" + "url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.8.2/mixin-0.8.2.jar" } }, "name": "org.spongepowered:mixin:0.8.2" diff --git a/build.gradle b/build.gradle index 07f4da9..19ed90e 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } maven { name = "sponge" - url = "https://repo.spongepowered.org/maven" + url = "https://repo.spongepowered.org/repository/maven-public/" } } dependencies { @@ -177,7 +177,9 @@ subprojects { include "**/*.jar" exclude "**/*-srg.jar" exclude "**/*-dev.jar" - exclude "**/*-sources.jar" + if (project.name.toLowerCase().contains("vanilla")) { + exclude "**/*-sources.jar" + } } } }