Upgrade codebase to Java 21

Author: thecatcore

build.gradle

@@ -64,7 +64,7 @@ dependencies {
 jvmdg {
 	downgradeTo = JavaVersion.VERSION_1_8
 	multiReleaseOriginal.set(true)
-	multiReleaseVersions = [JavaVersion.VERSION_17]
+	multiReleaseVersions = [JavaVersion.VERSION_17, JavaVersion.VERSION_21]
 }
 
 base {
@@ -84,7 +84,7 @@ processResources {
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -93,8 +93,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 shadowJar {

src/main/java/fr/catcore/modremapperapi/utils/MixinUtils.java

@@ -138,8 +138,7 @@ public static void applyASMMagic(String targetClassName, ClassNode targetClass,
     private static void transformCalls(ClassNode classNode, Consumer<MethodInsnNode> consumer) {
         for (MethodNode method : classNode.methods) {
             for (AbstractInsnNode insn : method.instructions) {
-                if (insn instanceof MethodInsnNode) {
-                    MethodInsnNode call = (MethodInsnNode) insn;
+                if (insn instanceof MethodInsnNode call) {
                     consumer.accept(call);
                 }
             }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingAPIImpl.java

@@ -51,7 +51,7 @@ public static void init() {
             var v2Keys = new ArrayList<>(v2Remappers.keySet());
 
             while (!v2Keys.isEmpty()) {
-                var contextKey = v2Keys.remove(0);
+                var contextKey = v2Keys.removeFirst();
                 var context = new ModRemmaperV2Context(contextKey, v2Remappers.get(contextKey));
                 CURRENT_CONTEXT = context;
 

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsRegistry.java

@@ -209,7 +209,7 @@ private void gatherChildClassCandidates(TrEnvironment trEnvironment, Map<Extende
             var toAdd = new ArrayList<>(entry.getValue());
 
             while (!toAdd.isEmpty()) {
-                var trClass = trEnvironment.getClass(toAdd.remove(0));
+                var trClass = trEnvironment.getClass(toAdd.removeFirst());
                 if (trClass == null) continue;
 
                 var children = trClass.getChildren().stream()

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/SoftLockFixer.java

@@ -9,7 +9,6 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -35,15 +34,15 @@ public static void preloadClasses() {
             }
         }
 
-        Stream<String> t = classes.stream().flatMap(s -> s);
-        List<String> toCheck = new ArrayList<>(Arrays.asList(new String[] {
+        var t = classes.stream().flatMap(s -> s);
+        var toCheck = new ArrayList<>(List.of(
                 "net.fabricmc.loader.impl.launch.FabricLauncher",
                 "net.fabricmc.loader.impl.launch.FabricLauncherBase",
                 "net.fabricmc.loader.api.ObjectShare",
                 "javax.lang.model.SourceVersion",
                 getLibClassName("tinyremapper", "extension.mixin.hard.ImprovedHardTargetMixinClassVisitor"),
                 getLibClassName("tinyremapper", "extension.mixin.hard.ImprovedMixinAnnotationVisitor")
-        }));
+        ));
         toCheck.addAll(t.toList());
 
         for (String clazz : toCheck) {

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/ClasspathUtils.java

@@ -49,10 +49,9 @@ public static Set<Path> getRemapClasspath() throws IOException {
 
         completeClasspath.addAll(classPaths);
 
-        Optional.ofNullable(share.get("fabric-loader:inputRealmsJar"))
-                .filter(Path.class::isInstance)
-                .map(Path.class::cast)
-                .ifPresent(completeClasspath::add);
+        if (share.get("fabric-loader:inputRealmsJar") instanceof Path realmsJar) {
+            completeClasspath.add(realmsJar);
+        }
 
         return completeClasspath;
     }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java

@@ -40,16 +40,11 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
 
                         if (value instanceof List<?> valueList) {
                             for (Object val : valueList) {
-                                String theVal;
-
-                                if (val instanceof Type type) {
-                                    theVal = type.getInternalName();
-                                } else {
-                                    theVal = ModRemappingAPIImpl.getCurrentContext().getMixinData().getMixinRefmapData()
+                                supers.add(switch (val) {
+                                    case Type type -> type.getInternalName();
+                                    default -> ModRemappingAPIImpl.getCurrentContext().getMixinData().getMixinRefmapData()
                                             .getOrDefault(className, new HashMap<>()).getOrDefault((String) val, (String) val);
-                                }
-
-                                supers.add(theVal);
+                                });
                             }
                         }
                     }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/FileUtils.java

@@ -41,7 +41,7 @@ public static void delete(Collection<Path> paths) {
 
     @ApiStatus.Internal
     public static void downloadFile(String url, Path target) throws IOException {
-        try (var inputStream = new BufferedInputStream(new URL(url).openStream());
+        try (var inputStream = new BufferedInputStream(URI.create(url).toURL().openStream());
              var outputStream = new BufferedOutputStream(Files.newOutputStream(target))) {
 
             var buffer = new byte[2048];