Sync with 5.14

build.gradle

@@ -1,40 +1,38 @@
-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        maven { url = 'https://repo.spongepowered.org/maven' }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
-    }
+import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
+import org.jetbrains.gradle.ext.Gradle
+
+plugins {
+    id 'java'
+    id 'java-library'
+    id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.9'
+    id 'com.matthewprenger.cursegradle' version '1.4.0'
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
-apply plugin: 'org.spongepowered.mixin'
-
-version = "5.6"
-group = "mirror.normalasm"
-archivesBaseName = "normalasm"
+version = project.mod_version
+group = project.maven_group
+archivesBaseName = project.archives_base_name
 
-sourceCompatibility = targetCompatibility = '1.8'
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+        vendor.set(org.gradle.jvm.toolchain.JvmVendorSpec.AZUL)
+    }
+    // Generate sources and javadocs jars when building and publishing
+    withSourcesJar()
+    // withJavadocJar()
 }
 
 minecraft {
-	version = "1.12.2-14.23.5.2847"
-    runDir = "run"
-    mappings = "stable_39"
+    mcVersion = '1.12.2'
     def args = [
+            "-ea:${project.group}",
             '-Dfml.coreMods.load=mirror.normalasm.core.NormalLoadingPlugin',
             '-Dmixin.hotSwap=true',
             '-Dmixin.checks.interfaces=true',
-			'-Dmixin.debug.export=true'
+            '-Dmixin.debug.export=true'
     ]
-    clientJvmArgs.addAll(args)
-    serverJvmArgs.addAll(args)
-    useDepAts = true
-    makeObfSourceJar = false
+    extraRunJvmArguments.addAll(args)
 }
 
 configurations {
@@ -44,112 +42,161 @@ configurations {
 
 repositories {
     jcenter()
+    maven  {
+        url 'https://repo.spongepowered.org/maven'
+    }
     maven {
-        url "https://maven.cleanroommc.com"
+        url 'https://maven.cleanroommc.com'
     }
     maven {
-        url "http://chickenbones.net/maven"
+        url 'http://chickenbones.net/maven'
+        allowInsecureProtocol = true
     }
     maven {
-        url "http://maven.covers1624.net"
+        url 'http://maven.covers1624.net'
+        allowInsecureProtocol = true
     }
     maven {
-        url "https://www.cursemaven.com"
+        url 'https://www.cursemaven.com'
     }
     maven {
-        url "https://dvs1.progwml6.com/files/maven/"
+        url 'https://dvs1.progwml6.com/files/maven/'
     }
     maven {
-        url "https://modmaven.k-4u.nl/"
+        url 'https://modmaven.k-4u.nl/'
     }
     maven {
-        url "https://maven.blamejared.com"
+        url 'https://maven.blamejared.com'
     }
     maven {
-        url "https://maven.thiakil.com"
+        url 'https://maven.thiakil.com'
     }
     maven {
-        url "https://repo.codemc.io/repository/maven-public/"
+        url 'https://repo.codemc.io/repository/maven-public/'
     }
     maven {
-        url "http://maven.tterrag.com"
+        url 'http://maven.tterrag.com'
+        allowInsecureProtocol = true
     }
     // maven {
-        // url = "http://maven.bluexin.be/repository/snapshots/"
+        // url = 'http://maven.bluexin.be/repository/snapshots/'
     // }
 }
 
 dependencies {
-    embed "me.nallar.whocalled:WhoCalled:1.1"
-    deobfProvided "com.enderio.core:EnderCore:1.12.2-+"
-    deobfProvided ("com.enderio:EnderIO:1.12.2-+") {
+    embed 'me.nallar.whocalled:WhoCalled:1.1'
+    implementation 'zone.rong:mixinbooter:7.1'
+    implementation files('./etc/spark-forge-deobf.jar')
+
+    compileOnly 'com.enderio.core:EnderCore:1.12.2-+'
+    compileOnly ('com.enderio:EnderIO:1.12.2-+') {
+        transitive = false
+    }
+    compileOnly 'codechicken:ChickenASM:1.12-1.0.2.9'
+    compileOnly 'epicsquid.mysticallib:mysticallib:1.12.2-+'
+    compileOnly 'mezz.jei:jei_1.12.2:4.15.0.293'
+    compileOnly 'slimeknights.mantle:Mantle:1.12-1.3.3.55'
+    compileOnly 'slimeknights:TConstruct:1.12.2-2.13.0.183'
+    compileOnly 'betterwithmods:BetterWithMods:1.12-2.3.20-1030'
+
+    compileOnly rfg.deobf('codechicken:CodeChickenLib:1.12.2-3.2.3.358:universal')
+    compileOnly rfg.deobf('com.azanor.baubles:Baubles:1.12-1.5.2')
+    compileOnly rfg.deobf('blusunrize:ImmersiveEngineering:0.12-92-+')
+
+    compileOnly rfg.deobf('curse.maven:astral-sorcery-241721:3044416')
+    compileOnly rfg.deobf('curse.maven:tfcraft-302973:3268988')
+    compileOnly rfg.deobf('curse.maven:foamfix-optimization-mod-278494:3327893')
+    compileOnly rfg.deobf('curse.maven:electroblobs-wizardry-265642:3189062')
+    // deobfCompile 'curse.maven:qmd-362056:3474533'
+    // deobfCompile 'cofh:CoFHCore:1.12.2-+:universal'
+    // compile 'com.teamwizardry.librarianlib:librarianlib-1.12:4.0-SNAPSHOT:deobf'
+    compileOnly rfg.deobf('curse.maven:extra-utilities-225561:2678374')
+    compileOnly rfg.deobf('curse.maven:gottschcore-272450:3748293')
+    compileOnly rfg.deobf('curse.maven:treasure2-289760:3758107')
+    compileOnly rfg.deobf('curse.maven:time-speed-mod-221053:2991593')
+    compileOnly rfg.deobf('curse.maven:gregtech-ce-unofficial-557242:3745499')
+
+    api ('org.spongepowered:mixin:0.8.3') {
+        transitive = false
+    }
+    annotationProcessor 'org.ow2.asm:asm-debug-all:5.2'
+    annotationProcessor 'com.google.guava:guava:24.1.1-jre'
+    annotationProcessor 'com.google.code.gson:gson:2.8.6'
+    annotationProcessor ('org.spongepowered:mixin:0.8.3') {
         transitive = false
     }
-    compile "codechicken:ChickenASM:1.12-1.0.2.9"
-    provided "epicsquid.mysticallib:mysticallib:1.12.2-+"
-    compile "mezz.jei:jei_1.12.2:4.15.0.293"
-    compile "zone.rong:mixinbooter:4.2"
-    // compile files("./etc/spark-forge-deobf.jar", "./etc/preview_OptiFine_1.12.2_HD_U_G6_pre1-deobf.jar")
-    compile files("./etc/spark-forge-deobf.jar")
-
-    deobfCompile 'slimeknights.mantle:Mantle:1.12-1.3.3.55+'
-    deobfCompile 'slimeknights:TConstruct:1.12.2-2.13.0.183+'
-
-    deobfProvided "betterwithmods:BetterWithMods:1.12-2.3.20-1030"
-
-    deobfCompile "codechicken:CodeChickenLib:1.12.2-3.2.3.358:universal"
-    deobfProvided "com.azanor.baubles:Baubles:1.12-1.5.2"
-    deobfProvided "blusunrize:ImmersiveEngineering:0.12-92-+"
-    deobfProvided "curse.maven:astral-sorcery-241721:3044416"
-    deobfProvided "curse.maven:tfcraft-302973:3268988"
-    deobfProvided "curse.maven:foamfix-optimization-mod-278494:3327893"
-    deobfProvided "curse.maven:electroblobs-wizardry-265642:3189062"
-    // deobfCompile "curse.maven:qmd-362056:3474533"
-    // deobfCompile "cofh:CoFHCore:1.12.2-+:universal"
-    // compile "com.teamwizardry.librarianlib:librarianlib-1.12:4.0-SNAPSHOT:deobf"
-    deobfProvided "curse.maven:extra-utilities-225561:2678374"
-    deobfProvided "curse.maven:gottschcore-272450:3748293"
-    deobfProvided "curse.maven:treasure2-289760:3758107"
-    deobfProvided "curse.maven:time-speed-mod-221053:2991593"
-    deobfCompile "curse.maven:gregtech-ce-unofficial-557242:3745499"
 }
 
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
+def mixinConfigRefMap = 'mixins.' + project.archives_base_name + '.refmap.json'
+def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
+def refMap = "${mixinTmpDir}" + File.separator + mixinConfigRefMap
+def mixinSrg = "${mixinTmpDir}" + File.separator + 'mixins.srg'
 
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
+tasks.named('reobfJar', ReobfuscatedJar).configure {
+    extraSrgFiles.from(mixinSrg)
+}
 
-    // copy everything else except the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+tasks.named('compileJava', JavaCompile).configure {
+    doFirst {
+        new File(mixinTmpDir).mkdirs()
     }
+    options.compilerArgs += ["-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}", "-AoutSrgFile=${mixinSrg}", "-AoutRefMapFile=${refMap}",]
 }
 
-sourceSets {
-    main {
-        ext.refMap = "mixins.normalasm.refmap.json"
+processResources {
+    inputs.property 'version', project.version
+    inputs.property 'mcversion', project.minecraft.version
+
+    filesMatching('mcmod.info') { fcd ->
+        include 'mcmod.info'
+        // replace version and mcversion
+        fcd.expand ('version': project.version, 'mcversion': project.minecraft.version)
     }
+
+    from refMap
+    dependsOn 'compileJava'
 }
 
 jar {
-    from (configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }) {
-        exclude 'LICENSE.txt', 'META-INF/MANIFSET.MF', 'META-INF/maven/**', 'META-INF/*.RSA', 'META-INF/*.SF'
+    from provider {
+        configurations.embed.collect {it.isDirectory() ? it : zipTree(it)}
     }
     manifest {
         attributes([
-                "FMLCorePluginContainsFMLMod": true,
-                "FMLCorePlugin": 'mirror.normalasm.core.NormalLoadingPlugin',
-                "ForceLoadAsMod": project.gradle.startParameter.taskNames[0] == "build",
-                "TweakClass": 'org.spongepowered.asm.launch.MixinTweaker',
-                "FMLAT": "normalasm_at.cfg"
+                'FMLCorePluginContainsFMLMod': true,
+                'FMLCorePlugin': 'mirror.normalasm.core.NormalLoadingPlugin',
+                'ForceLoadAsMod': project.gradle.startParameter.taskNames[0] == 'build',
+                'FMLAT': 'normalasm_at.cfg'
         ])
     }
 }
+
+idea {
+    module {
+        inheritOutputDirs = true
+    }
+    project {
+        settings {
+            runConfigurations {
+                '1. Run Client'(Gradle) {
+                    taskNames = ['runClient']
+                }
+                '2. Run Server'(Gradle) {
+                    taskNames = ['runServer']
+                }
+                '3. Run Obfuscated Client'(Gradle) {
+                    taskNames = ['runObfClient']
+                }
+                '4. Run Obfuscated Server'(Gradle) {
+                    taskNames = ['runObfServer']
+                }
+            }
+            compiler.javac {
+                afterEvaluate {
+                    javacAdditionalOptions = '-encoding utf8'
+                    moduleJavacAdditionalOptions = [(project.name + '.main'): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')]
+                }
+            }
+        }
+    }
+}

gradle.properties

@@ -1,3 +1,6 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs = -Xmx3G
+
+# Mod Information
+mod_version = 5.23
+maven_group = mirror.normalasm
+archives_base_name = normalasm

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip

settings.gradle

@@ -0,0 +1,24 @@
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name = 'GTNH Maven'
+            url = uri 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+            allowInsecureProtocol = true
+            mavenContent {
+                includeGroup 'com.gtnewhorizons'
+                includeGroup 'com.gtnewhorizons.retrofuturagradle'
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    // Automatic toolchain provisioning
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
+}
+
+rootProject.name = 'NormalASM'

src/main/java/mirror/normalasm/NormalReflector.java

@@ -214,6 +214,13 @@ public static boolean doesTweakExist(String tweakName) {
         return ((List<String>) Launch.blackboard.get("TweakClasses")).contains(tweakName);
     }
 
+    public static Class<?> getNullableClass(String className) {
+        try {
+            return Class.forName(className);
+        } catch (ClassNotFoundException ignored) { }
+        return null;
+    }
+
     public static Optional<Class<?>> getClass(String className) {
         try {
             return Optional.of(Class.forName(className));