From 50b008e44a73cd1db1fe24c1ac0764e1c66d1a75 Mon Sep 17 00:00:00 2001
From: Cassian Godsted <cassian@godsted.com>
Date: Sat, 1 Jun 2024 11:34:16 -0400
Subject: [PATCH] Fix Turf Item tinting in Forge

---
 .../java/cc/cassian/pyrite/forge/PyriteClient.java | 14 ++++++--------
 .../java/cc/cassian/pyrite/forge/PyriteForge.java  |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/forge/src/main/java/cc/cassian/pyrite/forge/PyriteClient.java b/forge/src/main/java/cc/cassian/pyrite/forge/PyriteClient.java
index cd867dbe1..3cfc3884a 100644
--- a/forge/src/main/java/cc/cassian/pyrite/forge/PyriteClient.java
+++ b/forge/src/main/java/cc/cassian/pyrite/forge/PyriteClient.java
@@ -30,13 +30,11 @@ public static void registerBlockColors(RegisterColorHandlersEvent.Block event){
         }
     }
 
-    public static void registerItemColors(RegisterColorHandlersEvent.Item event){
+    // Client-side mod bus event handler
+    @SubscribeEvent
+    public static void registerItemColorHandlers(RegisterColorHandlersEvent.Item event) {
         for (RegistrySupplier<Block> pyriteBlock : grassBlocks) {
-            ItemColors itemColors = event.getItemColors();
-            BlockColors blockColors = event.getBlockColors();
-            event.register((stack, tintIndex) -> {
-                BlockState blockstate = ((BlockItem) stack.getItem()).getBlock().getDefaultState();
-                return blockColors.getColor(blockstate, null, null, tintIndex);
-            }, pyriteBlock.get());
-        }}
+            event.register((stack, tintIndex) -> 9551193, pyriteBlock.get());
+        }
+    }
 }
diff --git a/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java b/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java
index 006744744..f0ad7edd3 100644
--- a/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java
+++ b/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java
@@ -17,6 +17,7 @@ public PyriteForge() {
         // Run our common setup.
         Pyrite.init(SharedConstants.WORLD_VERSION + "-forge");
         modEventBus.addListener(PyriteClient::registerBlockColors);
+        modEventBus.addListener(PyriteClient::registerItemColorHandlers);