Fix error when getting out of bounds block state

- Increased region range
- Refactor

Author: xCollateral

src/main/java/net/vulkanmod/render/chunk/build/RenderRegion.java

@@ -27,11 +27,15 @@ public class RenderRegion implements BlockAndTintGetter {
     public static final int WIDTH = 3;
     public static final int SIZE = WIDTH * WIDTH * WIDTH;
 
-    public static final int REGION_WIDTH = 16 + 2;
-    public static final int BLOCKS = REGION_WIDTH * REGION_WIDTH * REGION_WIDTH;
+    public static final int BOUNDARY_BLOCK_WIDTH = 2;
+    public static final int REGION_BLOCK_WIDTH = 16 + BOUNDARY_BLOCK_WIDTH * 2;
+    public static final int BLOCK_COUNT = REGION_BLOCK_WIDTH * REGION_BLOCK_WIDTH * REGION_BLOCK_WIDTH;
+
+    public static final BlockState AIR_BLOCK_STATE = Blocks.AIR.defaultBlockState();
 
     private final int minSecX, minSecY, minSecZ;
     private final int minX, minY, minZ;
+    private final int maxX, maxY, maxZ;
     private final Level level;
     private final int blendRadius;
 
@@ -51,49 +55,48 @@ public class RenderRegion implements BlockAndTintGetter {
         this.minSecX = x - 1;
         this.minSecY = y - 1;
         this.minSecZ = z - 1;
-        this.minX = (minSecX << 4) + 15;
-        this.minZ = (minSecZ << 4) + 15;
-        this.minY = (minSecY << 4) + 15;
+        this.minX = (minSecX << 4) + 16 - BOUNDARY_BLOCK_WIDTH;
+        this.minZ = (minSecZ << 4) + 16 - BOUNDARY_BLOCK_WIDTH;
+        this.minY = (minSecY << 4) + 16 - BOUNDARY_BLOCK_WIDTH;
+        this.maxX = minX + REGION_BLOCK_WIDTH;
+        this.maxZ = minZ + REGION_BLOCK_WIDTH;
+        this.maxY = minY + REGION_BLOCK_WIDTH;
 
         this.blockDataContainers = blockData;
         this.lightData = lightData;
         this.blockEntityMap = blockEntityMap;
 
-        this.blockData = new BlockState[BLOCKS];
+        this.blockData = new BlockState[BLOCK_COUNT];
 
         this.blockStateGetter = level.isDebug() ? this::debugBlockState : this::defaultBlockState;
 
         this.blendRadius = Minecraft.getInstance().options.biomeBlendRadius().get();
     }
 
     public void loadBlockStates() {
-        int maxSecX = minSecX + 2;
-        int maxSecY = minSecY + 2;
-        int maxSecZ = minSecZ + 2;
-
-        int maxX = (maxSecX << 4);
-        int maxZ = (maxSecZ << 4);
-        int maxY = (maxSecY << 4);
-
         Arrays.fill(blockData, Blocks.AIR.defaultBlockState());
 
-        for(int x = minSecX; x <= maxSecX; ++x) {
-            for(int z = minSecZ; z <= maxSecZ; ++z) {
-                for(int y = minSecY; y <= maxSecY; ++y) {
-                    final int idx = getSectionIdx((x - minSecX), (y - minSecY), (z - minSecZ));
+        for(int x = 0; x <= 2; ++x) {
+            for(int z = 0; z <= 2; ++z) {
+                for(int y = 0; y <= 2; ++y) {
+                    final int idx = getSectionIdx(x, y, z);
 
                     PalettedContainer<BlockState> container = blockDataContainers[idx];
 
                     if(container == null)
                         continue;
 
-                    int tMinX = Math.max(minX, x << 4);
-                    int tMinY = Math.max(minY, y << 4);
-                    int tMinZ = Math.max(minZ, z << 4);
+                    int absBlockX = (x + minSecX) << 4;
+                    int absBlockY = (y + minSecY) << 4;
+                    int absBlockZ = (z + minSecZ) << 4;
 
-                    int tMaxX = Math.min(maxX, (x << 4) + 15);
-                    int tMaxY = Math.min(maxY, (y << 4) + 15);
-                    int tMaxZ = Math.min(maxZ, (z << 4) + 15);
+                    int tMinX = Math.max(minX, absBlockX);
+                    int tMinY = Math.max(minY, absBlockY);
+                    int tMinZ = Math.max(minZ, absBlockZ);
+
+                    int tMaxX = Math.min(maxX, absBlockX + 16);
+                    int tMaxY = Math.min(maxY, absBlockY + 16);
+                    int tMaxZ = Math.min(maxZ, absBlockZ + 16);
 
                     loadSectionBlockStates(container, blockData,
                             tMinX, tMinY, tMinZ, tMaxX, tMaxY, tMaxZ);
@@ -106,10 +109,10 @@ public void loadBlockStates() {
     void loadSectionBlockStates(PalettedContainer<BlockState> container, BlockState[] blockStates,
                                 int minX, int minY, int minZ, int maxX, int maxY, int maxZ) {
 
-        for(int x = minX; x <= maxX; ++x) {
-            for(int z = minZ; z <= maxZ; ++z) {
-                for(int y = minY; y <= maxY; ++y) {
-                    final int idx = getBlockIdx(x, y, z);
+        for (int y = minY; y < maxY; ++y) {
+            for (int z = minZ; z < maxZ; ++z) {
+                for (int x = minX; x < maxX; ++x) {
+                    final int idx = getBlockIdx(x - this.minX, y - this.minY, z - this.minZ);
 
                     blockStates[idx] = container != null ?
                             container.get(x & 15, y & 15, z & 15)
@@ -129,7 +132,7 @@ public BlockState getBlockState(BlockPos blockPos) {
     }
 
     public FluidState getFluidState(BlockPos blockPos) {
-        return blockStateGetter.apply(blockPos).getFluidState();
+        return this.getBlockState(blockPos).getFluidState();
     }
 
     public float getShade(Direction direction, boolean bl) {
@@ -141,16 +144,23 @@ public LevelLightEngine getLightEngine() {
     }
 
     public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
+        if (outsideRegion(blockPos.getX(), blockPos.getY(), blockPos.getZ())) {
+            return 0;
+        }
+
         int secX = SectionPos.blockToSectionCoord(blockPos.getX()) - this.minSecX;
         int secY = SectionPos.blockToSectionCoord(blockPos.getY()) - this.minSecY;
         int secZ = SectionPos.blockToSectionCoord(blockPos.getZ()) - this.minSecZ;
 
         DataLayer dataLayer = this.lightData[getSectionIdx(secX, secY, secZ)][lightLayer.ordinal()];
         return dataLayer == null ? 0 : dataLayer.get(blockPos.getX() & 15, blockPos.getY() & 15, blockPos.getZ() & 15);
-
     }
 
     public int getRawBrightness(BlockPos blockPos, int i) {
+        if (outsideRegion(blockPos.getX(), blockPos.getY(), blockPos.getZ())) {
+            return 0;
+        }
+
         int secX = SectionPos.blockToSectionCoord(blockPos.getX()) - this.minSecX;
         int secY = SectionPos.blockToSectionCoord(blockPos.getY()) - this.minSecY;
         int secZ = SectionPos.blockToSectionCoord(blockPos.getZ()) - this.minSecZ;
@@ -190,14 +200,27 @@ public int getSectionIdx(int secX, int secY, int secZ) {
     }
 
     public int getBlockIdx(int x, int y, int z) {
+        return REGION_BLOCK_WIDTH * ((REGION_BLOCK_WIDTH * y) + z) + x;
+    }
+
+    public boolean outsideRegion(int x, int y, int z) {
+        return x < minX || x >= maxX || y < minY || y >= maxY || z < minZ || z >= maxZ;
+    }
+
+    public BlockState defaultBlockState(BlockPos blockPos) {
+        int x = blockPos.getX();
+        int y = blockPos.getY();
+        int z = blockPos.getZ();
+
+        if (outsideRegion(x, y, z)) {
+            return AIR_BLOCK_STATE;
+        }
+
         x -= minX;
         y -= minY;
         z -= minZ;
-        return REGION_WIDTH * ((REGION_WIDTH * y) + z) + x;
-    }
 
-    public BlockState defaultBlockState(BlockPos blockPos) {
-        return blockData[getBlockIdx(blockPos.getX(), blockPos.getY(), blockPos.getZ())];
+        return blockData[getBlockIdx(x, y, z)];
     }
 
     public BlockState debugBlockState(BlockPos blockPos) {