Port to 1.21.2 final, disable Neo for release

IrisShaders · Oct 22, 2024 · f909678 · f909678
1 parent 86073a8
commit f909678
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,17 +4,17 @@ plugins {
     id("fabric-loom") version("1.8.10") apply(false)
 }
 
-val MINECRAFT_VERSION by extra { "1.21.2-rc1" }
+val MINECRAFT_VERSION by extra { "1.21.2" }
 val NEOFORGE_VERSION by extra { "21.2.0-alpha.1.21.2-rc1.20241017.223717" }
-val FABRIC_LOADER_VERSION by extra { "0.16.5" }
-val FABRIC_API_VERSION by extra { "0.105.3+1.21.2" }
+val FABRIC_LOADER_VERSION by extra { "0.16.7" }
+val FABRIC_API_VERSION by extra { "0.106.0+1.21.2" }
 
 // This value can be set to null to disable Parchment.
 // TODO: Re-add Parchment
 val PARCHMENT_VERSION by extra { null }
 
 // https://semver.org/
-val MOD_VERSION by extra { "1.8.0-beta.5" }
+val MOD_VERSION by extra { "1.8.0-beta.6" }
 
 allprojects {
     apply(plugin = "java")

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -110,10 +110,9 @@ sourceSets {
 }
 
 loom {
-    noIntermediateMappings()
     mixin {
         defaultRefmapName = "iris.refmap.json"
-        useLegacyMixinAp = true
+        useLegacyMixinAp = false
     }
 
     accessWidenerPath = file("src/main/resources/iris.accesswidener")

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -90,7 +90,10 @@ loom {
         accessWidenerPath.set(project(":common").file("src/main/resources/iris.accesswidener"))
 
     @Suppress("UnstableApiUsage")
-    mixin { defaultRefmapName.set("iris-fabric.refmap.json") }
+    mixin {
+        defaultRefmapName.set("iris-fabric.refmap.json")
+        useLegacyMixinAp = false
+    }
 
     runs {
         named("client") {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,4 +8,4 @@ pluginManagement {
     }
 }
 
-include("common", "fabric", "neoforge")
+include("common", "fabric")
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ pluginManagement { @@
         }
     }
-    include("common", "fabric", "neoforge")
+    include("common", "fabric")