From a62ce898ff7c7301e71d02d5e0f91c6ae1906499 Mon Sep 17 00:00:00 2001 From: Nanabell Date: Fri, 12 Sep 2025 09:34:11 +0200 Subject: [PATCH 1/3] Allow ULV Input Hatches in Primitive Pump multi --- .../gtceu/common/data/machines/GTMultiMachines.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java index ae086fdeef3..fd059459154 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java @@ -577,7 +577,8 @@ public class GTMultiMachines { .where('F', Predicates.frames(GTMaterials.TreatedWood)) .where('H', Predicates.abilities(PartAbility.PUMP_FLUID_HATCH) - .or(blocks(FLUID_EXPORT_HATCH[LV].get(), FLUID_EXPORT_HATCH[MV].get()))) + .or(blocks(FLUID_EXPORT_HATCH[ULV].get(), FLUID_EXPORT_HATCH[LV].get(), + FLUID_EXPORT_HATCH[MV].get()))) .where('#', Predicates.any()) .build()) .allowExtendedFacing(false) From f54cadf8d6437251f3bd7ebcc4372b34df119dd7 Mon Sep 17 00:00:00 2001 From: Nanabell Date: Fri, 12 Sep 2025 13:22:15 +0200 Subject: [PATCH 2/3] Remove MV from allowed blocks --- .../gtceu/common/data/machines/GTMultiMachines.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java index fd059459154..7d901a54b0d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMultiMachines.java @@ -577,8 +577,7 @@ public class GTMultiMachines { .where('F', Predicates.frames(GTMaterials.TreatedWood)) .where('H', Predicates.abilities(PartAbility.PUMP_FLUID_HATCH) - .or(blocks(FLUID_EXPORT_HATCH[ULV].get(), FLUID_EXPORT_HATCH[LV].get(), - FLUID_EXPORT_HATCH[MV].get()))) + .or(blocks(FLUID_EXPORT_HATCH[ULV].get(), FLUID_EXPORT_HATCH[LV].get()))) .where('#', Predicates.any()) .build()) .allowExtendedFacing(false) From df3fb239954b0f1015d96d6c54e5d553650bfac1 Mon Sep 17 00:00:00 2001 From: Nanabell Date: Fri, 12 Sep 2025 15:35:09 +0200 Subject: [PATCH 3/3] Add changelog for new hatch requirements --- docs/content/Modpacks/Changes/v7.2.0.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/content/Modpacks/Changes/v7.2.0.md b/docs/content/Modpacks/Changes/v7.2.0.md index 7cde68d9693..047178f6b9f 100644 --- a/docs/content/Modpacks/Changes/v7.2.0.md +++ b/docs/content/Modpacks/Changes/v7.2.0.md @@ -31,4 +31,7 @@ In a similar vein, recipes that used to have adjacent block requirements, you no ## Recipe Conditions We have moved away from the .serialize, .deserialize, .toNetwork and .fromNetwork calls on the RecipeCondition, and we now exclusively use the recipeCondition's codec. -See the [Recipe Conditions Page](../Other-Topics/Recipe-Conditions.md) \ No newline at end of file +See the [Recipe Conditions Page](../Other-Topics/Recipe-Conditions.md) + +## Primitive Pump +MV output hatches are no longer valid hatches for the Primitive Pump and need to be replaced with either a ULV`(new)` or LV hatch.