Minecraft 1.20.0 backport

build-logic/src/main/kotlin/dynamic_fps.java.gradle.kts

@@ -6,14 +6,14 @@ java {
     withSourcesJar()
 
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }

gradle.properties

@@ -10,9 +10,9 @@ maven_group = juliand665
 archives_name = dynamic-fps
 
 # File naming version
-minecraft_version = 1.21.2-alpha.24w33a
+minecraft_version = 1.20.0
 # Version for publishing
-minecraft_version_min = 24w33a
-minecraft_version_max = 24w34a
+minecraft_version_min = 1.20
+minecraft_version_max = 1.20.1
 
-enabled_platforms=fabric,quilt
+enabled_platforms=fabric,forge,quilt

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-minecraft = "24w33a"
+minecraft = "1.20"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
-fabric_api = "0.102.2+1.21.2"
+fabric_api = "0.83.0+1.20"
 
-forge = "1.21-51.0.33"
+forge = "1.20-46.0.14"
 
-neoforge = "21.0.143"
+neoforge = "20.4.237"
 
 quilt_loader = "0.25.0"
 
@@ -18,8 +18,8 @@ battery = "1.1.0"
 
 # Modding libraries
 
-modmenu = "11.0.0-beta.1"
-cloth_config = "15.0.127"
+modmenu = "7.0.0"
+cloth_config = "11.0.99"
 
 mixinextras = "0.3.5"
 

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

@@ -10,16 +10,13 @@
 import dynamic_fps.impl.feature.battery.BatteryToast;
 import dynamic_fps.impl.feature.battery.BatteryTracker;
 import dynamic_fps.impl.feature.state.IdleHandler;
-import dynamic_fps.impl.util.BatteryUtil;
-import dynamic_fps.impl.util.FallbackConfigScreen;
-import dynamic_fps.impl.util.Logging;
+import dynamic_fps.impl.util.*;
 import dynamic_fps.impl.feature.state.OptionHolder;
-import dynamic_fps.impl.util.ResourceLocations;
-import dynamic_fps.impl.util.Version;
 import dynamic_fps.impl.feature.volume.SmoothVolumeHandler;
 import dynamic_fps.impl.util.duck.DuckLoadingOverlay;
 import dynamic_fps.impl.feature.state.WindowObserver;
 import dynamic_fps.impl.service.Platform;
+import dynamic_fps.impl.util.duck.DuckScreen;
 import net.lostluma.battery.api.State;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
@@ -178,7 +175,7 @@ public static GraphicsState graphicsState() {
 	}
 
 	public static boolean shouldShowLevels() {
-		return isDisabled() || !isLevelCoveredByOverlay();
+		return isDisabled() || !(isLevelCoveredByScreen() || isLevelCoveredByOverlay());
 	}
 
 	public static void onBatteryChargeChanged(int before, int after) {
@@ -200,11 +197,17 @@ public static void onBatteryStatusChanged(State before, State after) {
 	private static void doInit() {
 		// NOTE: Init battery tracker first here
 		// Since the idle handler queries it for info
+		ModCompatHelper.init();
+
 		BatteryTracker.init();
 		IdleHandler.init();
 		SmoothVolumeHandler.init();
 	}
 
+	private static boolean isLevelCoveredByScreen() {
+		return minecraft.screen != null && ((DuckScreen) minecraft.screen).dynamic_fps$rendersBackground();
+	}
+
 	private static void showNotification(String titleTranslationKey, String iconPath) {
 		if (!DynamicFPSConfig.INSTANCE.batteryTracker().notifications()) {
 			return;

platforms/common/src/main/java/dynamic_fps/impl/config/option/IdleCondition.java

@@ -2,6 +2,5 @@
 
 public enum IdleCondition {
 	NONE,
-	VANILLA,
 	ON_BATTERY;
 }

platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryToast.java

@@ -2,11 +2,9 @@
 
 import dynamic_fps.impl.util.ResourceLocations;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
-import net.minecraft.client.gui.components.toasts.ToastManager;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +17,6 @@ public class BatteryToast implements Toast {
 	private Component title;
 	private Component description;
 	private ResourceLocation icon;
-	private Visibility visibility;
 
 	private static BatteryToast queuedToast;
 
@@ -29,7 +26,6 @@ public class BatteryToast implements Toast {
 	private BatteryToast(Component title, ResourceLocation icon) {
 		this.title = title;
 		this.icon = icon;
-		this.visibility = Visibility.SHOW;
 	}
 
 	/**
@@ -42,28 +38,12 @@ public static void queueToast(Component title, ResourceLocation icon) {
 			queuedToast.icon = icon;
 		} else {
 			queuedToast = new BatteryToast(title, icon);
-			Minecraft.getInstance().getToastManager().addToast(queuedToast);
+			Minecraft.getInstance().getToasts().addToast(queuedToast);
 		}
 	}
 
 	@Override
-	public @NotNull Visibility getWantedVisibility() {
-		return this.visibility;
-	}
-
-	@Override
-	public void update(ToastManager toastManager, long currentTime) {
-		if (this.firstRender == 0) {
-			return;
-		}
-
-		if (currentTime - this.firstRender >= 5000.0 * toastManager.getNotificationDisplayTimeMultiplier()) {
-			this.visibility = Visibility.HIDE;
-		}
-	}
-
-	@Override
-	public void render(GuiGraphics graphics, Font font, long currentTime) {
+	public @NotNull Visibility render(GuiGraphics graphics, ToastComponent toastComponent, long currentTime) {
 		if (this.firstRender == 0) {
 			if (this == queuedToast) {
 				queuedToast = null;
@@ -75,12 +55,14 @@ public void render(GuiGraphics graphics, Font font, long currentTime) {
 		}
 
 		// resource, x, y, z, ?, ?, width, height, width, height
-		graphics.blit(RenderType::guiTextured, BACKGROUND_IMAGE, 0, 0, 0, 0.0f, 0, this.width(), this.height(), this.width(), this.height());
+		graphics.blit(BACKGROUND_IMAGE, 0, 0, 0, 0.0f, 0.0f, this.width(), this.height(), this.width(), this.height());
+
+		graphics.blit(MOD_ICON, 2, 2, 0, 0.0f, 0.0f, 8, 8, 8, 8);
+		graphics.blit(this.icon, 8, 8, 0, 0.0f, 0.0f, 16, 16, 16, 16);
 
-		graphics.blit(RenderType::guiTextured, MOD_ICON, 2, 2, 0, 0.0f, 0, 8, 8, 8, 8);
-		graphics.blit(RenderType::guiTextured, this.icon, 8, 8, 0, 0.0f, 0, 16, 16, 16, 16);
+		graphics.drawString(toastComponent.getMinecraft().font, this.title, 30, 7, 0x5f3315, false);
+		graphics.drawString(toastComponent.getMinecraft().font, this.description, 30, 18, -16777216, false);
 
-		graphics.drawString(Minecraft.getInstance().font, this.title, 30, 7, 0x5f3315, false);
-		graphics.drawString(Minecraft.getInstance().font, this.description, 30, 18, -16777216, false);
+		return currentTime - this.firstRender >= 5000.0 * toastComponent.getNotificationDisplayTimeMultiplier() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
 	}
 }

platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryTracker.java

@@ -70,7 +70,7 @@ public static void init() {
 			}
 		} else {
 			manager = temp; // Keep around to allow updating batteries
-			Thread.ofVirtual().name("refresh-battery").start(BatteryTracker::updateBatteries);
+			new Thread(BatteryTracker::updateBatteries, "refresh-battery").start();
 		}
 	}
 
@@ -139,7 +139,7 @@ private static void updateBatteries() {
 			updateState();
 
 			try {
-				Thread.sleep(updateInterval);
+				Thread.sleep(updateInterval.toMillis());
 			} catch (InterruptedException e) {
 				active = false;
 				Thread.currentThread().interrupt();

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

@@ -4,7 +4,7 @@
 import net.minecraft.client.CloudStatus;
 import net.minecraft.client.GraphicsStatus;
 import net.minecraft.client.Options;
-import net.minecraft.server.level.ParticleStatus;
+import net.minecraft.client.ParticleStatus;
 
 /*
  * Helper for saving, overriding, and re-applying vanilla options.

platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java

@@ -20,7 +20,7 @@
 public class MinecraftMixin {
 	@Shadow
 	@Final
-    private Window window;
+	private Window window;
 
 	@Shadow
 	@Final
@@ -36,4 +36,32 @@ private void setScreen(CallbackInfo callbackInfo) {
 		IdleHandler.onActivity();
 	}
 
+	/**
+	 * Conditionally bypasses the main menu frame rate limit.
+	 *
+	 * This is done in two cases:
+	 * - The window is active, and the user wants to uncap the frame rate
+	 * - The window is inactive, and the current FPS limit should be lower
+	 */
+	@Inject(method = "getFramerateLimit", at = @At(value = "CONSTANT", args = "intValue=60"), cancellable = true)
+	private void getFramerateLimit(CallbackInfoReturnable<Integer> callbackInfo) {
+		int limit = this.window.getFramerateLimit();
+
+		if (DynamicFPSMod.powerState() != PowerState.FOCUSED) {
+			// Vanilla returns 60 here
+			// Only overwrite if our current limit is lower
+			if (limit < 60) {
+				callbackInfo.setReturnValue(limit);
+			}
+		} else if (DynamicFPSConfig.INSTANCE.uncapMenuFrameRate()) {
+			if (this.options.enableVsync().get()) {
+				// VSync will regulate to a non-infinite value
+				callbackInfo.setReturnValue(Constants.NO_FRAME_RATE_LIMIT);
+			} else {
+				// Even though the option "uncaps" the frame rate the limit is 250 FPS.
+				// Since otherwise this will just cause coil whine with no real benefit
+				callbackInfo.setReturnValue(Math.min(limit, Constants.NO_FRAME_RATE_LIMIT - 10));
+			}
+		}
+	}
 }