Improve dynamic resolution and make it configurable

Author: UltimateBoomer

src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java

@@ -6,6 +6,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.Framebuffer;
@@ -116,6 +117,12 @@ && getWindow().getX() != -32000) {
 			}
 		});
 
+		ServerWorldEvents.LOAD.register((server, world) -> {
+			if (ConfigHandler.instance.getConfig().enableDynamicResolution) {
+				DynamicResolutionHandler.INSTANCE.reset();
+			}
+		});
+
 		optifineInstalled = FabricLoader.getInstance().isModLoaded("optifabric");
 	}
 
@@ -258,11 +265,11 @@ public void initScreenshotFramebuffer() {
 				true, MinecraftClient.IS_SYSTEM_MAC);
 	}
 
-	public double getScaleFactor() {
+	public float getScaleFactor() {
 		return Config.getInstance().scaleFactor;
 	}
 
-	public void setScaleFactor(double scaleFactor) {
+	public void setScaleFactor(float scaleFactor) {
 		Config.getInstance().scaleFactor = scaleFactor;
 
 		updateFramebufferSize();

src/main/java/io/github/ultimateboomer/resolutioncontrol/client/gui/screen/MainSettingsScreen.java

@@ -19,8 +19,8 @@
 public final class MainSettingsScreen extends SettingsScreen {
 	private static final Identifier backgroundTexture = ResolutionControlMod.identifier("textures/gui/settings.png");
 
-	private static final double[] scaleValues = {0.0, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 0.75, 1.0,
-			1.25, 1.5, 2.0, 3.0, 4.0, 6.0, 8.0};
+	private static final float[] scaleValues = {0.0f, 0.01f, 0.025f, 0.05f, 0.1f, 0.25f, 0.5f, 0.75f, 1.0f,
+			1.25f, 1.5f, 2.0f, 3.0f, 4.0f, 6.0f, 8.0f};
 
 	private static final double redValue = 2.0;
 
@@ -88,7 +88,7 @@ protected void init() {
 					if (manualEntry) {
 						setManualEntry(false, true);
 					} else {
-						mod.setScaleFactor(1.0);
+						mod.setScaleFactor(1.0f);
 						updateButtons();
 					}
 				}
@@ -194,7 +194,7 @@ public void tick() {
 	}
 
 	private void changeScaleFactor(boolean add) {
-		double currentScale = mod.getScaleFactor();
+		float currentScale = mod.getScaleFactor();
 		int nextIndex = ArrayUtils.indexOf(scaleValues, currentScale);
 		if (nextIndex == -1) {
 			for (int i = -1; i < scaleValues.length; ++i) {
@@ -236,7 +236,7 @@ public void setManualEntry(boolean manualEntry, boolean cancel) {
 			if (!cancel) {
 				String text = entryTextField.getText();
 				if (NumberUtils.isParsable(text)) {
-					double value = Math.abs(Double.parseDouble(text));
+					float value = Math.abs(Float.parseFloat(text));
 					mod.setScaleFactor(value);
 				}
 			}

src/main/java/io/github/ultimateboomer/resolutioncontrol/util/Config.java

@@ -1,7 +1,7 @@
 package io.github.ultimateboomer.resolutioncontrol.util;
 
 public final class Config {
-	public double scaleFactor = 1;
+	public float scaleFactor = 1.0f;
 
 	public ScalingAlgorithm upscaleAlgorithm = ScalingAlgorithm.NEAREST;
 	public ScalingAlgorithm downscaleAlgorithm = ScalingAlgorithm.LINEAR;
@@ -16,6 +16,13 @@ public final class Config {
 	public boolean enableDynamicResolution = false;
 	public boolean fastDynamicResolution = false;
 
+	public float drMinScale = 0.5f;
+	public float drMaxScale = 2.0f;
+	public float drResStep = 0.0625f;
+	public int drMinFps = 60;
+	public int drMaxFps = 70;
+	public int drFpsSmoothAmount = 10;
+
 	public static Config getInstance() {
 		return ConfigHandler.instance.getConfig();
 	}

src/main/java/io/github/ultimateboomer/resolutioncontrol/util/DynamicResolutionHandler.java

@@ -17,14 +17,27 @@ public class DynamicResolutionHandler {
     private final FloatList scales = new FloatArrayList();
     private int baseScale;
 
-    private int timer = 0;
+    private int timer = 10;
     private int currentScale;
 
     private int lastWidth;
     private int lastHeight;
 
     private DynamicResolutionHandler() {
-        for (float i = 0.5f; i <= 2.0f; i += 0.125f) {
+        reset();
+    }
+
+    public void tick() {
+        timer--;
+
+        if (timer <= 0) {
+            update();
+        }
+    }
+
+    public void reset() {
+        for (float i = Config.getInstance().drMinScale; i <= Config.getInstance().drMaxScale;
+             i += Config.getInstance().drResStep) {
             scales.add(i);
 
             if (i == 1.0f) {
@@ -34,29 +47,26 @@ private DynamicResolutionHandler() {
         }
     }
 
-    public void tick() {
-        timer++;
-
-        if (timer > 5) {
-            timer = 0;
-            update();
-        }
-    }
-
     private void update() {
         MinecraftClient client = MinecraftClient.getInstance();
 
-        final int smoothAmount = 10;
-        long accumulatedFrameTime =
-                Arrays.stream(client.metricsData.getSamples()).limit(smoothAmount).sum();
+        final int smoothAmount = Config.getInstance().drFpsSmoothAmount;
+        float sum = 0;
+        for (int i = client.metricsData.getCurrentIndex() - smoothAmount;
+             i < client.metricsData.getCurrentIndex(); i++) {
 
-        double fps = 1_000_000_000.0 / accumulatedFrameTime * smoothAmount;
-        System.out.println(fps);
+            sum += client.metricsData.getSamples()[Math.floorMod(i, 240)];
+        }
+        float fps = 1_000_000_000.0f / (sum / smoothAmount);
 
-        if (fps > 80) {
+        if (fps > Config.getInstance().drMaxFps) {
             setCurrentScale(Math.min(currentScale + 1, scales.size() - 1));
-        } else if (fps < 60) {
-            setCurrentScale(Math.max(currentScale - 2, 0));
+            timer = 15;
+        } else if (fps < Config.getInstance().drMinFps) {
+            setCurrentScale(Math.max(currentScale - 1, 0));
+            timer = 5;
+        } else {
+            timer = 3;
         }
     }