Restore files removed in clean commit

Author: s12kuma01

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

@@ -1,20 +1,22 @@
 package jp.s12kuma01.celeritasextra;
 
-import java.util.List;
-import java.util.Set;
-
+import net.minecraftforge.fml.common.Loader;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
+import java.util.List;
+import java.util.Set;
+
 /**
- * Mixin configuration plugin for Celeritas Extra.
- * Currently uses default behavior for all mixins.
+ * Mixin configuration plugin for Celeritas Extra
+ * Handles conditional mixin loading based on mod compatibility
  */
 public class CeleritasExtraMixinConfigPlugin implements IMixinConfigPlugin {
 
     @Override
     public void onLoad(String mixinPackage) {
+        // No initialization needed
     }
 
     @Override
@@ -24,13 +26,14 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        // Currently all mixins are applied unconditionally
-        // Can add conditional loading based on mod compatibility if needed
+        // 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
@@ -40,9 +43,11 @@ 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

@@ -1,19 +1,20 @@
 package jp.s12kuma01.celeritasextra;
 
-import jp.s12kuma01.celeritasextra.client.CeleritasExtraClientMod;
-import jp.s12kuma01.celeritasextra.client.gui.CeleritasExtraOptionsListener;
-
-import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLConstructionEvent;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.taumc.celeritas.api.OptionGUIConstructionEvent;
 
+/**
+ * Celeritas Extra - A port of Embeddium Extra to Celeritas 1.12.2
+ *
+ * @author Karnatour (port), FlashyReese (original)
+ */
 @Mod(modid = CeleritasExtraMod.MOD_ID, name = CeleritasExtraMod.MOD_NAME, version = CeleritasExtraMod.VERSION,
      clientSideOnly = true, acceptableRemoteVersions = "*")
 public class CeleritasExtraMod {
@@ -26,19 +27,13 @@ public class CeleritasExtraMod {
     @Mod.Instance
     public static CeleritasExtraMod INSTANCE;
 
-    /**
-     * Construction phase - registers Celeritas Extra options with Celeritas GUI.
-     * Checks for Celeritas 2.4.0+ compatibility by verifying OptionGUIConstructionEvent exists.
-     */
     @Mod.EventHandler
     public void construct(FMLConstructionEvent event) {
         if (Loader.isModLoaded("celeritas")) {
             try {
-                // Verify Celeritas version is 2.4.0 or newer by checking for API class
                 Class.forName("org.taumc.celeritas.api.OptionGUIConstructionEvent");
-
-                // Register our options listener to Celeritas GUI system
-                OptionGUIConstructionEvent.BUS.addListener(CeleritasExtraOptionsListener::onCeleritasOptionsConstruct);
+                // Register option GUI construction listener
+                OptionGUIConstructionEvent.BUS.addListener(jp.s12kuma01.celeritasextra.client.gui.CeleritasExtraOptionsListener::onCeleritasOptionsConstruct);
                 LOGGER.info("Successfully registered Celeritas Extra with Celeritas GUI");
             } catch (Throwable t) {
                 if (t instanceof NoClassDefFoundError) {
@@ -57,14 +52,10 @@ public void preInit(FMLPreInitializationEvent event) {
         LOGGER.info("Celeritas Extra pre-initialization");
     }
 
-    /**
-     * Initialization phase - initializes client-side configuration.
-     */
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        // Only initialize on client side (this is a client-only mod)
-        if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
-            CeleritasExtraClientMod.onClientInit();
+        if (net.minecraftforge.fml.common.FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+            jp.s12kuma01.celeritasextra.client.CeleritasExtraClientMod.onClientInit();
         }
         LOGGER.info("Celeritas Extra initialized");
     }

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

@@ -1,55 +1,39 @@
 package jp.s12kuma01.celeritasextra.client;
 
-import java.io.File;
-
 import jp.s12kuma01.celeritasextra.CeleritasExtraMod;
 import jp.s12kuma01.celeritasextra.client.gui.CeleritasExtraGameOptions;
-
 import net.minecraftforge.fml.common.FMLCommonHandler;
 
+import java.io.File;
+
 /**
- * Client-side initialization and configuration management for Celeritas Extra.
+ * Client-side handler for Celeritas Extra
  */
 public class CeleritasExtraClientMod {
 
     private static CeleritasExtraGameOptions CONFIG;
 
-    /**
-     * Gets the mod configuration, loading it lazily if needed.
-     *
-     * @return The configuration instance
-     */
     public static CeleritasExtraGameOptions options() {
         if (CONFIG == null) {
             CONFIG = loadConfig();
         }
         return CONFIG;
     }
 
-    /**
-     * Loads configuration from disk.
-     * Creates config directory if it doesn't exist.
-     *
-     * @return Loaded configuration instance
-     */
     private static CeleritasExtraGameOptions loadConfig() {
         File configDir = new File("config");
         if (!configDir.exists()) {
             configDir.mkdirs();
         }
-
         File configFile = new File(configDir, "celeritas-extra-options.json");
         return CeleritasExtraGameOptions.load(configFile);
     }
 
-    /**
-     * Called during client initialization.
-     * Triggers configuration loading.
-     */
     public static void onClientInit() {
         if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
             CeleritasExtraMod.LOGGER.info("Initializing Celeritas Extra client...");
-            options(); // Load config
+            // Load configuration
+            options();
         }
     }
 }

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

@@ -15,13 +15,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Defines all option pages for Celeritas Extra
+ */
 public class CeleritasExtraGameOptionPages {
 
     private static final CeleritasExtraOptionsStorage celeritasExtraOpts = new CeleritasExtraOptionsStorage();
 
+    /**
+     * Animation settings page
+     */
     public static OptionPage animation() {
         List<OptionGroup> groups = new ArrayList<>();
 
+        // All animations toggle
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, celeritasExtraOpts)
                         .setName(TextComponent.literal(I18n.format("celeritasextra.option.animations.all")))
@@ -34,6 +41,7 @@ public static OptionPage animation() {
                 )
                 .build());
 
+        // Individual animation controls
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, celeritasExtraOpts)
                         .setName(TextComponent.literal(I18n.format("celeritasextra.option.animations.water")))
@@ -85,9 +93,13 @@ public static OptionPage animation() {
         return new OptionPage(CeleritasExtraOptionPages.ANIMATION, TextComponent.literal(I18n.format("celeritasextra.option.page.animations")), ImmutableList.copyOf(groups));
     }
 
+    /**
+     * Particle settings page
+     */
     public static OptionPage particle() {
         List<OptionGroup> groups = new ArrayList<>();
 
+        // All particles toggle
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, celeritasExtraOpts)
                         .setName(TextComponent.literal(I18n.format("celeritasextra.option.particles.all")))
@@ -99,6 +111,7 @@ public static OptionPage particle() {
                 )
                 .build());
 
+        // Individual particle controls
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, celeritasExtraOpts)
                         .setName(TextComponent.literal(I18n.format("celeritasextra.option.particles.rain_splash")))
@@ -126,9 +139,15 @@ public static OptionPage particle() {
                 )
                 .build());
 
+        // NOTE: Individual particle type control is currently disabled due to mixin implementation issues
+        // Only basic particle controls (rain splash, block break, block breaking) are available
+
         return new OptionPage(CeleritasExtraOptionPages.PARTICLE, TextComponent.literal(I18n.format("celeritasextra.option.page.particles")), ImmutableList.copyOf(groups));
     }
 
+    /**
+     * Detail settings page
+     */
     public static OptionPage details() {
         List<OptionGroup> groups = new ArrayList<>();
 
@@ -182,6 +201,9 @@ public static OptionPage details() {
         return new OptionPage(CeleritasExtraOptionPages.DETAILS, TextComponent.literal(I18n.format("celeritasextra.option.page.details")), ImmutableList.copyOf(groups));
     }
 
+    /**
+     * Render settings page
+     */
     public static OptionPage render() {
         List<OptionGroup> groups = new ArrayList<>();
 
@@ -295,6 +317,9 @@ public static OptionPage render() {
         return new OptionPage(CeleritasExtraOptionPages.RENDER, TextComponent.literal(I18n.format("celeritasextra.option.page.render")), ImmutableList.copyOf(groups));
     }
 
+    /**
+     * Extra settings page
+     */
     public static OptionPage extra() {
         List<OptionGroup> groups = new ArrayList<>();
 

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

@@ -1,22 +1,19 @@
 package jp.s12kuma01.celeritasextra.client.gui;
 
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import jp.s12kuma01.celeritasextra.CeleritasExtraMod;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import jp.s12kuma01.celeritasextra.CeleritasExtraMod;
 
 /**
- * Main configuration class for Celeritas Extra.
- * Stores all game options and settings, serialized to JSON.
+ * Main configuration class for Celeritas Extra
+ * Stores all game options and settings
  */
 public class CeleritasExtraGameOptions {
 
@@ -34,13 +31,6 @@ public class CeleritasExtraGameOptions {
 
     private File file;
 
-    /**
-     * Loads configuration from the specified file.
-     * Falls back to defaults if file doesn't exist or parsing fails.
-     *
-     * @param file Configuration file path
-     * @return Loaded configuration instance
-     */
     public static CeleritasExtraGameOptions load(File file) {
         CeleritasExtraGameOptions config;
 
@@ -61,9 +51,6 @@ public static CeleritasExtraGameOptions load(File file) {
         return config;
     }
 
-    /**
-     * Writes current configuration to disk.
-     */
     public void writeChanges() {
         File dir = this.file.getParentFile();
 
@@ -82,7 +69,7 @@ public void writeChanges() {
         }
     }
 
-    /** Animation settings for textures. */
+    // Settings classes
     public static class AnimationSettings {
         public boolean animation = true;
         public boolean water = true;
@@ -93,16 +80,14 @@ public static class AnimationSettings {
         public boolean sculkSensor = true;
     }
 
-    /** Particle rendering settings. */
     public static class ParticleSettings {
         public boolean particles = true;
         public boolean rainSplash = true;
         public boolean blockBreak = true;
         public boolean blockBreaking = true;
-        public Map<String, Boolean> otherMap = new HashMap<>();
+        public java.util.Map<String, Boolean> otherMap = new java.util.HashMap<>();
     }
 
-    /** World detail settings (sky, weather, biome colors). */
     public static class DetailSettings {
         public boolean sky = true;
         public boolean stars = true;
@@ -111,7 +96,6 @@ public static class DetailSettings {
         public boolean biomeColors = true;
     }
 
-    /** Rendering optimizations and entity rendering controls. */
     public static class RenderSettings {
         public boolean fog = true;
         public int fogStart = 100;
@@ -131,7 +115,6 @@ public static class RenderSettings {
         public boolean preventShaders = false;
     }
 
-    /** Extra features (overlays, HUD, accessibility). */
     public static class ExtraSettings {
         public boolean showFps = false;
         public boolean showCoords = false;