adapt j21

Ecdcaeb · Nov 16, 2024 · 28f6c11 · 28f6c11
1 parent b3300f1
commit 28f6c11
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -292,7 +292,12 @@ jar {
             attribute_map['FMLAT']= project.access_transformer_locations
         }
         if(propertyBool('use_mixin')){
-            attribute_map['MixinConfigs'] = project.mixin_configs;
+            StringBuilder mixins = new StringBuilder();
+            for(String s : propertyStringList('mixin_configs').collect(config -> "mixins.${config}.json" as String)){
+                mixins.append(s).append(',');
+            }
+            mixins.deleteCharAt(mixins.length());
+            attribute_map['MixinConfigs'] = mixins.toString();
         }
 
         attributes(attribute_map)

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@
 org.gradle.jvmargs = -Xmx3G
 
 java_version = 21
-cleanroom_version=0.2.3-alpha+
+cleanroom_version=0.2.3-alpha
 
 # Mapping Properties
 mapping_channel= stable

diff --git a/runClient.bat b/runClient.bat
diff --git a/setupDecomp.bat b/setupDecomp.bat
diff --git a/src/main/java/rml/jrx/utils/file/FileHelper.java b/src/main/java/rml/jrx/utils/file/FileHelper.java
@@ -66,7 +66,7 @@ public static void findFiles(ContainerHolder containerHolder, @Nullable Module m
             {
                 try
                 {
-                    fs = FileSystems.newFileSystem(source.toPath(), null);
+                    fs = FileSystems.newFileSystem(source.toPath(), (ClassLoader) null);
                     root = fs.getPath("/" + base);
                 }
                 catch (IOException e)
@@ -122,7 +122,7 @@ public static void findFile(ContainerHolder containerHolder, Module module, Stri
         {
             try
             {
-                FileSystem fs = FileSystems.newFileSystem(source.toPath(), null);
+                FileSystem fs = FileSystems.newFileSystem(source.toPath(), (ClassLoader) null);
                 Path path;
                 try{
                     path = fs.getPath("/" + base);
@@ -159,7 +159,7 @@ public static byte[] findFile(ModContainer containerHolder, String base) {
         {
             try
             {
-                FileSystem fs = FileSystems.newFileSystem(source.toPath(), null);
+                FileSystem fs = FileSystems.newFileSystem(source.toPath(), (ClassLoader) null);
                 Path path;
                 byte[] toReturn;
                 try{