review comments

Author: htmlcsjs

src/main/java/gregtech/api/pipenet/block/BlockPipe.java

@@ -656,26 +656,18 @@ private List<IndexedCuboid6> getCollisionBox(IBlockAccess world, BlockPos pos, @
 
     public boolean hasPipeCollisionChangingItem(IBlockAccess world, BlockPos pos, Entity entity) {
         if (entity instanceof EntityPlayer) {
-            return hasPipeCollisionChangingItem(world, pos, ((EntityPlayer) entity).getHeldItem(EnumHand.MAIN_HAND),
-                    entity) ||
-                    hasPipeCollisionChangingItem(world, pos, ((EntityPlayer) entity).getHeldItem(EnumHand.OFF_HAND),
-                            entity) ||
+            return hasPipeCollisionChangingItem(world, pos, ((EntityPlayer) entity).getHeldItem(EnumHand.MAIN_HAND)) ||
+                    hasPipeCollisionChangingItem(world, pos, ((EntityPlayer) entity).getHeldItem(EnumHand.OFF_HAND)) ||
                     entity.isSneaking() && isHoldingPipe((EntityPlayer) entity);
         }
         return false;
     }
 
     public abstract boolean isHoldingPipe(EntityPlayer player);
 
-    public boolean hasPipeCollisionChangingItem(IBlockAccess world, BlockPos pos, ItemStack stack,
-                                                @Nullable Entity entity) {
+    public boolean hasPipeCollisionChangingItem(IBlockAccess world, BlockPos pos, ItemStack stack) {
         if (isPipeTool(stack)) return true;
 
-        if (entity != null && entity.isSneaking() && entity instanceof EntityPlayer player &&
-                (GTUtility.isSprayCan(player.getHeldItem(EnumHand.MAIN_HAND)) ||
-                        GTUtility.isSprayCan(player.getHeldItem(EnumHand.OFF_HAND))))
-            return true;
-
         IPipeTile<PipeType, NodeDataType> pipeTile = getPipeTileEntity(world, pos);
         if (pipeTile == null) return false;
 
@@ -688,10 +680,6 @@ public boolean hasPipeCollisionChangingItem(IBlockAccess world, BlockPos pos, It
         return GTUtility.isCoverBehaviorItem(stack, () -> hasAnyCover, coverDef -> acceptsCovers);
     }
 
-    public boolean hasPipeCollisionChangingItem(IBlockAccess world, BlockPos pos, ItemStack stack) {
-        return hasPipeCollisionChangingItem(world, pos, stack, null);
-    }
-
     @Override
     public boolean canRenderInLayer(@NotNull IBlockState state, @NotNull BlockRenderLayer layer) {
         return true;

src/main/java/gregtech/common/items/behaviors/ColorSprayBehavior.java

@@ -140,9 +140,10 @@ private boolean traversePipes(EntityPlayer player, World world, EnumHand hand, B
         if (connectedTe instanceof IPipeTile<?, ?>startPipe) {
             List<IPipeTile<?, ?>> pipes = PipeCollectorWalker.collectPipeNet(world, startPos, startPipe,
                     Math.min(MAX_PIPE_TRAVERSAL_LENGTH, getUsesLeft(heldItem)));
+            int colour = this.color == null ? -1 : this.color.colorValue;
             for (IPipeTile<?, ?> pipe : pipes) {
-                if (pipe.getPaintingColor() != (this.color == null ? -1 : this.color.colorValue)) {
-                    pipe.setPaintingColor(this.color == null ? -1 : this.color.colorValue);
+                if (pipe.getPaintingColor() != colour) {
+                    pipe.setPaintingColor(colour);
                     pipe.scheduleRenderUpdate();
                     if (getUsesLeft(heldItem) == 1) {
                         useItemDurability(player, hand, heldItem, empty.copy());

src/main/java/gregtech/common/pipelike/PipeCollectorWalker.java

@@ -18,13 +18,12 @@
 public class PipeCollectorWalker<T extends IPipeTile<?, ?>> extends PipeNetWalker<T> {
 
     @NotNull
-    @SuppressWarnings("unchecked")
     public static List<IPipeTile<?, ?>> collectPipeNet(World world, BlockPos sourcePipe, IPipeTile<?, ?> pipe,
                                                        int limit) {
         PipeCollectorWalker<? extends IPipeTile<?, ?>> walker = (PipeCollectorWalker<? extends IPipeTile<?, ?>>) new PipeCollectorWalker<>(
                 world, sourcePipe, 0, pipe.getClass());
         walker.traversePipeNet(limit);
-        return walker.isFailed() ? Collections.EMPTY_LIST : Collections.unmodifiableList(walker.pipes);
+        return walker.isFailed() ? Collections.emptyList() : Collections.unmodifiableList(walker.pipes);
     }
 
     public static List<IPipeTile<?, ?>> collectPipeNet(World world, BlockPos sourcePipe, IPipeTile<?, ?> pipe) {

src/main/resources/assets/gregtech/lang/en_us.lang

@@ -4701,7 +4701,7 @@ behaviour.paintspray.red.tooltip=Can paint things in Red
 behaviour.paintspray.black.tooltip=Can paint things in Black
 behaviour.paintspray.uses=Remaining Uses: %,d
 behaviour.paintspray.offhand=Hold in offhand to color while placing blocks
-behaviour.paintspray.crouch=Crouch to spray a network of pipes
+behaviour.paintspray.crouch=Crouch to spray connected pipes
 behaviour.prospecting=Usable for Prospecting
 
 # Multiblock machine controllers