From 8c31b669edc6eea13db62adb8c7fb44fa889c9cf Mon Sep 17 00:00:00 2001 From: Blue Staggo Date: Wed, 30 Oct 2024 10:35:18 +0000 Subject: [PATCH] 1.21.2 support --- gradle.properties | 10 +++++----- src/main/java/net/kyrptonaught/tooltipfix/Helper.java | 2 -- .../tooltipfix/mixin/FixToolTipMixin.java | 11 +++++------ src/main/resources/fabric.mod.json | 5 ++--- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9eac5ea..ac39eea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ org.gradle.jvmargs=-Xmx4G -minecraft_version=1.21 -yarn_mappings=1.21+build.9 -loader_version=0.15.11 +minecraft_version=1.21.2 +yarn_mappings=1.21.2+build.1 +loader_version=0.16.7 #Fabric api -fabric_version=0.100.8+1.21 +fabric_version=0.106.1+1.21.2 # Mod Properties -mod_version=1.1.1-1.21 +mod_version=1.1.1-1.21.2 maven_group=net.kyrptonaught archives_base_name=tooltipfix diff --git a/src/main/java/net/kyrptonaught/tooltipfix/Helper.java b/src/main/java/net/kyrptonaught/tooltipfix/Helper.java index ebb5332..df78bc7 100644 --- a/src/main/java/net/kyrptonaught/tooltipfix/Helper.java +++ b/src/main/java/net/kyrptonaught/tooltipfix/Helper.java @@ -6,9 +6,7 @@ import net.minecraft.client.gui.tooltip.TooltipComponent; import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import net.minecraft.util.math.MathHelper; -import java.util.ArrayList; import java.util.List; public class Helper { diff --git a/src/main/java/net/kyrptonaught/tooltipfix/mixin/FixToolTipMixin.java b/src/main/java/net/kyrptonaught/tooltipfix/mixin/FixToolTipMixin.java index d195943..36c5a7c 100644 --- a/src/main/java/net/kyrptonaught/tooltipfix/mixin/FixToolTipMixin.java +++ b/src/main/java/net/kyrptonaught/tooltipfix/mixin/FixToolTipMixin.java @@ -3,10 +3,9 @@ import net.kyrptonaught.tooltipfix.Helper; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tooltip.TooltipComponent; import net.minecraft.client.gui.tooltip.TooltipPositioner; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -23,17 +22,17 @@ public abstract class FixToolTipMixin { @Shadow public abstract int getScaledWindowWidth(); - @ModifyVariable(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;)V", at = @At(value = "HEAD"), index = 2, argsOnly = true) + @ModifyVariable(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;Lnet/minecraft/util/Identifier;)V", at = @At(value = "HEAD"), index = 2, argsOnly = true) public List makeListMutable(List value) { return new ArrayList<>(value); } - @Inject(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;)V", at = @At(value = "HEAD")) - public void fix(TextRenderer textRenderer, List components, int x, int y, TooltipPositioner positioner, CallbackInfo ci) { + @Inject(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;Lnet/minecraft/util/Identifier;)V", at = @At(value = "HEAD")) + public void fix(TextRenderer textRenderer, List components, int x, int y, TooltipPositioner positioner, Identifier texture, CallbackInfo ci) { Helper.newFix(components, textRenderer, x, getScaledWindowWidth()); } - @ModifyVariable(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;push()V"), index = 11) + @ModifyVariable(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;IILnet/minecraft/client/gui/tooltip/TooltipPositioner;Lnet/minecraft/util/Identifier;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;push()V"), index = 12) public int modifyRenderX(int value, TextRenderer textRenderer, List components, int x) { return Helper.shouldFlip(components, textRenderer, x); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d69a004..b1a1ad7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "tooltipfix", - "version": "1.1.1-1.21", + "version": "1.1.1-1.21.2", "name": "ToolTip Fix", "description": "Fixes ToolTips from running off the screen", "authors": [ @@ -21,7 +21,6 @@ } ], "depends": { - "fabricloader": ">=0.15.11", - "fabric": "*" + "fabricloader": ">=0.16.7" } }