From 74dac668fbdec8414739defc79a8a36461c40841 Mon Sep 17 00:00:00 2001
From: mcrcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Fri, 23 May 2025 12:10:14 +1000
Subject: [PATCH] Hardcode leaves to solid layers

---
 .../me/cortex/voxy/client/core/model/ModelFactory.java     | 7 ++++++-
 .../voxy/client/core/model/bakery/ModelTextureBakery.java  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
index 2ab22d55..5f6c0150 100644
--- a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
+++ b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
@@ -13,6 +13,7 @@ import me.cortex.voxy.common.world.other.Mapper;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FluidBlock;
+import net.minecraft.block.LeavesBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.color.block.BlockColorProvider;
@@ -258,7 +259,11 @@ public class ModelFactory {
         if (blockState.getBlock() instanceof FluidBlock) {
             blockRenderLayer = RenderLayers.getFluidLayer(blockState.getFluidState());
         } else {
-            blockRenderLayer = RenderLayers.getBlockLayer(blockState);
+            if (blockState.getBlock() instanceof LeavesBlock) {
+                blockRenderLayer = RenderLayer.getSolid();
+            } else {
+                blockRenderLayer = RenderLayers.getBlockLayer(blockState);
+            }
         }
 
 
diff --git a/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java b/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java
index 50e1c85a..674b2cd4 100644
--- a/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java
+++ b/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java
@@ -3,6 +3,7 @@ package me.cortex.voxy.client.core.model.bakery;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.FluidBlock;
+import net.minecraft.block.LeavesBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.RenderLayer;
@@ -166,7 +167,11 @@ public class ModelTextureBakery {
             layer = RenderLayers.getFluidLayer(state.getFluidState());
             isBlock = false;
         } else {
-            layer = RenderLayers.getBlockLayer(state);
+            if (state.getBlock() instanceof LeavesBlock) {
+                layer = RenderLayer.getSolid();
+            } else {
+                layer = RenderLayers.getBlockLayer(state);
+            }
         }
 
         //TODO: support block model entities