JSON Data Utils targets Java 8 (for SlimeLauncher)

Author: Jonathing

file-utils/src/main/java/net/minecraftforge/util/file/FileUtils.java

@@ -5,7 +5,6 @@
 package net.minecraftforge.util.file;
 
 import net.minecraftforge.srgutils.IMappingFile;
-import net.minecraftforge.util.logging.SimpleLogger;
 import org.apache.commons.io.IOUtils;
 
 import java.io.ByteArrayOutputStream;

json-data-utils/build.gradle

@@ -16,7 +16,7 @@ dependencies {
 }
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(17)
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
     withSourcesJar()
 }
 

json-data-utils/src/main/java/net/minecraftforge/util/data/DownloadUtils.java

@@ -24,6 +24,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 
@@ -149,7 +150,7 @@ private static URLConnection getConnection(String address) {
                         out.write(buf, 0, n);
                     }
 
-                    return out.toString(StandardCharsets.UTF_8);
+                    return out.toString(StandardCharsets.UTF_8.name());
                 }
             }
         } catch (IOException e) {
@@ -182,8 +183,8 @@ public static boolean downloadFile(File target, String url) {
     }
 
     private static void ensureParent(File path) {
-        var parent = path.getAbsoluteFile().getParentFile();
-        if (parent != null && !parent.exists())
-            parent.mkdirs();
+        File parent = path.getAbsoluteFile().getParentFile();
+        if (parent != null && !parent.exists() && !parent.mkdirs())
+            throw new IllegalStateException("Cannot create parent directory for " + path);
     }
 }

json-data-utils/src/main/java/net/minecraftforge/util/data/MCJsonUtils.java

@@ -14,8 +14,8 @@ public class MCJsonUtils {
      * @return The Minecraft directory
      */
     public static File getMCDir() {
-        var userHomeDir = System.getProperty("user.home", ".");
-        var mcDir = ".minecraft";
+        String userHomeDir = System.getProperty("user.home", ".");
+        String mcDir = ".minecraft";
         if (OS.CURRENT == OS.WINDOWS && System.getenv("APPDATA") != null)
             return new File(System.getenv("APPDATA"), mcDir);
         else if (OS.CURRENT == OS.MACOS)

json-data-utils/src/main/java/net/minecraftforge/util/data/json/JsonData.java

@@ -44,7 +44,7 @@ public static MinecraftVersion minecraftVersion(byte[] data) {
     }
 
     private static <T> T fromJson(File file, Class<T> classOfT) throws JsonSyntaxException, JsonIOException {
-        try (var stream = new FileInputStream(file)) {
+        try (FileInputStream stream = new FileInputStream(file)) {
             return fromJson(stream, classOfT);
         } catch (IOException e) {
             throw new JsonIOException(e);
@@ -64,7 +64,7 @@ public static String toJson(Object src) {
         return GSON.toJson(src);
     }
     public static void toJson(Object src, File file) throws IOException {
-        try (var writer = new FileWriter(file)) {
+        try (FileWriter writer = new FileWriter(file)) {
             GSON.toJson(src, writer);
         }
     }

json-data-utils/src/main/java/net/minecraftforge/util/data/json/LauncherManifest.java

@@ -24,7 +24,7 @@ public static class VersionInfo {
     public URL getUrl(String version) {
         if (version == null || versions == null)
             return null;
-        for (var info : versions)
+        for (VersionInfo info : versions)
             if (version.equals(info.id))
                 return info.url;
         return null;

json-data-utils/src/main/java/net/minecraftforge/util/data/json/MinecraftVersion.java

@@ -23,13 +23,13 @@ public class MinecraftVersion {
     public Library[] libraries;
 
     public List<Lib> getLibs() {
-        var libs = new ArrayList<Lib>();
+        List<Lib> libs = new ArrayList<>();
 
-        for (var lib : this.libraries) {
+        for (Library lib : this.libraries) {
             if (lib.rules != null && lib.rules.size() != 1)
-                throw new UnsupportedOperationException("Rules were found, but wasn't precisely one??? Rules: %s".formatted(String.valueOf(lib.rules)));
+                throw new UnsupportedOperationException("Rules were found, but wasn't precisely one??? Rules: " + lib.rules);
 
-            var os = lib.rules == null ? null : lib.rules.get(0).os.toOS();
+            OS os = lib.rules == null ? null : lib.rules.get(0).os.toOS();
             libs.add(new Lib(lib.name, lib.downloads.artifact, os));
             if (lib.downloads.classifiers != null)
                 lib.downloads.classifiers.forEach((k, v) -> libs.add(new Lib(lib.name + ':' + k, v, os)));
@@ -38,9 +38,20 @@ public List<Lib> getLibs() {
         return libs;
     }
 
-    public record Lib(String coord, LibraryDownload dl, @Nullable OS os) {}
+    public static final class Lib {
+        public final String coord;
+        public final LibraryDownload dl;
+        public final OS os;
+
+        public Lib(String coord, LibraryDownload dl, OS os) {
+            this.coord = coord;
+            this.dl = dl;
+            this.os = os;
+        }
+    }
 
     // TODO: [MCMaven][MinecraftVersion] Add function to filter libraries based on current operating systems
+
     /** Represents a library that is required by a minecraft version. */
     public static class Library {
         /** The artifact coordinates of the library. */
@@ -84,12 +95,16 @@ public static class OS {
             public String name;
 
             public net.minecraftforge.util.data.OS toOS() {
-                return switch (name) {
-                    case "windows" -> net.minecraftforge.util.data.OS.WINDOWS;
-                    case "linux" -> net.minecraftforge.util.data.OS.LINUX;
-                    case "osx" -> net.minecraftforge.util.data.OS.MACOS;
-                    default -> net.minecraftforge.util.data.OS.UNKNOWN;
-                };
+                switch (this.name) {
+                    case "windows":
+                        return net.minecraftforge.util.data.OS.WINDOWS;
+                    case "linux":
+                        return net.minecraftforge.util.data.OS.LINUX;
+                    case "osx":
+                        return net.minecraftforge.util.data.OS.MACOS;
+                    default:
+                        return net.minecraftforge.util.data.OS.UNKNOWN;
+                }
             }
         }
     }