Minecraft 1.21.9 backport

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

Author: LostLuma

gradle.properties

@@ -13,9 +13,9 @@ maven_group = juliand665
 archives_name = dynamic-fps
 
 # File naming version
-minecraft_version = 1.21.11
+minecraft_version = 1.21.9
 # Version for publishing
-minecraft_version_min = 1.21.11
-minecraft_version_max = 1.21.11
+minecraft_version_min = 1.21.9
+minecraft_version_max = 1.21.10
 
 enabled_platforms=fabric,neoforge,quilt

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-minecraft = "1.21.11"
+minecraft = "1.21.9"
 
 # Platform libraries
 
@@ -8,7 +8,7 @@ fabric_api = "0.133.7+1.21.9"
 
 forge = "1.21.5-55.0.3"
 
-neoforge = "21.11.0-beta"
+neoforge = "21.9.3-beta"
 
 quilt_loader = "0.29.1"
 

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

@@ -24,14 +24,14 @@
 import dynamic_fps.impl.feature.state.WindowObserver;
 import dynamic_fps.impl.service.Platform;
 import net.lostluma.battery.api.State;
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.LoadingOverlay;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
 
-import net.minecraft.util.Util;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -243,7 +243,7 @@ private static void showNotification(String titleTranslationKey, String iconPath
 		}
 
 		Component title = Components.translatable("toast", titleTranslationKey);
-		Identifier icon = ResourceLocations.of("dynamic_fps", "textures/battery/toast/" + iconPath + ".png");
+		ResourceLocation icon = ResourceLocations.of("dynamic_fps", "textures/battery/toast/" + iconPath + ".png");
 
 		BatteryToast.queueToast(title, icon);
 	}

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

@@ -8,7 +8,7 @@
 import net.minecraft.client.gui.components.toasts.ToastManager;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -18,12 +18,12 @@ public class BaseToast implements Toast {
 
 	protected Component title;
 	protected Component description;
-	protected @Nullable Identifier icon;
+	protected @Nullable ResourceLocation icon;
 
-	private static final Identifier MOD_ICON = ResourceLocations.of("dynamic_fps", "textures/battery/toast/background_icon.png");
-	private static final Identifier BACKGROUND_IMAGE = ResourceLocations.of("dynamic_fps", "textures/battery/toast/background.png");
+	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");
 
-	protected BaseToast(Component title, Component description, @Nullable Identifier icon) {
+	protected BaseToast(Component title, Component description, @Nullable ResourceLocation icon) {
 		this.title = title;
 		this.description = description;
 

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

@@ -3,20 +3,20 @@
 import dynamic_fps.impl.util.Components;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 
 public class BatteryToast extends BaseToast {
 	private static BatteryToast queuedToast;
 
-	private BatteryToast(Component title, Identifier icon) {
+	private BatteryToast(Component title, ResourceLocation icon) {
 		super(title, Component.empty(), icon);
 	}
 
 	/**
 	 * Queue some information to be shown as a toast.
 	 * If an older toast of the same type is already queued its information will be replaced.
 	 */
-	public static void queueToast(Component title, Identifier icon) {
+	public static void queueToast(Component title, ResourceLocation icon) {
 		if (queuedToast != null) {
 			queuedToast.title = title;
 			queuedToast.icon = icon;

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

@@ -6,8 +6,8 @@
 import dynamic_fps.impl.feature.battery.BatteryTracker;
 import dynamic_fps.impl.service.Platform;
 import net.lostluma.battery.api.State;
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.Util;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;

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

@@ -2,7 +2,7 @@
 
 import dynamic_fps.impl.config.option.GraphicsState;
 import net.minecraft.client.CloudStatus;
-import net.minecraft.client.GraphicsPreset;
+import net.minecraft.client.GraphicsStatus;
 import net.minecraft.client.Options;
 import net.minecraft.server.level.ParticleStatus;
 
@@ -13,7 +13,7 @@
  */
 public class OptionHolder {
 	private static CloudStatus cloudStatus;
-	private static GraphicsPreset graphicsStatus;
+	private static GraphicsStatus graphicsStatus;
 	private static boolean ambientOcclusion;
 	private static ParticleStatus particlesStatus;
 	private static boolean entityShadows;
@@ -26,7 +26,7 @@ public class OptionHolder {
 	 */
 	public static void copyOptions(Options options) {
 		cloudStatus = options.getCloudsType();
-		graphicsStatus = options.graphicsPreset().get();
+		graphicsStatus = options.graphicsMode().get();
 		ambientOcclusion = options.ambientOcclusion().get();
 		particlesStatus = options.particles().get();
 		entityShadows = options.entityShadows().get();
@@ -39,7 +39,7 @@ public static void copyOptions(Options options) {
 	public static void applyOptions(Options options, GraphicsState state) {
 		if (state == GraphicsState.DEFAULT) {
 			options.cloudStatus().set(cloudStatus);
-			options.graphicsPreset().set(graphicsStatus);
+			options.graphicsMode().set(graphicsStatus);
 			options.ambientOcclusion().set(ambientOcclusion);
 			options.particles().set(particlesStatus);
 			options.entityShadows().set(entityShadows);
@@ -51,7 +51,7 @@ public static void applyOptions(Options options, GraphicsState state) {
 			options.entityDistanceScaling().set(0.5);
 
 			if (state == GraphicsState.MINIMAL) {
-				options.graphicsPreset().set(GraphicsPreset.FAST);
+				options.graphicsMode().set(GraphicsStatus.FAST);
 				options.ambientOcclusion().set(false);
 			}
 		}

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

@@ -8,9 +8,8 @@
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 
-import net.minecraft.resources.Identifier;
-
 import dynamic_fps.impl.DynamicFPSMod;
+import net.minecraft.resources.ResourceLocation;
 
 public final class HudInfoRenderer {
 	public static void renderInfo(GuiGraphics guiGraphics) {
@@ -42,7 +41,7 @@ private static void drawBatteryOverlay(GuiGraphics graphics) {
 		Minecraft minecraft = Minecraft.getInstance();
 		BatteryTrackerConfig config = DynamicFPSConfig.INSTANCE.batteryTracker();
 
-		if ((!config.showWhenDebug() && minecraft.debugEntries.isOverlayVisible()) || !BatteryTracker.hasBatteries()) {
+		if ((!config.showWhenDebug() && minecraft.debugEntries.isF3Visible()) || !BatteryTracker.hasBatteries()) {
 			return;
 		}
 
@@ -52,7 +51,7 @@ private static void drawBatteryOverlay(GuiGraphics graphics) {
 
 		int index = BatteryTracker.charge() / 10;
 		String type = BatteryUtil.isCharging(BatteryTracker.status()) ? "charging" : "draining";
-		Identifier icon = ResourceLocations.of("dynamic_fps", "textures/battery/icon/" + type + "_" + index + ".png");
+		ResourceLocation icon = ResourceLocations.of("dynamic_fps", "textures/battery/icon/" + type + "_" + index + ".png");
 
 		// pair of coordinates
 		int[] position = config.display().placement().get(minecraft.getWindow());

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

@@ -1,9 +1,9 @@
 package dynamic_fps.impl.util;
 
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 
 public class ResourceLocations {
-	public static Identifier of(String namespace, String path) {
-		return Identifier.fromNamespaceAndPath(namespace, path);
+	public static ResourceLocation of(String namespace, String path) {
+		return ResourceLocation.fromNamespaceAndPath(namespace, path);
 	}
 }