Remove tint from otherworld leaves items

Closes #85
klikli-dev · Jan 10, 2021 · 12013ba · 12013ba
1 parent 520abec
commit 12013ba
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/ColorEventHandler.java b/src/main/java/com/github/klikli_dev/occultism/handlers/ColorEventHandler.java
@@ -58,13 +58,11 @@ public static void onRegisterBlockColors(ColorHandlerEvent.Block event) {
         //Otherworld leaves have a colored texture, so return white tint;
         //but while covered the oak leaves need their vanilla tint
         event.getBlockColors()
-                .register((state, light, pos, tintIndex) -> state.get(
-                        IOtherworldBlock.UNCOVERED) ? 	0xFFFFFF :
-                                                                    (light != null && pos != null ? BiomeColors
-                                                                                                            .getFoliageColor(
-                                                                                                                    light,
-                                                                                                                    pos) : FoliageColors
-                                                                                                                                   .getDefault()),
+                .register((state, light, pos, tintIndex) ->
+                                  state.get(IOtherworldBlock.UNCOVERED) ?
+                                          0xFFFFFF : (light != null && pos != null ?
+                                                              BiomeColors.getFoliageColor(light, pos) :
+                                                              FoliageColors.getDefault()),
                         OccultismBlocks.OTHERWORLD_LEAVES_NATURAL.get());
 
         Occultism.LOGGER.info("Block color registration complete.");
@@ -73,10 +71,8 @@ public static void onRegisterBlockColors(ColorHandlerEvent.Block event) {
     @SubscribeEvent
     public static void onRegisterItemColors(ColorHandlerEvent.Item event) {
         BlockColors blockColors = event.getBlockColors();
-        event.getItemColors()
-                .register((stack, tintIndex) -> OtherworldLeavesNaturalBlock.COLOR,
-                        OccultismBlocks.OTHERWORLD_LEAVES.get());
-
+        //Otherworld leaves have a colored texture, so return white tint;
+        //but while covered the oak leaves need their vanilla tint
         event.getItemColors()
                 .register((stack, tintIndex) -> {
                             BlockState blockstate = ((BlockItem) stack.getItem()).getBlock().getDefaultState();