Version 2.2.4

Hidoni · Jun 15, 2024 · 47a0cd5 · 47a0cd5
1 parent ae90a88
commit 47a0cd5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,5 @@
+# 2.2.4+1.21 15/06/2024
+- Fix mixin related crash when loading on Forge
+
 # 2.2.3+1.21 14/06/2024
 - Initial 1.21 port
diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -15,12 +15,10 @@ plugins {
 }
 
 archivesBaseName = rootProject.archivesBaseName + '-forge'
-project.ext.mixin_refmap = "${archivesBaseName}-refmap.json"
 
 minecraft {
-    // mappings channel: 'official', version: minecraft_version
-    mappings channel: 'parchment', version: "${project.parchment_minecraft_version}-${project.parchment_mappings_version}-${project.minecraft_version}"
-
+    mappings channel: 'official', version: minecraft_version
+    reobf false
     if (project.hasProperty('forge_ats_enabled') && project.findProperty('forge_ats_enabled').toBoolean()) {
         // This location is hardcoded in Forge and can not be changed.
         // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
@@ -33,7 +31,7 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
-            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.remapRefMap', 'false'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             arg "-mixin.config=mixins.${mod_id}.common.json"
             arg "-mixin.config=mixins.${mod_id}.forge.json"
@@ -49,7 +47,7 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
-            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.remapRefMap', 'false'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             arg "-mixin.config=mixins.${mod_id}.common.json"
             arg "-mixin.config=mixins.${mod_id}.forge.json"
@@ -66,7 +64,7 @@ minecraft {
             ideaModule "${rootProject.name}.${project.name}.main"
             args '--mod', mod_id, '--all', '--output', file('../Common/src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('/../Common/src/main/resources')
             taskName 'Data'
-            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.remapRefMap', 'false'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
                 modDataRun {
@@ -89,26 +87,25 @@ dependencies {
 
 apply plugin: 'org.spongepowered.mixin'
 mixin {
-    add sourceSets.main, project.ext.mixin_refmap
     config 'mixins.customizableelytra.common.json'
     config 'mixins.customizableelytra.forge.json'
 }
+jar {
+    manifest {
+        attributes([
+                "MixinConfigs": "mixins.customizableelytra.common.json,mixins.customizableelytra.forge.json"
+        ])
+    }
+}
 
 tasks.withType(JavaCompile) {
     source(project(":Common").sourceSets.main.allSource)
 }
 
 processResources {
     from project(":Common").sourceSets.main.resources
-
-    filesMatching("mixins.*.json") {
-        expand "mixin_refmap": project.ext.mixin_refmap
-    }
 }
 
-
-jar.finalizedBy('reobfJar')
-
 publishing {
     publications {
         mavenJava(MavenPublication) {

diff --git a/Forge/src/main/resources/mixins.customizableelytra.forge.json b/Forge/src/main/resources/mixins.customizableelytra.forge.json
@@ -9,6 +9,5 @@
   ],
   "injectors": {
     "defaultRequire": 1
-  },
-  "refmap": "${mixin_refmap}"
+  }
 }
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
@@ -9,7 +9,6 @@ plugins {
 base {
     archivesName = rootProject.archivesBaseName + '-neoforge'
 }
-project.ext.mixin_refmap = "${archivesBaseName}-refmap.json"
 
 // Automatically enable neoforge AccessTransformers if the file exists
 // This location is hardcoded in FML and can not be changed.
@@ -48,10 +47,6 @@ dependencies {
 processResources {
     from project(":Common").sourceSets.main.resources
     inputs.property "version", project.version
-
-    filesMatching("mixins.*.json") {
-        expand "mixin_refmap": project.ext.mixin_refmap
-    }
 }
 
 

diff --git a/NeoForge/src/main/resources/mixins.customizableelytra.neoforge.json b/NeoForge/src/main/resources/mixins.customizableelytra.neoforge.json
@@ -9,6 +9,5 @@
   ],
   "injectors": {
     "defaultRequire": 1
-  },
-  "refmap": "${mixin_refmap}"
+  }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-mod_version=2.2.3
+mod_version=2.2.4
 archives_base_name=customizableelytra
 group=com.hidoni.customizableelytra