Merge pull request #147 from jchung01/modifier-fix

Fix SingleBlockModifier applying to all blocks of the same base type in certain circumstances

Author: KasumiNova

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);
                 }
             }
         }