Merge Slab Color Fix
This commit is contained in:
+10
-6
@@ -30,10 +30,7 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.FlowerBlock;
|
||||
import net.minecraft.world.level.block.LeavesBlock;
|
||||
import net.minecraft.world.level.block.RotatedPillarBlock;
|
||||
import net.minecraft.world.level.block.*;
|
||||
#if MC_VER >= MC_1_19_2
|
||||
import net.minecraft.util.RandomSource;
|
||||
#else
|
||||
@@ -41,6 +38,7 @@ import java.util.Random;
|
||||
#endif
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import net.minecraft.world.level.block.state.properties.SlabType;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -282,13 +280,19 @@ public class ClientBlockStateColorCache
|
||||
private List<BakedQuad> getQuadsForDirection(@Nullable Direction direction)
|
||||
{
|
||||
List<BakedQuad> quads = null;
|
||||
BlockState effectiveBlockState = this.blockState;
|
||||
|
||||
if (this.blockState.getBlock() instanceof SlabBlock)
|
||||
{
|
||||
effectiveBlockState = this.blockState.setValue( SlabBlock.TYPE, SlabType.DOUBLE );
|
||||
}
|
||||
|
||||
#if MC_VER < MC_1_21_5
|
||||
quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
|
||||
getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
|
||||
getBlockModel(effectiveBlockState).getQuads(effectiveBlockState, direction, RANDOM);
|
||||
#else
|
||||
List<BlockModelPart> blockModelPartList = Minecraft.getInstance().getModelManager().getBlockModelShaper().
|
||||
getBlockModel(this.blockState).collectParts(RANDOM);
|
||||
getBlockModel(effectiveBlockState).collectParts(RANDOM);
|
||||
|
||||
quads = new ArrayList<>();
|
||||
if (blockModelPartList != null)
|
||||
|
||||
Reference in New Issue
Block a user