1.21 Update

Co-authored-by: RealMangoRage <[email protected]>
Co-authored-by: Daniel Norris <[email protected]>
Co-authored-by: Ven <[email protected]>
This commit is contained in:
committed 2024-06-13 10:42:32 -07:00
1 parent 3d9e12a71d
commit 4a2db246e0
941 files changed
+3119 -4266

No files matched your search

@@ -0,0 +1,46 @@
--- a/net/minecraft/client/renderer/chunk/SectionCompiler.java
+++ b/net/minecraft/client/renderer/chunk/SectionCompiler.java
@@ -41,6 +_,7 @@
}
public SectionCompiler.Results compile(SectionPos p_344383_, RenderChunkRegion p_342669_, VertexSorting p_342522_, SectionBufferBuilderPack p_343546_) {
+ var modelDataMap = net.minecraft.client.Minecraft.getInstance().level.getModelDataManager().getAt(p_344383_);
SectionCompiler.Results sectioncompiler$results = new SectionCompiler.Results();
BlockPos blockpos = p_344383_.origin();
BlockPos blockpos1 = blockpos.offset(15, 15, 15);
@@ -71,7 +_,11 @@
}
if (blockstate.getRenderShape() == RenderShape.MODEL) {
- RenderType rendertype2 = ItemBlockRenderTypes.getChunkRenderType(blockstate);
+ var model = this.blockRenderer.getBlockModel(blockstate);
+ var data = modelDataMap.getOrDefault(blockpos2, net.minecraftforge.client.model.data.ModelData.EMPTY);
+ data = model.getModelData(p_342669_, blockpos2, blockstate, data);
+ randomsource.setSeed(blockstate.getSeed(blockpos2));
+ for (RenderType rendertype2 : model.getRenderTypes(blockstate, randomsource, data)) {
BufferBuilder bufferbuilder1 = this.getOrBeginLayer(map, p_343546_, rendertype2);
posestack.pushPose();
posestack.translate(
@@ -79,8 +_,9 @@
(float)SectionPos.sectionRelative(blockpos2.getY()),
(float)SectionPos.sectionRelative(blockpos2.getZ())
);
- this.blockRenderer.renderBatched(blockstate, blockpos2, p_342669_, posestack, bufferbuilder1, true, randomsource);
+ this.blockRenderer.renderBatched(blockstate, blockpos2, p_342669_, posestack, bufferbuilder1, true, randomsource, data, rendertype2);
posestack.popPose();
+ }
}
}
@@ -115,9 +_,10 @@
private <E extends BlockEntity> void handleBlockEntity(SectionCompiler.Results p_343713_, E p_343478_) {
BlockEntityRenderer<E> blockentityrenderer = this.blockEntityRenderer.getRenderer(p_343478_);
if (blockentityrenderer != null) {
- p_343713_.blockEntities.add(p_343478_);
if (blockentityrenderer.shouldRenderOffScreen(p_343478_)) {
p_343713_.globalBlockEntities.add(p_343478_);
+ } else {
+ p_343713_.blockEntities.add(p_343478_); //FORGE: Fix MC-112730
}
}
}