spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hardcode leaves to solid layers

Browse Source
This commit is contained in:
mcrcortex
2025-05-23 12:10:14 +10:00
parent a1ace12042
commit 74dac668fb
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java
View File

@@ -13,6 +13,7 @@ import me.cortex.voxy.common.world.other.Mapper;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.FluidBlock; import net.minecraft.block.FluidBlock;
import net.minecraft.block.LeavesBlock;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.block.BlockColorProvider;
@@ -257,9 +258,13 @@ public class ModelFactory {
RenderLayer blockRenderLayer = null; RenderLayer blockRenderLayer = null;
if (blockState.getBlock() instanceof FluidBlock) { if (blockState.getBlock() instanceof FluidBlock) {
blockRenderLayer = RenderLayers.getFluidLayer(blockState.getFluidState()); blockRenderLayer = RenderLayers.getFluidLayer(blockState.getFluidState());
} else {
if (blockState.getBlock() instanceof LeavesBlock) {
blockRenderLayer = RenderLayer.getSolid();
} else { } else {
blockRenderLayer = RenderLayers.getBlockLayer(blockState); blockRenderLayer = RenderLayers.getBlockLayer(blockState);
} }
}
int checkMode = blockRenderLayer==RenderLayer.getSolid()?TextureUtils.WRITE_CHECK_STENCIL:TextureUtils.WRITE_CHECK_ALPHA; int checkMode = blockRenderLayer==RenderLayer.getSolid()?TextureUtils.WRITE_CHECK_STENCIL:TextureUtils.WRITE_CHECK_ALPHA;

5
src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java
View File

@@ -3,6 +3,7 @@ package me.cortex.voxy.client.core.model.bakery;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.FluidBlock; import net.minecraft.block.FluidBlock;
import net.minecraft.block.LeavesBlock;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
@@ -165,9 +166,13 @@ public class ModelTextureBakery {
if (state.getBlock() instanceof FluidBlock) { if (state.getBlock() instanceof FluidBlock) {
layer = RenderLayers.getFluidLayer(state.getFluidState()); layer = RenderLayers.getFluidLayer(state.getFluidState());
isBlock = false; isBlock = false;
} else {
if (state.getBlock() instanceof LeavesBlock) {
layer = RenderLayer.getSolid();
} else { } else {
layer = RenderLayers.getBlockLayer(state); layer = RenderLayers.getBlockLayer(state);
} }
}
//TODO: support block model entities //TODO: support block model entities
BakedBlockEntityModel bbem = null; BakedBlockEntityModel bbem = null;