Merge pull request #4 from juliand665/1.15

1.16 Support

Author: juliand665

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.3-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -19,19 +19,16 @@ repositories {
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
 	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
 	// You may need to force-disable transitivity on them.
-	modCompile "com.jamieswhiteshirt:developer-mode:${project.developer_mode_version}"
+	//modCompile "com.jamieswhiteshirt:developer-mode:${project.developer_mode_version}"
 	modCompile "io.github.prospector:modmenu:${project.mod_menu_version}"
-	
-	// Nullability Annotations
-	implementation "com.google.code.findbugs:jsr305:${project.findbugs_version}"
 }
 
 processResources {
@@ -71,7 +68,7 @@ publishing {
 	publications {
 		mavenJava(MavenPublication) {
 			// add all the jars that should be included when publishing to maven
-			artifact(jar) {
+			artifact(remapJar) {
 				builtBy remapJar
 			}
 			artifact(sourcesJar) {

gradle.properties

@@ -3,20 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.14.4
-	yarn_mappings=1.14.4+build.9
-	loader_version=0.4.8+build.159
+	minecraft_version=1.16.4
+	yarn_mappings=1.16.4+build.7
+	loader_version=0.10.8
 
 # Mod Properties
-	mod_version = 1.0.2
+	mod_version = 1.0.3
 	maven_group = juliand665
 	archives_base_name = resolution-control
 
 # Dependencies
 	# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/
-	fabric_version=0.3.1+build.208
+	fabric_version=0.27.1+1.16
 
-	developer_mode_version=1.0.14
-	mod_menu_version=1.7.7+build.116
-	
-	findbugs_version=3.0.2
+	developer_mode_version=1.0.15
+	mod_menu_version=1.14.13+build.19

src/main/java/resolutioncontrol/ResolutionControlMod.java

@@ -5,15 +5,16 @@
 import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
 import net.fabricmc.fabric.api.event.client.ClientTickCallback;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.GlFramebuffer;
+import net.minecraft.client.gl.Framebuffer;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.Window;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 import resolutioncontrol.client.gui.screen.SettingsScreen;
 import resolutioncontrol.util.*;
 
-import javax.annotation.Nullable;
+
 
 public class ResolutionControlMod implements ModInitializer {
 	public static final String MOD_ID = "resolutioncontrol";
@@ -22,6 +23,8 @@ public static Identifier identifier(String path) {
 		return new Identifier(MOD_ID, path);
 	}
 
+	private static MinecraftClient client = MinecraftClient.getInstance();
+	
 	private static ResolutionControlMod instance;
 
 	public static ResolutionControlMod getInstance() {
@@ -31,13 +34,17 @@ public static ResolutionControlMod getInstance() {
 	private static FabricKeyBinding settingsKeyBinding = FabricKeyBinding.Builder.create(
 		identifier("settings"),
 		InputUtil.Type.KEYSYM,
-		GLFW.GLFW_KEY_P,
+		GLFW.GLFW_KEY_O,
 		"key.categories.misc"
 	).build();
 
 	private boolean shouldScale = false;
+	
+	@Nullable
+	private Framebuffer framebuffer;
+	
 	@Nullable
-	private GlFramebuffer framebuffer;
+	private Framebuffer clientFramebuffer;
 
 	@Override
 	public void onInitialize() {
@@ -51,7 +58,7 @@ public void onInitialize() {
 		ClientTickCallback.EVENT.register(new KeyBindingHandler(settingsKeyBinding) {
 			@Override
 			public void handlePress() {
-				MinecraftClient.getInstance().openScreen(new SettingsScreen());
+				client.openScreen(new SettingsScreen());
 			}
 		});
 	}
@@ -61,22 +68,38 @@ public void setShouldScale(boolean shouldScale) {
 
 		if (getScaleFactor() == 1) return;
 
-		Window window = MinecraftClient.getInstance().window;
+		Window window = getWindow();
 		if (framebuffer == null) {
 			this.shouldScale = true; // so we get the right dimensions
-			framebuffer = new GlFramebuffer(window.getFramebufferWidth(), window.getFramebufferHeight(), true, MinecraftClient.IS_SYSTEM_MAC);
+			framebuffer = new Framebuffer(
+				window.getFramebufferWidth(),
+				window.getFramebufferHeight(),
+				true,
+				MinecraftClient.IS_SYSTEM_MAC
+			);
 		}
 
 		this.shouldScale = shouldScale;
 
+		client.getProfiler().swap(shouldScale ? "startScaling" : "finishScaling");
+		
 		// swap out framebuffers as needed
-		boolean shouldUpdateViewport = false;
+		boolean shouldUpdateViewport = true;
 		if (shouldScale) {
+			clientFramebuffer = client.getFramebuffer();
+			setClientFramebuffer(framebuffer);
 			framebuffer.beginWrite(shouldUpdateViewport);
+			// nothing on the client's framebuffer yet
 		} else {
-			MinecraftClient.getInstance().getFramebuffer().beginWrite(shouldUpdateViewport);
-			framebuffer.draw(window.getFramebufferWidth(), window.getFramebufferHeight());
+			setClientFramebuffer(clientFramebuffer);
+			client.getFramebuffer().beginWrite(shouldUpdateViewport);
+			framebuffer.draw(
+				window.getFramebufferWidth(),
+				window.getFramebufferHeight()
+			);
 		}
+		
+		client.getProfiler().swap("level");
 	}
 
 	public int getScaleFactor() {
@@ -88,13 +111,6 @@ public void setScaleFactor(int scaleFactor) {
 
 		Config.getInstance().scaleFactor = scaleFactor;
 
-		if (shouldScale) {
-			updateViewport();
-			if (scaleFactor == 1) {
-				MinecraftClient.getInstance().getFramebuffer().beginWrite(false);
-			}
-		}
-		
 		updateFramebufferSize();
 
 		ConfigHandler.instance.saveConfig();
@@ -110,16 +126,35 @@ public void onResolutionChanged() {
 
 	private void updateFramebufferSize() {
 		if (framebuffer == null) return;
-		if (getScaleFactor() == 1) return;
 
-		Window window = MinecraftClient.getInstance().window;
+		if (getScaleFactor() != 1) {
+			// resize if not unused
+			resize(framebuffer);
+		}
+		
+		resize(client.worldRenderer.getEntityOutlinesFramebuffer());
+	}
+	
+	public void resize(Framebuffer framebuffer) {
 		boolean prev = shouldScale;
 		shouldScale = true;
-		framebuffer.resize(window.getFramebufferWidth(), window.getFramebufferHeight(), MinecraftClient.IS_SYSTEM_MAC);
+		framebuffer.resize(
+			getWindow().getFramebufferWidth(),
+			getWindow().getFramebufferHeight(),
+			MinecraftClient.IS_SYSTEM_MAC
+		);
 		shouldScale = prev;
 	}
 
-	private void updateViewport() {
-		MinecraftClient.getInstance().window.method_4493(MinecraftClient.IS_SYSTEM_MAC);
+	private Window getWindow() {
+		return client.getWindow();
+	}
+	
+	private void setClientFramebuffer(Framebuffer framebuffer) {
+		((MutableMinecraftClient) client).setFramebuffer(framebuffer);
+	}
+	
+	public interface MutableMinecraftClient {
+		void setFramebuffer(Framebuffer framebuffer);
 	}
 }

src/main/java/resolutioncontrol/client/gui/screen/SettingsScreen.java

@@ -5,12 +5,14 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
 import resolutioncontrol.ResolutionControlMod;
 
-import javax.annotation.Nullable;
 
 public final class SettingsScreen extends Screen {
 	private static final Identifier backgroundTexture = ResolutionControlMod.identifier("textures/gui/settings.png");
@@ -62,59 +64,60 @@ protected void init() {
 		decreaseButton = new ButtonWidget(
 			centerX - buttonOffset - buttonSize / 2, buttonY,
 			buttonSize, buttonSize,
-			"-",
+			new LiteralText("-"),
 			button -> changeScaleFactor(-1));
 		addButton(decreaseButton);
 
 		increaseButton = new ButtonWidget(
 			centerX + buttonOffset - buttonSize / 2, buttonY,
 			buttonSize, buttonSize,
-			"+",
+				new LiteralText("+"),
 			button -> changeScaleFactor(+1)
 		);
 		addButton(increaseButton);
 
 		doneButton = new ButtonWidget(
 			centerX - 100 / 2, startY + containerHeight - 10 - 20,
 			100, buttonSize,
-			I18n.translate("gui.done"),
-			button -> minecraft.openScreen(parent)
+			new TranslatableText("gui.done"),
+			button -> client.openScreen(parent)
 		);
 		addButton(doneButton);
 
 		updateButtons();
 	}
 
 	@Override
-	public void render(int mouseX, int mouseY, float time) {
-		assert minecraft != null;
+	public void render(MatrixStack matrices, int mouseX, int mouseY, float time) {
+		assert client != null;
 
-		if (minecraft.world == null) {
-			renderDirtBackground(0);
+		if (client.world == null) {
+			renderBackgroundTexture(0);
 		}
 
 		GlStateManager.enableAlphaTest();
-		minecraft.getTextureManager().bindTexture(backgroundTexture);
+		client.getTextureManager().bindTexture(backgroundTexture);
 		GlStateManager.color4f(1, 1, 1, 1);
 
 		int textureWidth = 256;
 		int textureHeight = 192;
-		blit(
+		drawTexture(
+			matrices,
 			centerX - textureWidth / 2, centerY - textureHeight / 2,
 			0, 0,
 			textureWidth, textureHeight
 		);
 
-		drawCenteredString(getTitle().asFormattedString(), centerX, startY + 10, 0x404040);
+		drawCenteredString(matrices, getTitle().getString(), centerX, startY + 10, 0x404040);
 
 		Text scaleFactor = text("current", mod.getScaleFactor());
-		drawCenteredString(scaleFactor.asFormattedString(), centerX, centerY - 20, 0x000000);
+		drawCenteredString(matrices, scaleFactor.getString(), centerX, centerY - 20, 0x000000);
 
-		super.render(mouseX, mouseY, time); // buttons
+		super.render(matrices, mouseX, mouseY, time); // buttons
 	}
 
-	private void drawCenteredString(String text, int x, int y, int color) {
-		font.draw(text, x - font.getStringWidth(text) / 2, y, color);
+	private void drawCenteredString(MatrixStack matrices, String text, int x, int y, int color) {
+		textRenderer.draw(matrices, text, x - textRenderer.getWidth(text) / 2, y, color);
 	}
 
 	private void changeScaleFactor(int change) {

src/main/java/resolutioncontrol/mixin/MinecraftClientMixin.java

@@ -0,0 +1,19 @@
+package resolutioncontrol.mixin;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.Framebuffer;
+import org.spongepowered.asm.mixin.*;
+import resolutioncontrol.ResolutionControlMod;
+
+@Mixin(MinecraftClient.class)
+public abstract class MinecraftClientMixin implements ResolutionControlMod.MutableMinecraftClient {
+	@Mutable
+	@Final
+	@Shadow
+	private Framebuffer framebuffer;
+	
+	@Override
+	public void setFramebuffer(Framebuffer framebuffer) {
+		this.framebuffer = framebuffer;
+	}
+}

src/main/java/resolutioncontrol/mixin/WindowMixin.java

@@ -35,8 +35,8 @@ private void onFramebufferSizeChanged(CallbackInfo callbackInfo) {
 		ResolutionControlMod.getInstance().onResolutionChanged();
 	}
 
-	@Inject(at = @At("RETURN"), method = "method_4483")
-	private void onMethod4483(CallbackInfo callbackInfo) {
+	@Inject(at = @At("RETURN"), method = "updateFramebufferSize")
+	private void onUpdateFramebufferSize(CallbackInfo callbackInfo) {
 		ResolutionControlMod.getInstance().onResolutionChanged();
 	}
 }

src/main/java/resolutioncontrol/mixin/WorldRendererMixin.java

@@ -0,0 +1,27 @@
+package resolutioncontrol.mixin;
+
+import net.minecraft.client.gl.Framebuffer;
+import net.minecraft.client.render.WorldRenderer;
+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.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import resolutioncontrol.ResolutionControlMod;
+
+@Mixin(WorldRenderer.class)
+public abstract class WorldRendererMixin {
+	@Shadow
+	private Framebuffer entityOutlinesFramebuffer;
+	
+	@Inject(at = @At("RETURN"), method = "loadEntityOutlineShader")
+	private void onLoadEntityOutlineShader(CallbackInfo callbackInfo) {
+		ResolutionControlMod.getInstance().resize(entityOutlinesFramebuffer);
+	}
+	
+	@Inject(at = @At("RETURN"), method = "onResized")
+	private void onOnResized(CallbackInfo callbackInfo) {
+		if (entityOutlinesFramebuffer == null) return;
+		ResolutionControlMod.getInstance().resize(entityOutlinesFramebuffer);
+	}
+}

src/main/resources/resolutioncontrol.mixins.json

@@ -6,7 +6,9 @@
   ],
   "client": [
     "WindowMixin",
-    "GameRendererMixin"
+    "GameRendererMixin",
+    "MinecraftClientMixin",
+    "WorldRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1