Update to ForgeGrade 5, Gradle 7.4, and bump up some dependencies (#236)

* Update to ForgeGrade 5, Gradle 7.4

* Fix build

* Fix info expand

* Cleanup

Co-authored-by: Constructor <[email protected]>

Author: mmvanheusden

build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:4.+'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.+'
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
@@ -44,6 +44,7 @@ repositories {
     maven { url = 'https://repo.spongepowered.org/maven/' }
     maven { url = 'https://impactdevelopment.github.io/maven/' }
     maven { url = "https://jitpack.io" }
+    mavenCentral()
 }
 
 minecraft {
@@ -76,19 +77,20 @@ dependencies {
     // Forge
     minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion"
 
-    jarLibs('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+    jarLibs('org.spongepowered:mixin:0.8.3') {
         exclude module: 'commons-io'
         exclude module: 'gson'
         exclude module: 'guava'
         exclude module: 'launchwrapper'
-        exclude module: 'log4j-core' // we want to exclude this as well because 0.7.11 includes it too new for MC
+        exclude module: 'log4j-core' // we want to exclude this as well because 0.8.3 includes it too new for MC
     }
 
     // Hacky way to get mixin work
-    annotationProcessor('org.spongepowered:mixin:0.8.2:processor') {
+    annotationProcessor('org.spongepowered:mixin:0.8.3:processor') {
         exclude module: 'gson'
     }
 
+    // Not the latest Reflections because it breaks Future compatibility :/
     jarLibs('org.reflections:reflections:0.9.12') {
         exclude module: 'gson'
         exclude module: 'guava'
@@ -125,7 +127,7 @@ dependencies {
 
     // Add them back to compileOnly (provided)
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion"
-    compileOnly 'org.jetbrains:annotations:22.0.0'
+    compileOnly 'org.jetbrains:annotations:23.0.0'
 
     // This Baritone will NOT be included in the jar
     implementation 'com.github.cabaletta:baritone:1.2.14'
@@ -143,13 +145,12 @@ mixin {
 }
 
 processResources {
-    inputs.property 'version', project.version
-
     exclude '**/rawimagefiles'
 
     from(sourceSets.main.resources.srcDirs) {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
         include 'mcmod.info'
-        expand 'version': project.version
+        expand version: version, 'mcversion': minecraftVersion
     }
 }
 
@@ -182,6 +183,7 @@ jar {
 
     // Copy needed libs to jar
     from {
+        exclude "**/module-info.class"
         configurations.jarLibs.collect {
             it.isDirectory() ? it : zipTree(it)
         }

gradle.properties

@@ -11,4 +11,4 @@ mappingsVersion=39-1.12
 
 kotlinVersion=1.6.10
 kotlinxCoroutinesVersion=1.6.0
-dokkaVersion=1.6.0
+dokkaVersion=1.6.10

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/lambda/client/mixin/client/MixinMinecraft.java

@@ -23,7 +23,7 @@
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraftforge.common.ForgeHooks;
-import org.spongepowered.asm.lib.Opcodes;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

src/main/resources/mcmod.info

@@ -2,9 +2,9 @@
   {
     "modid": "lambda",
     "name": "Lambda",
-    "description": "λ\nLambda is a free, open-source, Minecraft 1.12.2 utility mod made for the anarchy experience.\nA visionary plugin system that allows additional modules to be added, without the need to create a fork!\nCustomize your experience, and improve your efficiency!",
+    "description": "λ\nLambda v${version} is a free, open-source, Minecraft ${mcversion} utility mod made for the anarchy experience.\nA visionary plugin system that allows additional modules to be added, without the need to create a Lambda fork!\nCustomize your experience, and improve your efficiency!",
     "version": "${version}",
-    "mcversion": "1.12.2",
+    "mcversion": "${mcversion}",
     "url": "https://github.com/lambda-client/lambda",
     "updateUrl": "",
     "authorList": [