Add SingleBlockModifier to machine pattern

- This ensures future retrieval of the BlockInformation at the position already has the modifier as an available block
Related #144

Author: jchung01

src/main/java/hellfirepvp/modularmachinery/common/machine/DynamicMachine.java

@@ -247,7 +247,7 @@ private static List<BlockPos> buildPermutations(List<Integer> avX, List<Integer>
             return out;
         }
 
-        private static void addModifierWithPattern(DynamicMachine machine, SingleBlockModifierReplacement mod, JsonObject part) throws JsonParseException {
+        private static void addModifierWithPattern(DynamicMachine machine, TaggedPositionBlockArray pattern, SingleBlockModifierReplacement mod, JsonObject part) throws JsonParseException {
             List<Integer> avX = new ArrayList<>();
             List<Integer> avY = new ArrayList<>();
             List<Integer> avZ = new ArrayList<>();
@@ -259,6 +259,10 @@ private static void addModifierWithPattern(DynamicMachine machine, SingleBlockMo
                 if (permutation.getX() == 0 && permutation.getY() == 0 && permutation.getZ() == 0) {
                     continue; //We're not going to overwrite the controller.
                 }
+                // Clone the block info, we don't want to modify the canonical instance.
+                BlockArray.BlockInformation info = pattern.getPattern().get(permutation).copy();
+                info.addMatchingStates(mod.getBlockInformation().getMatchingStates());
+                pattern.addBlock(permutation, info);
                 machine.modifiers.putIfAbsent(permutation, Lists.newArrayList());
                 machine.modifiers.get(permutation).add(mod.setPos(permutation));
             }
@@ -375,7 +379,7 @@ public DynamicMachine deserialize(JsonElement json, Type typeOfT, JsonDeserializ
 
             // Modifiers
             if (root.has("modifiers")) {
-                addModifiers(context, root, machine);
+                addModifiers(context, root, machine, machine.pattern);
             }
 
             // DynamicPatterns
@@ -550,7 +554,7 @@ private static void setMaxSize(final JsonObject jsonPattern, final DynamicPatter
             }
         }
 
-        private static void addModifiers(final JsonDeserializationContext context, final JsonObject root, final DynamicMachine machine) {
+        private static void addModifiers(final JsonDeserializationContext context, final JsonObject root, final DynamicMachine machine, final TaggedPositionBlockArray pattern) {
             JsonElement partModifiers = root.get("modifiers");
             if (!partModifiers.isJsonArray()) {
                 throw new JsonParseException("'modifiers' has to be an array of modifiers!");
@@ -561,7 +565,7 @@ private static void addModifiers(final JsonDeserializationContext context, final
                 if (!modifier.isJsonObject()) {
                     throw new JsonParseException("Elements of 'modifiers' have to be objects!");
                 }
-                addModifierWithPattern(machine, context.deserialize(modifier.getAsJsonObject(), SingleBlockModifierReplacement.class), modifier.getAsJsonObject());
+                addModifierWithPattern(machine, pattern, context.deserialize(modifier.getAsJsonObject(), SingleBlockModifierReplacement.class), modifier.getAsJsonObject());
             }
         }