Fix multi-layer offset issues

Author: robotgryphon

src/main/java/com/robotgryphon/compactcrafting/core/Registration.java

@@ -105,19 +105,18 @@ public class Registration {
         Collections.addAll(template, complexPattern);
 
         rec.setLayers(new IRecipeLayer[]{
-                new SingleComponentRecipeLayer("S", template)
-                // new SingleComponentRecipeLayer("O", template),
-                // new SingleComponentRecipeLayer("G", template)
+                new SingleComponentRecipeLayer("O", template),
+                new SingleComponentRecipeLayer("G", template)
+
         });
 
-        rec.catalyst = Items.GLASS;
+        rec.catalyst = Items.ANVIL;
         rec.outputs = new ItemStack[]{
-                new ItemStack(Items.BELL, 1)
+                new ItemStack(Items.CRYING_OBSIDIAN, 11)
         };
 
-        rec.addComponent("S", Blocks.STONE.getDefaultState());
-        // rec.addComponent("O", Blocks.OBSIDIAN.getDefaultState());
-        // rec.addComponent("G", Blocks.GLOWSTONE.getDefaultState());
+        rec.addComponent("O", Blocks.OBSIDIAN.getDefaultState());
+        rec.addComponent("G", Blocks.GLOWSTONE.getDefaultState());
 
         return rec;
     });

src/main/java/com/robotgryphon/compactcrafting/recipes/MiniaturizationRecipe.java

@@ -127,14 +127,14 @@ private boolean checkRotation(IWorldReader world, Rotation rot, AxisAlignedBB fi
             Map<BlockPos, BlockPos> layerRotated = BlockSpaceUtil.rotatePositionsInPlace(layerFilled, rot);
 
             // Check that the rotated positions are correct
-            boolean layerMatches = areLayerPositionsCorrect(filledBounds, layerRotated.values().toArray(new BlockPos[0]));
+            boolean layerMatches = areLayerPositionsCorrect(layer.get(), filledBounds, layerRotated.values().toArray(new BlockPos[0]));
             if (!layerMatches)
                 return false;
 
             // Check the states are correct
             for(BlockPos unrotatedPos : layerFilled) {
                 BlockPos rotatedPos = layerRotated.get(unrotatedPos);
-                BlockPos normalizedRotatedPos = BlockSpaceUtil.normalizeLayerPosition(filledBounds, rotatedPos);
+                BlockPos normalizedRotatedPos = BlockSpaceUtil.normalizeLayerPosition(filledBounds, rotatedPos).down(offset);
 
                 BlockState actualState = world.getBlockState(unrotatedPos);
 
@@ -194,19 +194,13 @@ public AxisAlignedBB getDimensions() {
      * @param filledPositions   The filled positions on the layer to check.
      * @return
      */
-    public boolean areLayerPositionsCorrect(AxisAlignedBB fieldFilledBounds, BlockPos[] filledPositions) {
+    public boolean areLayerPositionsCorrect(IRecipeLayer layer, AxisAlignedBB fieldFilledBounds, BlockPos[] filledPositions) {
         // Recipe layers using this method must define at least one filled space
         if (filledPositions.length == 0)
             return false;
 
-        Optional<IRecipeLayer> layer = getRecipeLayerFromPositions(fieldFilledBounds, filledPositions);
-        if (!layer.isPresent())
-            return false;
-
-        IRecipeLayer l = layer.get();
-
         int totalFilled = filledPositions.length;
-        int requiredFilled = l.getNumberFilledPositions();
+        int requiredFilled = layer.getNumberFilledPositions();
 
         // Early exit if we don't have the correct number of blocks in the layer
         if (totalFilled != requiredFilled)
@@ -226,7 +220,7 @@ public boolean areLayerPositionsCorrect(AxisAlignedBB fieldFilledBounds, BlockPo
 
         return Arrays.stream(fieldNormalizedPositionsLayerOffset)
                 .parallel()
-                .allMatch(l::isPositionRequired);
+                .allMatch(layer::isPositionRequired);
     }
 
     private Optional<IRecipeLayer> getRecipeLayerFromPositions(AxisAlignedBB fieldFilledBounds, BlockPos[] filledPositions) {