Merge pull request #392 from MrTroble/1.15.2/fix-linkableapi

ref: update linkableapi
MrTroble · Aug 6, 2024 · 82bd433 · 82bd433
2 parents eec7db2 + 1fead8b
commit 82bd433
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,7 +30,7 @@ jobs:
     if: endswith(github.ref_name, 'master') && github.ref_protected && github.ref_type == 'branch'
     runs-on: ubuntu-latest
     env:
-      APPVEYOR_BUILD_VERSION: '3.2.2'
+      APPVEYOR_BUILD_VERSION: '3.2.3'
       CURSETOKEN: ${{ secrets.CURSETOKEN }}
     steps:
     - uses: actions/checkout@v3

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.15.2 - 3.2.3]
+
+* feat: add item damage
+* ref: update linkable api
+
 ## [1.15.2 - 3.2.2]
 
 * rem: debug output

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
@@ -25,12 +25,20 @@ 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.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));
+        final CompoundNBT tag = getOrCreateForStack(itemstack);
+        if (tag.contains(LINKINGTOOL_TAG)) {
+            if (!hand.equals(Hand.MAIN_HAND) || level.isClientSide)
+                return ActionResult.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.success(itemstack);
+            }
+        }
         return ActionResult.success(itemstack);
     }
+10 −0		src/com/troblecodings/linkableapi/ILinkableTile.java
+72 −23		src/com/troblecodings/linkableapi/Linkingtool.java
+63 −49		src/com/troblecodings/linkableapi/MultiLinkingTool.java