Update ModDevGradle

Sinytra · Dec 16, 2024 · 569b2a2 · 569b2a2
1 parent aade659
commit 569b2a2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/definition/src/main/java/org/sinytra/adapter/patch/analysis/InstructionMatcher.java b/definition/src/main/java/org/sinytra/adapter/patch/analysis/InstructionMatcher.java
@@ -28,6 +28,9 @@ public String findReplacement(List<String> cleanCallOrder, List<String> dirtyCal
             return null;
         }
 
+        if (this.after.isEmpty()) {
+            return null;
+        }
         MethodInsnNode nextMethodCall = MethodCallAnalyzer.findFirstInsn(this.after.getFirst(), MethodInsnNode.class, MethodCallAnalyzer.FORWARD);
         if (nextMethodCall == null) {
             return null;

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.caching=true
 org.gradle.configuration-cache=true
 
 versionMc=1.21.1
-versionNeoForge=21.1.5
-versionModDevGradle=2.0.9-beta
+versionNeoForge=21.1.90
+versionModDevGradle=2.0.52-beta
 
 runtimeVersion=1.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/plugin/src/main/java/org/sinytra/adapter/gradle/AdapterPlugin.java b/plugin/src/main/java/org/sinytra/adapter/gradle/AdapterPlugin.java
@@ -28,7 +28,7 @@ private static void applyPlugin(Project project, AppliedPlugin plugin) {
         TaskProvider<CreateBinpatchedArtifactTask> createBinpatchedArtifactTask = project.getTasks().named("createBinpatchedArtifact", CreateBinpatchedArtifactTask.class); 
 
         project.getTasks().register("generateAdapterData", AdapterCompareJarTask.class, task -> {
-            task.getCleanJar().fileProvider(neoForge.getNeoFormRuntime().getAdditionalResults().map(p -> p.get("vanillaDeobfuscated")));
+            task.getCleanJar().fileProvider(neoForge.getAdditionalMinecraftArtifacts().map(p -> p.get("vanillaDeobfuscated")));
             task.getDirtyJar().set(createBinpatchedArtifactTask.flatMap(CreateBinpatchedArtifactTask::getOutputFile));
         });
     }

diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -41,7 +41,7 @@ tasks {
     test {
         useJUnitPlatform()
         systemProperty("adapter.definition.paramdiff.debug", true)
-        systemProperty("adapter.clean.path", neoForge.neoFormRuntime.additionalResults.getting("vanillaDeobfuscated").get().absolutePath)
+        systemProperty("adapter.clean.path", neoForge.additionalMinecraftArtifacts.getting("vanillaDeobfuscated").get().absolutePath)
         systemProperty("forge.logging.console.level", "debug")
         outputs.upToDateWhen { false }
     }

diff --git a/userdev/build.gradle.kts b/userdev/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "org.sinytra.adapter"
-version = "1.2-SNAPSHOT"
+version = "1.2.1-SNAPSHOT"
 
 val versionModDevGradle: String by Properties().also { file("../gradle.properties").bufferedReader().use(it::load) }
 

diff --git a/userdev/src/main/java/org/sinytra/adapter/userdev/AdapterUserdevPlugin.java b/userdev/src/main/java/org/sinytra/adapter/userdev/AdapterUserdevPlugin.java
@@ -36,7 +36,7 @@ public static void applyPlugin(Project project) {
         });
 
         File requestedOutput = project.file("build/createCleanArtifact/minecraft-renamed.jar");
-        neoForge.getNeoFormRuntime().getAdditionalResults().put("vanillaDeobfuscated", requestedOutput);
+        neoForge.getAdditionalMinecraftArtifacts().put("vanillaDeobfuscated", requestedOutput);
 
         TaskProvider<ExtractBinPatches> extractBinPatches = project.getTasks().register("extractBinPatches", ExtractBinPatches.class, task -> {
             task.setGroup("sinytra");