feat: Add Teleporter slot

TonimatasDEV · TonimatasDEV · commit 7850137c9cde · 2025-05-22T20:11:32.000+02:00
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/MekanismCurios.java b/src/main/java/dev/tonimatas/mekanismcurios/MekanismCurios.java
@@ -1,7 +1,9 @@
 package dev.tonimatas.mekanismcurios;
 
 import com.mojang.logging.LogUtils;
+import dev.tonimatas.mekanismcurios.bridge.PlayerBridge;
 import dev.tonimatas.mekanismcurios.networking.ModMessages;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -20,15 +22,25 @@ public MekanismCurios(FMLJavaModLoadingContext context) {
 
         LOGGER.info("Mekanism Curios initialized successfully.");
     }
-    
-    public static ItemStack getQIO(Player player) {
+
+    public static ItemStack getSlot(Player player) {
+        String slot = ((PlayerBridge) player).mci$getSlot().id();
         return CuriosApi.getCuriosInventory(player).map(iCuriosItemHandler -> 
-                iCuriosItemHandler.getCurios().get("qio").getStacks().getStackInSlot(0)).orElse(ItemStack.EMPTY);
+                iCuriosItemHandler.getCurios().get(slot).getStacks().getStackInSlot(0)).orElse(ItemStack.EMPTY);
+    }
+
+    public static void setSlot(Player player, ItemStack stack) {
+        if (player instanceof ServerPlayer) {
+            String slot = ((PlayerBridge) player).mci$getSlot().id();
+
+            CuriosApi.getCuriosInventory(player).ifPresent(curiosInventory ->
+                    curiosInventory.setEquippedCurio(slot, 0, stack));
+        }
     }
 
     public static ItemStack getHandOrCuriosItem(Player player, InteractionHand hand) {
         if (hand == null) {
-            return MekanismCurios.getQIO(player);
+            return MekanismCurios.getSlot(player);
         } else {
             return player.getItemInHand(hand);
         }
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/MekanismCuriosClient.java b/src/main/java/dev/tonimatas/mekanismcurios/MekanismCuriosClient.java
@@ -2,6 +2,7 @@
 
 import dev.tonimatas.mekanismcurios.networking.ModMessages;
 import dev.tonimatas.mekanismcurios.networking.packet.OpenPortableQIOPacket;
+import dev.tonimatas.mekanismcurios.util.CuriosSlots;
 import dev.tonimatas.mekanismcurios.util.KeyBinding;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.InputEvent;
@@ -15,7 +16,11 @@ public static class ClientForgeEvents {
         @SubscribeEvent
         public static void onClientTick(InputEvent event) {
             while (KeyBinding.PORTABLE_QIO_MAPPING.get().consumeClick()) {
-                ModMessages.sendToServer(new OpenPortableQIOPacket());
+                ModMessages.sendToServer(new OpenPortableQIOPacket(CuriosSlots.QIO));
+            }
+
+            while (KeyBinding.PORTABLE_TELEPORTER_MAPPING.get().consumeClick()) {
+                ModMessages.sendToServer(new OpenPortableQIOPacket(CuriosSlots.TELEPORTER));
             }
         }
     }
@@ -25,6 +30,7 @@ public static class ClientModBusEvents {
         @SubscribeEvent
         public static void onKeyRegister(RegisterKeyMappingsEvent event) {
             event.register(KeyBinding.PORTABLE_QIO_MAPPING.get());
+            event.register(KeyBinding.PORTABLE_TELEPORTER_MAPPING.get());
         }
     }
 }
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/bridge/PlayerBridge.java b/src/main/java/dev/tonimatas/mekanismcurios/bridge/PlayerBridge.java
@@ -0,0 +1,8 @@
+package dev.tonimatas.mekanismcurios.bridge;
+
+import dev.tonimatas.mekanismcurios.util.CuriosSlots;
+
+public interface PlayerBridge {
+    void mci$setSlot(CuriosSlots slot);
+    CuriosSlots mci$getSlot();
+}
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/mixins/MekanismItemContainerMixin.java b/src/main/java/dev/tonimatas/mekanismcurios/mixins/MekanismItemContainerMixin.java
@@ -24,7 +24,7 @@ public class MekanismItemContainerMixin {
     @Inject(method = "stillValid", at = @At("HEAD"), cancellable = true)
     private void mci$stillValid(Player player, CallbackInfoReturnable<Boolean> cir) {
         if (this.hand == null) {
-            ItemStack curiosStack = MekanismCurios.getQIO(player);
+            ItemStack curiosStack = MekanismCurios.getSlot(player);
             boolean validCurios = !curiosStack.isEmpty() && (curiosStack.is(this.stack.getItem()));
             cir.setReturnValue(validCurios);
         }
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/mixins/PacketPortableTeleporterTeleportMixin.java b/src/main/java/dev/tonimatas/mekanismcurios/mixins/PacketPortableTeleporterTeleportMixin.java
@@ -0,0 +1,18 @@
+package dev.tonimatas.mekanismcurios.mixins;
+
+import dev.tonimatas.mekanismcurios.MekanismCurios;
+import mekanism.common.network.to_server.PacketPortableTeleporterTeleport;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(PacketPortableTeleporterTeleport.class)
+public class PacketPortableTeleporterTeleportMixin {
+    @Redirect(method = "handle", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"))
+    private ItemStack mci$handle$getItemInHand(ServerPlayer instance, InteractionHand interactionHand) {
+        return MekanismCurios.getHandOrCuriosItem(instance, interactionHand);
+    }
+}
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/mixins/PlayerMixin.java b/src/main/java/dev/tonimatas/mekanismcurios/mixins/PlayerMixin.java
@@ -0,0 +1,23 @@
+package dev.tonimatas.mekanismcurios.mixins;
+
+import dev.tonimatas.mekanismcurios.bridge.PlayerBridge;
+import dev.tonimatas.mekanismcurios.util.CuriosSlots;
+import net.minecraft.world.entity.player.Player;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(Player.class)
+public class PlayerMixin implements PlayerBridge {
+    @Unique
+    private CuriosSlots mci$slot = null;
+    
+    @Override
+    public void mci$setSlot(CuriosSlots slot) {
+        this.mci$slot = slot;
+    }
+
+    @Override
+    public CuriosSlots mci$getSlot() {
+        return mci$slot;
+    }
+}
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/mixins/PortableQIODashboardContainerMixin.java b/src/main/java/dev/tonimatas/mekanismcurios/mixins/PortableQIODashboardContainerMixin.java
@@ -22,7 +22,7 @@ public abstract class PortableQIODashboardContainerMixin {
     @Inject(method = "stillValid", at = @At("HEAD"), cancellable = true)
     private void mci$stillValid(Player player, CallbackInfoReturnable<Boolean> cir) {
         if (this.hand == null) {
-            ItemStack curiosStack = MekanismCurios.getQIO(player);
+            ItemStack curiosStack = MekanismCurios.getSlot(player);
             boolean validCurios = !curiosStack.isEmpty() && (curiosStack.is(this.stack.getItem()));
             cir.setReturnValue(validCurios);
         }
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/networking/ModMessages.java b/src/main/java/dev/tonimatas/mekanismcurios/networking/ModMessages.java
@@ -26,8 +26,8 @@ public static void register() {
         INSTANCE = net;
 
         net.messageBuilder(OpenPortableQIOPacket.class, id(), NetworkDirection.PLAY_TO_SERVER)
-                .decoder(OpenPortableQIOPacket::new)
-                .encoder(OpenPortableQIOPacket::toBytes)
+                .decoder(OpenPortableQIOPacket::decode)
+                .encoder(OpenPortableQIOPacket::encode)
                 .consumerMainThread(OpenPortableQIOPacket::handle)
                 .add();
     }
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/networking/packet/OpenPortableQIOPacket.java b/src/main/java/dev/tonimatas/mekanismcurios/networking/packet/OpenPortableQIOPacket.java
@@ -2,7 +2,9 @@
 
 
 import dev.tonimatas.mekanismcurios.MekanismCurios;
-import mekanism.common.item.ItemPortableQIODashboard;
+import dev.tonimatas.mekanismcurios.bridge.PlayerBridge;
+import dev.tonimatas.mekanismcurios.util.CuriosSlots;
+import mekanism.common.item.interfaces.IGuiItem;
 import mekanism.common.util.SecurityUtils;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
@@ -13,11 +15,19 @@
 import java.util.function.Supplier;
 
 public class OpenPortableQIOPacket {
-    public OpenPortableQIOPacket() {}
-
-    public OpenPortableQIOPacket(FriendlyByteBuf buf) {}
+    private final CuriosSlots slot;
+    
+    public OpenPortableQIOPacket(CuriosSlots slot) {
+        this.slot = slot;
+    }
 
-    public void toBytes(FriendlyByteBuf buf) {}
+    public void encode(FriendlyByteBuf buf) {
+            buf.writeEnum(slot);
+    }
+    
+    public static OpenPortableQIOPacket decode(FriendlyByteBuf buf) {
+        return new OpenPortableQIOPacket(buf.readEnum(CuriosSlots.class));
+    }
     
     @SuppressWarnings({"DataFlowIssue", "unused", "UnusedReturnValue"})
     public boolean handle(Supplier<NetworkEvent.Context> supplier) {
@@ -26,10 +36,15 @@ public boolean handle(Supplier<NetworkEvent.Context> supplier) {
         context.enqueueWork(() -> {
             ServerPlayer player = context.getSender();
             Level level = player.level();
-            ItemStack stack = MekanismCurios.getQIO(player);
-            
-            if (!stack.isEmpty() && stack.getItem() instanceof ItemPortableQIODashboard item) {
-                SecurityUtils.get().claimOrOpenGui(level, player, null, item.getContainerType()::tryOpenGui);
+
+            ((PlayerBridge) player).mci$setSlot(this.slot);
+
+            ItemStack stack = MekanismCurios.getHandOrCuriosItem(player, null);
+
+            if (!stack.isEmpty()) {
+                if (stack.getItem() instanceof IGuiItem item) {
+                    SecurityUtils.get().claimOrOpenGui(level, player, null, item.getContainerType()::tryOpenGui);
+                }
             }
         });
 
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/util/CuriosSlots.java b/src/main/java/dev/tonimatas/mekanismcurios/util/CuriosSlots.java
@@ -0,0 +1,12 @@
+package dev.tonimatas.mekanismcurios.util;
+
+import java.util.Locale;
+
+public enum CuriosSlots {
+    QIO,
+    TELEPORTER;
+
+    public String id() {
+        return this.toString().toLowerCase(Locale.ENGLISH);
+    }
+}
diff --git a/src/main/java/dev/tonimatas/mekanismcurios/util/KeyBinding.java b/src/main/java/dev/tonimatas/mekanismcurios/util/KeyBinding.java
@@ -9,7 +9,10 @@
 public class KeyBinding {
     public static final String KEY_CATEGORY = "key.categories.mekanismcurios";
     public static final String KEY_PORTABLE_QIO = "key.mekanismcurios.protableqio";
+    public static final String KEY_PORTABLE_TELEPORTER = "key.mekanismcurios.portableteleporter";
     
     public static final Lazy<KeyMapping> PORTABLE_QIO_MAPPING = Lazy.of(() -> new KeyMapping(KEY_PORTABLE_QIO, 
             KeyConflictContext.IN_GAME, InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_Y, KEY_CATEGORY));
+    public static final Lazy<KeyMapping> PORTABLE_TELEPORTER_MAPPING = Lazy.of(() -> new KeyMapping(KEY_PORTABLE_TELEPORTER,
+            KeyConflictContext.IN_GAME, InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_U, KEY_CATEGORY));
 }
diff --git a/src/main/resources/assets/mekanismcurios/lang/en_us.json b/src/main/resources/assets/mekanismcurios/lang/en_us.json
@@ -1,5 +1,7 @@
 {
-  "key.mekanismcurios.protableqio": "Open Portable QIO",
   "key.categories.mekanismcurios": "Mekanism Curios",
-  "curios.identifier.qio": "QIO"
+  "key.mekanismcurios.protableqio": "Open Portable QIO",
+  "key.mekanismcurios.portableteleporter": "Open Portable Teleporter",
+  "curios.identifier.qio": "QIO",
+  "curios.identifier.teleporter": "Teleporter"
 }
diff --git a/src/main/resources/assets/mekanismcurios/textures/slot/teleporter_slot.png b/src/main/resources/assets/mekanismcurios/textures/slot/teleporter_slot.png
diff --git a/src/main/resources/data/curios/tags/items/teleporter.json b/src/main/resources/data/curios/tags/items/teleporter.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "mekanism:portable_teleporter"
+  ]
+}
diff --git a/src/main/resources/data/mekanismcurios/curios/entities/slots.json b/src/main/resources/data/mekanismcurios/curios/entities/slots.json
@@ -1,6 +1,7 @@
 {
   "entities": ["player"],
   "slots": [
-    "qio"
+    "qio",
+    "teleporter"
   ]
 }
diff --git a/src/main/resources/data/mekanismcurios/curios/slots/teleporter.json b/src/main/resources/data/mekanismcurios/curios/slots/teleporter.json
@@ -0,0 +1,5 @@
+{
+  "size": 1,
+  "icon": "mekanismcurios:slot/teleporter_slot",
+  "add_cosmetic": false
+}
diff --git a/src/main/resources/mekanismcurios.mixins.json b/src/main/resources/mekanismcurios.mixins.json
@@ -12,7 +12,9 @@
     "MekanismItemContainerMixin",
     "MekanismItemContainerTypeMixin",
     "PacketItemButtonPressMixin",
+    "PacketPortableTeleporterTeleportMixin",
     "PacketSetItemFrequencyMixin",
+    "PlayerMixin",
     "PortableQIODashboardContainerMixin",
     "SecurityUtilsMixin"
   ]

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import dev.tonimatas.mekanismcurios.networking.ModMessages;`
`4`	`4`	`import dev.tonimatas.mekanismcurios.networking.packet.OpenPortableQIOPacket;`
	`5`	`+import dev.tonimatas.mekanismcurios.util.CuriosSlots;`
`5`	`6`	`import dev.tonimatas.mekanismcurios.util.KeyBinding;`
`6`	`7`	`import net.minecraftforge.api.distmarker.Dist;`
`7`	`8`	`import net.minecraftforge.client.event.InputEvent;`
`@@ -15,7 +16,11 @@ public static class ClientForgeEvents {`
`15`	`16`	`@SubscribeEvent`
`16`	`17`	`public static void onClientTick(InputEvent event) {`
`17`	`18`	`while (KeyBinding.PORTABLE_QIO_MAPPING.get().consumeClick()) {`
`18`		`- ModMessages.sendToServer(new OpenPortableQIOPacket());`
	`19`	`+ ModMessages.sendToServer(new OpenPortableQIOPacket(CuriosSlots.QIO));`
	`20`	`+ }`
	`21`	`+`
	`22`	`+ while (KeyBinding.PORTABLE_TELEPORTER_MAPPING.get().consumeClick()) {`
	`23`	`+ ModMessages.sendToServer(new OpenPortableQIOPacket(CuriosSlots.TELEPORTER));`
`19`	`24`	`}`
`20`	`25`	`}`
`21`	`26`	`}`
`@@ -25,6 +30,7 @@ public static class ClientModBusEvents {`
`25`	`30`	`@SubscribeEvent`
`26`	`31`	`public static void onKeyRegister(RegisterKeyMappingsEvent event) {`
`27`	`32`	`event.register(KeyBinding.PORTABLE_QIO_MAPPING.get());`
	`33`	`+ event.register(KeyBinding.PORTABLE_TELEPORTER_MAPPING.get());`
`28`	`34`	`}`
`29`	`35`	`}`
`30`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class MekanismItemContainerMixin {`
`24`	`24`	`@Inject(method = "stillValid", at = @At("HEAD"), cancellable = true)`
`25`	`25`	`private void mci$stillValid(Player player, CallbackInfoReturnable<Boolean> cir) {`
`26`	`26`	`if (this.hand == null) {`
`27`		`- ItemStack curiosStack = MekanismCurios.getQIO(player);`
	`27`	`+ ItemStack curiosStack = MekanismCurios.getSlot(player);`
`28`	`28`	`boolean validCurios = !curiosStack.isEmpty() && (curiosStack.is(this.stack.getItem()));`
`29`	`29`	`cir.setReturnValue(validCurios);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public abstract class PortableQIODashboardContainerMixin {`
`22`	`22`	`@Inject(method = "stillValid", at = @At("HEAD"), cancellable = true)`
`23`	`23`	`private void mci$stillValid(Player player, CallbackInfoReturnable<Boolean> cir) {`
`24`	`24`	`if (this.hand == null) {`
`25`		`- ItemStack curiosStack = MekanismCurios.getQIO(player);`
	`25`	`+ ItemStack curiosStack = MekanismCurios.getSlot(player);`
`26`	`26`	`boolean validCurios = !curiosStack.isEmpty() && (curiosStack.is(this.stack.getItem()));`
`27`	`27`	`cir.setReturnValue(validCurios);`
`28`	`28`	`}`