diff --git a/CHANGELOG.md b/CHANGELOG.md index caaabba7cc..0842b97deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # ChangeLog -Version: 1.1.4.a +Version: 1.1.4.b ### ADDITIONS: ### FIXES: +- fixed Large assembler & circuit assembler being able to have >1 energy hatch - fix server crash in LDlib ### CHANGES: diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java index 49112b712c..426a41e8cc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java @@ -266,7 +266,8 @@ public static void init() {} .aisle("XXXXXXXXX","XGGGXXSXX","XGGGX###X") .where('S', controller(blocks(definition.get()))) .where('X', blocks(CASING_LARGE_SCALE_ASSEMBLING.get()).setMinGlobalLimited(40) - .or(Predicates.autoAbilities(definition.getRecipeTypes())) + .or(Predicates.autoAbilities(definition.getRecipeTypes(), false, false, true, true, true, true)) + .or(Predicates.abilities(INPUT_ENERGY).setExactLimit(1)) .or(Predicates.autoAbilities(true, false, true))) .where('G', Predicates.blocks(CASING_TEMPERED_GLASS.get())) .where('A', Predicates.air()) @@ -294,7 +295,8 @@ public static void init() {} .aisle("#####XX","#####SX","#####XX") .where('S', controller(blocks(definition.get()))) .where('X', blocks(CASING_LARGE_SCALE_ASSEMBLING.get()).setMinGlobalLimited(55) - .or(Predicates.autoAbilities(definition.getRecipeTypes())) + .or(Predicates.autoAbilities(definition.getRecipeTypes(), false, false, true, true, true, true)) + .or(Predicates.abilities(INPUT_ENERGY).setExactLimit(1)) .or(Predicates.autoAbilities(true, false, true))) .where('T', Predicates.blocks(CASING_TEMPERED_GLASS.get())) .where('G', Predicates.blocks(CASING_GRATE.get()))