upgrade to 1.20.1

jaanonim · Sep 16, 2023 · 0c62f47 · 0c62f47
1 parent a15a3ce
commit 0c62f47
Show file tree

Hide file tree

Showing 16 changed files with 239 additions and 145 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,9 +3,9 @@ name: Publish on GitHub, CurseForge & Modrinth
 on: [pull_request, workflow_dispatch]
 
 env:
-    MINECRAFT_VERSION: 1.19.4
+    MINECRAFT_VERSION: 1.20.1
     JAVA_VERSION: 17
-    VERSION: 1.0.2+1.19.4
+    VERSION: 1.0.2+1.20.1
     MODRINTH_TOKEN: ${{ secrets.PUBLISH_MODRINTH_TOKEN }}
     CURSEFORGE_TOKEN: ${{ secrets.PUBLISH_CURSEFORGE_TOKEN }}
     GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}

diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.2
-loader_version=0.14.19
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+loader_version=0.14.21
 
 # Mod Properties
 mod_version=1.0.2
 maven_group=com.jaanonim.ngrokapi
 archives_base_name=ngrok-api-fabric
 
 # Dependencies
-fabric_version=0.80.0+1.19.4
+fabric_version=0.86.1+1.20.1
diff --git a/Fabric/src/main/java/com/jaanonim/ngrokapi/AddNgrokTokenScreen.java b/Fabric/src/main/java/com/jaanonim/ngrokapi/AddNgrokTokenScreen.java
@@ -3,10 +3,10 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 
@@ -84,20 +84,20 @@ private void updateSaveButton() {
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
-        NgrokApiScreen.drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 17,
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        this.renderBackground(context);
+        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 17,
                 0xFFFFFF);
 
-        NgrokApiScreen.drawTextWithShadow(matrices, this.textRenderer, Text.of("Name"), this.width / 2 - 100,
+        context.drawTextWithShadow(this.textRenderer, Text.of("Name"), this.width / 2 - 100,
                 54,
                 0xA0A0A0);
-        NgrokApiScreen.drawTextWithShadow(matrices, this.textRenderer, Text.of("Ngrok API token"), this.width / 2 - 100,
+        context.drawTextWithShadow(this.textRenderer, Text.of("Ngrok API token"), this.width / 2 - 100,
                 104,
                 0xA0A0A0);
 
-        this.nameField.render(matrices, mouseX, mouseY, delta);
-        this.tokenField.render(matrices, mouseX, mouseY, delta);
-        super.render(matrices, mouseX, mouseY, delta);
+        this.nameField.render(context, mouseX, mouseY, delta);
+        this.tokenField.render(context, mouseX, mouseY, delta);
+        super.render(context, mouseX, mouseY, delta);
     }
 }
diff --git a/Fabric/src/main/java/com/jaanonim/ngrokapi/NgrokApiScreen.java b/Fabric/src/main/java/com/jaanonim/ngrokapi/NgrokApiScreen.java
@@ -5,11 +5,12 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ConnectScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.network.ServerAddress;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.network.ServerInfo;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 
@@ -129,15 +130,16 @@ public void join() {
         NgrokAddress adr = this.selectedEntry.getAddress();
         if (adr.canConnect()) {
             ServerAddress sa = new ServerAddress(adr.getHost(), adr.getPort());
-            ConnectScreen.connect(this, this.client, sa, null);
+            ConnectScreen.connect(this, this.client, sa,
+                    new ServerInfo(this.selectedEntry.getEntry().getName(), adr.getFull(), false), false);
         }
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        this.renderBackground(context);
 
-        this.listWidget.render(matrices, mouseX, mouseY, delta);
-        super.render(matrices, mouseX, mouseY, delta);
+        this.listWidget.render(context, mouseX, mouseY, delta);
+        super.render(context, mouseX, mouseY, delta);
     }
 }
diff --git a/Fabric/src/main/java/com/jaanonim/ngrokapi/NgrokTokenListWidget.java b/Fabric/src/main/java/com/jaanonim/ngrokapi/NgrokTokenListWidget.java
@@ -1,8 +1,8 @@
 package com.jaanonim.ngrokapi;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
-import net.minecraft.client.util.math.MatrixStack;
 
 import net.minecraft.text.Text;
 
@@ -42,14 +42,15 @@ public NgrokTokenEntry(NgrokApiScreen screen, NgrokToken entry) {
         }
 
         @Override
-        public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX,
+        public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX,
                 int mouseY, boolean hovered, float tickDelta) {
-            this.client.textRenderer.draw(matrices, Text.of(this.entry.getName()), (float) (x + 32 + 3),
-                    (float) (y + 2), 0xFFFFFF);
+            context.drawText(this.client.textRenderer, Text.of(this.entry.getName()), (x + 32 + 3),
+                    (y + 2), 0xFFFFFF, false);
+
             String s = this.address.getFull();
             Text t = !s.isEmpty() ? Text.of(s) : Text.of("None");
-            this.client.textRenderer.draw(matrices, t, (float) (x + 32 + 3),
-                    (float) (y + 12), 0xAAAAAA);
+            context.drawText(this.client.textRenderer, t, (x + 32 + 3),
+                    (y + 12), 0xAAAAAA, false);
 
         }
 

diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -22,8 +22,8 @@
 		"ngrok-api.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.14.19",
-		"minecraft": "~1.19.4",
+		"fabricloader": ">=0.14.21",
+		"minecraft": "~1.20.1",
 		"java": ">=17",
 		"fabric-api": "*"
 	}