Infinite Spraycan Additions (#3226)

Co-authored-by: Caedis <Caedis@users.noreply.github.com>

1 files changed, 17 insertions, 3 deletions

diff --git a/src/main/java/gregtech/common/blocks/BlockMachines.java b/src/main/java/gregtech/common/blocks/BlockMachines.java
index 1db6f51730..4c392f8cf5 100644
--- a/src/main/java/gregtech/common/blocks/BlockMachines.java
+++ b/src/main/java/gregtech/common/blocks/BlockMachines.java
@@ -42,6 +42,7 @@ import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IDebugableTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GTGenericBlock;
+import gregtech.api.items.MetaBaseItem;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
@@ -358,14 +359,28 @@ public class BlockMachines extends GTGenericBlock implements IDebugableBlock, IT
         if (tTileEntity == null) {
             return false;
         }
+
+        final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
+
         if (aPlayer.isSneaking()) {
-            final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
             if (tCurrentItem != null && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList)
                 && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)
                 && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList)
                 && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)
                 && !GTUtility.isStackInList(tCurrentItem, GregTechAPI.sJackhammerList)) return false;
         }
+
+        final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
+
+        // Used for Ring of Loki support
+        if (tCurrentItem != null && tCurrentItem.getItem() instanceof MetaBaseItem mbItem) {
+            if (mbItem.forEachBehavior(
+                tCurrentItem,
+                behavior -> behavior.shouldInterruptBlockActivation(aPlayer, tTileEntity, side))) {
+                return false;
+            }
+        }
+
         if (tTileEntity instanceof IGregTechTileEntity gtTE) {
             if (gtTE.getTimer() < 1L) {
                 return false;
@@ -373,8 +388,7 @@ public class BlockMachines extends GTGenericBlock implements IDebugableBlock, IT
             if ((!aWorld.isRemote) && !gtTE.isUseableByPlayer(aPlayer)) {
                 return true;
             }
-            return ((IGregTechTileEntity) tTileEntity)
-                .onRightclick(aPlayer, ForgeDirection.getOrientation(ordinalSide), aOffsetX, aOffsetY, aOffsetZ);
+            return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, side, aOffsetX, aOffsetY, aOffsetZ);
         }
         return false;
     }