From aee0af27f401b9cf4257cdf02fe8d58b57d77f4c Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 18 Mar 2021 23:33:26 +0800
Subject: [PATCH] Remove addListener from ColorHandlersImpl

---
 .../registry/forge/ColorHandlersImpl.java     | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java
index 44dfa3d2..0abb94a4 100644
--- a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java
+++ b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ColorHandlersImpl.java
@@ -40,19 +40,22 @@ public class ColorHandlersImpl {
     
     static {
         EventBuses.onRegistered(ArchitecturyForge.MOD_ID, bus -> {
-            bus.<ColorHandlerEvent.Item>addListener(event -> {
-                for (Pair<ItemColor, Supplier<ItemLike>[]> pair : ITEM_COLORS) {
-                    event.getItemColors().register(pair.getLeft(), unpackItems(pair.getRight()));
-                }
-            });
-            bus.<ColorHandlerEvent.Block>addListener(event -> {
-                for (Pair<BlockColor, Supplier<Block>[]> pair : BLOCK_COLORS) {
-                    event.getBlockColors().register(pair.getLeft(), unpackBlocks(pair.getRight()));
-                }
-            });
+            bus.register(ColorHandlersImpl.class);
         });
     }
     
+    public static void onItemColorEvent(ColorHandlerEvent.Item event) {
+        for (Pair<ItemColor, Supplier<ItemLike>[]> pair : ITEM_COLORS) {
+            event.getItemColors().register(pair.getLeft(), unpackItems(pair.getRight()));
+        }
+    }
+    
+    public static void onBlockColorEvent(ColorHandlerEvent.Block event) {
+        for (Pair<BlockColor, Supplier<Block>[]> pair : BLOCK_COLORS) {
+            event.getBlockColors().register(pair.getLeft(), unpackBlocks(pair.getRight()));
+        }
+    }
+    
     @SafeVarargs
     public static void registerItemColors(ItemColor itemColor, Supplier<ItemLike>... items) {
         Objects.requireNonNull(itemColor, "color is null!");