Minecraft 1.20.5 backport

gradle.properties

@@ -10,9 +10,9 @@ maven_group = juliand665
 archives_name = dynamic-fps
 
 # File naming version
-minecraft_version = 1.21.2
+minecraft_version = 1.20.5
 # Version for publishing
-minecraft_version_min = 1.21.2
-minecraft_version_max = 1.21.2
+minecraft_version_min = 1.20.5
+minecraft_version_max = 1.20.6
 
-enabled_platforms=fabric,quilt
+enabled_platforms=fabric,forge,neoforge,quilt

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-minecraft = "1.21.2-rc1"
+minecraft = "1.20.6"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
-fabric_api = "0.102.2+1.21.2"
+fabric_api = "0.97.8+1.20.6"
 
-forge = "1.21-51.0.33"
+forge = "1.20.6-50.1.12"
 
-neoforge = "21.0.143"
+neoforge = "20.6.119"
 
 quilt_loader = "0.25.0"
 

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

@@ -263,7 +263,7 @@ private static void checkForStateChanges() {
 			checkForStateChanges0();
 		} else {
 			// Schedule check for the beginning of the next frame
-			minecraft.schedule(DynamicFPSMod::checkForStateChanges0);
+			minecraft.tell(DynamicFPSMod::checkForStateChanges0);
 		}
 	}
 

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

@@ -31,7 +31,7 @@ public static void applyWorkaround() {
 			// Agrees that the window is focused. The mod is
 			// A little too fast for this, so we schedule it
 			// For the next client tick (before next frame).
-			minecraft.schedule(minecraft.mouseHandler::grabMouse);
+			minecraft.tell(minecraft.mouseHandler::grabMouse);
 		}
 	}
 

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,17 +17,15 @@ public class BatteryToast implements Toast {
 	private Component title;
 	private Component description;
 	private ResourceLocation icon;
-	private Visibility visibility;
 
 	private static BatteryToast queuedToast;
 
-	private static final ResourceLocation MOD_ICON = ResourceLocations.of("dynamic_fps", "textures/battery/toast/background_icon");
-	private static final ResourceLocation BACKGROUND_IMAGE = ResourceLocations.of("dynamic_fps", "textures/battery/toast/background");
+	private static final ResourceLocation MOD_ICON = ResourceLocations.of("dynamic_fps", "textures/battery/toast/background_icon.png");
+	private static final ResourceLocation BACKGROUND_IMAGE = ResourceLocations.of("dynamic_fps", "textures/battery/toast/background.png");
 
 	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;
@@ -73,13 +53,16 @@ public void render(GuiGraphics graphics, Font font, long currentTime) {
 			// Initialize when first rendering so the battery percentage is mostly up-to-date
 			this.description = localized("toast", "battery_charge", BatteryTracker.charge());
 		}
+
 		// resource, x, y, z, ?, ?, width, height, width, height
-		graphics.blit(RenderType::guiTextured, BACKGROUND_IMAGE, 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.0f, 0, 8, 8, 8, 8);
-		graphics.blit(RenderType::guiTextured, this.icon, 8, 8, 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

@@ -103,15 +103,15 @@ private static void updateState() {
 			changed = true;
 
 			int current = charge;
-			minecraft.schedule(() -> DynamicFPSMod.onBatteryChargeChanged(current, newCharge));
+			minecraft.tell(() -> DynamicFPSMod.onBatteryChargeChanged(current, newCharge));
 		}
 
 		if (readInitialData && status != newStatus) {
 			changed = true;
 
 			State current = status;
 			State updated = newStatus;
-			minecraft.schedule(() -> DynamicFPSMod.onBatteryStatusChanged(current, updated));
+			minecraft.tell(() -> DynamicFPSMod.onBatteryStatusChanged(current, updated));
 		}
 
 		charge = newCharge;

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));
+			}
+		}
+	}
 }

platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastManagerMixin.java → platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastComponentMixin.java

@@ -1,17 +1,17 @@
 package dynamic_fps.impl.mixin;
 
-import net.minecraft.client.gui.components.toasts.ToastManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import dynamic_fps.impl.DynamicFPSMod;
+import net.minecraft.client.gui.components.toasts.ToastComponent;
 
-@Mixin(ToastManager.class)
-public class ToastManagerMixin {
-	@Inject(method = "freeSlotCount", at = @At("HEAD"), cancellable = true)
-	private void freeSlotCount(CallbackInfoReturnable<Integer> callbackInfo) {
+@Mixin(ToastComponent.class)
+public class ToastComponentMixin {
+	@Inject(method = "freeSlots", at = @At("HEAD"), cancellable = true)
+	private void hasFreeSlots(CallbackInfoReturnable<Integer> callbackInfo) {
 		if (!DynamicFPSMod.shouldShowToasts()) {
 			callbackInfo.setReturnValue(0);
 		}

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

@@ -0,0 +1,28 @@
+package dynamic_fps.impl.mixin;
+
+import dynamic_fps.impl.PowerState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mojang.blaze3d.platform.Window;
+
+import dynamic_fps.impl.DynamicFPSMod;
+
+@Mixin(Window.class)
+public class WindowMixin {
+	/**
+	 * Sets a frame rate limit while we're cancelling some or all rendering.
+	 */
+	@Inject(method = "getFramerateLimit", at = @At("RETURN"), cancellable = true)
+	private void onGetFramerateLimit(CallbackInfoReturnable<Integer> callbackInfo) {
+		PowerState state = DynamicFPSMod.powerState();
+
+		if (state != PowerState.FOCUSED) {
+			// Instruct Minecraft to render a minimum of 15 FPS
+			// Going lower here makes resuming again feel sluggish
+			callbackInfo.setReturnValue(Math.max(DynamicFPSMod.targetFrameRate(), 15));
+		}
+	}
+}

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

@@ -5,7 +5,6 @@
 import dynamic_fps.impl.feature.battery.BatteryTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.Component;
 
 import static dynamic_fps.impl.util.Localization.localized;
@@ -58,7 +57,7 @@ private static void drawBatteryOverlay(GuiGraphics graphics) {
 		int[] position = config.placement().get(graphics);
 
 		// resource, x, y, z, ?, ?, width, height, width, height
-		graphics.blit(RenderType::guiTextured, icon, position[0], position[1], 0.0f, 0, 16, 16, 16, 16);
+		graphics.blit(icon, position[0], position[1], 0, 0.0f, 0.0f, 16, 16, 16, 16);
 		// font, text, x, y, text color
 		graphics.drawString(minecraft.font, BatteryTracker.charge() + "%", position[0] + 20, position[1] + 4, 0xFFFFFF);
 	}

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

@@ -4,6 +4,6 @@
 
 public class ResourceLocations {
 	public static ResourceLocation of(String namespace, String path) {
-		return ResourceLocation.fromNamespaceAndPath(namespace, path);
+		return new ResourceLocation(namespace, path);
 	}
 }

platforms/common/src/main/resources/assets/dynamic_fps/data/default_config.json

@@ -3,7 +3,7 @@
     "uncap_menu_frame_rate": false,
     "idle": {
         "timeout": 300,
-        "condition": "vanilla"
+        "condition": "on_battery"
     },
     "battery_tracker": {
         "enabled": false,