diff --git a/docs/content/Modpacks/Changes/v7.5.1.md b/docs/content/Modpacks/Changes/v7.5.1.md new file mode 100644 index 00000000000..768ffa04cf5 --- /dev/null +++ b/docs/content/Modpacks/Changes/v7.5.1.md @@ -0,0 +1,10 @@ +--- +title: "Version 7.5.1" +--- + +# Updating from `7.5.0` to `7.5.1` + +## Painted ME Stocking Input Buses/Hatches +Multiple ME Stocking buses/hatches on a single machine cannot contain the same input, unless one of the buses is set to +Distinct. This update alters that behavior to allow Stocking buses/hatches with different Paint colors to contain the +same inputs, allowing those inputs to be present in multiple distinct paint groups. \ No newline at end of file diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java index 55b6bd90570..a494aff3154 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java @@ -159,11 +159,14 @@ public boolean testConfiguredInOtherPart(@Nullable GenericStack config) { // Otherwise, we need to test for if the item is configured // in any stocking bus in the multi (besides ourselves). + // Duplicate configurations are allowed for Distinct Buses, and Painted Buses of different colors. for (MultiblockControllerMachine controller : getControllers()) { for (IMultiPart part : controller.getParts()) { if (part instanceof MEStockingBusPartMachine bus) { // We don't need to check for ourselves, as this case is handled elsewhere. - if (bus == this || bus.isDistinct()) continue; + if (bus == this || bus.isDistinct() || + (bus.getPaintingColor() != this.getPaintingColor())) + continue; if (bus.aeItemHandler.hasStackInConfig(config, false)) { return true; } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java index fdf58e578be..8083e3b56ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java @@ -148,11 +148,14 @@ public IConfigurableSlotList getSlotList() { public boolean testConfiguredInOtherPart(@Nullable GenericStack config) { if (config == null) return false; if (!isFormed()) return false; - + // Test for if the fluid is configured in any stocking hatch in the multi (besides ourselves). + // Duplicate configurations are allowed for Painted Hatches of different colors. for (MultiblockControllerMachine controller : getControllers()) { for (IMultiPart part : controller.getParts()) { if (part instanceof MEStockingHatchPartMachine hatch) { - if (hatch == this) continue; + if (hatch == this || + (hatch.getPaintingColor() != this.getPaintingColor())) + continue; if (hatch.aeFluidHandler.hasStackInConfig(config, false)) { return true; }