Refactor recipe packages and organize

Author: robotgryphon

src/main/java/com/robotgryphon/compactcrafting/config/ClientConfig.java

@@ -27,8 +27,13 @@ private static void generateConfig() {
                 .comment("Projector Settings")
                 .push("projectors");
 
+        String sep = System.lineSeparator();
+
         PROJECTOR_COLOR = builder
-                .comment("The color for the projector fields. (HEX format, default #FF6A00)")
+                .comment(
+                        "The color for the projector fields. (HEX format)",
+                        "Examples: Orange - #FF6A00, Violet - #32174D, Green - #00A658, Blue - #3A7FE1"
+                )
                 .define("projectorColor", "#FF6A00");
 
         builder.pop();

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

@@ -3,8 +3,8 @@
 import com.robotgryphon.compactcrafting.field.FieldProjectionSize;
 import com.robotgryphon.compactcrafting.field.MiniaturizationFieldBlockData;
 import com.robotgryphon.compactcrafting.recipes.exceptions.MiniaturizationRecipeException;
-import com.robotgryphon.compactcrafting.recipes.layers.IDynamicRecipeLayer;
-import com.robotgryphon.compactcrafting.recipes.layers.IFixedLayerDimensions;
+import com.robotgryphon.compactcrafting.recipes.layers.dim.IDynamicRecipeLayer;
+import com.robotgryphon.compactcrafting.recipes.layers.dim.IRigidRecipeLayer;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
 import com.robotgryphon.compactcrafting.util.BlockSpaceUtil;
 import net.minecraft.block.BlockState;
@@ -56,8 +56,8 @@ private void recalculateDimensions() {
 
         for (IRecipeLayer layer : this.layers) {
             // We only need to worry about fixed-dimension layers; the fluid layers will adapt
-            if (layer instanceof IFixedLayerDimensions) {
-                AxisAlignedBB dimensions = ((IFixedLayerDimensions) layer).getDimensions();
+            if (layer instanceof IRigidRecipeLayer) {
+                AxisAlignedBB dimensions = ((IRigidRecipeLayer) layer).getDimensions();
                 if (dimensions.getXSize() > x)
                     x = (int) Math.ceil(dimensions.getXSize());
 

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

@@ -1,10 +1,17 @@
 package com.robotgryphon.compactcrafting.recipes;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 import com.robotgryphon.compactcrafting.field.MiniaturizationFieldBlockData;
 import com.robotgryphon.compactcrafting.util.BlockSpaceUtil;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.stream.Stream;
 
 public abstract class RecipeHelper {
@@ -19,4 +26,72 @@ public static BlockPos[] normalizeFieldPositions(MiniaturizationFieldBlockData f
                 .map(BlockPos::toImmutable)
                 .toArray(BlockPos[]::new);
     }
+
+    /**
+     * Assumes an array is on the Z axis; meant to convert a single array to a map for collective
+     * adding.
+     *
+     * @param array
+     * @return
+     */
+    public static Map<BlockPos, String> convertSingleArrayToMap(String[] array, int x) {
+        HashMap<BlockPos, String> map = new HashMap<>();
+        for (int z = 0; z < array.length; z++) {
+            String val = array[z];
+            BlockPos relative = new BlockPos(x, 0, z);
+            map.put(relative, val);
+        }
+
+        return map;
+    }
+
+    public static Map<BlockPos, String> convertMultiArrayToMap(String[][] array) {
+        HashMap<BlockPos, String> map = new HashMap<>();
+
+        // Loop through top level
+        for (int x = 0; x < array.length; x++) {
+            String[] zValues = array[x];
+            map.putAll(convertSingleArrayToMap(zValues, x));
+        }
+
+        return map;
+    }
+
+    public static Map<String, Integer> getComponentCounts(Map<BlockPos, String> map) {
+        Map<String, Integer> counts = new HashMap<>();
+
+        map.forEach((key, value) -> {
+            counts.putIfAbsent(value, 0);
+            int prev = counts.get(value);
+            counts.replace(value, prev + 1);
+        });
+
+        return counts;
+    }
+
+    public static Map<BlockPos, String> getComponentMapFromPattern(JsonObject layer) {
+        if(!layer.has("pattern"))
+            return Collections.emptyMap();
+
+        JsonArray layerPattern = layer.get("pattern").getAsJsonArray();
+        int zSize = layerPattern.size();
+
+        String[][] mappedToArray = new String[zSize][];
+
+        for(int z = 0; z < zSize; z++) {
+            JsonElement jsonElement = layerPattern.get(z);
+            if(!jsonElement.isJsonArray())
+                throw new JsonParseException("Mixed layer definition got a non-array in its pattern definition.");
+
+            JsonArray el = jsonElement.getAsJsonArray();
+            String[] xValues = new String[el.size()];
+            for(int x = 0; x < el.size(); x++) {
+                xValues[x] = el.get(x).getAsString();
+            }
+
+            mappedToArray[z] = xValues;
+        }
+
+        return convertMultiArrayToMap(mappedToArray);
+    }
 }

…recipes/json/RecipeLoadingException.java …s/exceptions/RecipeLoadingException.javasrc/main/java/com/robotgryphon/compactcrafting/recipes/json/RecipeLoadingException.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/exceptions/RecipeLoadingException.java src/main/java/com/robotgryphon/compactcrafting/recipes/json/RecipeLoadingException.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/exceptions/RecipeLoadingException.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactcrafting.recipes.json;
+package com.robotgryphon.compactcrafting.recipes.exceptions;
 
 public class RecipeLoadingException extends Throwable {
 

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

@@ -4,8 +4,10 @@
 import com.robotgryphon.compactcrafting.CompactCrafting;
 import com.robotgryphon.compactcrafting.recipes.MiniaturizationRecipe;
 import com.robotgryphon.compactcrafting.recipes.MiniaturizationRecipeManager;
-import com.robotgryphon.compactcrafting.recipes.layers.IDynamicRecipeLayer;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
+import com.robotgryphon.compactcrafting.recipes.layers.dim.IDynamicRecipeLayer;
+import com.robotgryphon.compactcrafting.recipes.json.layers.LayerDeserializer;
+import com.robotgryphon.compactcrafting.util.JsonUtil;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.resources.JsonReloadListener;
 import net.minecraft.item.ItemStack;
@@ -78,7 +80,7 @@ private boolean loadOutputs(MiniaturizationRecipe recipe, JsonObject root) {
                 continue;
 
             JsonObject op = output.getAsJsonObject();
-            Optional<ItemStack> oStack = RecipeLoaderUtil.getItemStack(op);
+            Optional<ItemStack> oStack = JsonUtil.getItemStack(op);
             if(!oStack.isPresent())
                 continue;
 
@@ -95,7 +97,7 @@ private boolean loadCatalyst(MiniaturizationRecipe recipe, JsonObject root) {
         }
 
         JsonObject catalyst = root.getAsJsonObject("catalyst");
-        Optional<ItemStack> stack = RecipeLoaderUtil.getItemStack(catalyst);
+        Optional<ItemStack> stack = JsonUtil.getItemStack(catalyst);
         if(!stack.isPresent())
             return false;
 
@@ -159,14 +161,19 @@ private boolean loadComponents(MiniaturizationRecipe recipe, JsonObject root) {
 
         for(Map.Entry<String, JsonElement> component : components.entrySet()) {
             String key = component.getKey();
-            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);
-                continue;
+            JsonElement bsElement = component.getValue();
+            if(bsElement.isJsonObject()) {
+                Optional<BlockState> state = JsonUtil.getBlockState(bsElement.getAsJsonObject());
+
+                if (key.isEmpty() || !state.isPresent()) {
+                    CompactCrafting.LOGGER.warn("Failed to process blockstate for component {}; definition not found.", key);
+                    continue;
+                }
+
+                recipe.addComponent(key, state.get());
+            } else {
+                CompactCrafting.LOGGER.warn("Failed to process blockstate for component {}; not a JSON object. Cannot decode.", key);
             }
-
-            recipe.addComponent(key, state.get());
         }
 
         return true;

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

@@ -1,8 +1,8 @@
-package com.robotgryphon.compactcrafting.recipes.json.loaders;
+package com.robotgryphon.compactcrafting.recipes.json.layers;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.robotgryphon.compactcrafting.recipes.layers.FilledComponentRecipeLayer;
+import com.robotgryphon.compactcrafting.recipes.layers.impl.FilledComponentRecipeLayer;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
 
 public class FilledLayerLoader implements ILayerLoader {

…ipes/json/loaders/FilledLayerLoader.java …cipes/json/layers/FilledLayerLoader.javasrc/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/FilledLayerLoader.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/layers/FilledLayerLoader.java src/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/FilledLayerLoader.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/layers/FilledLayerLoader.java

@@ -1,8 +1,8 @@
-package com.robotgryphon.compactcrafting.recipes.json.loaders;
+package com.robotgryphon.compactcrafting.recipes.json.layers;
 
 import com.google.gson.JsonObject;
-import com.robotgryphon.compactcrafting.recipes.json.RecipeLoadingException;
-import com.robotgryphon.compactcrafting.recipes.layers.HollowComponentRecipeLayer;
+import com.robotgryphon.compactcrafting.recipes.exceptions.RecipeLoadingException;
+import com.robotgryphon.compactcrafting.recipes.layers.impl.HollowComponentRecipeLayer;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
 
 public class HollowLayerLoader implements ILayerLoader {

…ipes/json/loaders/HollowLayerLoader.java …cipes/json/layers/HollowLayerLoader.javasrc/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/HollowLayerLoader.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/layers/HollowLayerLoader.java src/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/HollowLayerLoader.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/layers/HollowLayerLoader.java

@@ -1,7 +1,7 @@
-package com.robotgryphon.compactcrafting.recipes.json.loaders;
+package com.robotgryphon.compactcrafting.recipes.json.layers;
 
 import com.google.gson.JsonObject;
-import com.robotgryphon.compactcrafting.recipes.json.RecipeLoadingException;
+import com.robotgryphon.compactcrafting.recipes.exceptions.RecipeLoadingException;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
 
 public interface ILayerLoader {

…g/recipes/json/loaders/ILayerLoader.java …ng/recipes/json/layers/ILayerLoader.javasrc/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/ILayerLoader.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/layers/ILayerLoader.java src/main/java/com/robotgryphon/compactcrafting/recipes/json/loaders/ILayerLoader.java renamed to src/main/java/com/robotgryphon/compactcrafting/recipes/json/layers/ILayerLoader.java

@@ -1,11 +1,8 @@
-package com.robotgryphon.compactcrafting.recipes.json;
+package com.robotgryphon.compactcrafting.recipes.json.layers;
 
 import com.google.gson.*;
 import com.robotgryphon.compactcrafting.CompactCrafting;
-import com.robotgryphon.compactcrafting.recipes.json.loaders.FilledLayerLoader;
-import com.robotgryphon.compactcrafting.recipes.json.loaders.HollowLayerLoader;
-import com.robotgryphon.compactcrafting.recipes.json.loaders.ILayerLoader;
-import com.robotgryphon.compactcrafting.recipes.json.loaders.MixedLayerLoader;
+import com.robotgryphon.compactcrafting.recipes.exceptions.RecipeLoadingException;
 import com.robotgryphon.compactcrafting.recipes.layers.IRecipeLayer;
 
 import java.lang.reflect.Type;