ref: update linkableapi

MrTroble · Jul 28, 2024 · f580834 · f580834
1 parent 8c37be6
commit f580834
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/linkableapi b/linkableapi
diff --git a/src/main/java/com/troblecodings/tcredstone/item/RemoteActivator.java b/src/main/java/com/troblecodings/tcredstone/item/RemoteActivator.java
@@ -26,13 +26,21 @@ public RemoteActivator(final ItemGroup tab, final BiPredicate<World, BlockPos> p
     public ActionResult<ItemStack> use(final World level, final PlayerEntity player,
             final Hand hand) {
         final ItemStack itemstack = player.getItemInHand(hand);
-        if (!hand.equals(Hand.MAIN_HAND) || level.isClientSide)
-            return ActionResult.newResult(ActionResultType.PASS,itemstack);
-        final CompoundNBT comp = itemstack.getTag();
-        final BlockPos linkpos = NBTUtil.readBlockPos(comp);
-        final boolean state = TileRedstoneEmitter.redstoneUpdate(linkpos, level);
-        message(player, "ra.state", String.valueOf(state));
-        return ActionResult.newResult(ActionResultType.SUCCESS,itemstack);
+        final CompoundNBT tag = getOrCreateForStack(itemstack);
+        if (tag.contains(LINKINGTOOL_TAG)) {
+            if (!hand.equals(Hand.MAIN_HAND) || level.isClientSide)
+                return ActionResult.newResult(ActionResultType.PASS, itemstack);
+            final CompoundNBT comp = tag.getCompound(LINKINGTOOL_TAG);
+            final boolean containsPos =
+                    comp.contains("X") && comp.contains("Y") && comp.contains("Z");
+            if (containsPos) {
+                final BlockPos linkpos = NBTUtil.readBlockPos(comp);
+                final boolean state = TileRedstoneEmitter.redstoneUpdate(linkpos, level);
+                message(player, "ra.state", String.valueOf(state));
+                return ActionResult.newResult(ActionResultType.SUCCESS, itemstack);
+            }
+        }
+        return ActionResult.newResult(ActionResultType.PASS, itemstack);
     }
 
 }
+3 −0		src/com/troblecodings/linkableapi/ILinkableTile.java
+60 −31		src/com/troblecodings/linkableapi/Linkingtool.java
+63 −49		src/com/troblecodings/linkableapi/MultiLinkingTool.java