SectionBufferBuilderPack->ChunkBufferBuilderPack

Author: ApexModder

rendering/src/main/java/dev/compactmods/gander/render/baked/BakedLevel.java

@@ -1,38 +1,35 @@
 package dev.compactmods.gander.render.baked;
 
-import com.mojang.blaze3d.vertex.BufferBuilder;
+import java.lang.ref.WeakReference;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3f;
 
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.VertexBuffer;
-
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.blaze3d.vertex.VertexSorting;
 
+import net.minecraft.client.renderer.ChunkBufferBuilderPack;
 import net.minecraft.client.renderer.RenderType;
-
-import net.minecraft.client.renderer.SectionBufferBuilderPack;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 
-import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3f;
-
-import java.lang.ref.WeakReference;
-import java.util.Map;
-
 public final class BakedLevel {
 	private final WeakReference<BlockAndTintGetter> originalLevel;
-	private final SectionBufferBuilderPack blockBuilders;
-	private final SectionBufferBuilderPack fluidBuilders;
+	private final ChunkBufferBuilderPack blockBuilders;
+	private final ChunkBufferBuilderPack fluidBuilders;
 	private final Map<RenderType, VertexBuffer> blockBuffers;
 	private final Map<RenderType, VertexBuffer> fluidBuffers;
 	private BufferBuilder.@Nullable SortState blockTransparencyState;
 	private BufferBuilder.@Nullable SortState fluidTransparencyState;
 	private final BoundingBox blockBoundaries;
 
 	public BakedLevel(WeakReference<BlockAndTintGetter> originalLevel,
-					  SectionBufferBuilderPack blockBuilders,
-					  SectionBufferBuilderPack fluidBuilders,
+					  ChunkBufferBuilderPack blockBuilders,
+					  ChunkBufferBuilderPack fluidBuilders,
 					  Map<RenderType, VertexBuffer> blockBuffers,
 					  Map<RenderType, VertexBuffer> fluidBuffers,
 					  @Nullable BufferBuilder.SortState blockTransparencyState,
@@ -53,7 +50,7 @@ public void resortTranslucency(Vector3f cameraPosition) {
 		this.fluidTransparencyState = resortTranslucency(cameraPosition, fluidBuilders, fluidBuffers, fluidTransparencyState);
 	}
 
-	private BufferBuilder.SortState resortTranslucency(Vector3f cameraPosition, SectionBufferBuilderPack pack, Map<RenderType, VertexBuffer> blockBuffers, BufferBuilder.SortState transparencyState) {
+	private BufferBuilder.SortState resortTranslucency(Vector3f cameraPosition, ChunkBufferBuilderPack pack, Map<RenderType, VertexBuffer> blockBuffers, BufferBuilder.SortState transparencyState) {
 		if (transparencyState != null && blockBuffers.containsKey(RenderType.translucent())) {
 			final var builder = pack.builder(RenderType.translucent());
 			builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.BLOCK);

rendering/src/main/java/dev/compactmods/gander/render/baked/LevelBakery.java

@@ -17,9 +17,9 @@
 import dev.compactmods.gander.render.FluidVertexConsumer;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ChunkBufferBuilderPack;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.SectionBufferBuilderPack;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.block.ModelBlockRenderer;
 import net.minecraft.client.renderer.chunk.RenderChunkRegion;
@@ -43,8 +43,8 @@ public static BakedLevel bakeVertices(Level level, BoundingBox blockBoundaries,
 		final Set<RenderType> visitedBlockRenderTypes = new HashSet<>();
 		final Set<RenderType> visitedFluidRenderTypes = new HashSet<>();
 		final RenderRegionCache regionCache = new RenderRegionCache();
-		final SectionBufferBuilderPack blockPack = new SectionBufferBuilderPack();
-		final SectionBufferBuilderPack fluidPack = new SectionBufferBuilderPack();
+		final ChunkBufferBuilderPack blockPack = new ChunkBufferBuilderPack();
+		final ChunkBufferBuilderPack fluidPack = new ChunkBufferBuilderPack();
 
 		PoseStack pose = new PoseStack();