Refactor codebase to Java 25 language features

Author: s12kuma01

gradle.properties

@@ -19,7 +19,7 @@ enable_lwjglx = true
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 0.4.0-dev-J25
+mod_version = 0.4.0-dev2-J25
 root_package = jp.s12kuma01
 mod_id = celeritasextra
 mod_name = Celeritas Extra

src/main/java/jp/s12kuma01/celeritasextra/CeleritasExtraMixinConfigPlugin.java

@@ -15,7 +15,6 @@ public class CeleritasExtraMixinConfigPlugin implements IMixinConfigPlugin {
 
     @Override
     public void onLoad(String mixinPackage) {
-        // No initialization needed
     }
 
     @Override
@@ -25,14 +24,11 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        // Add conditional mixin loading based on mod compatibility here
-        // For example, only load certain mixins if specific mods are present
         return true;
     }
 
     @Override
     public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
-        // No target filtering needed
     }
 
     @Override
@@ -42,11 +38,9 @@ public List<String> getMixins() {
 
     @Override
     public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-        // No pre-apply logic needed
     }
 
     @Override
     public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-        // No post-apply logic needed
     }
 }

src/main/java/jp/s12kuma01/celeritasextra/CeleritasExtraMod.java

@@ -29,10 +29,9 @@ public void construct(FMLConstructionEvent event) {
                 OptionGroupConstructionEvent.BUS.addListener(jp.s12kuma01.celeritasextra.client.gui.CeleritasExtraOptionsListener::onOptionGroupConstruct);
                 LOGGER.info("Successfully registered Celeritas Extra with Celeritas GUI");
             } catch (Throwable t) {
-                if (t instanceof NoClassDefFoundError) {
-                    LOGGER.error("Celeritas version is too old, use 2.4.0 or newer");
-                } else {
-                    LOGGER.error("Unable to check if Celeritas is up-to-date", t);
+                switch (t) {
+                    case NoClassDefFoundError _ -> LOGGER.error("Celeritas version is too old, use 2.4.0 or newer");
+                    default -> LOGGER.error("Unable to check if Celeritas is up-to-date", t);
                 }
             }
         } else {

src/main/java/jp/s12kuma01/celeritasextra/client/CeleritasExtraClientMod.java

@@ -32,7 +32,6 @@ private static CeleritasExtraGameOptions loadConfig() {
     public static void onClientInit() {
         if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
             CeleritasExtraMod.LOGGER.info("Initializing Celeritas Extra client...");
-            // Load configuration
             options();
         }
     }

src/main/java/jp/s12kuma01/celeritasextra/client/ClientTickHandler.java

@@ -33,13 +33,11 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
 
         int currentFPS = Minecraft.getDebugFPS();
 
-        // Add current FPS to queue
         if (fpsQueue.size() >= QUEUE_SIZE) {
             fpsQueue.pollFirst();
         }
         fpsQueue.addLast(currentFPS);
 
-        // Calculate statistics
         if (!fpsQueue.isEmpty()) {
             int sum = 0;
             int min = Integer.MAX_VALUE;

src/main/java/jp/s12kuma01/celeritasextra/client/gui/CeleritasExtraGameOptionPages.java

@@ -131,10 +131,10 @@ public static OptionPage particle() {
         ParticleClassRegistry.getInstance().scanModJars();
 
         // Dynamic particle class controls - grouped by mod name
-        Map<String, String> discovered = ParticleClassRegistry.getInstance().getDiscoveredClasses();
+        var discovered = ParticleClassRegistry.getInstance().getDiscoveredClasses();
         if (!discovered.isEmpty()) {
-            Map<String, List<Map.Entry<String, String>>> byMod = new TreeMap<>();
-            for (Map.Entry<String, String> entry : discovered.entrySet()) {
+            var byMod = new TreeMap<String, List<Map.Entry<String, String>>>();
+            for (var entry : discovered.entrySet()) {
                 String fullName = entry.getKey();
                 String modId = ParticleClassRegistry.getInstance().getModName(fullName);
                 if (modId == null) {
@@ -143,15 +143,15 @@ public static OptionPage particle() {
                 byMod.computeIfAbsent(modId, k -> new ArrayList<>()).add(entry);
             }
 
-            for (Map.Entry<String, List<Map.Entry<String, String>>> modEntry : byMod.entrySet()) {
-                String modId = modEntry.getKey();
-                OptionGroup.Builder groupBuilder = OptionGroup.createBuilder();
-                List<Map.Entry<String, String>> classEntries = modEntry.getValue();
+            for (var modEntry : byMod.entrySet()) {
+                var modId = modEntry.getKey();
+                var groupBuilder = OptionGroup.createBuilder();
+                var classEntries = modEntry.getValue();
                 classEntries.sort(Comparator.comparing(Map.Entry::getValue));
 
-                for (Map.Entry<String, String> classEntry : classEntries) {
-                    String fullClassName = classEntry.getKey();
-                    String simpleClassName = classEntry.getValue();
+                for (var classEntry : classEntries) {
+                    var fullClassName = classEntry.getKey();
+                    var simpleClassName = classEntry.getValue();
                     String displayName = simpleClassName + " (" + modId + ")";
 
                     groupBuilder.add(OptionImpl.createBuilder(boolean.class, celeritasExtraOpts)

src/main/java/jp/s12kuma01/celeritasextra/client/gui/CeleritasExtraGameOptions.java

@@ -21,7 +21,6 @@
  */
 public class CeleritasExtraGameOptions {
 
-    // Category names
     private static final String CAT_ANIMATION = "animation";
     private static final String CAT_PARTICLE = "particle";
     private static final String CAT_PARTICLE_CLASSES = "particle_classes";
@@ -269,18 +268,18 @@ public static VerticalSyncOption getVerticalSyncOption(CeleritasExtraGameOptions
     public static void setVerticalSyncOption(CeleritasExtraGameOptions opts, VerticalSyncOption value) {
         Minecraft mc = Minecraft.getMinecraft();
         switch (value) {
-            case OFF:
+            case OFF -> {
                 opts.extraSettings.useAdaptiveSync = false;
                 mc.gameSettings.enableVsync = false;
-                break;
-            case ON:
+            }
+            case ON -> {
                 opts.extraSettings.useAdaptiveSync = false;
                 mc.gameSettings.enableVsync = true;
-                break;
-            case ADAPTIVE:
+            }
+            case ADAPTIVE -> {
                 opts.extraSettings.useAdaptiveSync = true;
                 mc.gameSettings.enableVsync = true;
-                break;
+            }
         }
         // Trigger VSync update - our mixin intercepts this when adaptive is enabled
         Display.setVSyncEnabled(mc.gameSettings.enableVsync);
@@ -305,7 +304,6 @@ public String getLocalizedName() {
         }
     }
 
-    // Settings classes
     public static class AnimationSettings {
         public boolean animation = true;
         public boolean water = true;
@@ -363,24 +361,8 @@ public static class ExtraSettings {
         public int steadyDebugHudRefreshInterval = 20;
     }
 
-    private static class BooleanProperty {
-        final String category;
-        final String key;
-        final boolean defaultValue;
-        final String comment;
-        final Consumer<Boolean> setter;
-        final Supplier<Boolean> getter;
-
-        BooleanProperty(String category, String key, boolean defaultValue, String comment,
-                        Consumer<Boolean> setter, Supplier<Boolean> getter) {
-            this.category = category;
-            this.key = key;
-            this.defaultValue = defaultValue;
-            this.comment = comment;
-            this.setter = setter;
-            this.getter = getter;
-        }
-
+    private record BooleanProperty(String category, String key, boolean defaultValue, String comment,
+                                    Consumer<Boolean> setter, Supplier<Boolean> getter) {
         void load(Configuration config) {
             setter.accept(config.getBoolean(key, category, defaultValue, comment));
         }
@@ -390,28 +372,8 @@ void save(Configuration config) {
         }
     }
 
-    private static class IntProperty {
-        final String category;
-        final String key;
-        final int defaultValue;
-        final int min;
-        final int max;
-        final String comment;
-        final Consumer<Integer> setter;
-        final Supplier<Integer> getter;
-
-        IntProperty(String category, String key, int defaultValue, int min, int max, String comment,
-                    Consumer<Integer> setter, Supplier<Integer> getter) {
-            this.category = category;
-            this.key = key;
-            this.defaultValue = defaultValue;
-            this.min = min;
-            this.max = max;
-            this.comment = comment;
-            this.setter = setter;
-            this.getter = getter;
-        }
-
+    private record IntProperty(String category, String key, int defaultValue, int min, int max, String comment,
+                                Consumer<Integer> setter, Supplier<Integer> getter) {
         void load(Configuration config) {
             setter.accept(config.getInt(key, category, defaultValue, min, max, comment));
         }

src/main/java/jp/s12kuma01/celeritasextra/client/gui/CeleritasExtraHud.java

@@ -29,7 +29,7 @@ public class CeleritasExtraHud {
     @SubscribeEvent
     public static void onRenderOverlay(RenderGameOverlayEvent.Text event) {
         if (mc.gameSettings.showDebugInfo || mc.gameSettings.hideGUI) {
-            return; // Don't render when F3 debug screen is open or GUI is hidden
+            return;
         }
 
         List<String> lines = new ArrayList<>();
@@ -113,21 +113,13 @@ private static void drawString(FontRenderer fontRenderer, String text, int x, in
         int textColor = 0xFFFFFF;
 
         switch (textContrast) {
-            case BACKGROUND:
-                // Draw semi-transparent background
+            case BACKGROUND -> {
                 int textWidth = fontRenderer.getStringWidth(text);
                 Gui.drawRect(x - 1, y - 1, x + textWidth + 1, y + fontRenderer.FONT_HEIGHT + 1, 0x90505050);
                 fontRenderer.drawString(text, x, y, textColor);
-                break;
-            case SHADOW:
-                // Draw with shadow (default Minecraft style)
-                fontRenderer.drawStringWithShadow(text, x, y, textColor);
-                break;
-            case NONE:
-            default:
-                // Draw without any contrast enhancement
-                fontRenderer.drawString(text, x, y, textColor);
-                break;
+            }
+            case SHADOW -> fontRenderer.drawStringWithShadow(text, x, y, textColor);
+            default -> fontRenderer.drawString(text, x, y, textColor);
         }
     }
 }

src/main/java/jp/s12kuma01/celeritasextra/client/particle/ParticleClassRegistry.java

@@ -166,7 +166,7 @@ public void scanModJars() {
         boolean changed = true;
         while (changed) {
             changed = false;
-            for (Map.Entry<String, String> entry : superMap.entrySet()) {
+            for (var entry : superMap.entrySet()) {
                 String className = entry.getKey();
                 String superName = entry.getValue();
                 if (knownParticleNames.contains(className)) continue;
@@ -197,10 +197,10 @@ private void scanJarForSuperclasses(File jarFile, Map<String, String> superMap,
                     String className = cr.getClassName();
                     superMap.put(className, cr.getSuperName());
                     classToModName.put(className, modName);
-                } catch (Throwable ignored) {
+                } catch (Throwable _) {
                 }
             }
-        } catch (Throwable ignored) {
+        } catch (Throwable _) {
         }
     }
 
@@ -217,7 +217,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
                             String className = cr.getClassName();
                             superMap.put(className, cr.getSuperName());
                             classToModName.put(className, modName);
-                        } catch (Throwable ignored) {
+                        } catch (Throwable _) {
                         }
                     }
                     return FileVisitResult.CONTINUE;

src/main/java/jp/s12kuma01/celeritasextra/core/CeleritasExtraCore.java

@@ -34,7 +34,6 @@ public String getSetupClass() {
 
     @Override
     public void injectData(Map<String, Object> data) {
-        // No data injection needed
     }
 
     @Override