Reorganize some classes out of the internal util package

LostLuma · LostLuma · commit bebc2bafd926 · 2024-06-10T16:17:42.000+02:00
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java b/platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java
@@ -4,16 +4,17 @@
 import dynamic_fps.impl.compat.GLFW;
 import dynamic_fps.impl.config.Config;
 import dynamic_fps.impl.config.DynamicFPSConfig;
+import dynamic_fps.impl.config.option.GraphicsState;
 import dynamic_fps.impl.service.ModCompat;
-import dynamic_fps.impl.util.IdleHandler;
+import dynamic_fps.impl.feature.state.IdleHandler;
 import dynamic_fps.impl.util.FallbackConfigScreen;
 import dynamic_fps.impl.util.Logging;
-import dynamic_fps.impl.util.OptionsHolder;
+import dynamic_fps.impl.feature.state.OptionHolder;
 import dynamic_fps.impl.util.Version;
-import dynamic_fps.impl.util.SmoothVolumeHandler;
+import dynamic_fps.impl.feature.volume.SmoothVolumeHandler;
 import dynamic_fps.impl.util.duck.DuckLoadingOverlay;
 import dynamic_fps.impl.util.duck.DuckSoundEngine;
-import dynamic_fps.impl.util.event.WindowObserver;
+import dynamic_fps.impl.feature.state.WindowObserver;
 import dynamic_fps.impl.service.Platform;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
@@ -205,10 +206,10 @@ public static void handleStateChange(PowerState previous, PowerState current) {
 
 		if (before.graphicsState() != config.graphicsState()) {
 			if (before.graphicsState() == GraphicsState.DEFAULT) {
-				OptionsHolder.copyOptions(minecraft.options);
+				OptionHolder.copyOptions(minecraft.options);
 			}
 
-			OptionsHolder.applyOptions(minecraft.options, config.graphicsState());
+			OptionHolder.applyOptions(minecraft.options, config.graphicsState());
 		}
 	}
 
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/compat/ClothConfig.java b/platforms/common/src/main/java/dynamic_fps/impl/compat/ClothConfig.java
@@ -2,7 +2,7 @@
 
 import dynamic_fps.impl.Constants;
 import dynamic_fps.impl.DynamicFPSMod;
-import dynamic_fps.impl.GraphicsState;
+import dynamic_fps.impl.config.option.GraphicsState;
 import dynamic_fps.impl.PowerState;
 import dynamic_fps.impl.config.Config;
 import dynamic_fps.impl.util.VariableStepTransformer;
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/config/Config.java b/platforms/common/src/main/java/dynamic_fps/impl/config/Config.java
@@ -5,8 +5,8 @@
 import java.util.Map;
 
 import dynamic_fps.impl.Constants;
-import dynamic_fps.impl.GraphicsState;
 import dynamic_fps.impl.PowerState;
+import dynamic_fps.impl.config.option.GraphicsState;
 import net.minecraft.sounds.SoundSource;
 
 public final class Config {
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/config/DynamicFPSConfig.java b/platforms/common/src/main/java/dynamic_fps/impl/config/DynamicFPSConfig.java
@@ -9,17 +9,15 @@
 public final class DynamicFPSConfig {
 	private boolean enabled;
 	private int idleTime; // Seconds
-	private boolean detectIdleMovement;
 	private boolean uncapMenuFrameRate;
 	private VolumeTransitionSpeed volumeTransitionSpeed;
 
 	@SerializedName("states")
 	private final Map<PowerState, Config> configs;
 
-	private DynamicFPSConfig(boolean enabled, int abandonTime, boolean detectIdleMovement, boolean uncapMenuFrameRate, VolumeTransitionSpeed volumeTransitionSpeed, Map<PowerState, Config> configs) {
+	private DynamicFPSConfig(boolean enabled, int abandonTime, boolean uncapMenuFrameRate, VolumeTransitionSpeed volumeTransitionSpeed, Map<PowerState, Config> configs) {
 		this.enabled = enabled;
 		this.idleTime = abandonTime;
-		this.detectIdleMovement = detectIdleMovement;
 		this.uncapMenuFrameRate = uncapMenuFrameRate;
 		this.volumeTransitionSpeed = volumeTransitionSpeed;
 
@@ -36,7 +34,6 @@ public static DynamicFPSConfig createDefault() {
 		DynamicFPSConfig instance =  new DynamicFPSConfig(
 			true,
 			0,
-			true,
 			false,
 			new VolumeTransitionSpeed(1.0f, 0.5f),
 			new EnumMap<>(PowerState.class)
@@ -74,16 +71,6 @@ public VolumeTransitionSpeed volumeTransitionSpeed() {
 		return this.volumeTransitionSpeed;
 	}
 
-	public boolean detectIdleMovement() {
-		return this.detectIdleMovement;
-	}
-
-	/*
-	public void setDetectIdleMovement(boolean value) {
-		this.detectIdleMovement = value;
-	}
-	 */
-
 	public boolean uncapMenuFrameRate() {
 		return this.uncapMenuFrameRate;
 	}
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/config/Serialization.java b/platforms/common/src/main/java/dynamic_fps/impl/config/Serialization.java
@@ -13,8 +13,8 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import dynamic_fps.impl.Constants;
-import dynamic_fps.impl.GraphicsState;
 import dynamic_fps.impl.PowerState;
+import dynamic_fps.impl.config.option.GraphicsState;
 import dynamic_fps.impl.service.Platform;
 import dynamic_fps.impl.util.Logging;
 import org.jetbrains.annotations.Nullable;
@@ -99,7 +99,6 @@ private static void upgradeConfig(JsonObject root) {
 		addAbandonedConfig(root);
 		addUncapMenuFrameRate(root);
 		addEnabled(root);
-		addDetectIdleMovement(root);
 		addVolumeTransitionSpeed(root);
 	}
 
@@ -175,13 +174,6 @@ private static void addEnabled(JsonObject root) {
 		}
 	}
 
-	private static void addDetectIdleMovement(JsonObject root) {
-		// Add detect_idle_movement field if it's missing
-		if (!root.has("detect_idle_movement")) {
-			root.addProperty("detect_idle_movement", true);
-		}
-	}
-
 	private static void addVolumeTransitionSpeed(JsonObject root) {
 		// Add volume_transition_speed object if it's missing
 		if (!root.has("volume_transition_speed")) {
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/config/option/GraphicsState.java b/platforms/common/src/main/java/dynamic_fps/impl/config/option/GraphicsState.java
@@ -1,20 +1,20 @@
-package dynamic_fps.impl;
+package dynamic_fps.impl.config.option;
 
-/*
+/**
  * Graphics settings to apply within a given power state.
  */
 public enum GraphicsState {
-	/*
+	/**
 	 * User-defined graphics settings via the options menu.
 	 */
 	DEFAULT,
 
-	/*
+	/**
 	 * Reduce graphics settings which do not cause the world to reload.
 	 */
 	REDUCED,
 
-	/*
+	/**
 	 * Reduce graphics settings to minimal values, this will reload the world!
 	 */
 	MINIMAL;
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/state/IdleHandler.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/state/IdleHandler.java
@@ -1,4 +1,4 @@
-package dynamic_fps.impl.util;
+package dynamic_fps.impl.feature.state;
 
 import dynamic_fps.impl.DynamicFPSMod;
 import dynamic_fps.impl.service.Platform;
@@ -68,9 +68,7 @@ public static boolean isIdle() {
 	}
 
 	private static void checkActivity() {
-		if (DynamicFPSMod.modConfig.detectIdleMovement()) {
-			checkPlayerActivity();
-		}
+		checkPlayerActivity();
 
 		boolean idle = isIdle();
 
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/state/OptionHolder.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/state/OptionHolder.java
@@ -1,6 +1,6 @@
-package dynamic_fps.impl.util;
+package dynamic_fps.impl.feature.state;
 
-import dynamic_fps.impl.GraphicsState;
+import dynamic_fps.impl.config.option.GraphicsState;
 import net.minecraft.client.CloudStatus;
 import net.minecraft.client.GraphicsStatus;
 import net.minecraft.client.Options;
@@ -11,7 +11,7 @@
  *
  * Different power states may be configured to use different graphics settings.
  */
-public class OptionsHolder {
+public class OptionHolder {
 	private static CloudStatus cloudStatus;
 	private static GraphicsStatus graphicsStatus;
 	private static boolean ambientOcclusion;
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/state/WindowObserver.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/state/WindowObserver.java
@@ -1,4 +1,4 @@
-package dynamic_fps.impl.util.event;
+package dynamic_fps.impl.feature.state;
 
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWCursorEnterCallback;
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/volume/SmoothVolumeHandler.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/volume/SmoothVolumeHandler.java
@@ -1,4 +1,4 @@
-package dynamic_fps.impl.util;
+package dynamic_fps.impl.feature.volume;
 
 import dynamic_fps.impl.DynamicFPSMod;
 import dynamic_fps.impl.service.Platform;
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java
@@ -4,7 +4,7 @@
 import dynamic_fps.impl.Constants;
 import dynamic_fps.impl.DynamicFPSMod;
 import dynamic_fps.impl.PowerState;
-import dynamic_fps.impl.util.IdleHandler;
+import dynamic_fps.impl.feature.state.IdleHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
 import org.spongepowered.asm.mixin.Final;
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/SoundEngineMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/SoundEngineMixin.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import dynamic_fps.impl.util.SmoothVolumeHandler;
+import dynamic_fps.impl.feature.volume.SmoothVolumeHandler;
 import net.minecraft.client.Minecraft;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dynamic_fps.impl.util.event;`
	`1`	`+package dynamic_fps.impl.feature.state;`
`2`	`2`
`3`	`3`	`import org.lwjgl.glfw.GLFW;`
`4`	`4`	`import org.lwjgl.glfw.GLFWCursorEnterCallback;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dynamic_fps.impl.util;`
	`1`	`+package dynamic_fps.impl.feature.volume;`
`2`	`2`
`3`	`3`	`import dynamic_fps.impl.DynamicFPSMod;`
`4`	`4`	`import dynamic_fps.impl.service.Platform;`