feat: MixedSlabs (WIP)

Change render method + fix light issues
xYundy · Apr 24, 2024 · 1d953c6 · 1d953c6
1 parent 9249332
commit 1d953c6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 31 deletions.
diff --git a/src/client/java/pl/xyundy/squaredadditions/SquaredAdditionsClient.java b/src/client/java/pl/xyundy/squaredadditions/SquaredAdditionsClient.java
@@ -8,12 +8,12 @@
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
-import net.fabricmc.fabric.impl.client.rendering.BlockEntityRendererRegistryImpl;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
@@ -52,8 +52,7 @@ private void setKeybind(MinecraftClient client) {
 	public void onInitializeClient() {
 		ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("squaredadditions", "slabs"), container, Text.literal("Squared Additions Slabs (Built-In)"), ResourcePackActivationType.DEFAULT_ENABLED);
 
-
-		BlockEntityRendererRegistryImpl.register(MIXED_SLAB_BLOCK_ENTITY, MixedSlabBlockEntityRenderer::new);
+		BlockEntityRendererFactories.register(MIXED_SLAB_BLOCK_ENTITY, MixedSlabBlockEntityRenderer::new);
 
 		HudRenderCallback.EVENT.register((context, tickDelta) -> {
 

diff --git a/src/client/java/pl/xyundy/squaredadditions/block/entity/MixedSlabBlockEntityRenderer.java b/src/client/java/pl/xyundy/squaredadditions/block/entity/MixedSlabBlockEntityRenderer.java
@@ -1,45 +1,41 @@
 package pl.xyundy.squaredadditions.block.entity;
 
-import net.fabricmc.fabric.api.renderer.v1.model.ModelHelper;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayers;
+import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.client.render.block.BlockModels;
+import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
-import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.client.render.model.BakedModelManager;
-import net.minecraft.client.render.model.BakedQuad;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.random.Random;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 public class MixedSlabBlockEntityRenderer implements BlockEntityRenderer<MixedSlabBlockEntity> {
 
     public MixedSlabBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {}
 
     @Override
     public void render(MixedSlabBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
-        BakedModelManager manager = MinecraftClient.getInstance().getBakedModelManager();
-        BlockModels blockModels = manager.getBlockModels();
-        BakedModel bottomSlabModel = blockModels.getModel(entity.bottomSlabState);
-        BakedModel topSlabModel = blockModels.getModel(entity.topSlabState);
-
-
-        if (null != topSlabModel && null != bottomSlabModel) {
-            int lightAbove = WorldRenderer.getLightmapCoordinates(entity.getWorld(), entity.getPos().up());
-            VertexConsumer consumer = vertexConsumers.getBuffer(RenderLayers.getEntityBlockLayer(entity.getCachedState(), false));
-            matrices.push();
-            for (int i = 0; i <= 5; i++) { // render every model face except the inner ones
-                for (BakedQuad quad : bottomSlabModel.getQuads(null, ModelHelper.faceFromIndex(i), Random.create())) {
-                    consumer.quad(matrices.peek(), quad, 1f, 1f, 1f, lightAbove, overlay);
-                }
-                for (BakedQuad quad : topSlabModel.getQuads(null, ModelHelper.faceFromIndex(i), Random.create())) {
-                    consumer.quad(matrices.peek(), quad, 1f, 1f, 1f, lightAbove, overlay);
-                }
-            }
-            matrices.pop();
-        }
+        World world = entity.getWorld();
+        BlockPos pos = entity.getPos();
+
+        BlockRenderManager manager = MinecraftClient.getInstance().getBlockRenderManager();
+
+
+        RenderLayer layerTop = entity.topSlabState.isTransparent(world, pos) ? RenderLayer.getTranslucent() : RenderLayer.getSolid();
+        RenderLayer layerBot = entity.bottomSlabState.isTransparent(world, pos) ? RenderLayer.getTranslucent() : RenderLayer.getSolid();
+
+        VertexConsumer vertexConsumerTop = vertexConsumers.getBuffer(layerTop);
+        VertexConsumer vertexConsumerBot = vertexConsumers.getBuffer(layerBot);
+
+        manager.getModelRenderer().render(world, manager.getModel(entity.bottomSlabState), entity.bottomSlabState, pos, matrices, vertexConsumerBot, false, world.random, entity.bottomSlabState.getRenderingSeed(pos), OverlayTexture.DEFAULT_UV);
+        manager.getModelRenderer().render(world, manager.getModel(entity.topSlabState),entity.topSlabState, pos, matrices, vertexConsumerTop, false, world.random, entity.topSlabState.getRenderingSeed(pos), OverlayTexture.DEFAULT_UV);
+    }
+
+    @Override
+    public boolean rendersOutsideBoundingBox(MixedSlabBlockEntity blockEntity) {
+        return true;
     }
 }