diff --git a/build-logic/src/main/kotlin/dynamic_fps.java.gradle.kts b/build-logic/src/main/kotlin/dynamic_fps.java.gradle.kts index 10e67fe4..1acb9758 100644 --- a/build-logic/src/main/kotlin/dynamic_fps.java.gradle.kts +++ b/build-logic/src/main/kotlin/dynamic_fps.java.gradle.kts @@ -6,7 +6,7 @@ java { withSourcesJar() toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(17) } } @@ -14,6 +14,6 @@ tasks.withType { options.encoding = "UTF-8" javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(17) } } diff --git a/gradle.properties b/gradle.properties index 7586176e..e2c7deae 100644 --- a/gradle.properties +++ b/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.20.0 # Version for publishing -minecraft_version_min = 24w33a -minecraft_version_max = 24w34a +minecraft_version_min = 1.20 +minecraft_version_max = 1.20.1 -enabled_platforms=fabric,quilt +enabled_platforms=fabric,forge,quilt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d65ef45..7c240a0f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -minecraft = "24w33a" +minecraft = "1.20" # Platform libraries fabric_loader = "0.15.10" -fabric_api = "0.102.2+1.21.2" +fabric_api = "0.83.0+1.20" -forge = "1.21-51.0.33" +forge = "1.20-46.0.14" neoforge = "21.0.143" @@ -18,8 +18,8 @@ battery = "1.1.0" # Modding libraries -modmenu = "11.0.0-beta.1" -cloth_config = "15.0.127" +modmenu = "7.0.0" +cloth_config = "11.0.99" mixinextras = "0.3.5" diff --git a/platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java b/platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java index 76ce8a60..095250e1 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java +++ b/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; @@ -174,7 +176,7 @@ public static boolean shouldShowToasts() { } public static boolean shouldShowLevels() { - return isDisabled() || !isLevelCoveredByOverlay(); + return isDisabled() || !(isLevelCoveredByScreen() || isLevelCoveredByOverlay()); } public static void onBatteryChargeChanged(int before, int after) { @@ -196,11 +198,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; diff --git a/platforms/common/src/main/java/dynamic_fps/impl/config/option/IdleCondition.java b/platforms/common/src/main/java/dynamic_fps/impl/config/option/IdleCondition.java index eec4ac24..cc96914f 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/config/option/IdleCondition.java +++ b/platforms/common/src/main/java/dynamic_fps/impl/config/option/IdleCondition.java @@ -2,6 +2,5 @@ public enum IdleCondition { NONE, - VANILLA, ON_BATTERY; } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryToast.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryToast.java index 8e03db04..93ee1c16 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryToast.java +++ b/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,7 +17,6 @@ public class BatteryToast implements Toast { private Component title; private Component description; private ResourceLocation icon; - private Visibility visibility; private static BatteryToast queuedToast; @@ -29,7 +26,6 @@ public class BatteryToast implements Toast { 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; @@ -75,12 +55,14 @@ public void render(GuiGraphics graphics, Font font, long currentTime) { } // 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()); + 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, 0.0f, 0, 8, 8, 8, 8); - graphics.blit(RenderType::guiTextured, this.icon, 8, 8, 0, 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; } } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryTracker.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryTracker.java index b4db3334..1312451c 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/feature/battery/BatteryTracker.java +++ b/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(); diff --git a/platforms/common/src/main/java/dynamic_fps/impl/feature/state/OptionHolder.java b/platforms/common/src/main/java/dynamic_fps/impl/feature/state/OptionHolder.java index b4e4501a..e9e1130a 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/feature/state/OptionHolder.java +++ b/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. diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/FramerateLimitTrackerMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/FramerateLimitTrackerMixin.java deleted file mode 100644 index c0cb1077..00000000 --- a/platforms/common/src/main/java/dynamic_fps/impl/mixin/FramerateLimitTrackerMixin.java +++ /dev/null @@ -1,99 +0,0 @@ -package dynamic_fps.impl.mixin; - -import com.mojang.blaze3d.platform.FramerateLimitTracker; -import dynamic_fps.impl.Constants; -import dynamic_fps.impl.DynamicFPSMod; -import dynamic_fps.impl.PowerState; -import dynamic_fps.impl.config.DynamicFPSConfig; -import dynamic_fps.impl.config.option.IdleCondition; -import net.minecraft.client.Minecraft; -import net.minecraft.client.Options; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(FramerateLimitTracker.class) -public class FramerateLimitTrackerMixin { - @Shadow - @Final - private Options options; - - @Shadow - @Final - private Minecraft minecraft; - - @Shadow - private int framerateLimit; - - @Inject(method = "getFramerateLimit", at = @At("HEAD"), cancellable = true) - private void getFramerateLimit(CallbackInfoReturnable 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(this.getFramerateTarget(), 15)); - } else { - IdleCondition condition = DynamicFPSConfig.INSTANCE.idle().condition(); - - // Bypass all the vanilla idle checking code - // Note: If Dynamic FPS thinks the user is idle the power state would be different above - if (condition != IdleCondition.VANILLA) { - // Since we're bypassing the idle checking code we also need to set the menu FPS here as it's bundled now - if (isInLevel() || !DynamicFPSConfig.INSTANCE.uncapMenuFrameRate()) { - callbackInfo.setReturnValue(this.framerateLimit); - } else { - callbackInfo.setReturnValue(this.getMenuFramerateLimit()); - } - } - } - } - - /** - * Conditionally bypasses the main menu frame rate limit while using the vanilla idle code. - *

- * 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 getMenuFramerateLimit(CallbackInfoReturnable callbackInfo) { - int limit = this.getFramerateTarget(); - - 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()) { - callbackInfo.setReturnValue(this.getMenuFramerateLimit()); - } - } - - @Unique - private int getFramerateTarget() { - return DynamicFPSMod.targetFrameRate(); - } - - @Unique - private int getMenuFramerateLimit() { - if (this.options.enableVsync().get()) { - // VSync will regulate to a non-infinite value - return 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 - return Math.min(this.framerateLimit, Constants.NO_FRAME_RATE_LIMIT - 10); - } - } - - @Unique - private boolean isInLevel() { - return this.minecraft.level != null || this.minecraft.screen == null && this.minecraft.getOverlay() == null; - } -} diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java index d0ada68b..51392611 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/mixin/MinecraftMixin.java +++ b/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 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)); + } + } + } } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/ScreenMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/ScreenMixin.java new file mode 100644 index 00000000..7f39e351 --- /dev/null +++ b/platforms/common/src/main/java/dynamic_fps/impl/mixin/ScreenMixin.java @@ -0,0 +1,50 @@ +package dynamic_fps.impl.mixin; + +import dynamic_fps.impl.service.ModCompat; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import dynamic_fps.impl.util.duck.DuckScreen; +import net.minecraft.client.gui.screens.Screen; + +@Mixin(Screen.class) +public class ScreenMixin implements DuckScreen { + @Unique + private boolean dynamic_fps$canOptimize = false; + + @Unique + private boolean dynamic_fps$hasOptedOut = false; + + @Override + public boolean dynamic_fps$rendersBackground() { + return dynamic_fps$canOptimize; + } + + @Override + public void dynamic_fps$setRendersBackground() { + this.dynamic_fps$canOptimize = true; + } + + @Inject(method = "init", at = @At("HEAD")) + private void onInit(CallbackInfo callbackInfo) { + String name = this.getClass().getName(); + + this.dynamic_fps$hasOptedOut = ModCompat.getInstance().isScreenOptedOut(name); + + // Allow other mods to opt out on behalf of vanilla screens + // That Dynamic FPS forced to opt in via its own mod metadata. + if (!this.dynamic_fps$hasOptedOut) { + this.dynamic_fps$canOptimize = ModCompat.getInstance().isScreenOptedIn(name); + } + } + + @Inject(method = "renderDirtBackground", at = @At("HEAD")) + private void onRenderDirtBackground(CallbackInfo callbackInfo) { + if (!this.dynamic_fps$hasOptedOut) { + this.dynamic_fps$canOptimize = true; // Signal to apply optimizations on next frame + } + } +} diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/StatsScreenMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/StatsScreenMixin.java new file mode 100644 index 00000000..92b1b5ac --- /dev/null +++ b/platforms/common/src/main/java/dynamic_fps/impl/mixin/StatsScreenMixin.java @@ -0,0 +1,17 @@ +package dynamic_fps.impl.mixin; + +import dynamic_fps.impl.util.duck.DuckScreen; +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.CallbackInfo; + +import net.minecraft.client.gui.screens.achievement.StatsScreen; + +@Mixin(StatsScreen.class) +public class StatsScreenMixin { + @Inject(method = "onStatsUpdated", at = @At("HEAD")) + private void onStatsUpdated(CallbackInfo callbackInfo) { + ((DuckScreen) this).dynamic_fps$setRendersBackground(); + } +} diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastManagerMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastComponentMixin.java similarity index 58% rename from platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastManagerMixin.java rename to platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastComponentMixin.java index 7a3eaf4c..52368925 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/mixin/ToastManagerMixin.java +++ b/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 callbackInfo) { +@Mixin(ToastComponent.class) +public class ToastComponentMixin { + @Inject(method = "freeSlots", at = @At("HEAD"), cancellable = true) + private void hasFreeSlots(CallbackInfoReturnable callbackInfo) { if (!DynamicFPSMod.shouldShowToasts()) { callbackInfo.setReturnValue(0); } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/mixin/WindowMixin.java b/platforms/common/src/main/java/dynamic_fps/impl/mixin/WindowMixin.java new file mode 100644 index 00000000..6dfcfd9f --- /dev/null +++ b/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 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)); + } + } +} diff --git a/platforms/common/src/main/java/dynamic_fps/impl/service/ModCompat.java b/platforms/common/src/main/java/dynamic_fps/impl/service/ModCompat.java index dea57fdf..bbfdbc53 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/service/ModCompat.java +++ b/platforms/common/src/main/java/dynamic_fps/impl/service/ModCompat.java @@ -1,10 +1,23 @@ package dynamic_fps.impl.service; +import java.util.Set; + public interface ModCompat { boolean isDisabled(); boolean disableOverlayOptimization(); + Set getOptedInScreens(); + Set getOptedOutScreens(); + + default boolean isScreenOptedIn(String className) { + return getOptedInScreens().contains(className); + } + + default boolean isScreenOptedOut(String className) { + return getOptedOutScreens().contains(className); + } + static ModCompat getInstance() { return Services.MOD_COMPAT; } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/FallbackConfigScreen.java b/platforms/common/src/main/java/dynamic_fps/impl/util/FallbackConfigScreen.java index 99f5532b..19a9d9a2 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/util/FallbackConfigScreen.java +++ b/platforms/common/src/main/java/dynamic_fps/impl/util/FallbackConfigScreen.java @@ -33,6 +33,7 @@ protected void init() { @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderDirtBackground(guiGraphics); super.render(guiGraphics, mouseX, mouseY, partialTicks); int width = guiGraphics.guiWidth() / 2; diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/HudInfoRenderer.java b/platforms/common/src/main/java/dynamic_fps/impl/util/HudInfoRenderer.java index 2c2dc560..5390097a 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/util/HudInfoRenderer.java +++ b/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; @@ -40,7 +39,7 @@ private static void drawCenteredText(GuiGraphics guiGraphics, Component componen } private static void drawBatteryOverlay(GuiGraphics graphics) { - if (minecraft.getDebugOverlay().showDebugScreen() || !BatteryTracker.hasBatteries()) { + if (minecraft.options.renderDebug || !BatteryTracker.hasBatteries()) { return; } @@ -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, 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); } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/ModCompatHelper.java b/platforms/common/src/main/java/dynamic_fps/impl/util/ModCompatHelper.java new file mode 100644 index 00000000..7e629913 --- /dev/null +++ b/platforms/common/src/main/java/dynamic_fps/impl/util/ModCompatHelper.java @@ -0,0 +1,40 @@ +package dynamic_fps.impl.util; + +import dynamic_fps.impl.service.ModCompat; +import dynamic_fps.impl.service.Platform; + +import java.util.Optional; + +public class ModCompatHelper { + public static void init() { + fixFastloadSoftLock(); + } + + /** + * Fix softlock in combination with Fastload <=3.4.0 due to our screen / loading overlay optimization. + * + * See the issue report for more info. + */ + private static void fixFastloadSoftLock() { + Optional optional = Platform.getInstance().getModVersion("fastload"); + + if (optional.isEmpty()) { + return; + } + + Version other; + + try { + other = Version.of("3.4.0"); + } catch (Version.VersionParseException e) { + throw new RuntimeException(e); + } + + // If a version below 3.4.0 is present opt their custom world loading screen out of our optimization + if (optional.get().compareTo(other) <= 0) { + ModCompat.getInstance().getOptedOutScreens().add( + "io.github.bumblesoftware.fastload.client.BuildingTerrainScreen" + ); + } + } +} diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java b/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java index 45e40b8d..c9f0ab50 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java +++ b/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); } } diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/VariableStepTransformer.java b/platforms/common/src/main/java/dynamic_fps/impl/util/VariableStepTransformer.java index 93bef45f..dc94e8bc 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/util/VariableStepTransformer.java +++ b/platforms/common/src/main/java/dynamic_fps/impl/util/VariableStepTransformer.java @@ -1,6 +1,7 @@ package dynamic_fps.impl.util; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -13,9 +14,11 @@ public class VariableStepTransformer { private boolean unsorted; private final List steps; + private final List reversedSteps; public VariableStepTransformer() { this.steps = new ArrayList<>(); + this.reversedSteps = new ArrayList<>(); } /** @@ -27,6 +30,7 @@ public VariableStepTransformer() { public void addStep(int change, int max) { this.unsorted = true; this.steps.add(new Step(change, max)); + this.reversedSteps.add(new Step(change, max)); } /** @@ -42,7 +46,7 @@ public int toStep(int value) { int currentChange = 0; int currentValue = value; - for (Step pair : this.steps.reversed()) { + for (Step pair : this.reversedSteps) { if (currentValue > pair.max && currentChange != 0) { step += Math.floorDiv(currentValue - pair.max, currentChange); currentValue = pair.max; @@ -86,6 +90,14 @@ public int compare(Step self, Step other) { return Integer.compare(self.max, other.max); } }); + + this.reversedSteps.sort(new Comparator() { + @Override + public int compare(Step self, Step other) { + return Integer.compare(self.max, other.max); + } + }); + Collections.reverse(this.reversedSteps); } private record Step(int change, int max) {} diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/duck/DuckScreen.java b/platforms/common/src/main/java/dynamic_fps/impl/util/duck/DuckScreen.java new file mode 100644 index 00000000..fe72fe3d --- /dev/null +++ b/platforms/common/src/main/java/dynamic_fps/impl/util/duck/DuckScreen.java @@ -0,0 +1,11 @@ +package dynamic_fps.impl.util.duck; + +public interface DuckScreen { + default boolean dynamic_fps$rendersBackground() { + throw new RuntimeException("No implementation for dynamic_fps$rendersBackground was found."); + } + + default void dynamic_fps$setRendersBackground() { + throw new RuntimeException("No implementation for dynamic_fps$rendersBackground was found."); + } +} diff --git a/platforms/common/src/main/resources/assets/dynamic_fps/data/default_config.json b/platforms/common/src/main/resources/assets/dynamic_fps/data/default_config.json index 36ccd02d..0f1f9798 100644 --- a/platforms/common/src/main/resources/assets/dynamic_fps/data/default_config.json +++ b/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, diff --git a/platforms/common/src/main/resources/dynamic_fps-common.mixins.json b/platforms/common/src/main/resources/dynamic_fps-common.mixins.json index 189a9c1e..473d39e9 100644 --- a/platforms/common/src/main/resources/dynamic_fps-common.mixins.json +++ b/platforms/common/src/main/resources/dynamic_fps-common.mixins.json @@ -4,13 +4,15 @@ "minVersion": "0.8", "client": [ "DebugScreenOverlayMixin", - "FramerateLimitTrackerMixin", "GameRendererMixin", "GuiMixin", "LoadingOverlayMixin", "MinecraftMixin", + "ScreenMixin", "SoundEngineMixin", - "ToastManagerMixin", + "StatsScreenMixin", + "ToastComponentMixin", + "WindowMixin", "bugfix.BlockableEventLoopMixin" ], "mixins": [], diff --git a/platforms/fabric/src/main/resources/fabric.mod.json b/platforms/fabric/src/main/resources/fabric.mod.json index 2b98d051..a3dc3a9f 100644 --- a/platforms/fabric/src/main/resources/fabric.mod.json +++ b/platforms/fabric/src/main/resources/fabric.mod.json @@ -70,7 +70,10 @@ }, "depends": { "fabricloader": ">=0.15.10", - "minecraft": ">=1.21.2-alpha.24.33.a", + "minecraft": [ + "1.20.0", + "1.20.1" + ], "mixinextras": ">=0.3.2", "fabric-resource-loader-v0": "*", "fabric-lifecycle-events-v1": "*" @@ -88,5 +91,43 @@ "dynamic_fps-common.mixins.json", "dynamic_fps-textile.mixins.json" ], - "accessWidener": "dynamic_fps.accesswidener" + "accessWidener": "dynamic_fps.accesswidener", + "custom": { + "dynamic_fps": { + "optimized_screens": { + "enabled": [ + "net.minecraft.class_4189", + "net.minecraft.class_404", + "net.minecraft.class_426", + "net.minecraft.class_4288", + "net.minecraft.class_6777", + "net.minecraft.class_443", + "net.minecraft.class_446", + "net.minecraft.class_445", + "net.minecraft.class_6599" + ], + "disabled": [ + "net.minecraft.class_434" + ], + "_comment": { + "_0": "Mojang mapping names of the enabled / disabled screens.", + "_1": "Sorted by fully qualified name. Translation not needed for mod screens.", + "enabled": { + "net.minecraft.class_4189": "net.minecraft.client.gui.screens.AccessibilityOptionsScreen", + "net.minecraft.class_404": "net.minecraft.client.gui.screens.ChatOptionsScreen", + "net.minecraft.class_426": "net.minecraft.client.gui.screens.LanguageSelectScreen", + "net.minecraft.class_4288": "net.minecraft.client.gui.screens.MouseSettingsScreen", + "net.minecraft.class_6777": "net.minecraft.client.gui.screens.OnlineOptionsScreen", + "net.minecraft.class_443": "net.minecraft.client.gui.screens.SoundOptionsScreen", + "net.minecraft.class_446": "net.minecraft.client.gui.screens.VideoSettingsScreen", + "net.minecraft.class_445": "net.minecraft.client.gui.screens.WinScreen", + "net.minecraft.class_6599": "net.minecraft.client.gui.screens.controls.KeyBindsScreen" + }, + "disabled": { + "net.minecraft.class_434": "net.minecraft.client.gui.screens.ReceivingLevelScreen" + } + } + } + } + } } diff --git a/platforms/forge/build.gradle b/platforms/forge/build.gradle index 3dc6995f..0c0a9ba5 100644 --- a/platforms/forge/build.gradle +++ b/platforms/forge/build.gradle @@ -43,6 +43,8 @@ dependencies { include(libs.mixinextras.forge) implementation(libs.mixinextras.forge) + include(libs.battery) + common(project(path: ":platforms:common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":platforms:common", configuration: "transformProductionForge")) { transitive = false } } diff --git a/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/DynamicFPSForgeMod.java b/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/DynamicFPSForgeMod.java index 35b24bee..a4f343a2 100644 --- a/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/DynamicFPSForgeMod.java +++ b/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/DynamicFPSForgeMod.java @@ -3,9 +3,11 @@ import dynamic_fps.impl.Constants; import dynamic_fps.impl.DynamicFPSMod; import dynamic_fps.impl.service.Platform; +import dynamic_fps.impl.util.HudInfoRenderer; import dynamic_fps.impl.util.KeyMappingHandler; import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; +import net.minecraftforge.client.event.RenderGuiOverlayEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.fml.ModLoadingContext; @@ -20,7 +22,7 @@ public class DynamicFPSForgeMod { private static final List TICK_EVENT_LISTENERS = new ArrayList<>(); - public DynamicFPSForgeMod() { + public DynamicFPSForgeMod() { if (FMLLoader.getDist().isDedicatedServer()) { return; } @@ -35,16 +37,14 @@ public DynamicFPSForgeMod() { ); MinecraftForge.EVENT_BUS.addListener(this::onClientTick); - // MinecraftForge.EVENT_BUS.addListener(this::renderGuiOverlay); + MinecraftForge.EVENT_BUS.addListener(this::renderGuiOverlay); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::registerKeyMappings); - } + } - /* public void renderGuiOverlay(RenderGuiOverlayEvent event) { HudInfoRenderer.renderInfo(event.getGuiGraphics()); } - */ public void registerKeyMappings(RegisterKeyMappingsEvent event) { for (KeyMappingHandler handler : KeyMappingHandler.getHandlers()) { diff --git a/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/service/ForgeModCompat.java b/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/service/ForgeModCompat.java index 4f47fadb..814c28eb 100644 --- a/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/service/ForgeModCompat.java +++ b/platforms/forge/src/main/java/net/lostluma/dynamic_fps/impl/forge/service/ForgeModCompat.java @@ -1,9 +1,23 @@ package net.lostluma.dynamic_fps.impl.forge.service; +import com.electronwill.nightconfig.core.CommentedConfig; import dynamic_fps.impl.service.ModCompat; +import net.minecraft.client.gui.screens.ReceivingLevelScreen; import net.minecraftforge.fml.ModList; +import net.minecraftforge.forgespi.language.IModInfo; + +import java.util.HashSet; +import java.util.Set; public class ForgeModCompat implements ModCompat { + private static boolean disableOverlayOptimization = false; + private static final Set optedOutScreens = new HashSet<>(); + + static { + optedOutScreens.add(ReceivingLevelScreen.class.getCanonicalName()); + ModList.get().getMods().forEach(ForgeModCompat::parseModMetadata); + } + @Override public boolean isDisabled() { return false; @@ -11,6 +25,30 @@ public boolean isDisabled() { @Override public boolean disableOverlayOptimization() { - return ModList.get().isLoaded("rrls"); + return disableOverlayOptimization || ModList.get().isLoaded("rrls"); + } + + @Override + public Set getOptedInScreens() { + return Set.of(); + } + + @Override + public Set getOptedOutScreens() { + return optedOutScreens; + } + + private static void parseModMetadata(IModInfo modInfo) { + Object config = modInfo.getModProperties().get("dynamic_fps"); + + if (config == null) { + return; + } + + Boolean value = ((CommentedConfig) config).get("optimized_overlay"); + + if (value != null && !value) { + disableOverlayOptimization = true; + } } } diff --git a/platforms/forge/src/main/resources/META-INF/mods.toml b/platforms/forge/src/main/resources/META-INF/mods.toml index 2fbde7b1..ce3cc902 100644 --- a/platforms/forge/src/main/resources/META-INF/mods.toml +++ b/platforms/forge/src/main/resources/META-INF/mods.toml @@ -85,6 +85,6 @@ file="META-INF/accesstransformer.cfg" [[dependencies.dynamic_fps]] modId = "minecraft" mandatory = true -versionRange = "[1.21.0,)" +versionRange = "[1.20.0,1.20.1]" ordering = "NONE" side = "CLIENT" diff --git a/platforms/neoforge/gradle.properties b/platforms/neoforge/gradle.properties index 97b48a86..9d26e080 100644 --- a/platforms/neoforge/gradle.properties +++ b/platforms/neoforge/gradle.properties @@ -1,2 +1,5 @@ loom.platform=neoforge supported_platforms=neoforge + +minecraft_version = 1.20.2 +minecraft_version_min = 1.20.2 diff --git a/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/DynamicFPSNeoForgeMod.java b/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/DynamicFPSNeoForgeMod.java index 3f1cb0d5..e0832aa8 100644 --- a/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/DynamicFPSNeoForgeMod.java +++ b/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/DynamicFPSNeoForgeMod.java @@ -8,9 +8,9 @@ import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.common.Mod; import net.neoforged.fml.loading.FMLLoader; +import net.neoforged.neoforge.client.ConfigScreenHandler; import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; import net.neoforged.neoforge.client.event.RenderGuiEvent; -import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.common.NeoForge; @Mod(Constants.MOD_ID) @@ -23,8 +23,10 @@ public DynamicFPSNeoForgeMod(IEventBus modEventBus) { DynamicFPSMod.init(); ModLoadingContext.get().registerExtensionPoint( - IConfigScreenFactory.class, - () -> (minecraft, screen) -> DynamicFPSMod.getConfigScreen(screen) + ConfigScreenHandler.ConfigScreenFactory.class, + () -> new ConfigScreenHandler.ConfigScreenFactory( + (minecraft, screen) -> DynamicFPSMod.getConfigScreen(screen) + ) ); modEventBus.addListener(this::registerKeyMappings); diff --git a/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgeModCompat.java b/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgeModCompat.java index 7496aa3a..62735115 100644 --- a/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgeModCompat.java +++ b/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgeModCompat.java @@ -2,13 +2,19 @@ import com.electronwill.nightconfig.core.CommentedConfig; import dynamic_fps.impl.service.ModCompat; +import net.minecraft.client.gui.screens.ReceivingLevelScreen; import net.neoforged.fml.ModList; import net.neoforged.neoforgespi.language.IModInfo; +import java.util.HashSet; +import java.util.Set; + public class NeoForgeModCompat implements ModCompat { private static boolean disableOverlayOptimization = false; + private static final Set optedOutScreens = new HashSet<>(); static { + optedOutScreens.add(ReceivingLevelScreen.class.getCanonicalName()); ModList.get().getMods().forEach(NeoForgeModCompat::parseModMetadata); } @@ -22,6 +28,16 @@ public boolean disableOverlayOptimization() { return disableOverlayOptimization || ModList.get().isLoaded("rrls"); } + @Override + public Set getOptedInScreens() { + return Set.of(); + } + + @Override + public Set getOptedOutScreens() { + return optedOutScreens; + } + private static void parseModMetadata(IModInfo modInfo) { Object config = modInfo.getModProperties().get("dynamic_fps"); diff --git a/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgePlatform.java b/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgePlatform.java index 08f5b43e..fd4eef6c 100644 --- a/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgePlatform.java +++ b/platforms/neoforge/src/main/java/net/lostluma/dynamic_fps/impl/neoforge/service/NeoForgePlatform.java @@ -7,8 +7,8 @@ import net.neoforged.fml.ModList; import net.neoforged.fml.loading.FMLLoader; import net.neoforged.fml.loading.FMLPaths; -import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.TickEvent; import java.io.IOException; import java.nio.file.Files; @@ -61,7 +61,7 @@ public Optional getModVersion(String modId) { @Override public void registerStartTickEvent(StartTickEvent event) { - NeoForge.EVENT_BUS.addListener(ClientTickEvent.Pre.class, (unused) -> event.onStartTick()); + NeoForge.EVENT_BUS.addListener(TickEvent.ClientTickEvent.class, (unused) -> event.onStartTick()); } private Path ensureDir(Path path) { diff --git a/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/platforms/neoforge/src/main/resources/META-INF/mods.toml similarity index 97% rename from platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to platforms/neoforge/src/main/resources/META-INF/mods.toml index e6a2bbc4..892d4df4 100644 --- a/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/platforms/neoforge/src/main/resources/META-INF/mods.toml @@ -85,6 +85,6 @@ file="META-INF/accesstransformer.cfg" [[dependencies.dynamic_fps]] modId = "minecraft" mandatory = true -versionRange = "[1.21.0,)" +versionRange = "[1.20.2,1.20.4]" ordering = "NONE" side = "CLIENT" diff --git a/platforms/quilt/build.gradle b/platforms/quilt/build.gradle index 15eda105..280c19af 100644 --- a/platforms/quilt/build.gradle +++ b/platforms/quilt/build.gradle @@ -12,12 +12,12 @@ repositories { } architectury { - platformSetupLoomIde() - loader("quilt") + platformSetupLoomIde() + loader("quilt") } loom { - accessWidenerPath = project(":platforms:common").loom.accessWidenerPath + accessWidenerPath = project(":platforms:common").loom.accessWidenerPath } configurations { @@ -37,7 +37,7 @@ configurations { } dependencies { - modImplementation(libs.quilt.loader) + modImplementation(libs.quilt.loader) include(libs.battery) @@ -49,26 +49,26 @@ dependencies { } shadowJar { - exclude "architectury.common.json" - configurations = [project.configurations.shadowBundle] + exclude "architectury.common.json" + configurations = [project.configurations.shadowBundle] } remapJar { - injectAccessWidener = true - input.set shadowJar.archiveFile - dependsOn shadowJar + injectAccessWidener = true + input.set shadowJar.archiveFile + dependsOn shadowJar } sourcesJar { - def commonSources = project(":platforms:common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } + def commonSources = project(":platforms:common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } } components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } } var modVersion = project.property("mod_version").toString() diff --git a/platforms/quilt/src/main/resources/quilt.mod.json b/platforms/quilt/src/main/resources/quilt.mod.json index f6304b11..e83c8359 100644 --- a/platforms/quilt/src/main/resources/quilt.mod.json +++ b/platforms/quilt/src/main/resources/quilt.mod.json @@ -81,7 +81,9 @@ }, { "id": "minecraft", - "versions": ">=1.21.2-alpha.24.33.a" + "versions": { + "all": [">=1.20.0", "<=1.20.1"] + } }, { "id": "mixinextras", @@ -115,5 +117,41 @@ "dynamic_fps-common.mixins.json", "dynamic_fps-textile.mixins.json" ], - "access_widener": "dynamic_fps.accesswidener" + "access_widener": "dynamic_fps.accesswidener", + "dynamic_fps": { + "optimized_screens": { + "enabled": [ + "net.minecraft.class_4189", + "net.minecraft.class_404", + "net.minecraft.class_426", + "net.minecraft.class_4288", + "net.minecraft.class_6777", + "net.minecraft.class_443", + "net.minecraft.class_446", + "net.minecraft.class_445", + "net.minecraft.class_6599" + ], + "disabled": [ + "net.minecraft.class_434" + ], + "_comment": { + "_0": "Mojang mapping names of the enabled / disabled screens.", + "_1": "Sorted by fully qualified name. Translation not needed for mod screens.", + "enabled": { + "net.minecraft.class_4189": "net.minecraft.client.gui.screens.AccessibilityOptionsScreen", + "net.minecraft.class_404": "net.minecraft.client.gui.screens.ChatOptionsScreen", + "net.minecraft.class_426": "net.minecraft.client.gui.screens.LanguageSelectScreen", + "net.minecraft.class_4288": "net.minecraft.client.gui.screens.MouseSettingsScreen", + "net.minecraft.class_6777": "net.minecraft.client.gui.screens.OnlineOptionsScreen", + "net.minecraft.class_443": "net.minecraft.client.gui.screens.SoundOptionsScreen", + "net.minecraft.class_446": "net.minecraft.client.gui.screens.VideoSettingsScreen", + "net.minecraft.class_445": "net.minecraft.client.gui.screens.WinScreen", + "net.minecraft.class_6599": "net.minecraft.client.gui.screens.controls.KeyBindsScreen" + }, + "disabled": { + "net.minecraft.class_434": "net.minecraft.client.gui.screens.ReceivingLevelScreen" + } + } + } + } } diff --git a/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/mixin/GuiMixin.java b/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/mixin/GuiMixin.java index 31bcb2a5..225c6178 100644 --- a/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/mixin/GuiMixin.java +++ b/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/mixin/GuiMixin.java @@ -14,7 +14,13 @@ public class GuiMixin { /** * Render info on whether Dynamic FPS is disabled or always reducing the user's FPS. */ - @Inject(method = "renderSavingIndicator", at = @At("HEAD")) + @Inject( + method = "render", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/Gui;renderSavingIndicator(Lnet/minecraft/client/gui/GuiGraphics;)V" + ) + ) private void renderSavingIndicator(CallbackInfo callbackInfo, @Local(argsOnly = true) GuiGraphics guiGraphics) { HudInfoRenderer.renderInfo(guiGraphics); } diff --git a/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/service/TextileModCompat.java b/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/service/TextileModCompat.java index 58e699bc..e4396623 100644 --- a/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/service/TextileModCompat.java +++ b/platforms/textile/src/main/java/net/lostluma/dynamic_fps/impl/textile/service/TextileModCompat.java @@ -2,15 +2,22 @@ import dynamic_fps.impl.service.ModCompat; import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.MappingResolver; import net.fabricmc.loader.api.ModContainer; import net.fabricmc.loader.api.metadata.CustomValue; import net.fabricmc.loader.api.metadata.ModMetadata; import net.lostluma.dynamic_fps.impl.textile.compat.FREX; import org.jetbrains.annotations.Nullable; +import java.util.HashSet; +import java.util.Set; + public class TextileModCompat implements ModCompat { private static boolean disableOverlayOptimization = false; + private static final Set optedInScreens = new HashSet<>(); + private static final Set optedOutScreens = new HashSet<>(); + static { FabricLoader.getInstance().getAllMods().forEach(TextileModCompat::parseModMetadata); } @@ -25,6 +32,16 @@ public boolean disableOverlayOptimization() { return disableOverlayOptimization; } + @Override + public Set getOptedInScreens() { + return optedInScreens; + } + + @Override + public Set getOptedOutScreens() { + return optedOutScreens; + } + private static void parseModMetadata(ModContainer mod) { CustomValue.CvObject root; ModMetadata data = mod.getMetadata(); @@ -36,6 +53,9 @@ private static void parseModMetadata(ModContainer mod) { } parseOverlayOverride(root.get("optimized_overlay")); + + parseScreenOverrides(root.get("optimized_screens"), "enabled", optedInScreens); + parseScreenOverrides(root.get("optimized_screens"), "disabled", optedOutScreens); } private static void parseOverlayOverride(@Nullable CustomValue value) { @@ -43,4 +63,25 @@ private static void parseOverlayOverride(@Nullable CustomValue value) { disableOverlayOptimization = true; } } + + private static void parseScreenOverrides(@Nullable CustomValue parent, String type, Set set) { + if (parent == null || parent.getType() != CustomValue.CvType.OBJECT) { + return; + } + + CustomValue values = parent.getAsObject().get(type); + + if (values == null || values.getType() != CustomValue.CvType.ARRAY) { + return; + } + + MappingResolver resolver = FabricLoader.getInstance().getMappingResolver(); + + values.getAsArray().forEach(value -> { + if (value.getType() == CustomValue.CvType.STRING) { + // Translate from intermediary to runtime names for vanilla screens + set.add(resolver.mapClassName("intermediary", value.getAsString())); + } + }); + } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 51d6c06c..cb576658 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ includeBuild("build-logic") include(":platforms:common") include(":platforms:fabric") -// include(":platforms:forge") +include(":platforms:forge") // include(":platforms:neoforge") include(":platforms:quilt") include(":platforms:textile")