update dependencies (now uses vineflower) (#3)

Looks good, thanks!

Author: metroite

build.gradle

@@ -16,7 +16,7 @@ repositories {
 
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
-    it.options.release = 8
+    it.options.release = 21
 }
 
 application {
@@ -51,5 +51,5 @@ dependencies {
     implementation "org.eclipse.jgit:org.eclipse.jgit:${jgit_version}"
 
     // Decompiler, could be replaced with another fernflower fork
-    implementation "org.quiltmc:quiltflower:${quiltflower_version}"
+    implementation "org.vineflower:vineflower:${vineflower_version}"
 }

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs = -Xmx3G
 
 # GitCraft Properties
 group = dex.mcgitmaker
-version = 0.1.2-SNAPSHOT
+version = 0.1.3-SNAPSHOT
 
 # GitCraft Dependencies
 groovy_version = 3.0.+
-fabric_loader_version = 0.14.+
-asm_version = 9.3
+fabric_loader_version = 0.15.+
+asm_version = 9.7
 stitch_version = 0.6.+
-tiny_remapper_version = 0.8.+
+tiny_remapper_version = 0.10.+
 access_widener_version = 2.1.+
-mappingio_version = 0.3.+
+mappingio_version = 0.6.+
 lorenz_tiny_version = 4.0.+
-jgit_version = 6.2.+
-quiltflower_version = 1.8.+
+jgit_version = 6.8.+
+vineflower_version = 1.10.+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/groovy/dex/mcgitmaker/data/McVersion.groovy

@@ -5,10 +5,11 @@ import dex.mcgitmaker.Util
 import dex.mcgitmaker.loom.BundleMetadata
 import dex.mcgitmaker.loom.Decompiler
 import dex.mcgitmaker.loom.Remapper
+import net.fabricmc.mappingio.MappingWriter
 import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch
 import net.fabricmc.mappingio.format.MappingFormat
-import net.fabricmc.mappingio.format.ProGuardReader
-import net.fabricmc.mappingio.format.Tiny2Writer
+import net.fabricmc.mappingio.format.proguard.ProGuardFileReader
+import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter
 import net.fabricmc.mappingio.tree.MemoryMappingTree
 import net.fabricmc.stitch.merge.JarMerger
 import net.fabricmc.tinyremapper.IMappingProvider
@@ -71,13 +72,14 @@ class McVersion {
 
             try (BufferedReader clientBufferedReader = Files.newBufferedReader(artifacts.clientMappings.fetchArtifact().toPath(), StandardCharsets.UTF_8)
                  BufferedReader serverBufferedReader = Files.newBufferedReader(artifacts.serverMappings.fetchArtifact().toPath(), StandardCharsets.UTF_8)) {
-                ProGuardReader.read(clientBufferedReader as Reader, Util.MappingsNamespace.MOJMAP.toString(), Util.MappingsNamespace.OFFICIAL.toString(), nsSwitch)
-                ProGuardReader.read(serverBufferedReader as Reader, Util.MappingsNamespace.MOJMAP.toString(), Util.MappingsNamespace.OFFICIAL.toString(), nsSwitch)
+                ProGuardFileReader.read(clientBufferedReader as Reader, Util.MappingsNamespace.MOJMAP.toString(), Util.MappingsNamespace.OFFICIAL.toString(), nsSwitch)
+                ProGuardFileReader.read(serverBufferedReader as Reader, Util.MappingsNamespace.MOJMAP.toString(), Util.MappingsNamespace.OFFICIAL.toString(), nsSwitch)
             }
 
-            def w = Tiny2Writer.create(mappingsFile, MappingFormat.TINY_2)
-            mappingTree.accept(w)
-            w.close()
+            try (MappingWriter w = MappingWriter.create(mappingsFile, MappingFormat.TINY_2_FILE)) {
+                mappingTree.accept(w)
+                w.close()
+            }
         }
 
         return mappingsFile

src/main/groovy/dex/mcgitmaker/loom/Decompiler.groovy

@@ -5,7 +5,6 @@ import dex.mcgitmaker.data.Artifact
 import dex.mcgitmaker.data.McVersion
 import groovy.json.JsonGenerator
 import groovy.json.JsonOutput
-import net.fabricmc.stitch.util.StitchUtil
 import org.jetbrains.java.decompiler.main.Fernflower
 import org.jetbrains.java.decompiler.main.decompiler.DirectoryResultSaver
 import org.jetbrains.java.decompiler.main.decompiler.PrintStreamLogger
@@ -35,12 +34,12 @@ class Decompiler {
         options.put(IFernflowerPreferences.THREADS, Integer.toString(Runtime.getRuntime().availableProcessors() - 3));
         //options.put(IFabricJavadocProvider.PROPERTY_NAME, new QfTinyJavadocProvider(metaData.javaDocs().toFile()));
 
-        // Experimental QF preferences
+        // Experimental VF preferences
         options.put(IFernflowerPreferences.PATTERN_MATCHING, "1");
-        options.put(IFernflowerPreferences.EXPERIMENTAL_TRY_LOOP_FIX, "1");
+        options.put(IFernflowerPreferences.TRY_LOOP_FIX, "1");
         //options.putAll(ReflectionUtil.<Map<String, String>>maybeGetFieldOrRecordComponent(metaData, "options").orElse(Map.of()));
 
-        Fernflower ff = new Fernflower(Zips::getBytes, new DirectoryResultSaver(decompiledPath(mcVersion).toFile()), options, new PrintStreamLogger(/*System.out*/NULL_IS))
+        Fernflower ff = new Fernflower(new DirectoryResultSaver(decompiledPath(mcVersion).toFile()), options, new PrintStreamLogger(/*System.out*/NULL_IS))
 
         println 'Adding libraries...'
         for (Artifact library : mcVersion.libraries) {
@@ -72,17 +71,4 @@ class Decompiler {
         x.createNewFile()
         x.write(JsonOutput.prettyPrint(generator.toJson(c)))
     }
-
-    // Adapted from loom-quiltflower by Juuxel
-    static final class Zips {
-        static byte[] getBytes(String outerPath, String innerPath) throws IOException {
-            if (innerPath == null) {
-                return Files.readAllBytes(Path.of(outerPath));
-            }
-
-            try (StitchUtil.FileSystemDelegate fs = StitchUtil.getJarFileSystem(new File(outerPath), false)) {
-                return Files.readAllBytes(fs.get().getPath(innerPath));
-            }
-        }
-    }
 }