chore: compile against loom 1.9

TeamGalacticraft · Dec 15, 2024 · 1727308 · 1727308
1 parent 372745d
commit 1727308
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v4
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Mixes official and file (yarn) mappings for better parameter names.
 
 ## Usage
-To install mojarn, add the galacticraft repository to your `settings.gradle.kts` file:
+To install mojarn, add the Galacticraft repository to your `settings.gradle.kts` file:
 ```kotlin
 pluginManagement {
     repositories {
@@ -14,7 +14,7 @@ pluginManagement {
 Then, add the following to your `build.gradle.kts` file:
 ```kotlin
 plugins {
-    id("dev.galacticraft.mojarn") version("0.5.0+13")
+    id("dev.galacticraft.mojarn") version("0.5.2+15")
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@
 plugins {
     `java-gradle-plugin`
     `maven-publish`
-    id("com.gradle.plugin-publish") version("1.2.2")
+    id("com.gradle.plugin-publish") version("1.3.0")
     id("org.cadixdev.licenser") version("0.6.1")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ plugin.group=dev.galacticraft
 plugin.name=Mojarn
 plugin.id=mojarn
 plugin.description=Mixes official and yarn mappings for better argument names
-plugin.version=0.5.1
+plugin.version=0.5.2
 
-loom.version=1.8.11
+loom.version=1.9.2
 mapping-io.version=0.6.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/dev/galacticraft/mojarn/impl/MojarnMappingsLayer.java b/src/main/java/dev/galacticraft/mojarn/impl/MojarnMappingsLayer.java
@@ -150,6 +150,7 @@ public void visit(MappingVisitor mappingVisitor) throws IOException {
         }
 
         long time = System.currentTimeMillis() - start;
+        MojarnPlugin.LOGGER.info("Failed to map {} method arguments due to LVT mismatch.", this.skipped);
         MojarnPlugin.LOGGER.info("Mapping layer generation took {}ms", time);
     }
 
@@ -203,8 +204,8 @@ private void mapArguments(MappingVisitor output, MappingTree.MethodMapping metho
             String argName = arg.getDstName(named);
             if (argName != null) {
                 if (offset >= 0 && (arg.getLvIndex() - offset < 0 || arg.getLvIndex() - offset >= descriptor.size())) {
-                    MojarnPlugin.LOGGER.debug("Skipping method {} (LVT offset mismatch)}", method.getName(named));
-                    skipped++;
+                    MojarnPlugin.LOGGER.debug("Skipping arguments of method '{}' (LVT offset mismatch)", method.getName(named));
+                    this.skipped++;
                     break;
                 }
                 // check if the argument is a class