From d9e5a4962763dd8127e59334b27a281b06ac5dfd Mon Sep 17 00:00:00 2001 From: mmvanheusden Date: Thu, 10 Feb 2022 15:44:54 +0100 Subject: [PATCH 1/4] Update to ForgeGrade 5, Gradle 7.4 --- build.gradle | 20 ++++++++----------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../client/mixin/client/MixinMinecraft.java | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index fab61f572..d1886573e 100644 --- a/build.gradle +++ b/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,8 +44,10 @@ repositories { maven { url = 'https://repo.spongepowered.org/maven/' } maven { url = 'https://impactdevelopment.github.io/maven/' } maven { url = "https://jitpack.io" } + mavenCentral() } + minecraft { mappings channel: "$mappingsChannel", version: "$mappingsVersion" @@ -76,19 +78,18 @@ 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 +126,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' @@ -146,11 +147,6 @@ processResources { inputs.property 'version', project.version exclude '**/rawimagefiles' - - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - expand 'version': project.version - } } task sourceJar(type: Jar) { // Generate sources diff --git a/gradle.properties b/gradle.properties index 62b1d87e1..ef99bcf52 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3ab0b725e..41dfb8790 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/com/lambda/client/mixin/client/MixinMinecraft.java b/src/main/java/com/lambda/client/mixin/client/MixinMinecraft.java index 4decb5b5b..8e8c61b0f 100644 --- a/src/main/java/com/lambda/client/mixin/client/MixinMinecraft.java +++ b/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; From d36fc41820aa209b3c7ecf2acf8b54b5c476d461 Mon Sep 17 00:00:00 2001 From: mmvanheusden Date: Thu, 10 Feb 2022 16:07:33 +0100 Subject: [PATCH 2/4] Fix build --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index d1886573e..85a25ed96 100644 --- a/build.gradle +++ b/build.gradle @@ -178,6 +178,7 @@ jar { // Copy needed libs to jar from { + exclude "**/module-info.class" configurations.jarLibs.collect { it.isDirectory() ? it : zipTree(it) } From 0e76d996479317b484e361a041c1b0d34a7cc3e5 Mon Sep 17 00:00:00 2001 From: Constructor Date: Sat, 12 Feb 2022 02:00:02 +0100 Subject: [PATCH 3/4] Fix info expand --- build.gradle | 8 ++++++-- src/main/resources/mcmod.info | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 85a25ed96..0e6e028ae 100644 --- a/build.gradle +++ b/build.gradle @@ -144,9 +144,13 @@ mixin { } processResources { - inputs.property 'version', project.version - exclude '**/rawimagefiles' + + from(sourceSets.main.resources.srcDirs) { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + include 'mcmod.info' + expand version: version, 'mcversion': minecraftVersion + } } task sourceJar(type: Jar) { // Generate sources diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index f7c5d322c..40ef7e4af 100644 --- a/src/main/resources/mcmod.info +++ b/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": [ From cac7765663d931d54af5ab20010860224ab82ed3 Mon Sep 17 00:00:00 2001 From: Constructor Date: Sat, 12 Feb 2022 02:10:04 +0100 Subject: [PATCH 4/4] Cleanup --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e6e028ae..5f30efae5 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,6 @@ repositories { mavenCentral() } - minecraft { mappings channel: "$mappingsChannel", version: "$mappingsVersion" @@ -85,10 +84,12 @@ dependencies { exclude module: 'launchwrapper' 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.3:processor') { exclude module: 'gson' } + // Not the latest Reflections because it breaks Future compatibility :/ jarLibs('org.reflections:reflections:0.9.12') { exclude module: 'gson'