Fix Forge tinting logic

common/src/main/java/net/lerariemann/infinity/util/PlatformMethods.java

···
         return (int)(256 * ((r + 1)/2)) + 256*((int)(256 * ((g + 1)/2)) + 256*(int)(256 * ((b + 1)/2)));
     }
 
-    public static int getBookBoxColour(BlockState state, BlockRenderView world, BlockPos pos, int tintIndex) {
-        if (pos != null) {
-            return posToColor(pos);
-        }
-        return 16777215;
-    }
-
-    public static int getOverlayColorFromComponents(ItemStack stack, int layer) {
-        if (stack.getNbt() != null) {
-            int color = stack.getNbt().getInt("key_color");
-            if (layer == 1) {
-                return color;
-            }
-        }
-        return 0xFFFFFF;
-    }
-
-    public static int getNeitherPortalColour(BlockState state, BlockRenderView world, BlockPos pos, int tintIndex) {
-        if (world != null && pos != null) {
-            BlockEntity blockEntity = world.getBlockEntity(pos);
-            if (blockEntity instanceof InfinityPortalBlockEntity be) {
-                Object j = be.getTint();
-                return (int)j & 0xFFFFFF;
-            }
-        }
-        return 0xFFFFFF;
-    }
-
-    public static int getBiomeBottleColor(BlockState state, BlockRenderView world, BlockPos pos, int tintIndex) {
-        if (world != null && pos != null) {
-            BlockEntity blockEntity = world.getBlockEntity(pos);
-            if (blockEntity instanceof BiomeBottleBlockEntity be) {
-                Object j = be.getTint();
-                return (int)j & 0xFFFFFF;
-            }
-        }
-        return 0xFFFFFF;
-    }
-
     @ExpectPlatform
     public static <T extends Item> void addAfter(RegistrySupplier<T> blockItem, RegistryKey<ItemGroup> group, Item item) {
         throw new AssertionError();
···
     }
 
     /**
-     * Neoforge-exclusive method of testing if a mob is located in iridescence as far as fluid types are concerned.
+     * Forge-exclusive method of testing if a mob is located in iridescence as far as fluid types are concerned.
      * Used only in mixins, to fix the neoforge loader stripping mobs of ability to swim in non-water fluids.
      * On Fabric, returns false.
      */
···
     public static boolean acidTest(Entity entity, boolean eyes) {
         throw new AssertionError();
     }
+
     @ExpectPlatform
     public static double acidHeightTest(Entity entity) {
         throw new AssertionError();

fabric/src/main/java/net/lerariemann/infinity/fabric/client/InfinityModFabricClient.java

···
         ColorProviderRegistry.ITEM.register(InfinityMethods::getOverlayColorFromComponents,
                 ModItems.TRANSFINITE_KEY.get(),
                 ModItems.BIOME_BOTTLE_ITEM.get(),
-                ModItems.F4.get());
-        ColorProviderRegistry.ITEM.register(InfinityMethods::getOverlayColorFromComponents,
+                ModItems.F4.get(),
                 ModItems.CHROMATIC_WOOL.get(),
                 ModItems.CHROMATIC_CARPET.get(),
                 ModItems.CHROMATIC_MATTER.get());

forge/src/main/java/net/lerariemann/infinity/forge/client/InfinityModForgeClient.java

···
 import net.lerariemann.infinity.registry.core.ModBlocks;
 import net.lerariemann.infinity.registry.core.ModItemFunctions;
 import net.lerariemann.infinity.registry.core.ModItems;
+import net.lerariemann.infinity.util.InfinityMethods;
 import net.lerariemann.infinity.util.PlatformMethods;
 import net.lerariemann.infinity.compat.forge.ModConfigFactory;
 import net.minecraft.client.render.RenderLayer;
···
     // Apply colour handlers to tint Neither Portals and Book Boxes.
     @SubscribeEvent
     public static void registerBlockColorHandlers(RegisterColorHandlersEvent.Block event) {
-        event.register(PlatformMethods::getNeitherPortalColour, ModBlocks.PORTAL.get());
-        event.register(PlatformMethods::getBookBoxColour, ModBlocks.BOOK_BOX.get(), ModBlocks.IRIDESCENCE.get());
+        event.register(InfinityMethods::getBlockEntityColor,
+                ModBlocks.PORTAL.get(),
+                ModBlocks.BIOME_BOTTLE.get(),
+                ModBlocks.CHROMATIC_WOOL.get(),
+                ModBlocks.CHROMATIC_CARPET.get());
+        event.register(InfinityMethods::getBookBoxColor,
+                ModBlocks.BOOK_BOX.get());
     }
     @SubscribeEvent
     public static void registerItemColorHandlers(RegisterColorHandlersEvent.Item event) {
-        event.register(PlatformMethods::getOverlayColorFromComponents, ModItems.TRANSFINITE_KEY.get(), ModItems.BIOME_BOTTLE_ITEM.get());
+        event.register(InfinityMethods::getOverlayColorFromComponents,
+                ModItems.TRANSFINITE_KEY.get(),
+                ModItems.BIOME_BOTTLE_ITEM.get(),
+                ModItems.F4.get(),
+                ModItems.CHROMATIC_WOOL.get(),
+                ModItems.CHROMATIC_CARPET.get(),
+                ModItems.CHROMATIC_MATTER.get());
+        event.register(InfinityMethods::getPortalItemColor,
+                ModItems.PORTAL_ITEM.get());
     }
     @SubscribeEvent
     public static void registerModelPredicates(FMLClientSetupEvent event) {