Spray can refactor and creative spray can

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -19,7 +19,7 @@
 import gregtech.api.util.Mods;
 import gregtech.client.renderer.handler.MetaTileEntityRenderer;
 import gregtech.common.creativetab.GTCreativeTabs;
-import gregtech.common.items.MetaItems;
+import gregtech.common.items.behaviors.spray.AbstractSprayBehavior;
 import gregtech.integration.ctm.IFacadeWrapper;
 
 import net.minecraft.block.Block;
@@ -257,9 +257,10 @@ public EnumFacing[] getValidRotations(@NotNull World world, @NotNull BlockPos po
     public boolean recolorBlock(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing side,
                                 @NotNull EnumDyeColor color) {
         MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos);
-        if (metaTileEntity == null || metaTileEntity.getPaintingColor() == color.colorValue)
+        if (metaTileEntity == null || metaTileEntity.getPaintingColor() == color.colorValue) {
             return false;
-        metaTileEntity.setPaintingColor(color.colorValue);
+        }
+        metaTileEntity.setPaintingColor(color.colorValue, side);
         return true;
     }
 
@@ -326,15 +327,8 @@ public void onBlockPlacedBy(World worldIn, @NotNull BlockPos pos, @NotNull IBloc
         }
 
         // Color machines on place if holding spray can in off-hand
-        if (placer instanceof EntityPlayer) {
-            ItemStack offhand = placer.getHeldItemOffhand();
-            for (int i = 0; i < EnumDyeColor.values().length; i++) {
-                if (offhand.isItemEqual(MetaItems.SPRAY_CAN_DYES[i].getStackForm())) {
-                    MetaItems.SPRAY_CAN_DYES[i].getBehaviours().get(0).onItemUse((EntityPlayer) placer, worldIn,
-                            pos, EnumHand.OFF_HAND, EnumFacing.UP, 0, 0, 0);
-                    break;
-                }
-            }
+        if (placer instanceof EntityPlayer player) {
+            AbstractSprayBehavior.handleExternalSpray(player, EnumHand.OFF_HAND, worldIn, pos, EnumFacing.UP);
         }
 
         metaTileEntity.onPlacement(placer);

src/main/java/gregtech/api/color/ColoredBlockContainer.java

@@ -0,0 +1,96 @@
+package gregtech.api.color;
+
+import gregtech.api.color.containers.AE2ColorContainer;
+import gregtech.api.color.containers.GTPipeColorContainer;
+import gregtech.api.color.containers.MTEColorContainer;
+import gregtech.api.color.containers.NullColorContainer;
+import gregtech.api.color.containers.VanillaColorContainer;
+import gregtech.api.util.Mods;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import it.unimi.dsi.fastutil.objects.ObjectArraySet;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Used to provide a consistent interface for dealing with colored blocks, whether vanilla or modded. <br/>
+ * Inspired by GT5u's <a href=
+ * "https://github.com/GTNewHorizons/GT5-Unofficial/blob/7ba0fc903e5d14928d2b894b00a7b7dfc65eee18/src/main/java/gregtech/api/util/ColoredBlockContainer.java">ColoredBlockContainer</a>
+ */
+public abstract class ColoredBlockContainer {
+
+    @NotNull
+    private static final Set<ColoredBlockContainer> CONTAINERS = new ObjectArraySet<>(4);
+
+    public static void registerContainer(@NotNull ColoredBlockContainer container) {
+        CONTAINERS.add(Objects.requireNonNull(container, "A null ColoredBlockContainer cannot be registered!"));
+    }
+
+    public static @NotNull ColoredBlockContainer getContainer(@NotNull World world, @NotNull BlockPos pos,
+                                                              @NotNull EnumFacing facing,
+                                                              @NotNull EntityPlayer player) {
+        for (ColoredBlockContainer container : CONTAINERS) {
+            if (container.isValid(world, pos, facing, player)) {
+                return container;
+            }
+        }
+
+        return NullColorContainer.NULL_CONTAINER;
+    }
+
+    @ApiStatus.Internal
+    public static void registerCEuContainers() {
+        registerContainer(new GTPipeColorContainer());
+        registerContainer(new MTEColorContainer());
+        if (Mods.AppliedEnergistics2.isModLoaded()) {
+            registerContainer(new AE2ColorContainer());
+        }
+        registerContainer(new VanillaColorContainer());
+    }
+
+    public abstract boolean isValid(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                    @NotNull EntityPlayer player);
+
+    public abstract boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                     @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor);
+
+    public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                            @NotNull EntityPlayer player, int newColor) {
+        return false;
+    }
+
+    public abstract boolean removeColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                        @NotNull EntityPlayer player);
+
+    public abstract @Nullable EnumDyeColor getColor(@NotNull World world, @NotNull BlockPos pos,
+                                                    @NotNull EnumFacing facing, @NotNull EntityPlayer player);
+
+    public int getColorInt(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                           @NotNull EntityPlayer player) {
+        EnumDyeColor dyeColor = getColor(world, pos, facing, player);
+        return dyeColor == null ? -1 : dyeColor.colorValue;
+    }
+
+    public boolean colorMatches(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                @NotNull EntityPlayer player, @Nullable EnumDyeColor color) {
+        return getColor(world, pos, facing, player) == color;
+    }
+
+    public boolean colorMatches(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                @NotNull EntityPlayer player, int color) {
+        return getColorInt(world, pos, facing, player) == color;
+    }
+
+    public boolean supportsARGB() {
+        return false;
+    }
+}

src/main/java/gregtech/api/color/containers/AE2ColorContainer.java

@@ -0,0 +1,69 @@
+package gregtech.api.color.containers;
+
+import gregtech.api.color.ColoredBlockContainer;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import appeng.api.implementations.tiles.IColorableTile;
+import appeng.api.util.AEColor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class AE2ColorContainer extends ColoredBlockContainer {
+
+    @Override
+    public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                            @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {
+        if (newColor == null) {
+            return removeColor(world, pos, facing, player);
+        }
+
+        if (getColor(world, pos, facing, player) == newColor) {
+            return false;
+        }
+
+        TileEntity te = world.getTileEntity(pos);
+        if (te instanceof IColorableTile colorableTile) {
+            if (colorableTile.getColor().dye != newColor) {
+                colorableTile.recolourBlock(facing, AEColor.values()[newColor.ordinal()], player);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean removeColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                               @NotNull EntityPlayer player) {
+        TileEntity te = world.getTileEntity(pos);
+        if (te instanceof IColorableTile colorableTile && colorableTile.getColor() != AEColor.TRANSPARENT) {
+            colorableTile.recolourBlock(facing, AEColor.TRANSPARENT, player);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public @Nullable EnumDyeColor getColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                           @NotNull EntityPlayer player) {
+        TileEntity te = world.getTileEntity(pos);
+        if (te instanceof IColorableTile colorableTile) {
+            return colorableTile.getColor().dye;
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean isValid(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                           @NotNull EntityPlayer player) {
+        return world.getTileEntity(pos) instanceof IColorableTile;
+    }
+}

src/main/java/gregtech/api/color/containers/GTPipeColorContainer.java

@@ -0,0 +1,93 @@
+package gregtech.api.color.containers;
+
+import gregtech.api.color.ColoredBlockContainer;
+import gregtech.api.pipenet.tile.IPipeTile;
+import gregtech.api.util.ColorUtil;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class GTPipeColorContainer extends ColoredBlockContainer {
+
+    @Override
+    public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                            @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {
+        if (newColor == null) {
+            return removeColor(world, pos, facing, player);
+        }
+
+        if (getColorInt(world, pos, facing, player) == newColor.colorValue) {
+            return false;
+        }
+
+        if (world.getTileEntity(pos) instanceof IPipeTile<?, ?>pipeTile) {
+            pipeTile.setPaintingColor(newColor.colorValue);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                            @NotNull EntityPlayer player, int newColor) {
+        if (newColor == -1) {
+            return removeColor(world, pos, facing, player);
+        }
+
+        if (world.getTileEntity(pos) instanceof IPipeTile<?, ?>pipeTile) {
+            if (pipeTile.isPainted() && getColorInt(world, pos, facing, player) == newColor) {
+                return false;
+            } else {
+                pipeTile.setPaintingColor(newColor);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean removeColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                               @NotNull EntityPlayer player) {
+        if (world.getTileEntity(pos) instanceof IPipeTile<?, ?>pipeTile && pipeTile.isPainted()) {
+            pipeTile.setPaintingColor(-1);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public @Nullable EnumDyeColor getColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                                           @NotNull EntityPlayer player) {
+        return ColorUtil.getDyeColorFromRGB(getColorInt(world, pos, facing, player));
+    }
+
+    @Override
+    public int getColorInt(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                           @NotNull EntityPlayer player) {
+        if (world.getTileEntity(pos) instanceof IPipeTile<?, ?>pipeTile && pipeTile.isPainted()) {
+            return pipeTile.getPaintingColor();
+        }
+
+        return -1;
+    }
+
+    @Override
+    public boolean supportsARGB() {
+        return true;
+    }
+
+    @Override
+    public boolean isValid(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
+                           @NotNull EntityPlayer player) {
+        return world.getTileEntity(pos) instanceof IPipeTile<?, ?>;
+    }
+}