Remove IRecipeBlocks test class, replace with a IBlockReader impl

Author: robotgryphon

src/api/java/dev/compactmods/crafting/api/components/IRecipeBlockComponent.java

@@ -1,10 +1,13 @@
 package dev.compactmods.crafting.api.components;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 
 public interface IRecipeBlockComponent extends IRecipeComponent {
+
     boolean matches(BlockState state);
 
+    Block getBlock();
     BlockState getRenderState();
 
     boolean didErrorRendering();

src/api/java/dev/compactmods/crafting/api/components/IRecipeComponents.java

@@ -16,6 +16,8 @@ public interface IRecipeComponents {
     boolean hasBlock(String key);
 
     void registerBlock(String key, IRecipeBlockComponent component);
+    void unregisterBlock(String key);
+
     void registerOther(String key, IRecipeComponent component);
 
     int size();

src/api/java/dev/compactmods/crafting/api/recipe/IMiniaturizationRecipe.java

@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.Optional;
+import java.util.stream.Stream;
 import dev.compactmods.crafting.api.components.IRecipeComponents;
 import dev.compactmods.crafting.api.recipe.layers.IRecipeLayer;
 import net.minecraft.item.ItemStack;
@@ -24,4 +25,6 @@ public interface IMiniaturizationRecipe {
     IRecipeComponents getComponents();
 
     void setOutputs(Collection<ItemStack> outputs);
+
+    Stream<IRecipeLayer> getLayers();
 }

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

@@ -19,7 +19,7 @@ public interface IRecipeLayerBlocks {
      * @param relative The relative location of the blockspace, in the layer.
      * @return A filled Optional if the state is mapped, empty otherwise.
      */
-    Optional<BlockState> getStateAtPosition(BlockPos relative);
+    BlockState getStateAtPosition(BlockPos relative);
 
     Stream<BlockPos> getPositions();
 
@@ -29,11 +29,16 @@ public interface IRecipeLayerBlocks {
      */
     int getNumberKnownComponents();
 
+    void rebuildComponentTotals();
+    
     Map<String, Integer> getKnownComponentTotals();
 
     AxisAlignedBB getBounds();
 
     boolean allIdentified();
 
+    Stream<BlockPos> getUnmappedPositions();
+    Stream<String> getUnknownComponents();
+
     Stream<BlockPos> getPositionsForComponent(String component);
 }

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

@@ -325,6 +325,11 @@ public int getNumberLayers() {
         return layers.size();
     }
 
+    @Override
+    public Stream<IRecipeLayer> getLayers() {
+        return layers.values().stream();
+    }
+
     public IRecipeComponents getComponents() {
         return this.components;
     }

src/main/java/dev/compactmods/crafting/recipes/blocks/ComponentPositionLookup.java

@@ -20,10 +20,14 @@ public ComponentPositionLookup() {
 
     public void add(BlockPos location, String component) {
         components.putIfAbsent(location, component);
+        componentTotals.putIfAbsent(component, 0);
+
+        // Increment totals to keep in sync
+        componentTotals.put(component, componentTotals.get(component) + 1);
     }
 
     public Collection<String> getComponents() {
-        return components.values();
+        return componentTotals.keySet();
     }
 
     public Stream<BlockPos> getAllPositions() {
@@ -35,10 +39,6 @@ public boolean containsLocation(BlockPos location) {
     }
 
     public Map<String, Integer> getComponentTotals() {
-        if (!this.components.isEmpty() && !this.componentTotals.isEmpty())
-            return this.componentTotals;
-
-        rebuildComponentTotals();
         return this.componentTotals;
     }
 

src/main/java/dev/compactmods/crafting/recipes/blocks/ComponentPositionLookupCodec.java

@@ -35,6 +35,7 @@ public <T> DataResult<ComponentPositionLookup> read(DynamicOps<T> ops, T input)
             }
 
             lookup.components.putAll(RecipeHelper.convertMultiArrayToMap(mappedToArray));
+            lookup.rebuildComponentTotals();
 
             return DataResult.success(lookup);
         });

src/main/java/dev/compactmods/crafting/recipes/blocks/RecipeLayerBlocks.java

@@ -33,7 +33,8 @@ public RecipeLayerBlocks(IRecipeLayerBlocks original) {
             if (key.isPresent()) lookup.components.put(pos.immutable(), key.get());
             else unmatchedStates.add(pos.immutable());
 
-            original.getStateAtPosition(pos).ifPresent(state -> states.put(pos.immutable(), state));
+            BlockState oState = original.getStateAtPosition(pos);
+            states.put(pos.immutable(), oState);
         });
     }
 
@@ -60,13 +61,12 @@ public static RecipeLayerBlocks create(IBlockReader blocks, MiniaturizationRecip
             // Pre-populate a set of component keys from the recipe instance, so we don't have to do it later
             Optional<String> compKey = recipe.getRecipeComponentKey(state);
             if (compKey.isPresent())
-                instance.lookup.components.put(normalizedPos, compKey.get());
+                instance.lookup.add(normalizedPos, compKey.get());
             else
                 instance.unmatchedStates.add(normalizedPos);
 
         });
 
-        instance.lookup.rebuildComponentTotals();
         return instance;
     }
 
@@ -77,11 +77,21 @@ public AxisAlignedBB getBounds() {
 
     @Override
     public boolean allIdentified() {
-        boolean lookupHasAllKeys = this.lookup.getComponents()
-                .stream()
-                .allMatch(states::containsKey);
+        return unmatchedStates.isEmpty();
+    }
+
+    @Override
+    public Stream<BlockPos> getUnmappedPositions() {
+        return unmatchedStates.stream();
+    }
 
-        return lookupHasAllKeys && unmatchedStates.isEmpty();
+    @Override
+    public Stream<String> getUnknownComponents() {
+        return getUnmappedPositions()
+                .map(lookup::getRequiredComponentKeyForPosition)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .distinct();
     }
 
     @Override
@@ -96,8 +106,8 @@ public Optional<String> getComponentAtPosition(BlockPos relative) {
     }
 
     @Override
-    public Optional<BlockState> getStateAtPosition(BlockPos relative) {
-        return Optional.ofNullable(states.get(relative));
+    public BlockState getStateAtPosition(BlockPos relative) {
+        return states.get(relative);
     }
 
     @Override
@@ -115,6 +125,11 @@ public int getNumberKnownComponents() {
         return this.getKnownComponentTotals().keySet().size();
     }
 
+    @Override
+    public void rebuildComponentTotals() {
+        lookup.rebuildComponentTotals();
+    }
+
     @Override
     public Map<String, Integer> getKnownComponentTotals() {
         return lookup.componentTotals;

src/main/java/dev/compactmods/crafting/recipes/components/CCMiniRecipeComponents.java

@@ -61,6 +61,11 @@ public void registerBlock(String key, IRecipeBlockComponent component) {
         blockComponents.put(key, component);
     }
 
+    @Override
+    public void unregisterBlock(String key) {
+        blockComponents.remove(key);
+    }
+
     @Override
     public void registerOther(String key, IRecipeComponent component) {
         otherComponents.put(key, component);

src/main/java/dev/compactmods/crafting/recipes/components/EmptyBlockComponent.java

@@ -4,6 +4,7 @@
 import dev.compactmods.crafting.api.components.IRecipeBlockComponent;
 import dev.compactmods.crafting.api.components.IRecipeComponent;
 import dev.compactmods.crafting.api.components.RecipeComponentType;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 
@@ -19,6 +20,11 @@ public boolean matches(BlockState state) {
         return state.isAir();
     }
 
+    @Override
+    public Block getBlock() {
+        return Blocks.AIR;
+    }
+
     @Override
     public BlockState getRenderState() {
         return Blocks.AIR.defaultBlockState();