Fix bed spraying from a tool belt

Author: Zorbatron

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

@@ -504,32 +504,20 @@ public void setSelectedTool(int slot, ItemStack stack) {
                                                     @NotNull BlockPos pos, @NotNull EnumFacing side, float hitX,
                                                     float hitY, float hitZ, @NotNull EnumHand hand) {
         EnumActionResult result = IDyeableItem.super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
-        if (result == EnumActionResult.PASS) {
-            ItemStack stack = player.getHeldItem(hand);
-            ToolStackHandler handler = getHandler(stack);
-            if (handler.getSelectedStack().isEmpty() &&
-                    world.getTileEntity(pos) instanceof MetaTileEntityHolder holder &&
-                    holder.getMetaTileEntity() instanceof MetaTileEntityMaintenanceHatch maintenance) {
-                maintenance.fixMaintenanceProblemsWithToolbelt(player, this, stack);
-                return EnumActionResult.SUCCESS;
-            }
-            return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
-        } else return result;
-    }
+        if (result != EnumActionResult.PASS) return result;
 
-    @Override
-    public @NotNull EnumActionResult onItemUse(@NotNull EntityPlayer player, @NotNull World world,
-                                               @NotNull BlockPos pos, @NotNull EnumHand hand,
-                                               @NotNull EnumFacing facing, float hitX, float hitY, float hitZ) {
-        ToolStackHandler handler = getHandler(player.getHeldItem(hand));
-        ItemStack selected = handler.getSelectedStack();
-        if (!selected.isEmpty()) {
-            EnumActionResult result = AbstractSprayBehavior.handleExternalSpray(player, world, pos, facing, selected);
-            if (result != EnumActionResult.PASS) {
-                return result;
-            }
+        ItemStack thisToolBelt = player.getHeldItem(hand);
+        ToolStackHandler handler = getHandler(thisToolBelt);
+        ItemStack selectedToolBeltStack = handler.getSelectedStack();
+        if (selectedToolBeltStack.isEmpty() && world.getTileEntity(pos) instanceof MetaTileEntityHolder holder &&
+                holder.getMetaTileEntity() instanceof MetaTileEntityMaintenanceHatch maintenance) {
+            maintenance.fixMaintenanceProblemsWithToolbelt(player, this, thisToolBelt);
+            return EnumActionResult.SUCCESS;
+        } else if (AbstractSprayBehavior.isSprayCan(selectedToolBeltStack)) {
+            return AbstractSprayBehavior.handleExternalSpray(player, world, pos, side, selectedToolBeltStack);
         }
-        return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
+
+        return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
     }
 
     @Override

src/main/java/gregtech/common/items/behaviors/spray/AbstractSprayBehavior.java

@@ -80,13 +80,23 @@ public static boolean isSprayCan(@NotNull ItemStack stack) {
         return getSprayCanBehavior(stack) != null;
     }
 
+    /**
+     * Call from your items
+     * {@link net.minecraft.item.Item#onItemUseFirst(EntityPlayer, World, BlockPos, EnumFacing, float, float, float, EnumHand)}
+     * or the meta item equivalent to check if block is sprayable early enough in the click handling chain.
+     */
     @SuppressWarnings("UnusedReturnValue")
     public static @NotNull EnumActionResult handleExternalSpray(@NotNull EntityPlayer player, @NotNull EnumHand hand,
                                                                 @NotNull World world, @NotNull BlockPos pos,
                                                                 @NotNull EnumFacing facing) {
         return handleExternalSpray(player, world, pos, facing, player.getHeldItem(hand));
     }
 
+    /**
+     * Call from your items
+     * {@link net.minecraft.item.Item#onItemUseFirst(EntityPlayer, World, BlockPos, EnumFacing, float, float, float, EnumHand)}
+     * or the meta item equivalent to check if block is sprayable early enough in the click handling chain.
+     */
     public static @NotNull EnumActionResult handleExternalSpray(@NotNull EntityPlayer player,
                                                                 @NotNull World world, @NotNull BlockPos pos,
                                                                 @NotNull EnumFacing facing,