chore: Get first curios item

Author: TonimatasDEV

src/main/java/dev/tonimatas/mekanismcurios/MekanismCurios.java

@@ -3,10 +3,12 @@
 import com.mojang.logging.LogUtils;
 import dev.tonimatas.mekanismcurios.bridge.PlayerBridge;
 import dev.tonimatas.mekanismcurios.networking.OpenPortableQIOPacket;
+import dev.tonimatas.mekanismcurios.util.CuriosSlots;
 import mekanism.common.registries.MekanismItems;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -18,6 +20,11 @@
 import org.slf4j.Logger;
 import top.theillusivec4.curios.api.CuriosApi;
 import top.theillusivec4.curios.api.CuriosCapability;
+import top.theillusivec4.curios.api.SlotContext;
+import top.theillusivec4.curios.api.SlotResult;
+import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler;
+
+import java.util.Optional;
 
 @Mod(MekanismCurios.MODID)
 public class MekanismCurios {
@@ -41,18 +48,18 @@ public void registerNetworking(final RegisterPayloadHandlersEvent event) {
     }
 
     public static ItemStack getSlot(Player player) {
-        String slot = ((PlayerBridge) player).mci$getSlot().id();
-        
-        return CuriosApi.getCuriosInventory(player).map(iCuriosItemHandler -> 
-                iCuriosItemHandler.getCurios().get(slot).getStacks().getStackInSlot(0)).orElse(ItemStack.EMPTY);
+        return ((PlayerBridge) player).mci$getSlot().getItemStack(player);
     }
 
     public static void setSlot(Player player, ItemStack stack) {
         if (player instanceof ServerPlayer) {
-            String slot = ((PlayerBridge) player).mci$getSlot().id();
+            CuriosSlots slot = ((PlayerBridge) player).mci$getSlot();
+            SlotContext slotContext = getFirstCurios(player, slot.getItem());
+            
+            if (slotContext == null) return;
 
             CuriosApi.getCuriosInventory(player).ifPresent(curiosInventory ->
-                    curiosInventory.setEquippedCurio(slot, 0, stack));
+                    curiosInventory.setEquippedCurio(slotContext.identifier(), slotContext.index(), stack));
         }
     }
 
@@ -63,4 +70,15 @@ public static ItemStack getHandOrCuriosItem(Player player, InteractionHand hand)
             return player.getItemInHand(hand);
         }
     }
+
+    public static SlotResult getCuriosSlot(Player player, SlotContext slotContext) {
+        Optional<ICuriosItemHandler> curiosInventory = CuriosApi.getCuriosInventory(player);
+        return curiosInventory.flatMap(iCuriosItemHandler -> iCuriosItemHandler.findCurio(slotContext.identifier(), slotContext.index())).orElse(null);
+    }
+
+    public static SlotContext getFirstCurios(Player player, Item item) {
+        Optional<ICuriosItemHandler> curiosInventory = CuriosApi.getCuriosInventory(player);
+        Optional<SlotResult> firstCurios = curiosInventory.flatMap(iCuriosItemHandler -> iCuriosItemHandler.findFirstCurio(item));
+        return firstCurios.map(SlotResult::slotContext).orElse(null);
+    }
 }

src/main/java/dev/tonimatas/mekanismcurios/networking/OpenPortableQIOPacket.java

@@ -16,8 +16,8 @@
 import org.jetbrains.annotations.NotNull;
 
 public record OpenPortableQIOPacket(CuriosSlots slot) implements CustomPacketPayload {
-    public static final CustomPacketPayload.Type<OpenPortableQIOPacket> TYPE = 
-            new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(MekanismCurios.MODID, "portable_qio_packet"));
+    public static final Type<OpenPortableQIOPacket> TYPE = 
+            new Type<>(ResourceLocation.fromNamespaceAndPath(MekanismCurios.MODID, "portable_qio_packet"));
 
     public static final StreamCodec<FriendlyByteBuf, OpenPortableQIOPacket> STREAM_CODEC = StreamCodec.composite(
             CuriosSlots.CURIOS_SLOT_STREAM_CODEC, OpenPortableQIOPacket::slot,
@@ -37,7 +37,7 @@ public static void handle(final OpenPortableQIOPacket packet, final IPayloadCont
 
             ((PlayerBridge) player).mci$setSlot(packet.slot);
 
-            ItemStack stack = MekanismCurios.getHandOrCuriosItem(player, null);
+            ItemStack stack = packet.slot.getItemStack(player);
 
             if (!stack.isEmpty()) {
                 if (stack.getItem() instanceof IGuiItem item) {

src/main/java/dev/tonimatas/mekanismcurios/util/CuriosSlots.java

@@ -1,17 +1,30 @@
 package dev.tonimatas.mekanismcurios.util;
 
+import dev.tonimatas.mekanismcurios.MekanismCurios;
 import io.netty.buffer.ByteBuf;
 import mekanism.common.network.PacketUtils;
+import mekanism.common.registries.MekanismItems;
 import net.minecraft.network.codec.StreamCodec;
-
-import java.util.Locale;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import top.theillusivec4.curios.api.SlotContext;
 
 public enum CuriosSlots {
     QIO,
     TELEPORTER;
 
-    public String id() {
-        return this.toString().toLowerCase(Locale.ENGLISH);
+    public Item getItem() {
+        return switch (this) {
+            case QIO -> MekanismItems.PORTABLE_QIO_DASHBOARD.get();
+            case TELEPORTER -> MekanismItems.PORTABLE_TELEPORTER.get();
+        };
+    }
+    
+    public ItemStack getItemStack(Player player) {
+        SlotContext slotContext = MekanismCurios.getFirstCurios(player, getItem());
+        if (slotContext == null) return ItemStack.EMPTY;
+        return MekanismCurios.getCuriosSlot(player, slotContext).stack();
     }
 
     public static final StreamCodec<ByteBuf, CuriosSlots> CURIOS_SLOT_STREAM_CODEC = PacketUtils.enumCodec(CuriosSlots.class);