Basic pattern loader, fix particle spawning on field clear

Author: robotgryphon

src/main/java/com/robotgryphon/compactcrafting/blocks/FieldProjectorTile.java

@@ -241,7 +241,8 @@ private void tickCrafting() {
             if (world == null || world.isRemote())
                 return;
 
-            List<ItemEntity> catalystEntities = getCatalystsInField(fieldBounds, currentRecipe.catalyst.getItem());
+            // We grow the bounds check here a little to support patterns that are exactly the size of the field
+            List<ItemEntity> catalystEntities = getCatalystsInField(fieldBounds.grow(0.25), currentRecipe.catalyst.getItem());
             if (catalystEntities.size() > 0) {
                 // We dropped a catalyst item in
                 // At this point, we had a valid recipe and a valid catalyst entity

src/main/java/com/robotgryphon/compactcrafting/client/render/FieldProjectorRenderer.java

@@ -265,7 +265,7 @@ private void renderProjectionCube(FieldProjectorTile tile, MatrixStack mx, IRend
 
         IVertexBuilder builder = buffers.getBuffer(RenderTypesExtensions.PROJECTION_FIELD_RENDERTYPE);
 
-        double expansion = 0.0001;
+        double expansion = 0.005;
         AxisAlignedBB slightlyBiggerBecauseFoxes = cube
                 .expand(expansion, expansion, expansion)
                 .expand(-expansion, -expansion, -expansion);

src/main/java/com/robotgryphon/compactcrafting/field/FieldProjection.java

@@ -1,12 +1,14 @@
 package com.robotgryphon.compactcrafting.field;
 
 import com.robotgryphon.compactcrafting.blocks.FieldProjectorBlock;
+import net.minecraft.block.Blocks;
 import net.minecraft.particles.ParticleTypes;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.IWorldReader;
+import net.minecraft.world.server.ServerWorld;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -127,10 +129,13 @@ public void clearBlocks(IWorld world) {
                 .map(BlockPos::toImmutable)
                 .sorted(Comparator.comparingInt(BlockPos::getY).reversed())
                 .forEach(blockPos -> {
-                    world.destroyBlock(blockPos, false);
-                    world.addParticle(ParticleTypes.LARGE_SMOKE,
-                            blockPos.getX() + 0.5f, blockPos.getY() + 0.5f, blockPos.getZ() + 0.5f,
-                            0d, 0.05D, 0D);
+                    world.setBlockState(blockPos, Blocks.AIR.getDefaultState(), 7);
+
+                    if(world instanceof ServerWorld) {
+                        ((ServerWorld) world).spawnParticle(ParticleTypes.LARGE_SMOKE,
+                                blockPos.getX() + 0.5f, blockPos.getY() + 0.5f, blockPos.getZ() + 0.5f,
+                                1,0d, 0.05D, 0D, 0.25d);
+                    }
                 });
     }
 }

src/main/java/com/robotgryphon/compactcrafting/recipes/json/MiniaturizationPatternLoader.java

@@ -1,8 +1,6 @@
 package com.robotgryphon.compactcrafting.recipes.json;
 
 import com.google.gson.*;
-import com.mojang.datafixers.util.Pair;
-import com.mojang.serialization.JsonOps;
 import com.robotgryphon.compactcrafting.CompactCrafting;
 import com.robotgryphon.compactcrafting.recipes.MiniaturizationRecipe;
 import com.robotgryphon.compactcrafting.recipes.MiniaturizationRecipeManager;
@@ -55,27 +53,33 @@ protected void apply(Map<ResourceLocation, JsonElement> objectIn, IResourceManag
 
             loadCatalyst(recipe, root);
 
+            loadOutputs(recipe, root);
+            
             MiniaturizationRecipeManager.add(rl, recipe);
         }
     }
 
+    private boolean loadOutputs(MiniaturizationRecipe recipe, JsonObject root) {
+        if(!root.has("outputs")) {
+            CompactCrafting.LOGGER.warn("Warning: Recipe does not have outputs defined; not skipping here, but the recipe will not give anything!");
+            return false;
+        }
+
+        JsonArray outputs = root.getAsJsonArray("outputs");
+        return false;
+    }
+
     private boolean loadCatalyst(MiniaturizationRecipe recipe, JsonObject root) {
         if(!root.has("catalyst")) {
             CompactCrafting.LOGGER.warn("Catalyst entry not found for recipe {}; skipping rest of recipe loading.", recipe.getRegistryName());
             return false;
         }
 
         JsonObject catalyst = root.getAsJsonObject("catalyst");
-
-        Optional<ItemStack> stack = ItemStack.CODEC.decode(JsonOps.INSTANCE, catalyst)
-                .get()
-                .ifRight(err -> CompactCrafting.LOGGER.warn("Failed to load itemstack for catalyst: {}", err.message()))
-                .mapLeft(Pair::getFirst)
-                .left();
-
+        Optional<ItemStack> stack = RecipeLoaderUtil.getItemStack(catalyst);
         if(!stack.isPresent())
             return false;
-
+        
         ItemStack c = stack.get();
 
         if(c.getCount() != 1) {
@@ -116,7 +120,7 @@ private void loadComponents(JsonObject root, MiniaturizationRecipe recipe) {
 
         components.entrySet().forEach(component -> {
             String key = component.getKey();
-            Optional<BlockState> state = extractComponentDefinition(key, component.getValue());
+            Optional<BlockState> state = RecipeLoaderUtil.extractComponentDefinition(key, component.getValue());
 
             if(key.isEmpty() || !state.isPresent()) {
                 CompactCrafting.LOGGER.warn("Failed to process blockstate for component {}; definition not found.", key);
@@ -127,11 +131,4 @@ private void loadComponents(JsonObject root, MiniaturizationRecipe recipe) {
         });
     }
 
-    private Optional<BlockState> extractComponentDefinition(String key, JsonElement definition) {
-        JsonObject comp = definition.getAsJsonObject();
-        return BlockState.CODEC.decode(JsonOps.INSTANCE, comp)
-                .get().ifRight(error -> {
-                    CompactCrafting.LOGGER.warn("Failed to process blockstate for component {}: {}", key, error.message());
-                }).mapLeft(Pair::getFirst).left();
-    }
 }

…mpactcrafting/util/RecipeLoaderUtil.java …fting/recipes/json/RecipeLoaderUtil.javasrc/main/java/com/robotgryphon/compactcrafting/util/RecipeLoaderUtil.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/RecipeLoaderUtil.java src/main/java/com/robotgryphon/compactcrafting/util/RecipeLoaderUtil.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/RecipeLoaderUtil.java

@@ -1,14 +1,20 @@
-package com.robotgryphon.compactcrafting.util;
+package com.robotgryphon.compactcrafting.recipes.json;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.JsonOps;
+import com.robotgryphon.compactcrafting.CompactCrafting;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 public class RecipeLoaderUtil {
 
@@ -79,4 +85,20 @@ public static Map<BlockPos, String> getComponentMapFromPattern(JsonObject layer)
 
         return convertMultiArrayToMap(mappedToArray);
     }
+
+    public static Optional<ItemStack> getItemStack(JsonObject stack) {
+        return ItemStack.CODEC.decode(JsonOps.INSTANCE, stack)
+                .get()
+                .ifRight(err -> CompactCrafting.LOGGER.warn("Failed to load itemstack from JSON: {}", err.message()))
+                .mapLeft(Pair::getFirst)
+                .left();
+    }
+
+    public static Optional<BlockState> extractComponentDefinition(String key, JsonElement definition) {
+        JsonObject comp = definition.getAsJsonObject();
+        return BlockState.CODEC.decode(JsonOps.INSTANCE, comp)
+                .get().ifRight(error -> {
+                    CompactCrafting.LOGGER.warn("Failed to process blockstate for component {}: {}", key, error.message());
+                }).mapLeft(Pair::getFirst).left();
+    }
 }

src/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/MixedLayerLoader.java

@@ -4,7 +4,7 @@
 import com.google.gson.JsonParseException;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
 import com.robotgryphon.compactcrafting.recipes.layers.MixedComponentRecipeLayer;
-import com.robotgryphon.compactcrafting.util.RecipeLoaderUtil;
+import com.robotgryphon.compactcrafting.recipes.json.RecipeLoaderUtil;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Map;

src/test/java/com/robotgryphon/compactcrafting/util/RecipeLoaderUtilTest.java

@@ -1,13 +1,12 @@
 package com.robotgryphon.compactcrafting.util;
 
+import com.robotgryphon.compactcrafting.recipes.json.RecipeLoaderUtil;
 import net.minecraft.util.math.BlockPos;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class RecipeLoaderUtilTest {
 
     @Test