Enable NeoForge module

It seems that the mod initializer now runs before a Minecraft
instance exists, so all static Minecraft fields had to be removed.

Signed-off-by: Lilly Rose Berner <lilly@lostluma.net>

Author: LostLuma

gradle.properties

@@ -18,4 +18,4 @@ minecraft_version = 1.21.5
 minecraft_version_min = 1.21.5
 minecraft_version_max = 1.21.5
 
-enabled_platforms=fabric,quilt
+enabled_platforms=fabric,neoforge,quilt

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ fabric_api = "0.118.2+1.21.5"
 
 forge = "1.21.3-53.0.7"
 
-neoforge = "21.3.0-beta"
+neoforge = "21.5.2-beta"
 
 quilt_loader = "0.25.0"
 
@@ -24,7 +24,7 @@ cloth_config = "15.0.127"
 mixinextras = "0.4.1"
 
 architectury = "3.4.161"
-architectury_loom = "1.9.428"
+architectury_loom = "1.10.429"
 
 mod_publish = "0.8.4"
 

platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java

@@ -44,8 +44,6 @@ public class DynamicFPSMod {
 	private static boolean isForcingLowFPS = false;
 	private static boolean isKeybindDisabled = false;
 
-	private static final Minecraft minecraft = Minecraft.getInstance();
-
 	private static @Nullable WindowObserver window;
 	private static @Nullable ClickIgnoreHandler clickHandler;
 
@@ -251,11 +249,14 @@ private static void showNotification(String titleTranslationKey, String iconPath
 	}
 
 	private static boolean isLevelCoveredByOverlay() {
+		Minecraft minecraft = Minecraft.getInstance();
 		return OVERLAY_OPTIMIZATION_ACTIVE && minecraft.getOverlay() instanceof LoadingOverlay && ((DuckLoadingOverlay)minecraft.getOverlay()).dynamic_fps$isReloadComplete();
 	}
 
 	@SuppressWarnings("squid:S1215") // Garbage collector call
 	public static void handleStateChange(PowerState previous, PowerState current) {
+		Minecraft minecraft = Minecraft.getInstance();
+
 		if (Constants.DEBUG) {
 			Logging.getLogger().info("State changed from {} to {}.", previous, current);
 		}
@@ -289,6 +290,8 @@ public static void handleStateChange(PowerState previous, PowerState current) {
 	}
 
 	private static void checkForStateChanges() {
+		Minecraft minecraft = Minecraft.getInstance();
+
 		if (window == null) {
 			return;
 		}

platforms/common/src/main/java/dynamic_fps/impl/compat/GLFW.java

@@ -6,7 +6,6 @@
 import net.minecraft.client.Minecraft;
 
 public class GLFW {
-	private static final Minecraft minecraft = Minecraft.getInstance();
 	private static final boolean enterEventBroken = isEnterEventBroken();
 
 	/**
@@ -18,6 +17,8 @@ public class GLFW {
 	 * Dynamic FPS releases and captures the cursor in tandem with window focus.
 	 */
 	public static void applyWorkaround() {
+		Minecraft minecraft = Minecraft.getInstance();
+
 		if (!useWorkaround()) {
 			return;
 		}
@@ -38,6 +39,7 @@ public static void applyWorkaround() {
 	}
 
 	private static boolean useWorkaround() {
+		Minecraft minecraft = Minecraft.getInstance();
 		return enterEventBroken && minecraft.screen == null && !minecraft.options.pauseOnLostFocus;
 	}
 

platforms/common/src/main/java/dynamic_fps/impl/feature/state/ClickIgnoreHandler.java

@@ -16,8 +16,6 @@ public class ClickIgnoreHandler {
 	private final GLFWWindowFocusCallback previousFocusCallback;
 	private final GLFWMouseButtonCallback previousClickCallback;
 
-	private static final Minecraft MINECRAFT = Minecraft.getInstance();
-
 	public ClickIgnoreHandler(long address) {
 		this.address = address;
 
@@ -30,13 +28,14 @@ public static boolean isFeatureActive() {
 	}
 
 	private boolean shouldIgnoreClick() {
+		Minecraft minecraft = Minecraft.getInstance();
 		IgnoreInitialClick config = DynamicFPSConfig.INSTANCE.ignoreInitialClick();
 
 		if (config == IgnoreInitialClick.DISABLED) {
 			return false;
 		}
 
-		if (config == IgnoreInitialClick.IN_WORLD && MINECRAFT.screen != null) {
+		if (config == IgnoreInitialClick.IN_WORLD && minecraft.screen != null) {
 			return false;
 		}
 

platforms/common/src/main/java/dynamic_fps/impl/feature/volume/SmoothVolumeHandler.java

@@ -15,7 +15,6 @@ public class SmoothVolumeHandler {
 	private static boolean active = false;
 	private static boolean needsUpdating = false;
 
-	private static final Minecraft minecraft = Minecraft.getInstance();
 	private static final Map<SoundSource, Float> currentOverrides = new HashMap<>();
 
 	public static void init() {
@@ -77,6 +76,7 @@ private static void tickVolumes() {
 
 	private static void updateVolume(SoundSource source) {
 		// Update volume of currently playing sounds
+		Minecraft minecraft = Minecraft.getInstance();
 		((DuckSoundEngine) minecraft.getSoundManager().soundEngine).dynamic_fps$updateVolume(source);
 	}
 }

platforms/common/src/main/java/dynamic_fps/impl/util/HudInfoRenderer.java

@@ -13,9 +13,9 @@
 import dynamic_fps.impl.DynamicFPSMod;
 
 public final class HudInfoRenderer {
-	private static final Minecraft minecraft = Minecraft.getInstance();
-
 	public static void renderInfo(GuiGraphics guiGraphics) {
+		Minecraft minecraft = Minecraft.getInstance();
+
 		if (minecraft.options.hideGui || minecraft.screen != null) {
 			return;
 		}
@@ -33,11 +33,14 @@ public static void renderInfo(GuiGraphics guiGraphics) {
 
 	private static void drawCenteredText(GuiGraphics guiGraphics, Component component) {
 		int width = guiGraphics.guiWidth() / 2;
+		Minecraft minecraft = Minecraft.getInstance();
 
 		guiGraphics.drawCenteredString(minecraft.font, component, width, 32, 0xFFFFFF);
 	}
 
 	private static void drawBatteryOverlay(GuiGraphics graphics) {
+		Minecraft minecraft = Minecraft.getInstance();
+
 		if (minecraft.getDebugOverlay().showDebugScreen() || !BatteryTracker.hasBatteries()) {
 			return;
 		}

settings.gradle.kts

@@ -18,6 +18,6 @@ includeBuild("build-logic")
 include(":platforms:common")
 include(":platforms:fabric")
 // include(":platforms:forge")
-// include(":platforms:neoforge")
+include(":platforms:neoforge")
 include(":platforms:quilt")
 include(":platforms:textile")