Copy block info before adding modifier blockstate

This reverts commit 2269792.
- Adding the modifier to the pattern directly caused issues with auto-assembly requirements

Author: jchung01

src/main/java/github/kasuminova/mmce/client/gui/widget/impl/preview/WorldSceneRendererWidget.java

@@ -177,7 +177,10 @@ protected void addUpgradeIngredientToPattern(final DynamicMachine machine) {
         Map<BlockPos, BlockArray.BlockInformation> pattern = this.pattern.getPattern();
         machine.getModifiersAsMatchingReplacements().forEach((pos, infoList) -> infoList.forEach(info -> {
             if (pattern.containsKey(pos)) {
-                pattern.get(pos).addMatchingStates(info.getMatchingStates());
+                // Clone the block info, we don't want to modify the canonical instance.
+                BlockArray.BlockInformation newInfo = pattern.get(pos).copy();
+                newInfo.addMatchingStates(info.getMatchingStates());
+                this.pattern.addBlock(pos, newInfo);
             } else {
                 this.pattern.addBlock(pos, info);
             }

src/main/java/hellfirepvp/modularmachinery/client/util/DynamicMachineRenderContext.java

@@ -136,9 +136,12 @@ public static void addReplacementToBlockArray(
             for (BlockArray.BlockInformation info : informationList) {
                 Map<BlockPos, BlockArray.BlockInformation> pattern = blockArray.getPattern();
                 if (pattern.containsKey(pos)) {
-                    pattern.get(pos).addMatchingStates(info.getMatchingStates());
+                    // Clone the block info, we don't want to modify the canonical instance.
+                    BlockArray.BlockInformation newInfo = pattern.get(pos).copy();
+                    newInfo.addMatchingStates(info.getMatchingStates());
+                    blockArray.addBlock(pos, newInfo);
                 } else {
-                    pattern.put(pos, info);
+                    blockArray.addBlock(pos, info);
                 }
             }
         }

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, TaggedPositionBlockArray pattern, SingleBlockModifierReplacement mod, JsonObject part) throws JsonParseException {
+        private static void addModifierWithPattern(DynamicMachine machine, SingleBlockModifierReplacement mod, JsonObject part) throws JsonParseException {
             List<Integer> avX = new ArrayList<>();
             List<Integer> avY = new ArrayList<>();
             List<Integer> avZ = new ArrayList<>();
@@ -259,10 +259,6 @@ private static void addModifierWithPattern(DynamicMachine machine, TaggedPositio
                 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));
             }
@@ -379,7 +375,7 @@ public DynamicMachine deserialize(JsonElement json, Type typeOfT, JsonDeserializ
 
             // Modifiers
             if (root.has("modifiers")) {
-                addModifiers(context, root, machine, machine.pattern);
+                addModifiers(context, root, machine);
             }
 
             // DynamicPatterns
@@ -554,7 +550,7 @@ private static void setMaxSize(final JsonObject jsonPattern, final DynamicPatter
             }
         }
 
-        private static void addModifiers(final JsonDeserializationContext context, final JsonObject root, final DynamicMachine machine, final TaggedPositionBlockArray pattern) {
+        private static void addModifiers(final JsonDeserializationContext context, final JsonObject root, final DynamicMachine machine) {
             JsonElement partModifiers = root.get("modifiers");
             if (!partModifiers.isJsonArray()) {
                 throw new JsonParseException("'modifiers' has to be an array of modifiers!");
@@ -565,7 +561,7 @@ private static void addModifiers(final JsonDeserializationContext context, final
                 if (!modifier.isJsonObject()) {
                     throw new JsonParseException("Elements of 'modifiers' have to be objects!");
                 }
-                addModifierWithPattern(machine, pattern, context.deserialize(modifier.getAsJsonObject(), SingleBlockModifierReplacement.class), modifier.getAsJsonObject());
+                addModifierWithPattern(machine, context.deserialize(modifier.getAsJsonObject(), SingleBlockModifierReplacement.class), modifier.getAsJsonObject());
             }
         }