From 30c5163bddb8c2781d367956c2f7018f78281cd8 Mon Sep 17 00:00:00 2001
From: biom4st3r <37042156+biom4st3r@users.noreply.github.com>
Date: Tue, 16 Nov 2021 13:46:56 -0600
Subject: * Updated to 1.18 (#142)

* Updated Jankson-Fabric
---
 .../java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java    | 2 +-
 src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java  | 2 +-
 src/main/resources/fabric.mod.json                                  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
index 99a6d00..33d8b43 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
@@ -136,7 +136,7 @@ public class ScreenDrawing {
 		float b = (color & 255) / 255.0F;
 		Tessellator tessellator = Tessellator.getInstance();
 		BufferBuilder buffer = tessellator.getBuffer();
-		Matrix4f model = matrices.peek().getModel();
+		Matrix4f model = matrices.peek().getPositionMatrix();
 		RenderSystem.enableBlend();
 		RenderSystem.setShaderTexture(0, texture);
 		RenderSystem.setShaderColor(r, g, b, opacity);
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
index e9e2692..39bd13d 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
@@ -216,7 +216,7 @@ public class WTextField extends WWidget {
 	private void invertedRect(MatrixStack matrices, int x, int y, int width, int height) {
 		Tessellator tessellator = Tessellator.getInstance();
 		BufferBuilder buffer = tessellator.getBuffer();
-		Matrix4f model = matrices.peek().getModel();
+		Matrix4f model = matrices.peek().getPositionMatrix();
 		RenderSystem.setShaderColor(0.0F, 0.0F, 1.0F, 1.0F);
 		RenderSystem.setShader(GameRenderer::getPositionTexShader);
 		RenderSystem.disableTexture();
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 87ab98b..291aee8 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,10 +23,10 @@
 		"modmenu": ["io.github.cottonmc.cotton.gui.impl.modmenu.ModMenuSupport"]
 	},
 	"depends": {
-		"fabricloader": ">=0.11.0",
+		"fabricloader": ">=0.12.5",
 		"fabric": "*",
-		"minecraft": ">=1.17.1",
-		"jankson": "^3.0.0",
+		"minecraft": "~1.18-beta.1",
+		"jankson": "^4.0.0",
 		"fabric-networking-api-v1": "^1.0.0",
 		"libninepatch": "^1.1.0"
 	},
-- 
cgit