Minecraft 1.16.4 backport

Author: LostLuma

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

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

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.16.4
 # Version for publishing
-minecraft_version_min = 24w33a
-minecraft_version_max = 24w34a
+minecraft_version_min = 1.16.4
+minecraft_version_max = 1.16.5
 
 enabled_platforms=fabric,quilt

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-minecraft = "24w33a"
+minecraft = "1.16.5"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
-fabric_api = "0.102.2+1.21.2"
+fabric_api = "0.29.4+1.16"
 
-forge = "1.21-51.0.33"
+forge = "1.18.2-40.2.17"
 
-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 = "1.16.23"
+cloth_config = "4.17.101"
 
 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;
@@ -63,7 +60,7 @@ public static void init() {
 		doInit();
 
 		Platform platform = Platform.getInstance();
-		Version version = platform.getModVersion(Constants.MOD_ID).orElseThrow();
+		Version version = platform.getModVersion(Constants.MOD_ID).orElseThrow(RuntimeException::new);
 
 		Logging.getLogger().info("Dynamic FPS {} active on {}!", version, platform.getName());
 	}
@@ -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;
@@ -247,7 +250,7 @@ public static void handleStateChange(PowerState previous, PowerState current) {
 		}
 
 		// The FOCUSED config doesn't have the user's actual vsync preference sadly ...
-		boolean enableVsync = current != PowerState.FOCUSED ? config.enableVsync() : minecraft.options.enableVsync().get();
+		boolean enableVsync = current != PowerState.FOCUSED ? config.enableVsync() : minecraft.options.enableVsync;
 
 		if (enableVsync != before.enableVsync()) {
 			minecraft.getWindow().updateVsync(enableVsync);

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

@@ -17,8 +17,9 @@
 import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sounds.SoundSource;
 
 import java.util.Locale;
@@ -64,7 +65,7 @@ public static Screen genConfigScreen(Screen parent) {
 		);
 
 		general.addEntry(
-			entryBuilder.startTextDescription(CommonComponents.SPACE).build()
+			entryBuilder.startTextDescription(new TextComponent(" ")).build()
 		);
 
 		general.addEntry(
@@ -89,12 +90,12 @@ public static Screen genConfigScreen(Screen parent) {
 			.setDefaultValue(defaultConfig.idle().condition())
 			.setSaveConsumer(config.idle()::setCondition)
 			.setEnumNameProvider(ClothConfig::IdleConditionMessage)
-			.setTooltipSupplier(ClothConfig::idleConditionTooltip)
+			.setTooltipSupplier(value -> ClothConfig.idleConditionTooltip((IdleCondition) value))
 			.build()
 		);
 
 		general.addEntry(
-			entryBuilder.startTextDescription(CommonComponents.SPACE).build()
+			entryBuilder.startTextDescription(new TextComponent(" ")).build()
 		);
 
 		VariableStepTransformer volumeTransformer = getVolumeStepTransformer();
@@ -126,7 +127,7 @@ public static Screen genConfigScreen(Screen parent) {
 		);
 
 		general.addEntry(
-			entryBuilder.startTextDescription(CommonComponents.SPACE).build()
+			entryBuilder.startTextDescription(new TextComponent(" ")).build()
 		);
 
 		BatteryTrackerConfig batteryTracker = config.batteryTracker();
@@ -220,7 +221,7 @@ public static Screen genConfigScreen(Screen parent) {
 
 			category.addEntry(
 				entryBuilder.startBooleanToggle(
-					Component.translatable("options.vsync"),
+					new TranslatableComponent("options.vsync"),
 					instance.enableVsync()
 				)
 				.setDefaultValue(standard.enableVsync())
@@ -240,7 +241,7 @@ public static Screen genConfigScreen(Screen parent) {
 
 				volumes.add(
 					entryBuilder.startIntSlider(
-						Component.translatable("soundCategory." + name),
+						new TranslatableComponent("soundCategory." + name),
 						(int) (instance.rawVolumeMultiplier(source) * 100),
 						0, 100
 					)
@@ -262,7 +263,7 @@ public static Screen genConfigScreen(Screen parent) {
 				.setDefaultValue(standard.graphicsState())
 				.setSaveConsumer(instance::setGraphicsState)
 				.setEnumNameProvider(ClothConfig::graphicsStateMessage)
-				.setTooltipSupplier(ClothConfig::graphicsStateTooltip)
+				.setTooltipSupplier(value -> ClothConfig.graphicsStateTooltip((GraphicsState) value))
 				.build()
 			);
 
@@ -346,7 +347,7 @@ private static Component volumeTransitionMessage(int step) {
 		int value = getVolumeStepTransformer().toValue(step);
 
 		if (value <= 300) {
-			return Component.literal(value + "%");
+			return new TextComponent(value + "%");
 		} else {
 			return localized("config", "volume_transition_speed_instant");
 		}
@@ -368,14 +369,14 @@ private static Component fpsTargetMessage(int step) {
 		int fps = getFpsTransformer().toValue(step);
 
 		if (fps != Constants.NO_FRAME_RATE_LIMIT) {
-			return Component.translatable("options.framerate", fps);
+			return new TranslatableComponent("options.framerate", fps);
 		} else {
-			return Component.translatable("options.framerateLimit.max");
+			return new TranslatableComponent("options.framerateLimit.max");
 		}
 	}
 
 	private static Component volumeMultiplierMessage(int value) {
-		return Component.literal(Integer.toString(value) + "%");
+		return new TextComponent(Integer.toString(value) + "%");
 	}
 
 	public static Component IdleConditionMessage(Enum<IdleCondition> state) {

platforms/common/src/main/java/dynamic_fps/impl/config/Serialization.java

@@ -124,7 +124,8 @@ public static DynamicFPSConfig loadDefault() {
 				throw new IOException("Stream is null.");
 			}
 
-			data = stream.readAllBytes();
+			data = new byte[stream.available()];
+			stream.read(data, 0, stream.available());
 		} catch (IOException e) {
 			throw new RuntimeException("Failed to load Dynamic FPS config.", e);
 		}

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

@@ -1,28 +1,28 @@
 package dynamic_fps.impl.config.option;
 
-import net.minecraft.client.gui.GuiGraphics;
+import com.mojang.blaze3d.platform.Window;
 
 /**
  * Screen corner to render the battery indicator in.
  */
 public enum BatteryIndicatorPlacement {
-	TOP_LEFT(graphics -> new int[] {4, 4}),
-	TOP_RIGHT(graphics -> new int[] {graphics.guiWidth() - 47, 4}),
-	BOTTOM_LEFT(graphics -> new int[] {4, graphics.guiHeight() - 20}),
-	BOTTOM_RIGHT(graphics -> new int[] {graphics.guiWidth() - 47, graphics.guiHeight() - 20});
+	TOP_LEFT(window -> new int[] {4, 4}),
+	TOP_RIGHT(window -> new int[] {window.getGuiScaledWidth() - 47, 4}),
+	BOTTOM_LEFT(window -> new int[] {4, window.getGuiScaledHeight() - 20}),
+	BOTTOM_RIGHT(window -> new int[] {window.getGuiScaledWidth() - 47, window.getGuiScaledHeight() - 20});
 
 	private final DynamicPlacement placement;
 
 	BatteryIndicatorPlacement(DynamicPlacement placement) {
 		this.placement = placement;
 	}
 
-	public int[] get(GuiGraphics graphics) {
-		return this.placement.get(graphics);
+	public int[] get(Window window) {
+		return this.placement.get(window);
 	}
 
 	@FunctionalInterface
 	private interface DynamicPlacement {
-		int[] get(GuiGraphics graphics);
+		int[] get(Window window);
 	}
 }

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

@@ -1,12 +1,12 @@
 package dynamic_fps.impl.feature.battery;
 
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 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.GuiComponent;
 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 +19,17 @@ public class BatteryToast implements Toast {
 	private Component title;
 	private Component description;
 	private ResourceLocation icon;
-	private Visibility visibility;
 
 	private static BatteryToast queuedToast;
 
+	private static final Minecraft MINECRAFT = Minecraft.getInstance();
+
 	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 +42,12 @@ public static void queueToast(Component title, ResourceLocation icon) {
 			queuedToast.icon = icon;
 		} else {
 			queuedToast = new BatteryToast(title, icon);
-			Minecraft.getInstance().getToastManager().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;
+			Minecraft.getInstance().getToasts().addToast(queuedToast);
 		}
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, Font font, long currentTime) {
+	public @NotNull Visibility render(PoseStack poseStack, ToastComponent toastComponent, long currentTime) {
 		if (this.firstRender == 0) {
 			if (this == queuedToast) {
 				queuedToast = null;
@@ -74,13 +58,18 @@ public void render(GuiGraphics graphics, Font font, long currentTime) {
 			this.description = localized("toast", "battery_charge", BatteryTracker.charge());
 		}
 
+		MINECRAFT.getTextureManager().bind(BACKGROUND_IMAGE);
 		// 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());
+		GuiComponent.blit(poseStack, 0, 0, 0, 0.0f, 0.0f, this.width(), this.height(), this.width(), this.height());
+
+		MINECRAFT.getTextureManager().bind(MOD_ICON);
+		GuiComponent.blit(poseStack, 2, 2, 0, 0.0f, 0.0f, 8, 8, 8, 8);
+		MINECRAFT.getTextureManager().bind(this.icon);
+		GuiComponent.blit(poseStack, 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);
+		GuiComponent.drawString(poseStack, toastComponent.getMinecraft().font, this.title, 30, 7, 0x5f3315);
+		GuiComponent.drawString(poseStack, toastComponent.getMinecraft().font, this.description, 30, 18, -16777216);
 
-		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 ? 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();