Recipes package now at 90 percent, only missing main recipe class

Author: robotgryphon

build.gradle

@@ -200,8 +200,12 @@ repositories {
     }
 
     maven {
-        name 'MCUnitTests'
-        url 'https://jitpack.io'
+        name "MCJUnitLib - CM Github"
+        url = uri("https://maven.pkg.github.com/CompactMods/mcjunitlib")
+        credentials {
+            username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+        }
     }
 }
 
@@ -213,7 +217,7 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    testImplementation fg.deobf("com.github.CompactMods:mcjunitlib:${mcunittest_version}")
+    testImplementation fg.deobf("com.github.alcatrazEscapee:mcjunitlib:${mcunittest_version}")
 
     // Deobfuscate each dev mod for runtime
     dev_mods.each {

gradle.properties

@@ -12,7 +12,7 @@ mod_version=1.0.0-beta.5
 # Dependencies and Libs
 jei_version=7.7.1.110
 top_version=1.16-3.1.4-22
-mcunittest_version=1.4.4-1.16.5
+mcunittest_version=1.4.6-1.16.5
 
 # Curseforge
 cf_project=429735

src/api/java/dev/compactmods/crafting/api/field/MiniaturizationFieldSize.java

@@ -139,4 +139,8 @@ public AxisAlignedBB getBoundsAtPosition(BlockPos center) {
     public String getSerializedName() {
         return name;
     }
+
+    public BlockPos getCenterOffset() {
+        return new BlockPos(getBoundsAtOrigin().getCenter());
+    }
 }

…pi/recipe/layers/IRecipeLayerBlocks.java …ing/api/recipe/layers/IRecipeBlocks.javasrc/api/java/dev/compactmods/crafting/api/recipe/layers/IRecipeLayerBlocks.java renamed to src/api/java/dev/compactmods/crafting/api/recipe/layers/IRecipeBlocks.java src/api/java/dev/compactmods/crafting/api/recipe/layers/IRecipeLayerBlocks.java renamed to src/api/java/dev/compactmods/crafting/api/recipe/layers/IRecipeBlocks.java

@@ -6,8 +6,9 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3i;
 
-public interface IRecipeLayerBlocks {
+public interface IRecipeBlocks {
 
     Optional<String> getComponentAtPosition(BlockPos relative);
 
@@ -33,11 +34,31 @@ public interface IRecipeLayerBlocks {
 
     Map<String, Integer> getKnownComponentTotals();
 
-    AxisAlignedBB getBounds();
+    AxisAlignedBB getSourceBounds();
 
     boolean allIdentified();
 
     Stream<BlockPos> getUnmappedPositions();
 
     Stream<BlockPos> getPositionsForComponent(String component);
+
+    AxisAlignedBB getFilledBounds();
+
+    IRecipeBlocks slice(AxisAlignedBB bounds);
+
+    IRecipeBlocks offset(Vector3i amount);
+
+    default IRecipeBlocks below(int offset) {
+        return offset(new Vector3i(0, -offset, 0));
+    }
+
+    default IRecipeBlocks above(int offset) {
+        return offset(new Vector3i(0, offset, 0));
+    }
+
+    default IRecipeBlocks normalize() {
+        AxisAlignedBB sb = getSourceBounds();
+        BlockPos offset = new BlockPos(-sb.minX, -sb.minY, -sb.minZ);
+        return offset(offset);
+    }
 }

src/api/java/dev/compactmods/crafting/api/recipe/layers/IRecipeLayer.java

@@ -27,7 +27,7 @@ default boolean requiresAllBlocksIdentified() {
         return true;
     }
 
-    default boolean matches(IRecipeComponents components, IRecipeLayerBlocks blocks) {
+    default boolean matches(IRecipeComponents components, IRecipeBlocks blocks) {
         return !requiresAllBlocksIdentified() || blocks.allIdentified();
     }
 

src/main/java/dev/compactmods/crafting/field/MiniaturizationField.java

@@ -11,6 +11,7 @@
 import dev.compactmods.crafting.network.NetworkHandler;
 import dev.compactmods.crafting.projector.block.FieldProjectorBlock;
 import dev.compactmods.crafting.recipes.MiniaturizationRecipe;
+import dev.compactmods.crafting.recipes.blocks.RecipeBlocks;
 import dev.compactmods.crafting.server.ServerConfig;
 import dev.compactmods.crafting.util.BlockSpaceUtil;
 import dev.compactmods.crafting.api.EnumCraftingState;
@@ -113,7 +114,7 @@ private void getRecipeFromId() {
 
             r.ifPresent(rec -> {
                 this.currentRecipe = (MiniaturizationRecipe) rec;
-                if(craftingState == EnumCraftingState.NOT_MATCHED)
+                if (craftingState == EnumCraftingState.NOT_MATCHED)
                     setCraftingState(EnumCraftingState.MATCHED);
 
                 this.listeners.forEach(li -> li.ifPresent(l -> {
@@ -301,7 +302,8 @@ public void doRecipeScan() {
         // Begin recipe dry run - loop, check bottom layer for matches
         MiniaturizationRecipe matchedRecipe = null;
         for (MiniaturizationRecipe recipe : recipes) {
-            boolean recipeMatches = recipe.matches(level, this);
+            RecipeBlocks blocks = RecipeBlocks.create(level, recipe.getComponents(), getFilledBounds());
+            boolean recipeMatches = recipe.matches(blocks);
             if (!recipeMatches)
                 continue;
 
@@ -320,7 +322,7 @@ private void setRecipe(MiniaturizationRecipe recipe) {
         setCraftingState(recipe != null ? EnumCraftingState.MATCHED : EnumCraftingState.NOT_MATCHED);
 
         // Send tracking client updates
-        if(!level.isClientSide) {
+        if (!level.isClientSide) {
             NetworkHandler.MAIN_CHANNEL.send(
                     PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(center)),
                     new FieldRecipeChangedPacket(this)
@@ -331,7 +333,7 @@ private void setRecipe(MiniaturizationRecipe recipe) {
         listeners.forEach(l -> l.ifPresent(fl -> {
             fl.onRecipeChanged(this, recipe);
 
-            if(craftingState == EnumCraftingState.MATCHED)
+            if (craftingState == EnumCraftingState.MATCHED)
                 fl.onRecipeMatched(this, recipe);
         }));
     }

src/main/java/dev/compactmods/crafting/recipes/MiniaturizationRecipe.java

@@ -11,12 +11,10 @@
 import dev.compactmods.crafting.api.components.IRecipeComponents;
 import dev.compactmods.crafting.api.field.MiniaturizationFieldSize;
 import dev.compactmods.crafting.api.recipe.IMiniaturizationRecipe;
+import dev.compactmods.crafting.api.recipe.layers.IRecipeBlocks;
 import dev.compactmods.crafting.api.recipe.layers.IRecipeLayer;
-import dev.compactmods.crafting.api.recipe.layers.IRecipeLayerBlocks;
 import dev.compactmods.crafting.api.recipe.layers.dim.IDynamicSizedRecipeLayer;
 import dev.compactmods.crafting.api.recipe.layers.dim.IFixedSizedRecipeLayer;
-import dev.compactmods.crafting.field.MiniaturizationField;
-import dev.compactmods.crafting.recipes.blocks.RecipeLayerBlocks;
 import dev.compactmods.crafting.recipes.components.EmptyBlockComponent;
 import dev.compactmods.crafting.recipes.components.MiniaturizationRecipeComponents;
 import dev.compactmods.crafting.recipes.exceptions.MiniaturizationRecipeException;
@@ -32,7 +30,6 @@
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.IBlockReader;
 
 public class MiniaturizationRecipe extends RecipeBase implements IMiniaturizationRecipe {
 
@@ -163,10 +160,11 @@ void recalculateDimensions() {
 
     private void updateFluidLayerDimensions() {
         // Update all the dynamic recipe layers
+        final AxisAlignedBB footprint = BlockSpaceUtil.getLayerBounds(dimensions, 0);
         this.layers.values()
                 .stream()
                 .filter(l -> l instanceof IDynamicSizedRecipeLayer)
-                .forEach(dl -> ((IDynamicSizedRecipeLayer) dl).setRecipeDimensions(dimensions));
+                .forEach(dl -> ((IDynamicSizedRecipeLayer) dl).setRecipeDimensions(footprint));
     }
 
     /**
@@ -183,15 +181,15 @@ public boolean fitsInFieldSize(MiniaturizationFieldSize fieldSize) {
         return fits;
     }
 
-    public boolean matches(IBlockReader world, MiniaturizationField field) {
-        if (!fitsInFieldSize(field.getFieldSize())) {
+    public boolean matches(IRecipeBlocks blocks) {
+        if (!BlockSpaceUtil.boundsFitsInside(blocks.getFilledBounds(), dimensions)) {
             if (ServerConfig.RECIPE_MATCHING.get())
                 CompactCrafting.LOGGER.debug("Failing recipe {} for being too large to fit in field.", this.id);
             return false;
         }
 
         // We know that the recipe will at least fit inside the current projection field
-        AxisAlignedBB filledBounds = field.getFilledBounds();
+        AxisAlignedBB filledBounds = blocks.getFilledBounds();
 
         Rotation[] validRotations = new Rotation[]{
                 Rotation.NONE,
@@ -201,7 +199,7 @@ public boolean matches(IBlockReader world, MiniaturizationField field) {
         };
 
         for (Rotation rot : validRotations) {
-            boolean matchesRot = checkRotation(world, rot, filledBounds);
+            boolean matchesRot = checkRotation(blocks, rot);
             if (matchesRot)
                 return true;
         }
@@ -211,7 +209,7 @@ public boolean matches(IBlockReader world, MiniaturizationField field) {
         return false;
     }
 
-    private boolean checkRotation(IBlockReader world, Rotation rot, AxisAlignedBB filledBounds) {
+    private boolean checkRotation(IRecipeBlocks blocks, Rotation rot) {
         // Check the recipe layer by layer
 
         int maxY = (int) dimensions.getYsize();
@@ -223,19 +221,18 @@ private boolean checkRotation(IBlockReader world, Rotation rot, AxisAlignedBB fi
                 return false;
             }
 
-            AxisAlignedBB bounds = BlockSpaceUtil.getLayerBounds(filledBounds, offset);
-            IRecipeLayerBlocks blocks = RecipeLayerBlocks.create(world, this.components, bounds);
+            IRecipeBlocks layerBlocks = blocks.slice(BlockSpaceUtil.getLayerBounds(blocks.getFilledBounds(), offset)).below(offset);
 
             if (rot != Rotation.NONE)
-                blocks = RecipeLayerUtil.rotate(blocks, rot);
+                layerBlocks = RecipeLayerUtil.rotate(layerBlocks, rot);
 
             IRecipeLayer targetLayer = layer.get();
 
             // If the layer spec requires all components to be known (by default) then check early
-            if (targetLayer.requiresAllBlocksIdentified() && !blocks.allIdentified())
+            if (targetLayer.requiresAllBlocksIdentified() && !layerBlocks.allIdentified())
                 return false;
 
-            boolean layerMatched = targetLayer.matches(components, blocks);
+            boolean layerMatched = targetLayer.matches(components, layerBlocks);
 
             if (!layerMatched) {
                 if (ServerConfig.RECIPE_MATCHING.get())