1 files changed, 19 insertions, 19 deletions

diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceTextsInDrawContext.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceTextsInDrawContext.java
index faf15cc..9a568f7 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceTextsInDrawContext.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceTextsInDrawContext.java
@@ -2,53 +2,53 @@ package moe.nea.firmament.mixins.custommodels;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import moe.nea.firmament.features.texturepack.CustomTextReplacements;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.StringVisitable;
-import net.minecraft.text.Text;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 import java.util.stream.Stream;
 
-@Mixin(DrawContext.class)
+@Mixin(GuiGraphics.class)
 public class ReplaceTextsInDrawContext {
 	// I HATE THIS SO MUCH WHY CANT I JUST OPERATE ON ORDEREDTEXTS!!!
 	// JUNE I WILL RIP ALL OF THIS OUT AND MAKE YOU REWRITE EVERYTHING
 	// TODO: be in a mood to rewrite this
 
-	@ModifyVariable(method = "drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)V", at = @At("HEAD"), argsOnly = true)
-	private Text replaceTextInDrawText(Text text) {
+	@ModifyVariable(method = "drawString(Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Component;IIIZ)V", at = @At("HEAD"), argsOnly = true)
+	private Component replaceTextInDrawText(Component text) {
 		return CustomTextReplacements.replaceText(text);
 	}
 
-	@ModifyVariable(method = "drawCenteredTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V", at = @At("HEAD"), argsOnly = true)
-	private Text replaceTextInDrawCenteredTextWithShadow(Text text) {
+	@ModifyVariable(method = "drawCenteredString(Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Component;III)V", at = @At("HEAD"), argsOnly = true)
+	private Component replaceTextInDrawCenteredTextWithShadow(Component text) {
 		return CustomTextReplacements.replaceText(text);
 	}
 
-	@ModifyVariable(method = "drawWrappedText", at = @At("HEAD"), argsOnly = true)
-	private StringVisitable replaceTextInDrawWrappedText(StringVisitable stringVisitable) {
-		return stringVisitable instanceof Text text ? CustomTextReplacements.replaceText(text) : stringVisitable;
+	@ModifyVariable(method = "drawWordWrap", at = @At("HEAD"), argsOnly = true)
+	private FormattedText replaceTextInDrawWrappedText(FormattedText stringVisitable) {
+		return stringVisitable instanceof Component text ? CustomTextReplacements.replaceText(text) : stringVisitable;
 	}
 
-	@ModifyExpressionValue(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/util/Identifier;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;stream()Ljava/util/stream/Stream;"))
-	private Stream<Text> replaceTextInDrawTooltipListText(Stream<Text> original) {
+	@ModifyExpressionValue(method = "setComponentTooltipForNextFrame(Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/resources/ResourceLocation;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;stream()Ljava/util/stream/Stream;"))
+	private Stream<Component> replaceTextInDrawTooltipListText(Stream<Component> original) {
 		return original.map(CustomTextReplacements::replaceText);
 	}
 
-	@ModifyExpressionValue(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;stream()Ljava/util/stream/Stream;"))
-	private Stream<Text> replaceTextInDrawTooltipListTextWithOptional(Stream<Text> original) {
+	@ModifyExpressionValue(method = "setTooltipForNextFrame(Lnet/minecraft/client/gui/Font;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/resources/ResourceLocation;)V", at = @At(value = "INVOKE", target = "Ljava/util/List;stream()Ljava/util/stream/Stream;"))
+	private Stream<Component> replaceTextInDrawTooltipListTextWithOptional(Stream<Component> original) {
 		return original.map(CustomTextReplacements::replaceText);
 	}
 
-	@ModifyVariable(method = "drawTooltip(Lnet/minecraft/text/Text;II)V", at = @At("HEAD"), argsOnly = true)
-	private Text replaceTextInDrawTooltipSingle(Text text) {
+	@ModifyVariable(method = "setTooltipForNextFrame(Lnet/minecraft/network/chat/Component;II)V", at = @At("HEAD"), argsOnly = true)
+	private Component replaceTextInDrawTooltipSingle(Component text) {
 		return CustomTextReplacements.replaceText(text);
 	}
 
-	@ModifyExpressionValue(method = "drawHoverEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/text/HoverEvent$ShowText;value()Lnet/minecraft/text/Text;"))
-	private Text replaceShowTextInHover(Text text) {
+	@ModifyExpressionValue(method = "renderComponentHoverEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/chat/HoverEvent$ShowText;value()Lnet/minecraft/network/chat/Component;"))
+	private Component replaceShowTextInHover(Component text) {
 		return CustomTextReplacements.replaceText(text);
 	}