24w12a

2 files changed, 3 insertions, 21 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/DataTrackerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/DataTrackerMixin.java
index d9db5dae..a0b5de84 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/DataTrackerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/DataTrackerMixin.java
@@ -9,6 +9,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.data.DataTracked;
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
@@ -26,14 +27,14 @@ import java.util.Optional;
 public abstract class DataTrackerMixin {
     @Shadow
     @Final
-    private Entity trackedEntity;
+    private DataTracked trackedEntity;
 
     @SuppressWarnings("ConstantValue")
     @Inject(method = "writeUpdatedEntries", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/data/DataTracker;copyToFrom(Lnet/minecraft/entity/data/DataTracker$Entry;Lnet/minecraft/entity/data/DataTracker$SerializedEntry;)V"))
     private <T> void skyblocker$onWriteUpdatedEntries(CallbackInfo ci, @Local DataTracker.Entry<T> entry, @Local DataTracker.SerializedEntry<T> serializedEntry) {
         if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.enableYangGlyphsNotification && entry.getData() == EndermanEntityAccessor.getCARRIED_BLOCK() && entry.get() instanceof Optional<?> value && value.isPresent() && value.get() instanceof BlockState state && state.isOf(Blocks.BEACON) && ((Optional<?>) serializedEntry.value()).isEmpty()) {
             MinecraftClient client = MinecraftClient.getInstance();
-            if (MobGlow.getArmorStands(trackedEntity).stream().anyMatch(armorStand -> armorStand.getName().getString().contains(client.getSession().getUsername()))) {
+            if (trackedEntity instanceof Entity entity && MobGlow.getArmorStands(entity).stream().anyMatch(armorStand -> armorStand.getName().getString().contains(client.getSession().getUsername()))) {
                 client.inGameHud.setTitleTicks(5, 20, 10);
                 client.inGameHud.setTitle(Text.literal("Yang Glyph!").formatted(Formatting.RED));
                 client.player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_PLING.value(), 100f, 0.1f);
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ItemMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ItemMixin.java
deleted file mode 100644
index 6b49220b..00000000
--- a/src/main/java/de/hysky/skyblocker/mixin/ItemMixin.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.hysky.skyblocker.mixin;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(Item.class)
-public abstract class ItemMixin {
-	@Redirect(
-		method = {"getItemBarColor", "getItemBarStep"},
-		at = @At(value = "FIELD", target = "Lnet/minecraft/item/Item;maxDamage:I", opcode = Opcodes.GETFIELD)
-	)
-	private int skyblocker$handlePickoDrillBar(Item item, ItemStack stack) {
-		return stack.getMaxDamage();
-	}
-}