Fix cfps (I hope)

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/Configs.java

@@ -1,19 +1,29 @@
 package net.earthcomputer.clientcommands;
 
+import com.google.common.base.Suppliers;
+import dev.xpple.betterconfig.api.BetterConfigAPI;
 import dev.xpple.betterconfig.api.Config;
+import dev.xpple.betterconfig.api.ModConfig;
 import net.earthcomputer.clientcommands.command.ReplyCommand;
 import net.earthcomputer.clientcommands.features.ChorusManipulation;
 import net.earthcomputer.clientcommands.features.EnchantmentCracker;
 import net.earthcomputer.clientcommands.features.FishingCracker;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
 import net.earthcomputer.clientcommands.features.ServerBrandManager;
 import net.earthcomputer.clientcommands.util.MultiVersionCompat;
+import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import net.minecraft.util.StringRepresentable;
 
 import java.util.Locale;
+import java.util.function.Supplier;
 
 public class Configs {
+    private static final Supplier<ModConfig<Component>> CONFIG_REF = Suppliers.memoize(() -> BetterConfigAPI.getInstance().getModConfig("clientcommands"));
+
+    public static void save() {
+        CONFIG_REF.get().save();
+    }
 
     @Config(readOnly = true, temporary = true)
     public static double calcAnswer = 0;
@@ -182,4 +192,7 @@ public enum PacketDumpMethod {
     public static void setMinimumReplyDelaySeconds(float minimumReplyDelaySeconds) {
         Configs.minimumReplyDelaySeconds = Math.clamp(minimumReplyDelaySeconds, 0.0f, ReplyCommand.MAXIMUM_REPLY_DELAY_SECONDS);
     }
+
+    @Config(readOnly = true)
+    public static int overriddenFps = 0;
 }

src/main/java/net/earthcomputer/clientcommands/command/FramerateCommand.java

@@ -1,6 +1,8 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
+import net.earthcomputer.clientcommands.Configs;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
@@ -18,7 +20,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
             .executes(ctx -> getMaxFps(ctx.getSource()))
             .then(literal("unlimited")
                 .executes(ctx -> maxFps(ctx.getSource(), Integer.MAX_VALUE)))
-            .then(argument("maxfps", integer())
+            .then(argument("maxfps", integer(1))
                 .suggests((context, builder) -> {
                     int maxFps = getDisplayMaxFramerate();
                     for (int refreshRate : COMMON_REFRESH_RATES) {
@@ -31,12 +33,18 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                 })
                 .executes(ctx -> maxFps(ctx.getSource(), getInteger(ctx, "maxfps")))
             )
+            .then(literal("reset")
+                .executes(ctx -> resetMaxFps(ctx.getSource()))
+            )
         );
 
     }
 
     private static int getMaxFps(FabricClientCommandSource source) {
-        int framerateLimit = source.getClient().getFramerateLimitTracker().getFramerateLimit();
+        int framerateLimit = Configs.overriddenFps;
+        if (framerateLimit <= 0) {
+            framerateLimit = source.getClient().getFramerateLimitTracker().getFramerateLimit();
+        }
         if (framerateLimit < Integer.MAX_VALUE) {
             source.sendFeedback(Component.translatable("commands.cfps.getMaxFps", framerateLimit));
         } else {
@@ -46,7 +54,8 @@ private static int getMaxFps(FabricClientCommandSource source) {
     }
 
     private static int maxFps(FabricClientCommandSource source, int maxFps) {
-        source.getClient().getFramerateLimitTracker().setFramerateLimit(maxFps);
+        Configs.overriddenFps = maxFps;
+        Configs.save();
         if (maxFps == Integer.MAX_VALUE) {
             source.sendFeedback(Component.translatable("commands.cfps.setMaxFps.unlimited"));
         } else {
@@ -55,10 +64,16 @@ private static int maxFps(FabricClientCommandSource source, int maxFps) {
         return maxFps;
     }
 
+    private static int resetMaxFps(FabricClientCommandSource source) {
+        Configs.overriddenFps = 0;
+        Configs.save();
+        source.sendFeedback(Component.translatable("commands.cfps.resetMaxFps.success"));
+        return Command.SINGLE_SUCCESS;
+    }
+
     private static int getDisplayMaxFramerate() {
         return Minecraft.getInstance().virtualScreen.screenManager.monitors.values().stream()
             .mapToInt(monitor -> monitor.getCurrentMode().getRefreshRate())
             .max().orElseThrow();
     }
-
 }

src/main/java/net/earthcomputer/clientcommands/mixin/commands/fps/FramerateLimitTrackerMixin.java

@@ -0,0 +1,28 @@
+package net.earthcomputer.clientcommands.mixin.commands.fps;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.mojang.blaze3d.platform.FramerateLimitTracker;
+import net.earthcomputer.clientcommands.Configs;
+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;
+
+@Mixin(FramerateLimitTracker.class)
+public class FramerateLimitTrackerMixin {
+    @ModifyExpressionValue(method = "getFramerateLimit", at = @At(value = "FIELD", target = "Lcom/mojang/blaze3d/platform/FramerateLimitTracker;framerateLimit:I"))
+    private int fixFps(int fps) {
+        if (Configs.overriddenFps > 0) {
+            return Configs.overriddenFps;
+        }
+
+        return fps;
+    }
+
+    @Inject(method = "setFramerateLimit", at = @At("HEAD"))
+    private void onSetFramerateLimit(CallbackInfo ci) {
+        // Avoid overriding the FPS when something else (e.g. the user) has explicitly set it
+        Configs.overriddenFps = 0;
+        Configs.save();
+    }
+}

src/main/java/net/earthcomputer/clientcommands/mixin/commands/fps/MinecraftMixin.java

@@ -1,17 +1,20 @@
 package net.earthcomputer.clientcommands.mixin.commands.fps;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.earthcomputer.clientcommands.Configs;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
-
     @ModifyExpressionValue(method = "runTick", at = @At(value = "CONSTANT", args = "intValue=" + Options.UNLIMITED_FRAMERATE_CUTOFF))
     private int fixMaxFps(int fps) {
-        return Integer.MAX_VALUE;
-    }
+        if (Configs.overriddenFps > 0) {
+            return Integer.MAX_VALUE;
+        }
 
+        return fps;
+    }
 }

src/main/java/net/earthcomputer/clientcommands/mixin/commands/fps/OptionsMixin.java

@@ -131,6 +131,7 @@
 
   "commands.cfps.getMaxFps": "Max FPS is %s",
   "commands.cfps.getMaxFps.unlimited": "Max FPS is unlimited",
+  "commands.cfps.resetMaxFps.success": "Stopped overriding max FPS",
   "commands.cfps.setMaxFps": "Set max FPS to %s",
   "commands.cfps.setMaxFps.unlimited": "Set max FPS to unlimited",
 

src/main/resources/assets/clientcommands/lang/en_us.json

@@ -68,8 +68,8 @@
     "commands.alias.ClientSuggestionProviderMixin",
     "commands.enchant.MultiPlayerGameModeMixin",
     "commands.findblock.ClientLevelMixin",
+    "commands.fps.FramerateLimitTrackerMixin",
     "commands.fps.MinecraftMixin",
-    "commands.fps.OptionsMixin",
     "commands.generic.CommandSuggestionsMixin",
     "commands.glow.LivingEntityRenderStateMixin",
     "commands.reply.ClientPacketListenerMixin",