Update BlockSpaceUtil getLayerBoundsByYOffset method

Also adds a new method, getLayerBounds, that takes a field size and Y offset and does the same math. Handy.

Author: robotgryphon

src/main/java/dev/compactmods/crafting/compat/jei/JeiMiniaturizationCraftingCategory.java

@@ -472,7 +472,7 @@ private void renderRecipeLayer(MiniaturizationRecipe recipe, MatrixStack mx, IRe
         // Begin layer
         mx.pushPose();
 
-        AxisAlignedBB layerBounds = BlockSpaceUtil.getLayerBoundsByYOffset(recipe.getDimensions(), layerY);
+        AxisAlignedBB layerBounds = BlockSpaceUtil.getLayerBounds(recipe.getDimensions(), layerY);
         BlockPos.betweenClosedStream(layerBounds).forEach(filledPos -> {
             mx.pushPose();
 

src/main/java/dev/compactmods/crafting/field/render/CraftingPreviewRenderer.java

@@ -52,7 +52,7 @@ public static void render(IMiniaturizationRecipe recipe, double progress, Matrix
                 Optional<IRecipeLayer> layer = recipe.getLayer(y);
                 int finalY = y;
                 layer.ifPresent(l -> {
-                    AxisAlignedBB layerBounds = BlockSpaceUtil.getLayerBoundsByYOffset(recipe.getDimensions(), finalY);
+                    AxisAlignedBB layerBounds = BlockSpaceUtil.getLayerBounds(recipe.getDimensions(), finalY);
                     BlockPos.betweenClosedStream(layerBounds).forEach(filledPos -> {
                         stack.pushPose();
                         stack.translate(filledPos.getX(), 0, filledPos.getZ());

src/main/java/dev/compactmods/crafting/util/BlockSpaceUtil.java

@@ -4,6 +4,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
@@ -12,10 +13,15 @@
 
 public abstract class BlockSpaceUtil {
 
-    public static AxisAlignedBB getLayerBoundsByYOffset(AxisAlignedBB fullBounds, int yOffset) {
+    public static AxisAlignedBB getLayerBounds(MiniaturizationFieldSize fieldSize, int layerOffset) {
+        AxisAlignedBB fieldBounds = fieldSize.getBoundsAtOrigin();
+        return getLayerBounds(fieldBounds, layerOffset);
+    }
+
+    public static AxisAlignedBB getLayerBounds(AxisAlignedBB fieldBounds, int layerOffset) {
         return new AxisAlignedBB(
-                new Vector3d(fullBounds.minX, fullBounds.minY + yOffset, fullBounds.minZ),
-                new Vector3d(fullBounds.maxX, (fullBounds.minY + yOffset) + 1, fullBounds.maxZ)
+                new Vector3d(fieldBounds.minX, fieldBounds.minY + layerOffset, fieldBounds.minZ),
+                new Vector3d(fieldBounds.maxX, (fieldBounds.minY + layerOffset) + 1, fieldBounds.maxZ)
         );
     }
 
@@ -60,6 +66,11 @@ public static boolean boundsFitsInside(AxisAlignedBB inner, AxisAlignedBB outer)
         return true;
     }
 
+    public static Stream<BlockPos> getBlocksIn(MiniaturizationFieldSize fieldSize, int layerOffset) {
+        AxisAlignedBB layerBounds = getLayerBounds(fieldSize, layerOffset);
+        return getBlocksIn(layerBounds);
+    }
+
     @Nonnull
     public static Stream<BlockPos> getBlocksIn(AxisAlignedBB bounds) {
         return BlockPos.betweenClosedStream(bounds.contract(1, 1, 1));

src/test/java/dev/compactmods/crafting/tests/recipes/util/BlockSpaceUtilTests.java

@@ -16,7 +16,7 @@ void CanSpliceSingleLayer() {
         AxisAlignedBB fullBounds = new AxisAlignedBB(0, 0, 0, 10, 10, 10);
         AxisAlignedBB slice = new AxisAlignedBB(0, 0, 0, 10, 1, 10);
 
-        final AxisAlignedBB actual = BlockSpaceUtil.getLayerBoundsByYOffset(fullBounds, 0);
+        final AxisAlignedBB actual = BlockSpaceUtil.getLayerBounds(fullBounds, 0);
 
         Assertions.assertEquals(slice, actual, "Slice did not equal actual returned value.");
     }