Skip to content

Commit 3252c0d

Browse files
committed
- Fix RequirementCatalyst not taking effect when restarting a recipe.
- Fix RequirementIngredientArray changing from output to input. - Controller's AnimationFactory is no longer reloaded (maybe it caused some animation problems? But now it no longer replays the animation twice.)
1 parent de11000 commit 3252c0d

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementCatalyst.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ public int getMaxParallelism(final List<ProcessingComponent<?>> components, fina
6969
return result;
7070
}
7171

72+
@Override
73+
public void finishCrafting(final List<ProcessingComponent<?>> components, final RecipeCraftingContext context, final ResultChance chance) {
74+
super.finishCrafting(components, context, chance);
75+
isRequired = false;
76+
}
77+
7278
@Override
7379
public RequirementCatalyst deepCopy() {
7480
return deepCopyModified(Collections.emptyList());

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementIngredientArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public RequirementIngredientArray deepCopyModified(List<RecipeModifier> modifier
8585
copiedIngredients.add(copied);
8686
});
8787

88-
return new RequirementIngredientArray(copiedIngredients);
88+
return new RequirementIngredientArray(copiedIngredients, getActionType());
8989
}
9090

9191
@Nonnull

src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,9 +1051,9 @@ public void readCustomNBT(NBTTagCompound compound) {
10511051
BlockModelHider.hideOrShowBlocks(this);
10521052
notifyStructureFormedState(isStructureFormed());
10531053
}, 1);
1054-
if (!isStructureFormed()) {
1055-
animationFactory = null;
1056-
}
1054+
// if (!isStructureFormed()) {
1055+
// animationFactory = null;
1056+
// }
10571057
}
10581058
}
10591059

0 commit comments

Comments
 (0)