diff --git a/build.gradle b/build.gradle index eddf57d..c72bdf6 100644 --- 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 index 7daec87..aff2764 100644 --- 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 deleted file mode 100644 index 2fe01b3..0000000 --- a/runClient.bat +++ /dev/null @@ -1 +0,0 @@ -call gradlew.bat runClient \ No newline at end of file diff --git a/setupDecomp.bat b/setupDecomp.bat deleted file mode 100644 index 8bdba6e..0000000 --- a/setupDecomp.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -"C:\Windows\System32\chcp.com" 65001 -cd /d "%~dp0" -echo %JAVA_TOOL_OPTIONS% | "C:\Windows\System32\findstr.exe" /C:"-Dfile.encoding=" > nul -if errorlevel 1 ( - if defined JAVA_TOOL_OPTIONS ( - "C:\Windows\System32\setx.exe" JAVA_TOOL_OPTIONS "%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8" - set "JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8" - ) else ( - "C:\Windows\System32\setx.exe" JAVA_TOOL_OPTIONS "-Dfile.encoding=UTF-8" - set "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8" - ) -) -call gradlew.bat setupDecompWorkspace genIntellijRuns --info -pause diff --git a/src/main/java/rml/jrx/utils/file/FileHelper.java b/src/main/java/rml/jrx/utils/file/FileHelper.java index 05be89a..e05ca61 100644 --- 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{