From db6b54732edd497385f9f7d3af6c5aaf46c0ee70 Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Wed, 22 Aug 2018 03:42:50 +0800 Subject: [PATCH] Update MCP map to stable --- 1.13/build.properties | 2 +- Forge/.gitignore | 1 + Forge/build.gradle | 3 ++- Forge/source/customskinloader/forge/ForgeMod.java | 12 ++++++++---- .../customskinloader/forge/TransformerManager.java | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/1.13/build.properties b/1.13/build.properties index fe0346c..cd0d35c 100644 --- a/1.13/build.properties +++ b/1.13/build.properties @@ -3,5 +3,5 @@ minecraft_full_versions=1.13 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.4.2705 -mappings_version=snapshot_20180810 +mappings_version=stable_39 srg_notch_map=1.13.srg \ No newline at end of file diff --git a/Forge/.gitignore b/Forge/.gitignore index 4a95481..7987877 100644 --- a/Forge/.gitignore +++ b/Forge/.gitignore @@ -1,2 +1,3 @@ /bin/ /build/ +/run/ \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle index be317ae..742f6b8 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' ext.MINECRAFT_VERSION = "1.12.2" ext.FORGE_VERSION = "14.23.4.2705" -ext.MAPPING_VERSION = "snapshot_20180810" +ext.MAPPING_VERSION = "stable_39" ext.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" ext.snapshot = !(rootProject.ext.config.snapshot == "" || rootProject.ext.config.snapshot == "0" || rootProject.ext.config.snapshot == 0) @@ -57,6 +57,7 @@ minecraft { version = MINECRAFT_VERSION + "-" + FORGE_VERSION runDir = "run" mappings = MAPPING_VERSION + clientJvmArgs += "-Dfml.coreMods.load=customskinloader.forge.ForgePlugin" replace '@MOD_VERSION@', rootProject.ext.config.version replace '@MOD_FULL_VERSION@', project.version diff --git a/Forge/source/customskinloader/forge/ForgeMod.java b/Forge/source/customskinloader/forge/ForgeMod.java index 2ff4b70..f4267aa 100644 --- a/Forge/source/customskinloader/forge/ForgeMod.java +++ b/Forge/source/customskinloader/forge/ForgeMod.java @@ -20,10 +20,14 @@ public class ForgeMod { CustomSkinLoader.logger.warning("!!!Fingerprint ERROR!!!"); CustomSkinLoader.logger.warning("Failed to check fingerprint in file '" + event.getSource().getAbsolutePath() + "'."); - CustomSkinLoader.logger.warning("Excepted fingerprint: " + event.getExpectedFingerprint()); - CustomSkinLoader.logger.warning("Founded fingerprint: "); - for (String s : event.getFingerprints()) - CustomSkinLoader.logger.warning(s); + CustomSkinLoader.logger.warning("Excepted Fingerprint: " + event.getExpectedFingerprint()); + if (event.getFingerprints().isEmpty()) { + CustomSkinLoader.logger.warning("No Fingerprint Founded."); + } else { + CustomSkinLoader.logger.warning("Founded Fingerprint: "); + for (String s : event.getFingerprints()) + CustomSkinLoader.logger.warning(s); + } throw new RuntimeException("Fingerprint ERROR, please **DO NOT MODIFY** any mod."); } diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index adaee8a..7664443 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -25,7 +25,7 @@ import customskinloader.forge.transformer.SkinManagerTransformer.*; import customskinloader.forge.transformer.SpectatorMenuTransformer.PlayerMenuObjectTransformer; public class TransformerManager implements IClassTransformer { - public static Logger logger = new Logger(new File(Launch.minecraftHome, "/CustomSkinLoader/ForgePlugin.log")); + public static Logger logger = new Logger(new File(Launch.minecraftHome, "./CustomSkinLoader/ForgePlugin.log")); @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface TransformTarget{