Slight cleanup

Author: UltimateBoomer

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

@@ -21,9 +21,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 public class ResolutionControlMod implements ModInitializer {
 	public static final String MOD_ID = "resolutioncontrol";
@@ -61,7 +61,7 @@ public static ResolutionControlMod getInstance() {
 	@Nullable
 	private Framebuffer clientFramebuffer;
 
-	private List<Framebuffer> minecraftFramebuffers;
+	private Set<Framebuffer> minecraftFramebuffers;
 
 	private Class<? extends SettingsScreen> lastSettingsScreen = MainSettingsScreen.class;
 
@@ -134,6 +134,8 @@ private void saveScreenshot(Framebuffer fb) {
 
 	public void setShouldScale(boolean shouldScale) {
 		if (shouldScale == this.shouldScale) return;
+
+		if (getScaleFactor() == 1) return;
 
 		Window window = getWindow();
 		if (framebuffer == null) {
@@ -146,11 +148,11 @@ public void setShouldScale(boolean shouldScale) {
 			);
 			calculateSize();
 		}
-		
+
 		this.shouldScale = shouldScale;
-		
+
 		client.getProfiler().swap(shouldScale ? "startScaling" : "finishScaling");
-		
+
 		// swap out framebuffers as needed
 		if (shouldScale) {
 			clientFramebuffer = client.getFramebuffer();
@@ -197,15 +199,15 @@ public void setShouldScale(boolean shouldScale) {
 				);
 			}
 		}
-		
+
 		client.getProfiler().swap("level");
 	}
 
 	public void initMinecraftFramebuffers() {
 		if (minecraftFramebuffers != null) {
 			minecraftFramebuffers.clear();
 		} else {
-			minecraftFramebuffers = new ArrayList<>();
+			minecraftFramebuffers = new HashSet<>();
 		}
 
 		minecraftFramebuffers.add(client.worldRenderer.getEntityOutlinesFramebuffer());
@@ -352,19 +354,19 @@ public void onResolutionChanged() {
 		if (getWindow() == null)
 			return;
 
-		LOGGER.debug("Size changed to {}x{} {}x{} {}x{}",
+		LOGGER.info("Size changed to {}x{} {}x{} {}x{}",
 				getWindow().getFramebufferWidth(), getWindow().getFramebufferHeight(),
 				getWindow().getWidth(), getWindow().getHeight(),
 				getWindow().getScaledWidth(), getWindow().getScaledHeight());
 
-		if (getWindow().getScaledHeight() == lastWidth
-				|| getWindow().getScaledHeight() == lastHeight)
-		{
+//		if (getWindow().getScaledHeight() == lastWidth
+//				|| getWindow().getScaledHeight() == lastHeight)
+//		{
 			updateFramebufferSize();
 
 			lastWidth = getWindow().getScaledHeight();
 			lastHeight = getWindow().getScaledHeight();
-		}
+//		}
 
 
 	}
@@ -374,7 +376,8 @@ public void updateFramebufferSize() {
 			return;
 
 		resize(framebuffer);
-		resizeMinecraftFramebuffers();
+		resize(client.worldRenderer.getEntityOutlinesFramebuffer());
+//		resizeMinecraftFramebuffers();
 
 		calculateSize();
 	}

src/main/java/io/github/ultimateboomer/resolutioncontrol/mixin/WindowMixin.java

@@ -4,7 +4,6 @@
 import net.minecraft.client.util.Window;
 import net.minecraft.util.math.MathHelper;
 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;
@@ -14,17 +13,17 @@
 public abstract class WindowMixin {
 	@Inject(at = @At("RETURN"), method = "getFramebufferWidth", cancellable = true)
 	private void getFramebufferWidth(CallbackInfoReturnable<Integer> ci) {
-		if (getRCMod().isScreenshotting()) {
-			ci.setReturnValue(getRCMod().getScreenshotWidth());
+		if (ResolutionControlMod.getInstance().isScreenshotting()) {
+			ci.setReturnValue(ResolutionControlMod.getInstance().getScreenshotWidth());
 		} else {
 			ci.setReturnValue(scale(ci.getReturnValueI()));
 		}
 	}
 
 	@Inject(at = @At("RETURN"), method = "getFramebufferHeight", cancellable = true)
 	private void getFramebufferHeight(CallbackInfoReturnable<Integer> ci) {
-		if (getRCMod().isScreenshotting()) {
-			ci.setReturnValue(getRCMod().getScreenshotHeight());
+		if (ResolutionControlMod.getInstance().isScreenshotting()) {
+			ci.setReturnValue(ResolutionControlMod.getInstance().getScreenshotHeight());
 		} else {
 			ci.setReturnValue(scale(ci.getReturnValueI()));
 		}
@@ -49,9 +48,4 @@ private void onFramebufferSizeChanged(CallbackInfo ci) {
 	private void onUpdateFramebufferSize(CallbackInfo ci) {
 		ResolutionControlMod.getInstance().onResolutionChanged();
 	}
-
-	@Unique
-	private ResolutionControlMod getRCMod() {
-		return ResolutionControlMod.getInstance();
-	}
 }