diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-12 17:18:57 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-26 16:23:20 -0400 |
| commit | 38008ae8f6b7ae18cce19f046b13fb5890f64399 (patch) | |
| tree | 594f8e45f3ec96bfb9120da6f02a5a21576cb29b /src/main | |
| parent | 4581056e0f741e6f253613eb401c2c84652c9e1c (diff) | |
| download | Skyblocker-38008ae8f6b7ae18cce19f046b13fb5890f64399.tar.gz Skyblocker-38008ae8f6b7ae18cce19f046b13fb5890f64399.tar.bz2 Skyblocker-38008ae8f6b7ae18cce19f046b13fb5890f64399.zip | |
Port animated dyes & temp disable mixin
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java index 75a45d7c..41201439 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java @@ -40,7 +40,7 @@ public abstract class MinecraftClientMixin { } //Remove Downloading Terrain Screen and Reconfiguring Screen - @ModifyVariable(at = @At("HEAD"), method = "setScreen", ordinal = 0, argsOnly = true) + /*@ModifyVariable(at = @At("HEAD"), method = "setScreen", ordinal = 0, argsOnly = true) public Screen modifySetScreen(Screen screen) { if (Utils.isOnSkyblock()) { return switch (screen) { @@ -51,7 +51,7 @@ public abstract class MinecraftClientMixin { }; } return screen; - } + }*/ @ModifyArg(method = "joinWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;reset(Lnet/minecraft/client/gui/screen/Screen;)V"), index = 0) private Screen modifyJoinWorld(Screen screen) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java index b011b2b0..4440cd84 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorAnimatedDyes.java @@ -22,8 +22,8 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallba import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.command.CommandRegistryAccess; -import net.minecraft.item.DyeableItem; import net.minecraft.item.ItemStack; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.text.Text; import net.minecraft.util.math.MathHelper; @@ -62,7 +62,7 @@ public class CustomArmorAnimatedDyes { ItemStack heldItem = source.getPlayer().getMainHandStack(); if (Utils.isOnSkyblock() && heldItem != null && !heldItem.isEmpty()) { - if (heldItem.getItem() instanceof DyeableItem) { + if (heldItem.isIn(ItemTags.DYEABLE)) { String itemUuid = ItemUtils.getItemUuid(heldItem); if (!itemUuid.isEmpty()) { |