Minecraft 1.18.0 backport

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

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(17)
     }
 }
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }

gradle.properties

@@ -13,9 +13,9 @@ maven_group = juliand665
 archives_name = dynamic-fps
 
 # File naming version
-minecraft_version = 1.21.5
+minecraft_version = 1.18.0
 # Version for publishing
-minecraft_version_min = 1.21.5
-minecraft_version_max = 1.21.5
+minecraft_version_min = 1.18
+minecraft_version_max = 1.18.2
 
-enabled_platforms=fabric,quilt
+enabled_platforms=fabric,forge,quilt

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-minecraft = "1.21.5"
+minecraft = "1.18.2"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
-fabric_api = "0.118.2+1.21.5"
+fabric_api = "0.77.0+1.18.2"
 
-forge = "1.21.3-53.0.7"
+forge = "1.18.2-40.2.17"
 
-neoforge = "21.3.0-beta"
+neoforge = "20.4.237"
 
 quilt_loader = "0.25.0"
 
@@ -18,8 +18,8 @@ battery = "1.3.0"
 
 # Modding libraries
 
-modmenu = "11.0.0-beta.1"
-cloth_config = "15.0.127"
+modmenu = "3.2.5"
+cloth_config = "6.2.57"
 
 mixinextras = "0.4.1"
 

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

@@ -16,13 +16,15 @@
 import dynamic_fps.impl.util.FallbackConfigScreen;
 import dynamic_fps.impl.util.Logging;
 import dynamic_fps.impl.feature.state.OptionHolder;
+import dynamic_fps.impl.util.ModCompatHelper;
 import dynamic_fps.impl.util.ResourceLocations;
 import dynamic_fps.impl.util.Threads;
 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;
@@ -190,7 +192,7 @@ public static GraphicsState graphicsState() {
 	}
 
 	public static boolean shouldShowLevels() {
-		return isDisabled() || !isLevelCoveredByOverlay();
+		return isDisabled() || !(isLevelCoveredByScreen() || isLevelCoveredByOverlay());
 	}
 
 	public static void onBatteryChargeChanged(int before, int after) {
@@ -214,6 +216,8 @@ public static void onBatteryStatusChanged(State before, State after) {
 	private static void doInit() {
 		initClickHandler();
 		SmoothVolumeHandler.init();
+		// NOTE: Init battery tracker first here
+		// Since the idle handler queries it for info
 
 		if (!BatteryTracker.isFeatureEnabled()) {
 			IdleHandler.init();
@@ -227,6 +231,8 @@ private static void doInit() {
 				Threads.runOnMainThread(IdleHandler::init);
 			});
 		}
+
+		ModCompatHelper.init();
 	}
 
 	private static void initClickHandler() {
@@ -239,6 +245,11 @@ private static void initClickHandler() {
 			clickHandler = new ClickIgnoreHandler(window.address());
 		}
 	}
+
+	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;
@@ -281,7 +292,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

@@ -20,6 +20,8 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.screens.Screen;
 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;

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/BaseToast.java

@@ -1,11 +1,13 @@
 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.gui.components.toasts.ToastComponent;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -14,12 +16,13 @@
 
 public class BaseToast implements Toast {
 	private long firstRender;
-	private Visibility visibility;
 
 	protected Component title;
 	protected Component description;
 	protected @Nullable ResourceLocation icon;
 
+	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");
 
@@ -28,47 +31,34 @@ protected BaseToast(Component title, Component description, @Nullable ResourceLo
 		this.description = description;
 
 		this.icon = icon;
-
-		this.visibility = Visibility.SHOW;
 	}
 
 	@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(PoseStack poseStack, ToastComponent toastComponent, long currentTime) {
 		if (this.firstRender == 0) {
 			this.onFirstRender();
 			this.firstRender = currentTime;
 		}
 
-		// type, resource, x, y, ?, ?, width, height, width, height
-		graphics.blit(RenderType::guiTextured, BACKGROUND_IMAGE, 0, 0, 0.0f, 0, this.width(), this.height(), this.width(), this.height());
+		RenderSystem.setShaderTexture(0, BACKGROUND_IMAGE);
+		// resource, x, y, z, ?, ?, width, height, width, height
+		GuiComponent.blit(poseStack, 0, 0, 0.0f, 0.0f, this.width(), this.height(), this.width(), this.height());
 
 		int x = 8;
 
 		if (this.icon != null) {
 			x += 22;
 
-			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);
+			RenderSystem.setShaderTexture(0, MOD_ICON);
+			GuiComponent.blit(poseStack, 2, 2, 0, 0.0f, 0.0f, 8, 8, 8, 8);
+			RenderSystem.setShaderTexture(0, this.icon);
+			GuiComponent.blit(poseStack, 8, 8, 0, 0.0f, 0.0f, 16, 16, 16, 16);
 		}
 
-		graphics.drawString(Minecraft.getInstance().font, this.title, x, 7, 0x5f3315, false);
-		graphics.drawString(Minecraft.getInstance().font, this.description, x, 18, -16777216, false);
+		MINECRAFT.font.draw(poseStack, this.title, x, 7, 0x5f3315);
+		MINECRAFT.font.draw(poseStack, this.description, x, 18, -16777216);
+
+		return currentTime - this.firstRender >= 5000.0 ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
 	}
 
 	public void onFirstRender() {}

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

@@ -3,13 +3,14 @@
 import dynamic_fps.impl.util.Components;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 
 public class BatteryToast extends BaseToast {
 	private static BatteryToast queuedToast;
 
 	private BatteryToast(Component title, ResourceLocation icon) {
-		super(title, Component.empty(), icon);
+		super(title, TextComponent.EMPTY, icon);
 	}
 
 	/**
@@ -22,7 +23,7 @@ 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);
 		}
 	}
 

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

@@ -143,7 +143,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/battery/ErrorToast.java

@@ -16,6 +16,6 @@ private ErrorToast(Component description) {
 	 */
 	public static void queueToast(Component description) {
 		ErrorToast toast = new ErrorToast(description);
-		Minecraft.getInstance().getToastManager().addToast(toast);
+		Minecraft.getInstance().getToasts().addToast(toast);
 	}
 }

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

@@ -1,10 +1,11 @@
 package dynamic_fps.impl.feature.state;
 
 import dynamic_fps.impl.config.option.GraphicsState;
+import net.minecraft.client.AmbientOcclusionStatus;
 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.
@@ -14,45 +15,45 @@
 public class OptionHolder {
 	private static CloudStatus cloudStatus;
 	private static GraphicsStatus graphicsStatus;
-	private static boolean ambientOcclusion;
+	private static AmbientOcclusionStatus ambientOcclusion;
 	private static ParticleStatus particlesStatus;
 	private static boolean entityShadows;
-	private static double entityDistance;
+	private static float entityDistance;
 
 	/*
 	 * Create an in-memory copy of current vanilla graphics options.
 	 *
 	 * This MUST be called while graphics options have not been changed yet.
 	 */
 	public static void copyOptions(Options options) {
-		cloudStatus = options.getCloudsType();
-		graphicsStatus = options.graphicsMode().get();
-		ambientOcclusion = options.ambientOcclusion().get();
-		particlesStatus = options.particles().get();
-		entityShadows = options.entityShadows().get();
-		entityDistance = options.entityDistanceScaling().get();
+		cloudStatus = options.renderClouds;
+		graphicsStatus = options.graphicsMode;
+		ambientOcclusion = options.ambientOcclusion;
+		particlesStatus = options.particles;
+		entityShadows = options.entityShadows;
+		entityDistance = options.entityDistanceScaling;
 	}
 
 	/*
 	 * Apply or revert the graphics options for the specified graphics state.
 	 */
 	public static void applyOptions(Options options, GraphicsState state) {
 		if (state == GraphicsState.DEFAULT) {
-			options.cloudStatus().set(cloudStatus);
-			options.graphicsMode().set(graphicsStatus);
-			options.ambientOcclusion().set(ambientOcclusion);
-			options.particles().set(particlesStatus);
-			options.entityShadows().set(entityShadows);
-			options.entityDistanceScaling().set(entityDistance);
+			options.renderClouds = cloudStatus;
+			options.graphicsMode = graphicsStatus;
+			options.ambientOcclusion = ambientOcclusion;
+			options.particles = particlesStatus;
+			options.entityShadows = entityShadows;
+			options.entityDistanceScaling = entityDistance;
 		} else { // state == GraphicsState.REDUCED
-			options.cloudStatus().set(CloudStatus.OFF);
-			options.particles().set(ParticleStatus.MINIMAL);
-			options.entityShadows().set(false);
-			options.entityDistanceScaling().set(0.5);
+			options.renderClouds = CloudStatus.OFF;
+			options.particles = ParticleStatus.MINIMAL;
+			options.entityShadows = false;
+			options.entityDistanceScaling = 0.5f;
 
 			if (state == GraphicsState.MINIMAL) {
-				options.graphicsMode().set(GraphicsStatus.FAST);
-				options.ambientOcclusion().set(false);
+				options.graphicsMode = GraphicsStatus.FAST;
+				options.ambientOcclusion = AmbientOcclusionStatus.OFF;
 			}
 		}
 	}