From a295f81fa9fa9e1190b4dab4c30ffb77af02cc7e Mon Sep 17 00:00:00 2001
From: gnembon <41132274+gnembon@users.noreply.github.com>
Date: Wed, 15 Feb 2023 20:10:24 +0100
Subject: [PATCH] 23w07a

---
 gradle.properties                                             | 4 ++--
 .../java/carpet/mixins/MinecraftServer_tickspeedMixin.java    | 2 +-
 src/main/java/carpet/mixins/ServerStatus_motdMixin.java       | 2 +-
 src/main/java/carpet/script/utils/ShapesRenderer.java         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 21e3d680..6dce9405 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=23w06a
+	minecraft_version=23w07a
 	loader_version=0.14.14
 	jsr305_version=3.0.2
-	fabric_version=0.73.5+1.19.4
+	fabric_version=0.74.0+1.19.4
 
 # Mod Properties
 	mod_version = 1.4.97
diff --git a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
index cebe1ba1..c581492d 100644
--- a/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
@@ -82,7 +82,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantBlockableE
     // could possibly just inject that mspt selection at the beginning of the loop, but then adding all mspt's to
     // replace 50L will be a hassle
     @Inject(method = "runServer", at = @At(value = "INVOKE", shift = At.Shift.AFTER,
-            target = "Lnet/minecraft/server/MinecraftServer;updateStatusIcon(Lnet/minecraft/network/protocol/status/ServerStatus;)V"))
+            target = "Lnet/minecraft/server/MinecraftServer;buildServerStatus()Lnet/minecraft/network/protocol/status/ServerStatus;"))
     private void modifiedRunLoop(CallbackInfo ci)
     {
         while (this.running)
diff --git a/src/main/java/carpet/mixins/ServerStatus_motdMixin.java b/src/main/java/carpet/mixins/ServerStatus_motdMixin.java
index 55ee6a3b..adae60a0 100644
--- a/src/main/java/carpet/mixins/ServerStatus_motdMixin.java
+++ b/src/main/java/carpet/mixins/ServerStatus_motdMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(ServerStatus.class)
 public class ServerStatus_motdMixin
 {
-    @Inject(method = "getDescription", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "description", at = @At("HEAD"), cancellable = true)
     private void getDescriptionAlternative(CallbackInfoReturnable<Component> cir)
     {
         if (!CarpetSettings.customMOTD.equals("_"))
diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java
index a83851a7..f3ae057c 100644
--- a/src/main/java/carpet/script/utils/ShapesRenderer.java
+++ b/src/main/java/carpet/script/utils/ShapesRenderer.java
@@ -568,7 +568,7 @@ public class ShapesRenderer
                 text_x = (float) (-textRenderer.width(shape.value.getString()));
             }
             MultiBufferSource.BufferSource immediate = MultiBufferSource.immediate(builder);
-            textRenderer.drawInBatch(shape.value, text_x, 0.0F, shape.textcolor, false, matrices.last().pose(), immediate, false, shape.textbck, 15728880);
+            textRenderer.drawInBatch(shape.value, text_x, 0.0F, shape.textcolor, false, matrices.last().pose(), immediate, Font.DisplayMode.NORMAL, shape.textbck, 15728880);
             immediate.endBatch();
             matrices.popPose();
             RenderSystem.enableCull();