Skip to content

Commit 2712968

Browse files
committed
actually fix class cast
1 parent e6a1605 commit 2712968

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
public class ItemGTToolbelt extends ItemGTTool implements IDyeableItem {
7777

7878
private static final ThreadLocal<Integer> lastSlot = ThreadLocal.withInitial(() -> -999);
79-
private static final ThreadLocal<EntityPlayer> lastPlayer = ThreadLocal.withInitial(() -> null);
79+
private static final ThreadLocal<EntityPlayerMP> lastPlayer = ThreadLocal.withInitial(() -> null);
8080

8181
public ItemGTToolbelt(String domain, String id, Supplier<ItemStack> markerItem, IToolBehavior... behaviors) {
8282
super(domain, id, -1,
@@ -525,7 +525,7 @@ public static boolean checkIngredientAgainstToolbelt(@NotNull ItemStack input, @
525525
return false;
526526
}
527527

528-
public static void setCraftingSlot(int slot, EntityPlayer player) {
528+
public static void setCraftingSlot(int slot, EntityPlayerMP player) {
529529
lastSlot.set(slot);
530530
lastPlayer.set(player);
531531
}

src/main/java/gregtech/mixins/minecraft/ContainerMixin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import gregtech.api.items.toolitem.ItemGTToolbelt;
44

55
import net.minecraft.entity.player.EntityPlayer;
6+
import net.minecraft.entity.player.EntityPlayerMP;
67
import net.minecraft.inventory.ClickType;
78
import net.minecraft.inventory.Container;
89
import net.minecraft.item.ItemStack;
@@ -22,8 +23,8 @@ public abstract class ContainerMixin {
2223
private void setPlayer(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player,
2324
CallbackInfoReturnable<ItemStack> cir) {
2425
var playerStack = player.inventory.getItemStack();
25-
if (playerStack.getItem() instanceof ItemGTToolbelt) {
26-
ItemGTToolbelt.setCraftingSlot(slotId, player);
26+
if (player instanceof EntityPlayerMP serverPlayer && playerStack.getItem() instanceof ItemGTToolbelt) {
27+
ItemGTToolbelt.setCraftingSlot(slotId, serverPlayer);
2728
}
2829
}
2930
}

0 commit comments

Comments
 (0)