Dyeable blocks 2: angelica boogaloo

dependencies.gradle

@@ -41,7 +41,7 @@ dependencies {
     implementation('curse.maven:cofh-lib-220333:2388748')
     compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.7:dev")
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-    compileOnly('com.github.GTNewHorizons:Angelica:2.1.49:dev')
+    compileOnly('com.github.GTNewHorizons:Angelica:2.1.53:dev')
     compileOnly("com.github.GTNewHorizons:FindIt:1.4.3:dev")
     compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.93-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev') {transitive = false}
@@ -51,11 +51,12 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:Postea:1.2.5:dev") {transitive = false}
     compileOnly("com.github.GTNewHorizons:SimpleSkinBackport:1.0.2-GTNH:dev") {transitive = false}
     compileOnly('com.falsepattern:endlessids-mc1.7.10:1.7.4:dev') {transitive = false}
+    compileOnly("com.github.slprime:ChromaticTooltips:1.0.29-GTNH:dev") {transitive = false}
 
     devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev")
     devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev")
     devOnlyNonPublishable("io.github.legacymoddingmc:unimixins:0.1.23:dev")
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:2.1.49:dev')
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:2.1.53:dev')
 
     // Deobf Extra Utilities, allows hodgepodge mixins to not crash. For testing feature parity and postea only.
     runtimeOnlyNonPublishable("curse.maven:extrautilities-225561:2264384")

src/main/java/com/fouristhenumber/utilitiesinexcess/ClientProxy.java

@@ -18,6 +18,7 @@
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.FMPItems;
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.render.item.ItemUEMultiPartRenderer;
 import com.fouristhenumber.utilitiesinexcess.compat.Mods;
+import com.fouristhenumber.utilitiesinexcess.compat.angelica.coloredblocks.CTMForColoredBlocks;
 import com.fouristhenumber.utilitiesinexcess.compat.findit.FindItHelper;
 import com.fouristhenumber.utilitiesinexcess.compat.simpleskinbackport.SsbCompat;
 import com.fouristhenumber.utilitiesinexcess.compat.waila.TTRenderColoredBlock;
@@ -41,6 +42,9 @@ public class ClientProxy extends CommonProxy {
     public void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);
         ModelRegistry.registerModid(MODID);
+        if (Mods.Angelica.isLoaded()) {
+            CTMForColoredBlocks.init();
+        }
     }
 
     @Override

src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java

@@ -49,9 +49,6 @@ public void preInit(FMLPreInitializationEvent event) {
         ModDimensions.init();
         ModBiomes.init();
 
-        if (Mods.NEI.isLoaded()) {
-            IMCForNEI.IMCSender();
-        }
         if (Mods.Waila.isLoaded()) {
             FMLInterModComms.sendMessage(
                 "Waila",
@@ -67,6 +64,10 @@ public void preInit(FMLPreInitializationEvent event) {
         if (ColoredBlocksConfig.INSTANCE.enableColoredBlocks) {
             BlockColored.registerConfigBlocks();
         }
+
+        if (Mods.NEI.isLoaded()) {
+            IMCForNEI.IMCSender();
+        }
     }
 
     public void init(FMLInitializationEvent event) {
@@ -94,7 +95,7 @@ public void postInit(FMLPostInitializationEvent event) {
     public void loadComplete(FMLLoadCompleteEvent event) {
 
         if (ColoredBlocksConfig.INSTANCE.enableColoredBlocks) {
-            BlockColored.initColoredBlocks();
+            BlockColored.initColoredBlocks(null);
         }
 
     }

src/main/java/com/fouristhenumber/utilitiesinexcess/ModBlocks.java

@@ -6,6 +6,7 @@
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
+import com.fouristhenumber.utilitiesinexcess.common.IUIERegistered;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockAdvancedUpdateDetector;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockBedrockium;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockBlackoutCurtains;
@@ -230,6 +231,10 @@ public static void init() {
         itemBlock = iblock;
         hasItemBlock = iblock != null;
         this.name = name;
+
+        if (block instanceof IUIERegistered iUIERegistered) {
+            iUIERegistered.setRegistryName(name);
+        }
     }
 
     /**

src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java

@@ -4,6 +4,7 @@
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 
+import com.fouristhenumber.utilitiesinexcess.common.IUIERegistered;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemAnalyzer;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemArchitectsWand;
 import com.fouristhenumber.utilitiesinexcess.common.items.ItemBedrockiumIngot;
@@ -93,6 +94,10 @@ public static void init() {
             if (item.isEnabled()) {
                 item.theItem.setCreativeTab(UtilitiesInExcess.uieTab);
                 GameRegistry.registerItem(item.get(), item.name);
+
+                if (item.theItem instanceof IUIERegistered iUIERegistered) {
+                    iUIERegistered.setRegistryName(item.name);
+                }
             }
         }
     }

src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java

@@ -37,7 +37,7 @@
     version = Tags.VERSION,
     name = "UtilitiesInExcess",
     acceptedMinecraftVersions = "[1.7.10]",
-    dependencies = "required-after:gtnhlib@[0.9.9,);after:ForgeMicroblock;after:Waila;after:NotEnoughItems@[2.8.108-GTNH,);")
+    dependencies = "required-after:gtnhlib@[0.9.9,);after:ForgeMicroblock;after:Waila;after:NotEnoughItems@[2.8.108-GTNH,);after:angelica@[2.1.53,);")
 public class UtilitiesInExcess {
 
     public static final String MODID = "utilitiesinexcess";

src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java

@@ -2,12 +2,10 @@
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import com.fouristhenumber.utilitiesinexcess.ModBlocks;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockColored;
 import com.fouristhenumber.utilitiesinexcess.compat.Mods;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.ColoredBlocksConfig;
 import com.fouristhenumber.utilitiesinexcess.config.items.InversionConfig;
-import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorBlock;
 
 import cpw.mods.fml.common.event.FMLInterModComms;
 
@@ -280,18 +278,15 @@ public static void IMCSender() {
         if (ColoredBlocksConfig.INSTANCE.enableColoredBlocks && BlockColored.allowDyingBlocks()) {
             sendInfoPage("<utilitiesinexcess:paint_roller>", "uie.nei.infopage.paint_roller");
 
-            for (ModBlocks modBlock : ModBlocks.VALUES) {
-                if (modBlock.get() instanceof BlockColored bc && bc.useNEIPage()
-                    && !modBlock.name()
-                        .equals("COLORED_STONE_BRICKS")) {
-                    sendInfoPage("utilitiesinexcess:" + modBlock.name(), "uie.nei.infopage.colored_blocks.dyeable");
+            for (BlockColored block : BlockColored.COLORED_BLOCKS) {
+                if (block.useDefaultNEIPage()) {
+                    sendInfoPage(
+                        "utilitiesinexcess:" + block.getRegistryName(),
+                        "uie.nei.infopage.colored_blocks.dyeable");
+                }
+                if (block.getCustomNEIPage() != null) {
+                    sendInfoPage("utilitiesinexcess:" + block.getRegistryName(), block.getCustomNEIPage());
                 }
-            }
-
-            for (BlockColored block : BlockColored.CONFIG_COLORED_BLOCKS) {
-                sendInfoPage(
-                    "utilitiesinexcess:" + ((AccessorBlock) block).uie$getUnlocalizedNameRaw(),
-                    "uie.nei.infopage.colored_blocks.dyeable");
             }
         }
     }

src/main/java/com/fouristhenumber/utilitiesinexcess/common/IUIERegistered.java

@@ -0,0 +1,11 @@
+package com.fouristhenumber.utilitiesinexcess.common;
+
+/**
+ * A simple interface for making sure block and item instances can access their registry names.
+ */
+public interface IUIERegistered {
+
+    void setRegistryName(String name);
+
+    String getRegistryName();
+}