fix: repair macOS reduced resolution presentation (#566)

Author: FlashyReese

common/src/main/java/me/flashyreese/mods/sodiumextra/client/util/MacReducedResolution.java

@@ -0,0 +1,18 @@
+package me.flashyreese.mods.sodiumextra.client.util;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.Util;
+
+public final class MacReducedResolution {
+    public static boolean isEnabled() {
+        return Util.getPlatform() == Util.OS.OSX && SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac;
+    }
+
+    public static int reduce(int value) {
+        return Math.max(1, value / 2);
+    }
+
+    public static boolean shouldScalePresentation(int sourceWidth, int sourceHeight, int targetWidth, int targetHeight) {
+        return isEnabled() && (sourceWidth < targetWidth || sourceHeight < targetHeight);
+    }
+}

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/reduce_resolution_on_mac/MixinRenderTarget.java

@@ -0,0 +1,35 @@
+package me.flashyreese.mods.sodiumextra.mixin.reduce_resolution_on_mac;
+
+import com.mojang.blaze3d.pipeline.RenderTarget;
+import me.flashyreese.mods.sodiumextra.client.util.MacReducedResolution;
+import net.minecraft.client.Minecraft;
+import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
+
+@Mixin(RenderTarget.class)
+public class MixinRenderTarget {
+    @Shadow
+    public int viewWidth;
+
+    @Shadow
+    public int viewHeight;
+
+    @ModifyArgs(method = "_blitToScreen", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_viewport(IIII)V"))
+    private void scalePresentedTexture(Args args) {
+        int[] framebufferWidth = new int[1];
+        int[] framebufferHeight = new int[1];
+
+        GLFW.glfwGetFramebufferSize(Minecraft.getInstance().getWindow().getWindow(), framebufferWidth, framebufferHeight);
+
+        if (!MacReducedResolution.shouldScalePresentation(this.viewWidth, this.viewHeight, framebufferWidth[0], framebufferHeight[0])) {
+            return;
+        }
+
+        args.set(2, framebufferWidth[0]);
+        args.set(3, framebufferHeight[0]);
+    }
+}

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/reduce_resolution_on_mac/MixinWindow.java

@@ -1,7 +1,7 @@
 package me.flashyreese.mods.sodiumextra.mixin.reduce_resolution_on_mac;
 
 import com.mojang.blaze3d.platform.Window;
-import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import me.flashyreese.mods.sodiumextra.client.util.MacReducedResolution;
 import org.lwjgl.glfw.GLFW;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,9 +23,6 @@
  */
 @Mixin(Window.class)
 public class MixinWindow {
-    @Unique
-    private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
-
     @Shadow
     private int framebufferWidth;
 
@@ -36,14 +33,13 @@ public class MixinWindow {
     private void onDefaultWindowHints() {
         GLFW.glfwDefaultWindowHints();
 
-        if (OS_NAME.contains("mac") && SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac) {
+        if (MacReducedResolution.isEnabled()) {
             GLFW.glfwWindowHint(GLFW.GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW.GLFW_FALSE);
         }
     }
 
     @Inject(at = @At(value = "RETURN"), method = "refreshFramebufferSize")
     private void afterUpdateFrameBufferSize(CallbackInfo ci) {
-        // prevents mis-scaled startup screen
         this.scaleFramebufferSize();
     }
 
@@ -54,11 +50,11 @@ private void afterFramebufferResize(long handle, int newWidth, int newHeight, Ca
 
     @Unique
     private void scaleFramebufferSize() {
-        if (!OS_NAME.contains("mac") || !SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac) {
+        if (!MacReducedResolution.isEnabled()) {
             return;
         }
 
-        framebufferWidth = Math.max(1, framebufferWidth / 2);
-        framebufferHeight = Math.max(1, framebufferHeight / 2);
+        framebufferWidth = MacReducedResolution.reduce(framebufferWidth);
+        framebufferHeight = MacReducedResolution.reduce(framebufferHeight);
     }
 }

common/src/main/resources/sodium-extra.mixins.json

@@ -25,6 +25,7 @@
     "particle.MixinLevelRenderer",
     "particle.MixinParticleEngine",
     "prevent_shaders.MixinGameRenderer",
+    "reduce_resolution_on_mac.MixinRenderTarget",
     "reduce_resolution_on_mac.MixinWindow",
     "render.block.entity.MixinBeaconRenderer",
     "render.block.entity.MixinEnchantingTableBlockEntityRenderer",