Skip to content

Commit 637bdeb

Browse files
committed
Fix cutoff
1 parent c4c654e commit 637bdeb

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.mojang.brigadier.CommandDispatcher;
44
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
55
import net.minecraft.client.Minecraft;
6+
import net.minecraft.client.Options;
67
import net.minecraft.network.chat.Component;
78

89
import java.util.function.IntSupplier;
@@ -12,9 +13,9 @@
1213

1314
public class FramerateCommand {
1415

15-
public static final IntSupplier MAX_REFRESH_RATE = () -> Minecraft.getInstance().virtualScreen.screenManager.monitors.values().stream()
16+
public static final IntSupplier MAX_REFRESH_RATE = () -> Math.max(Options.UNLIMITED_FRAMERATE_CUTOFF, Minecraft.getInstance().virtualScreen.screenManager.monitors.values().stream()
1617
.mapToInt(monitor -> monitor.getCurrentMode().getRefreshRate())
17-
.max().orElseThrow();
18+
.max().orElseThrow());
1819

1920
public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
2021
dispatcher.register(literal("cfps")

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import net.earthcomputer.clientcommands.command.FramerateCommand;
44
import net.minecraft.client.Minecraft;
5+
import net.minecraft.client.Options;
56
import org.spongepowered.asm.mixin.Mixin;
67
import org.spongepowered.asm.mixin.injection.Constant;
78
import org.spongepowered.asm.mixin.injection.ModifyConstant;
89

910
@Mixin(Minecraft.class)
1011
public class MinecraftMixin {
11-
@ModifyConstant(method = "runTick", constant = @Constant(intValue = 260))
12-
private int uncapFps(int original) {
12+
@ModifyConstant(method = "runTick", constant = @Constant(intValue = Options.UNLIMITED_FRAMERATE_CUTOFF))
13+
private int changeCutoff(int original) {
1314
return FramerateCommand.MAX_REFRESH_RATE.getAsInt();
1415
}
1516
}

0 commit comments

Comments
 (0)