Minecraft 1.18.0 backport

Author: LostLuma

build.gradle

@@ -54,15 +54,15 @@ subprojects {
 		withSourcesJar()
 
 		toolchain {
-			languageVersion = JavaLanguageVersion.of(21)
+			languageVersion = JavaLanguageVersion.of(17)
 		}
 	}
 
 	tasks.withType(JavaCompile).configureEach {
 		it.options.encoding = "UTF-8"
 
 		javaCompiler = javaToolchains.compilerFor {
-			languageVersion = JavaLanguageVersion.of(21)
+			languageVersion = JavaLanguageVersion.of(17)
 		}
 	}
 }

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.jvmargs = -Xmx3G
 
 # Mod Properties
 mod_version = 3.5.0
-minecraft_version_min = 1.21.0
+minecraft_version_min = 1.18.0
 
 maven_group = juliand665
 archives_base_name = dynamic-fps
 
-enabled_platforms=fabric,neoforge
+enabled_platforms=fabric,forge,quilt
 # enabled_platforms=fabric,forge,neoforge,quilt

gradle/libs.versions.toml

@@ -1,26 +1,26 @@
 [versions]
-minecraft = "1.21"
+minecraft = "1.18.2"
 
 # Platform libraries
 
 fabric_loader = "0.15.10"
-fabric_api = "0.100.1+1.21"
+fabric_api = "0.77.0+1.18.2"
 
-forge = "1.20.4-49.0.30"
+forge = "1.18.2-40.2.17"
 
-neoforge = "21.0.0-beta"
+neoforge = "20.4.237"
 
 quilt_loader = "0.25.0"
-quilt_standard_libraries = "8.0.0-alpha.12+1.20.4"
+quilt_standard_libraries = "1.1.0-beta.26+1.18.2"
 
 # Regular libraries
 
 battery = "1.0.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.3.5"
 

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

@@ -14,12 +14,14 @@
 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.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;
@@ -170,7 +172,7 @@ public static boolean shouldShowToasts() {
 	}
 
 	public static boolean shouldShowLevels() {
-		return isDisabled() || !isLevelCoveredByOverlay();
+		return isDisabled() || !(isLevelCoveredByScreen() || isLevelCoveredByOverlay());
 	}
 
 	public static void onBatteryChargeChanged(int before, int after) {
@@ -192,11 +194,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/compat/ClothConfig.java

@@ -19,6 +19,8 @@
 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 +66,7 @@ public static Screen genConfigScreen(Screen parent) {
 		);
 
 		general.addEntry(
-			entryBuilder.startTextDescription(CommonComponents.SPACE).build()
+			entryBuilder.startTextDescription(new TextComponent(" ")).build()
 		);
 
 		general.addEntry(
@@ -93,7 +95,7 @@ public static Screen genConfigScreen(Screen parent) {
 		);
 
 		general.addEntry(
-			entryBuilder.startTextDescription(CommonComponents.SPACE).build()
+			entryBuilder.startTextDescription(new TextComponent(" ")).build()
 		);
 
 		VariableStepTransformer volumeTransformer = getVolumeStepTransformer();
@@ -125,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();
@@ -229,7 +231,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
 					)
@@ -325,7 +327,7 @@ private static Component volumeTransitionMessage(int step) {
 		int value = getVolumeStepTransformer().toValue(step);
 
 		if (value <= 300) {
-			return Component.literal(value + "%");
+			return new TranslatableComponent(value + "%");
 		} else {
 			return localized("config", "volume_transition_speed_instant");
 		}
@@ -347,14 +349,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 TranslatableComponent(Integer.toString(value) + "%");
 	}
 
 	public static Component IdleConditionMessage(Enum<IdleCondition> state) {

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

@@ -85,7 +85,7 @@ private static JsonObject removeUnchangedFields(JsonObject config, JsonObject pa
 				removeUnchangedFields((JsonObject) value, (JsonObject) other);
 			}
 
-			if (value.equals(other) || (value.isJsonObject() && value.getAsJsonObject().isEmpty())) {
+			if (value.equals(other) || (value.isJsonObject() && value.getAsJsonObject().size() == 0)) {
 				config.remove(name);
 			}
 		});

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/feature/battery/BatteryToast.java

@@ -1,8 +1,10 @@
 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.GuiGraphics;
+import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
@@ -43,7 +45,7 @@ public static void queueToast(Component title, ResourceLocation icon) {
 	}
 
 	@Override
-	public @NotNull Visibility render(GuiGraphics graphics, ToastComponent toastComponent, long currentTime) {
+	public @NotNull Visibility render(PoseStack poseStack, ToastComponent toastComponent, long currentTime) {
 		if (this.firstRender == 0) {
 			if (this == queuedToast) {
 				queuedToast = null;
@@ -54,15 +56,18 @@ public static void queueToast(Component title, ResourceLocation icon) {
 			this.description = localized("toast", "battery_charge", BatteryTracker.charge());
 		}
 
+		RenderSystem.setShaderTexture(0, BACKGROUND_IMAGE);
 		// resource, x, y, z, ?, ?, width, height, width, height
-		graphics.blit(BACKGROUND_IMAGE, 0, 0, 0, 0.0f, 0.0f, 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());
 
-		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);
+		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(toastComponent.getMinecraft().font, this.title, 30, 7, 0x5f3315, false);
-		graphics.drawString(toastComponent.getMinecraft().font, this.description, 30, 18, -16777216, false);
+		GuiComponent.drawString(poseStack, toastComponent.getMinecraft().font, this.title, 30, 7, 0x5f3315);
+		GuiComponent.drawString(poseStack, toastComponent.getMinecraft().font, this.description, 30, 18, -16777216);
 
-		return currentTime - this.firstRender >= 5000.0 * toastComponent.getNotificationDisplayTimeMultiplier() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
+		return currentTime - this.firstRender >= 5000.0 ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
 	}
 }

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

@@ -58,7 +58,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();
 		}
 	}
 
@@ -127,7 +127,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

@@ -1,6 +1,7 @@
 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;
@@ -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;
 			}
 		}
 	}

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

@@ -54,7 +54,7 @@ private void getFramerateLimit(CallbackInfoReturnable<Integer> callbackInfo) {
 				callbackInfo.setReturnValue(limit);
 			}
 		} else if (DynamicFPSConfig.INSTANCE.uncapMenuFrameRate()) {
-			if (this.options.enableVsync().get()) {
+			if (this.options.enableVsync) {
 				// VSync will regulate to a non-infinite value
 				callbackInfo.setReturnValue(Constants.NO_FRAME_RATE_LIMIT);
 			} else {