diff options
author | msg-programs <msgdoesstuff@gmail.com> | 2023-06-04 13:44:22 +0200 |
---|---|---|
committer | msg-programs <msgdoesstuff@gmail.com> | 2023-06-04 13:44:22 +0200 |
commit | 9170e46f4166573fe837e2a7bdd2747854ab2921 (patch) | |
tree | 1b81b1cd1d669e4156d37b98a2841394d936d51f /src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java | |
parent | 34d87f0e435963cb571568a783c9c4456e811012 (diff) | |
parent | 9d114a7be8ac358131441752db14d5356fc9fd3d (diff) | |
download | Skyblocker-9170e46f4166573fe837e2a7bdd2747854ab2921.tar.gz Skyblocker-9170e46f4166573fe837e2a7bdd2747854ab2921.tar.bz2 Skyblocker-9170e46f4166573fe837e2a7bdd2747854ab2921.zip |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into skyhytab
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
# src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
# src/main/resources/skyblocker.mixins.json
Pull newest changes from upstream master
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java')
-rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java index 14aa8868..9389b792 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java @@ -1,28 +1,24 @@ package me.xmrvizzy.skyblocker.mixin; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.Utils; - import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Screen.class) public abstract class ScreenMixin { - @Inject(at = @At("HEAD"), method = "renderTooltip(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/item/ItemStack;II)V", cancellable = true) public void skyblocker$renderTooltip(MatrixStack matrices, ItemStack itemStack, int x, int y, CallbackInfo ci) { Text stackName = itemStack.getName(); String strName = stackName.getString(); - if (Utils.isOnSkyblock && SkyblockerConfig.get().general.hideEmptyTooltips && strName.equals(" ")) { + if (Utils.isOnSkyblock() && SkyblockerConfig.get().general.hideEmptyTooltips && strName.equals(" ")) { ci.cancel(); } } - } |