Require ColoredBlockContainers to have a ResourceLocation ID

Author: Zorbatron

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

@@ -6,21 +6,23 @@
 import gregtech.api.color.containers.MTEColorContainer;
 import gregtech.api.color.containers.NullColorContainer;
 import gregtech.api.color.containers.VanillaColorContainer;
+import gregtech.api.util.GTUtility;
 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.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import it.unimi.dsi.fastutil.objects.ObjectArraySet;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * Used to provide a consistent interface for dealing with colored blocks, whether vanilla or modded. <br/>
@@ -30,16 +32,24 @@
 public abstract class ColoredBlockContainer {
 
     @NotNull
-    private static final Set<ColoredBlockContainer> CONTAINERS = new ObjectArraySet<>(4);
+    private static final Map<ResourceLocation, ColoredBlockContainer> CONTAINERS = new Object2ObjectOpenHashMap<>(5);
 
     public static void registerContainer(@NotNull ColoredBlockContainer container) {
-        CONTAINERS.add(Objects.requireNonNull(container, "A null ColoredBlockContainer cannot be registered!"));
+        Objects.requireNonNull(container, "A null ColoredBlockContainer cannot be registered!");
+        ResourceLocation id = container.id;
+        Objects.requireNonNull(id, "A null ColoredBlockContainer cannot have a null ID!");
+        if (CONTAINERS.containsKey(id)) {
+            throw new IllegalArgumentException(
+                    String.format("A ColoredBlockContainer with an ID of %s already exists!", id));
+        }
+
+        CONTAINERS.put(id, container);
     }
 
     public static @NotNull ColoredBlockContainer getContainer(@NotNull World world, @NotNull BlockPos pos,
                                                               @NotNull EnumFacing facing,
                                                               @NotNull EntityPlayer player) {
-        for (ColoredBlockContainer container : CONTAINERS) {
+        for (ColoredBlockContainer container : CONTAINERS.values()) {
             if (container.isBlockValid(world, pos, facing, player)) {
                 return container;
             }
@@ -50,13 +60,20 @@ public static void registerContainer(@NotNull ColoredBlockContainer container) {
 
     @ApiStatus.Internal
     public static void registerCEuContainers() {
-        registerContainer(new GTPipeColorContainer());
-        registerContainer(new MTEColorContainer());
+        registerContainer(new GTPipeColorContainer(GTUtility.gregtechId("pipe")));
+        registerContainer(new MTEColorContainer(GTUtility.gregtechId("mte")));
         if (Mods.AppliedEnergistics2.isModLoaded()) {
-            registerContainer(new AE2ColorContainer());
+            registerContainer(new AE2ColorContainer(GTUtility.gregtechId("ae2")));
         }
-        registerContainer(new VanillaColorContainer());
-        registerContainer(new BedColorContainer());
+        registerContainer(new VanillaColorContainer(GTUtility.gregtechId("vanilla")));
+        registerContainer(new BedColorContainer(GTUtility.gregtechId("bed")));
+    }
+
+    @NotNull
+    protected final ResourceLocation id;
+
+    public ColoredBlockContainer(@NotNull ResourceLocation id) {
+        this.id = id;
     }
 
     public abstract boolean isBlockValid(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,

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

@@ -6,6 +6,7 @@
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -16,6 +17,10 @@
 
 public class AE2ColorContainer extends ColoredBlockContainer {
 
+    public AE2ColorContainer(@NotNull ResourceLocation id) {
+        super(id);
+    }
+
     @Override
     public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
                             @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {

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

@@ -10,6 +10,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityBed;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -18,6 +19,10 @@
 
 public class BedColorContainer extends ColoredBlockContainer {
 
+    public BedColorContainer(@NotNull ResourceLocation id) {
+        super(id);
+    }
+
     @Override
     public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
                             @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {

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

@@ -7,6 +7,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -15,6 +16,10 @@
 
 public class GTPipeColorContainer extends ColoredBlockContainer {
 
+    public GTPipeColorContainer(@NotNull ResourceLocation id) {
+        super(id);
+    }
+
     @Override
     public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
                             @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {

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

@@ -7,6 +7,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -17,6 +18,10 @@
 
 public class MTEColorContainer extends ColoredBlockContainer {
 
+    public MTEColorContainer(@NotNull ResourceLocation id) {
+        super(id);
+    }
+
     @Override
     public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
                             @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {

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

@@ -15,6 +15,10 @@ public class NullColorContainer extends ColoredBlockContainer {
 
     public static final NullColorContainer NULL_CONTAINER = new NullColorContainer();
 
+    public NullColorContainer() {
+        super();
+    }
+
     @Override
     public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @Nullable EnumFacing facing,
                             @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {

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

@@ -12,6 +12,7 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -35,6 +36,10 @@ public class VanillaColorContainer extends ColoredBlockContainer {
             Blocks.GLASS_PANE, BlockStainedGlassPane.COLOR,
             Blocks.HARDENED_CLAY, BlockColored.COLOR);
 
+    public VanillaColorContainer(@NotNull ResourceLocation id) {
+        super(id);
+    }
+
     @Override
     public boolean setColor(@NotNull World world, @NotNull BlockPos pos, @NotNull EnumFacing facing,
                             @NotNull EntityPlayer player, @Nullable EnumDyeColor newColor) {