Merge pull request #3 from LucilleTea/1.16

Port to 1.16

Author: juliand665

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.6-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -29,9 +29,6 @@ dependencies {
 	// You may need to force-disable transitivity on them.
 	//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 {

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.15.2
-	yarn_mappings=1.15.2+build.7
-	loader_version=0.7.6+build.179
+	minecraft_version=1.16.4
+	yarn_mappings=1.16.4+build.7
+	loader_version=0.10.8
 
 # Mod Properties
 	mod_version = 1.0.3
@@ -14,9 +14,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Dependencies
 	# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/
-	fabric_version=0.4.29+build.290-1.15
+	fabric_version=0.27.1+1.16
 
 	developer_mode_version=1.0.15
-	mod_menu_version=1.8.5+build.23
-	
-	findbugs_version=3.0.2
+	mod_menu_version=1.14.13+build.19

src/main/java/resolutioncontrol/ResolutionControlMod.java

@@ -9,14 +9,13 @@
 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;
-import javax.annotation.ParametersAreNonnullByDefault;
 
-@ParametersAreNonnullByDefault
+
 public class ResolutionControlMod implements ModInitializer {
 	public static final String MOD_ID = "resolutioncontrol";
 
@@ -35,7 +34,7 @@ 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();
 

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) {