Merge branch 'unstable/8.0'

# Conflicts:
#	gradle.properties
#	src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java
#	src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java

3 files changed, 9 insertions, 9 deletions

diff --git a/src/testMod/java/io/github/cottonmc/test/TestItemDescription.java b/src/testMod/java/io/github/cottonmc/test/TestItemDescription.java
index 4c9c1f0..45be514 100644
--- a/src/testMod/java/io/github/cottonmc/test/TestItemDescription.java
+++ b/src/testMod/java/io/github/cottonmc/test/TestItemDescription.java
@@ -2,7 +2,7 @@ package io.github.cottonmc.test;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.StackReference;
 import net.minecraft.text.Text;
@@ -149,8 +149,8 @@ public class TestItemDescription extends ItemSyncedGuiDescription {
 		}
 
 		@Override
-		public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {
-			ScreenDrawing.coloredRect(matrices, x, y, this.getWidth(), this.getHeight(), color);
+		public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
+			ScreenDrawing.coloredRect(context, x, y, this.getWidth(), this.getHeight(), color);
 		}
 	}
 }
diff --git a/src/testMod/java/io/github/cottonmc/test/client/TestClientGui.java b/src/testMod/java/io/github/cottonmc/test/client/TestClientGui.java
index 839072e..7bc7ffb 100644
--- a/src/testMod/java/io/github/cottonmc/test/client/TestClientGui.java
+++ b/src/testMod/java/io/github/cottonmc/test/client/TestClientGui.java
@@ -2,7 +2,7 @@ package io.github.cottonmc.test.client;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -149,8 +149,8 @@ public class TestClientGui extends LightweightGuiDescription {
 		}
 		
 		@Override
-		public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {
-			ScreenDrawing.coloredRect(matrices, x, y, this.getWidth(), this.getHeight(), color);
+		public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
+			ScreenDrawing.coloredRect(context, x, y, this.getWidth(), this.getHeight(), color);
 		}
 	}
 }
diff --git a/src/testMod/java/io/github/cottonmc/test/client/WHudTest.java b/src/testMod/java/io/github/cottonmc/test/client/WHudTest.java
index 98f4d0f..2f07c3a 100644
--- a/src/testMod/java/io/github/cottonmc/test/client/WHudTest.java
+++ b/src/testMod/java/io/github/cottonmc/test/client/WHudTest.java
@@ -2,7 +2,7 @@ package io.github.cottonmc.test.client;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 
 import io.github.cottonmc.cotton.gui.client.ScreenDrawing;
 import io.github.cottonmc.cotton.gui.widget.WWidget;
@@ -14,8 +14,8 @@ public class WHudTest extends WWidget {
 	private static final Logger LOGGER = LogManager.getLogger();
 
 	@Override
-	public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {
-		ScreenDrawing.coloredRect(matrices, x, y, width, height, 0xFF_00FF00);
+	public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
+		ScreenDrawing.coloredRect(context, x, y, width, height, 0xFF_00FF00);
 	}
 
 	@Override