Skip to content

Commit 2d9178d

Browse files
committed
Prevent machines from running when aspect outputs can't take the produced aspect
1 parent 65abe4b commit 2d9178d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

README.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
Changes from upstream:
2+
3+
- Prevent machines from running when aspect outputs can't take the produced aspect (fixes voiding)
4+
5+
════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
6+
17
An addon for the Minecraft Mod : Modular Machinery, this adds compatibility with some well known magics mods such as Blood Magic, Astral Sorcery, Thaumcraft and more.
28
Download this mod on Curseforge : https://www.curseforge.com/minecraft/mc-mods/modular-magic

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
1111
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
1212

1313

14-
version = "1.6.1"
14+
version = "1.6.2+forked"
1515
group = "fr.frinn.modularmagic" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
1616
archivesBaseName = "modularmagic"
1717

src/main/java/fr/frinn/modularmagic/common/crafting/requirement/RequirementAspect.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import hellfirepvp.modularmachinery.common.util.ResultChance;
1717
import thaumcraft.api.aspects.Aspect;
1818
import thaumcraft.api.aspects.AspectList;
19+
import thaumcraft.common.tiles.essentia.TileJarFillable;
1920

2021
import javax.annotation.Nonnull;
2122
import java.util.List;
@@ -74,7 +75,7 @@ public CraftCheck canStartCrafting(ProcessingComponent component, RecipeCrafting
7475
return CraftCheck.failure("error.modularmagic.requirement.aspect.less");
7576

7677
case OUTPUT:
77-
if(provider.doesContainerAccept(this.aspect))
78+
if(provider.amount == 0 || provider.aspect == this.aspect && TileJarFillable.CAPACITY >= provider.amount + this.amount)
7879
return CraftCheck.success();
7980
else
8081
return CraftCheck.failure("error.modularmagic.requirement.aspect.out");

0 commit comments

Comments
 (0)