diff --git a/docs/content/Modpacks/Changes/v8.0.0.md b/docs/content/Modpacks/Changes/v8.0.0.md
index af2a7b18ccb..6d4e394dccd 100644
--- a/docs/content/Modpacks/Changes/v8.0.0.md
+++ b/docs/content/Modpacks/Changes/v8.0.0.md
@@ -15,7 +15,8 @@ Many aspects of the machine classes have been refactored and changed in order to
 
 - The `MetaMachineBlockEntity`(MMBE) class has been removed, and `MetaMachine`(MM) is now a BlockEntity.
 - Most methods and properties of MMBE have been moved onto MM.
-- The `IMachineBlockEntity` interface has been removed. Use `MetaMachineBlock` directly instead.
+- The `IMachineBlock` interface has been removed. Use `MetaMachineBlock` directly instead.
+- The `IMachineBlockEntity` interface has been removed. Use `MetaMachine` directly instead.
 - Many methods common to all block entities have been moved to the `IGregtechBlockEntity` interface.
 - Machine instance creation functions have signature `(BlockEntityCreationInfo) -> MetaMachine` instead of `(IMachineBlockEntity) -> MetaMachine` 
 
diff --git a/docs/content/Modpacks/Materials-and-Elements/TagPrefixes-and-the-power-of-.setIgnored().md b/docs/content/Modpacks/Materials-and-Elements/TagPrefixes-and-the-power-of-.setIgnored().md
index 5438349be25..5ab5c122912 100644
--- a/docs/content/Modpacks/Materials-and-Elements/TagPrefixes-and-the-power-of-.setIgnored().md
+++ b/docs/content/Modpacks/Materials-and-Elements/TagPrefixes-and-the-power-of-.setIgnored().md
@@ -76,3 +76,25 @@ GTCEuStartupEvents.materialModification(event => { // (1)
 
 The `Material` for which you are adjusting the TagPrefix must be registered in GTCEu Modern's material registry; if this
 material is custom, this is done using `GTCEuStartupEvents.registry()`, as depicted in these docs.
+
+
+## What about fluids?
+
+Fluids are treated differently to items, their inclusion in a material is a property rather than a TagPrefix or MaterialFlag. 
+This makes replacing the fluid of a material with a fluid that you or another mod have created require a different approach than setIgnored. 
+The way to do this is using `GTFluids.handleNonMaterialFluids()` which can be found in the [``GTFluids`` class](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java)
+
+`GTFluids.handleNonMaterialFluids()` takes in a `Material` and a `Fluid` or `Supplier<Fluid>` to replace the liquid of the material with the provided fluid.
+Assure that the material is registered with a liquid before attempting to replace it with your new fluid. An example is below.
+
+!!! note "This may differ!"
+    Depending on the way your fluid is registered you may need to change how you pass the `Fluid` argument, check how it is registered in the mod you are working with.
+
+```java title="ExampleMaterials.java"
+public static void register() {
+    GLUGG_BRINE = new Material.Builder(MyMod.id("glugg_brine"))
+        .liquid(new FluidBuilder()).buildAndRegister();
+
+    GTFluids.handleNonMaterialFluids(GLUGG_BRINE, () -> PVFluidRegistry.BRINE_FLUID_SOURCE.get());
+}
+```
diff --git a/gradle/forge.versions.toml b/gradle/forge.versions.toml
index 318d42572b5..631f7acc2b1 100644
--- a/gradle/forge.versions.toml
+++ b/gradle/forge.versions.toml
@@ -3,9 +3,9 @@ registrate = "MC1.21-1.3.0+67"
 configuration = "3.1.1-neoforge"
 jei = "19.25.1.328"
 rei = "16.0.799"
-emi = "1.1.22+1.21.1"
+emi = "1.1.24+1.21.1"
 ae2 = "19.2.8"
-mui = "3.3.0-SNAPSHOT"
+mui = "3.3.1-SNAPSHOT"
 kubejs = "2101.7.2-build.336"
 rhino = "2101.2.7-build.81"
 architectury = "13.0.8"
diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java
index 876174f8fbb..a6d69976879 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java
@@ -289,8 +289,9 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 
         InteractionResult machineInteractResult = InteractionResult.PASS;
 
-        if (!itemStack.isEmpty())
+        if (!itemStack.isEmpty()) {
             machineInteractResult = machine.onUseWithItem(new ExtendedUseOnContext(player, hand, hit));
+        }
         if (machineInteractResult != InteractionResult.PASS) return getFromInteractionResult(machineInteractResult);
         machineInteractResult = machine.onUse(new ExtendedUseOnContext(player, hand, hit));
         if (machineInteractResult != InteractionResult.PASS) return getFromInteractionResult(machineInteractResult);
diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java
index 9ff9aed219d..2109df03609 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java
@@ -100,6 +100,7 @@ public int getSlotLimit(int slot) {
             };
 
             this.filterSlot.setFilter(this::canInsertFilterItem);
+            this.filterSlot.setOnContentsChanged(this::updateFilter);
         }
 
         return this.filterSlot;
@@ -107,7 +108,6 @@ public int getSlotLimit(int slot) {
 
     public void setFilterItem(ItemStack item) {
         getFilterSlot().setStackInSlot(0, item);
-        updateFilter();
     }
 
     private void updateFilter() {
diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java
index 46839877a96..d152c2d08d9 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java
@@ -101,9 +101,7 @@ public Flow getFilterUI(GuiData data, PanelSyncManager syncManager, UISettings s
                 .gridOfSizeWidth(9, 3, (x, y, i) -> new PhantomItemSlot()
                         .size(16)
                         .syncHandler(new PhantomItemSlotSyncHandler(new ModularSlot(handler, i)
-                                .changeListener((stack, amount, client, init) -> {
-                                    handler.setStackInSlot(i, stack);
-                                }).ignoreMaxStackSize(true).accessibility(true, false))));
+                                .ignoreMaxStackSize(true).accessibility(true, false))));
 
         BooleanSyncValue blacklist = new BooleanSyncValue(this::isBlackList, this::setBlackList).allowC2S();
         syncManager.syncValue("blacklist", blacklist);
diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/mui/MachineUIPanelBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/machine/mui/MachineUIPanelBuilder.java
index 6c09f38dbf0..dcbe171c7a6 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/machine/mui/MachineUIPanelBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/machine/mui/MachineUIPanelBuilder.java
@@ -4,9 +4,12 @@
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IVoidable;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IDistinctPart;
+import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
 import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine;
 import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine;
 import com.gregtechceu.gtceu.api.machine.trait.feature.IAttachConfiguratorsTrait;
+import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifierList;
+import com.gregtechceu.gtceu.common.data.GTRecipeModifiers;
 import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
 import com.gregtechceu.gtceu.common.mui.GTMuiWidgets;
 import com.gregtechceu.gtceu.common.mui.widgets.SteamDialWidget;
@@ -27,6 +30,7 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 @Accessors(fluent = true)
@@ -86,6 +90,11 @@ public MachineUIPanel build(PanelSyncManager syncManager, UISettings settings) {
                 attachRight.childIf(distinctPart.supportsDistinct(),
                         () -> GTMuiWidgets.createDistinctnessButton(distinctPart));
             }
+            if (machine.getDefinition().getRecipeModifier() instanceof RecipeModifierList rml &&
+                    Arrays.stream(rml.getModifiers()).anyMatch(m -> m == GTRecipeModifiers.BATCH_MODE) &&
+                    machine instanceof WorkableElectricMultiblockMachine workableElectric) {
+                attachRight.child(GTMuiWidgets.createBatchModeButton(workableElectric));
+            }
         }
 
         leftConfigurators.accept(attachLeft);
diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/notifiable/NotifiableFluidTank.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/notifiable/NotifiableFluidTank.java
index c285ff7a21b..f5ea7b18495 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/notifiable/NotifiableFluidTank.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/notifiable/NotifiableFluidTank.java
@@ -67,6 +67,7 @@ public NotifiableFluidTank(int slots, int capacity, IO io, IO capabilityIO) {
             this.storages[i] = new CustomFluidTank(capacity);
             this.storages[i].setOnContentsChanged(this::onContentsChanged);
         }
+        this.lockedFluid.setOnContentsChanged(this::onLockedFluidChanged);
     }
 
     public NotifiableFluidTank(List<CustomFluidTank> storages, IO io, IO capabilityIO) {
@@ -80,6 +81,7 @@ public NotifiableFluidTank(List<CustomFluidTank> storages, IO io, IO capabilityI
         if (io == IO.IN) {
             this.allowSameFluids = true;
         }
+        this.lockedFluid.setOnContentsChanged(this::onLockedFluidChanged);
     }
 
     public NotifiableFluidTank(int slots, int capacity, IO io) {
@@ -96,6 +98,26 @@ public void onContentsChanged() {
         notifyListeners();
     }
 
+    protected void onLockedFluidChanged() {
+        syncDataHolder.markClientSyncFieldDirty("lockedFluid");
+        var newFluid = this.lockedFluid.getFluid();
+        if (newFluid.isEmpty()) {
+            this.setFilter(stack -> true);
+            this.onContentsChanged();
+            return;
+        }
+        for (int i = 0; i < this.getTanks(); i++) {
+            if (this.getFluidInTank(i).isEmpty()) continue;
+            if (!this.getFluidInTank(i).isFluidEqual(newFluid)) {
+                // Fluid in a tank that doesn't equal the new locked fluid
+                this.lockedFluid.setFluid(FluidStack.EMPTY);
+                return;
+            }
+        }
+        this.setFilter(stack -> stack.isFluidEqual(newFluid));
+        this.onContentsChanged();
+    }
+
     @Override
     public List<SizedFluidIngredient> handleRecipeInner(IO io, GTRecipe recipe,
                                                         List<SizedFluidIngredient> left,
diff --git a/src/main/java/com/gregtechceu/gtceu/api/placeholder/MultiLineComponent.java b/src/main/java/com/gregtechceu/gtceu/api/placeholder/MultiLineComponent.java
index 156e1ea13c6..3f52a0695e1 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/placeholder/MultiLineComponent.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/placeholder/MultiLineComponent.java
@@ -1,6 +1,8 @@
 package com.gregtechceu.gtceu.api.placeholder;
 
 import net.minecraft.ChatFormatting;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.nbt.*;
 import net.minecraft.network.chat.*;
 
 import com.mojang.serialization.Codec;
@@ -10,7 +12,6 @@
 import lombok.experimental.Accessors;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnmodifiableView;
 
 import java.util.*;
 import java.util.ArrayList;
@@ -177,6 +178,7 @@ public MultiLineComponent withStyle(UnaryOperator<Style> style) {
             out.appendNewline();
         }
         if (!out.isEmpty()) out.removeLast();
+        out.addGraphics(this.getGraphics());
         return out;
     }
 
@@ -187,11 +189,44 @@ public MultiLineComponent withStyle(ChatFormatting... style) {
             out.appendNewline();
         }
         if (!out.isEmpty()) out.removeLast();
+        out.addGraphics(this.getGraphics());
         return out;
     }
 
-    public @UnmodifiableView List<Component> toImmutable() {
-        return Collections.unmodifiableList(this);
+    public List<Component> toImmutable() {
+        return new ArrayList<>(this);
+    }
+
+    public Tag toTag(HolderLookup.Provider registries) {
+        CompoundTag compoundTag = new CompoundTag();
+        ListTag tag = new ListTag();
+        for (MutableComponent component : this) {
+            tag.add(StringTag.valueOf(Component.Serializer.toJson(component, registries)));
+        }
+        compoundTag.put("text", tag);
+        ListTag graphicsTag = new ListTag();
+        for (GraphicsComponent component : this.getGraphics()) {
+            graphicsTag.add(GraphicsComponent.CODEC.encodeStart(NbtOps.INSTANCE, component).result().orElseThrow());
+        }
+        compoundTag.put("graphics", graphicsTag);
+        return compoundTag;
+    }
+
+    public static MultiLineComponent fromTag(@Nullable Tag tag, HolderLookup.Provider registries) {
+        MultiLineComponent out = MultiLineComponent.empty();
+        out.clear();
+        if (tag == null) return out;
+        if (tag instanceof ListTag listTag) {
+            for (Tag i : listTag) {
+                out.add(Component.Serializer.fromJson(i.getAsString(), registries));
+            }
+        } else if (tag instanceof CompoundTag compoundTag) {
+            ListTag textTag = compoundTag.getList("text", Tag.TAG_STRING);
+            for (Tag i : textTag) out.add(Component.Serializer.fromJson(i.getAsString(), registries));
+            ListTag graphicsTag = compoundTag.getList("graphics", Tag.TAG_COMPOUND);
+            for (Tag i : graphicsTag) out.addGraphics(GraphicsComponent.CODEC.parse(NbtOps.INSTANCE, i).getOrThrow());
+        }
+        return out;
     }
 
     public long toLong() {
diff --git a/src/main/java/com/gregtechceu/gtceu/api/placeholder/Placeholder.java b/src/main/java/com/gregtechceu/gtceu/api/placeholder/Placeholder.java
index 39d67815116..26638e63ffc 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/placeholder/Placeholder.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/placeholder/Placeholder.java
@@ -17,19 +17,20 @@ public abstract class Placeholder {
     @Getter
     private final ResourceLocation id;
 
+    @Getter
+    private final String name;
+
     public abstract MultiLineComponent apply(PlaceholderContext ctx,
                                              List<MultiLineComponent> args) throws PlaceholderException;
 
     public Placeholder(String str) {
-        this(GTCEu.id(str));
+        this.id = GTCEu.id(str);
+        this.name = str;
     }
 
     public Placeholder(ResourceLocation id) {
         this.id = id;
-    }
-
-    public String getName() {
-        return id.getPath();
+        this.name = id.getPath();
     }
 
     protected CompoundTag getData(PlaceholderContext ctx) {
diff --git a/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java b/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java
index 4e53b359671..344a56be69f 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java
@@ -37,7 +37,6 @@
 import brachy.modularui.widgets.layout.Flow;
 import brachy.modularui.widgets.slot.ItemSlot;
 import brachy.modularui.widgets.textfield.TextFieldWidget;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -101,8 +100,7 @@ public static void addRenderer(String id, IPlaceholderRenderer renderer) {
     }
 
     public static MultiLineComponent processPlaceholder(List<MultiLineComponent> placeholder,
-                                                        PlaceholderContext context,
-                                                        Object2IntOpenHashMap<String> indices) throws PlaceholderException {
+                                                        PlaceholderContext context) throws PlaceholderException {
         var id = toId(placeholder.getFirst().toString());
         if (id == null) throw new UnknownPlaceholderException(placeholder.getFirst().toString());
         var holder = context.holderLookup().holder(id);
@@ -118,7 +116,6 @@ public static MultiLineComponent processPlaceholders(String s, PlaceholderContex
         if (ctx.level().isClientSide)
             GTCEu.LOGGER.warn("Placeholder processing is running on client instead of server!");
         List<Exception> exceptions = new ArrayList<>();
-        Object2IntOpenHashMap<String> indices = new Object2IntOpenHashMap<>();
         boolean escape = false;
         boolean escapeNext = false;
         boolean literalEscape = false;
@@ -180,7 +177,7 @@ public static MultiLineComponent processPlaceholders(String s, PlaceholderContex
                         List<MultiLineComponent> placeholder = stack.pop();
                         try {
                             if (stack.isEmpty()) throw new UnexpectedBracketException();
-                            MultiLineComponent result = processPlaceholder(placeholder, ctx, indices);
+                            MultiLineComponent result = processPlaceholder(placeholder, ctx);
                             if (result.isIgnoreSpaces() || stack.size() == 1) {
                                 stack.peek().getLast().append(result);
                             } else {
@@ -347,8 +344,7 @@ public static ModularPanel<?> createPlaceholderEditorPanel(String name,
                                                         .center())
                                                 .tooltip(new RichTooltip()
                                                         .addDrawableLines(LangHandler
-                                                                .getSingleOrMultiLang(
-                                                                        "gtceu.placeholder_info." + s)
+                                                                .getSingleOrMultiLang("gtceu.placeholder_info." + s)
                                                                 .stream()
                                                                 .map(Text::of)
                                                                 .map(key -> (IDrawable) key)
diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/ender/AbstractEnderLinkCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/ender/AbstractEnderLinkCover.java
index 05b2b52dbef..81b963829da 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/cover/ender/AbstractEnderLinkCover.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/cover/ender/AbstractEnderLinkCover.java
@@ -250,7 +250,7 @@ public void createCoverUIRows(Flow column, SidedPosGuiData data, PanelSyncManage
                 (sm, sh) -> createChannelManagerPanel(data, sm, settings));
 
         var colorSyncer = new IntSyncValue(this::getColor);
-        EnumSyncValue<IO> ioSync = new EnumSyncValue<>(IO.class, this::getIo, this::setIo);
+        EnumSyncValue<IO> ioSync = new EnumSyncValue<>(IO.class, this::getIo, this::setIo).allowC2S();
 
         syncManager.syncValue("io", ioSync);
         syncManager.syncValue("color", colorSyncer);
@@ -258,6 +258,8 @@ public void createCoverUIRows(Flow column, SidedPosGuiData data, PanelSyncManage
         var currentEntry = GenericSyncValue.<RegistryFriendlyByteBuf, VirtualEntry>builder(VirtualEntry.class)
                 .adapter(new VirtualEntryAdapter())
                 .getter(this::getEntry)
+                .adapter(new VirtualEntryAdapter())
+                .allowC2S()
                 .build();
         syncManager.syncValue("currentEntry", currentEntry);
 
@@ -277,9 +279,9 @@ public void createCoverUIRows(Flow column, SidedPosGuiData data, PanelSyncManage
                         .tooltip(1, t -> t.addLine(Text.lang(Permissions.PROTECTED.tooltip)))
                         .tooltip(2, t -> t.addLine(Text.lang(Permissions.PRIVATE.tooltip)))
                         .value(new EnumSyncValue<>(Permissions.class, this::getPermission,
-                                this::setPermission)))
+                                this::setPermission).allowC2S()))
                 .child(new TextFieldWidget()
-                        .value(new StringSyncValue(this::getColorStr, this::setColorStr))
+                        .value(new StringSyncValue(this::getColorStr, this::setColorStr).allowC2S())
                         .setMaxLength(8)
                         .setValidator(str -> COLOR_INPUT_PATTERN.matcher(str).replaceAll(""))
                         .addTooltipLine(Text.lang("cover.ender_link.tooltip.channel_name")))
@@ -294,7 +296,7 @@ public void createCoverUIRows(Flow column, SidedPosGuiData data, PanelSyncManage
                 .setMaxLength(32)
                 .widthRel(1f)
                 .addTooltipLine(Text.lang("cover.ender_link.tooltip.channel_description"))
-                .value(new StringSyncValue(this::getDescription, this::setDescription))));
+                .value(new StringSyncValue(this::getDescription, this::setDescription).allowC2S())));
 
         Flow bottomRow = coverUIRow();
         bottomRow.child(GTMuiWidgets.createPowerButton(this));
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 5365d08289a..2da61cd004c 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
@@ -873,11 +873,7 @@ public class GTMultiMachines {
             .rotationState(RotationState.ALL)
             .recipeType(DUMMY_RECIPES)
             .appearanceBlock(CASING_ALUMINIUM_FROSTPROOF)
-            .pattern((definition) -> MultiblockPatternBuilder.start()
-                    .slice("BCB", "BBB", "BBB", "BBB")
-                    .where('C', Predicates.controller(Predicates.blocks(definition.get())))
-                    .where('B', CentralMonitorMachine.getMultiPredicate())
-                    .build())
+            .pattern(CentralMonitorMachine::getPattern)
             .modelProperty(RecipeLogic.STATUS_PROPERTY, RecipeLogic.Status.IDLE)
             .model(createWorkableCasingMachineModel(
                     GTCEu.id("block/casings/solid/machine_casing_frost_proof"),
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java
index 9a5b010c9ea..d03a5dfb95e 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java
@@ -151,7 +151,6 @@ private ParentWidget<?> createSimpleFilterPage(SimpleItemFilter filter) {
                 .gridOfSizeWidth(9, 3, (x, y, i) -> new PhantomItemSlot()
                         .size(16)
                         .syncHandler(new PhantomItemSlotSyncHandler(new ModularSlot(handler, i)
-                                .changeListener((stack, amount, client, init) -> handler.setStackInSlot(i, stack))
                                 .ignoreMaxStackSize(true).accessibility(true, false))));
 
         BooleanSyncValue blacklist = new BooleanSyncValue(filter::isBlackList, filter::setBlackList).allowC2S();
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java
index 455ca29d192..4f48bae5303 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java
@@ -2,6 +2,7 @@
 
 import com.gregtechceu.gtceu.api.item.component.IAddInformation;
 import com.gregtechceu.gtceu.api.item.component.IMonitorModuleItem;
+import com.gregtechceu.gtceu.api.placeholder.GraphicsComponent;
 import com.gregtechceu.gtceu.api.placeholder.MultiLineComponent;
 import com.gregtechceu.gtceu.api.placeholder.PlaceholderContext;
 import com.gregtechceu.gtceu.api.placeholder.PlaceholderHandler;
@@ -137,6 +138,11 @@ public void appendHoverText(ItemStack stack, @Nullable Item.TooltipContext conte
                     .addAll(stack.getOrDefault(GTDataComponents.FORMAT_STRING_LIST, TextLineList.EMPTY).lines());
             tooltipComponents.add(Component.literal("Processed text:").withStyle(ChatFormatting.GOLD));
             tooltipComponents.addAll(getText(stack));
+            tooltipComponents.add(Component.literal("Graphics components:").withStyle(ChatFormatting.GOLD));
+            tooltipComponents.addAll(getText(stack).getGraphics().stream()
+                    .map(GraphicsComponent::rendererId)
+                    .map(Component::literal)
+                    .toList());
         }
     }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java
index 98cbdd7a3c2..e7709b04158 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java
@@ -6,15 +6,14 @@
 import com.gregtechceu.gtceu.api.item.IComponentItem;
 import com.gregtechceu.gtceu.api.item.component.IItemComponent;
 import com.gregtechceu.gtceu.api.item.component.IMonitorModuleItem;
+import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.machine.feature.IDataInfoProvider;
 import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
 import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
 import com.gregtechceu.gtceu.api.misc.EnergyContainerList;
 import com.gregtechceu.gtceu.api.multiblock.*;
 import com.gregtechceu.gtceu.api.multiblock.Predicates;
-import com.gregtechceu.gtceu.api.multiblock.pattern.CurrentBlockInfo;
-import com.gregtechceu.gtceu.api.multiblock.pattern.IBlockPattern;
-import com.gregtechceu.gtceu.api.multiblock.pattern.MultiblockPatternBuilder;
+import com.gregtechceu.gtceu.api.multiblock.pattern.*;
 import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection;
 import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged;
 import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
@@ -39,6 +38,9 @@
 import net.neoforged.neoforge.network.PacketDistributor;
 
 import brachy.modularui.api.drawable.IDrawable;
+import it.unimi.dsi.fastutil.ints.IntIntPair;
+import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import lombok.Getter;
 import org.jetbrains.annotations.Nullable;
 
@@ -62,8 +64,6 @@ public class CentralMonitorMachine extends WorkableElectricMultiblockMachine
     @Getter
     private List<MonitorGroup> monitorGroups = new ArrayList<>();
 
-    private @Nullable CurrentBlockInfo patternFindingState;
-
     private static @Nullable PatternPredicate MULTI_PREDICATE = null;
 
     public CentralMonitorMachine(BlockEntityCreationInfo info) {
@@ -72,14 +72,14 @@ public CentralMonitorMachine(BlockEntityCreationInfo info) {
 
     public static PatternPredicate getMultiPredicate() {
         if (MULTI_PREDICATE == null) {
-            MULTI_PREDICATE = Predicates.abilities(PartAbility.INPUT_ENERGY)
-                    .setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)
+            MULTI_PREDICATE = Predicates.machines(GTMachines.MONITOR)
+                    .or(Predicates.abilities(PartAbility.INPUT_ENERGY)
+                            .setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1))
                     .or(Predicates.abilities(PartAbility.DATA_ACCESS).setPreviewCount(1)
                             .or(Predicates.machines(GTMachines.BATTERY_BUFFER_4).setPreviewCount(0))
                             .or(Predicates.machines(GTMachines.BATTERY_BUFFER_16).setPreviewCount(0))
                             .setMaxGlobalLimited(4))
-                    .or(Predicates.machines(GTMachines.HULL))
-                    .or(Predicates.machines(GTMachines.MONITOR))
+                    .or(Predicates.machines(GTMachines.HULL).setPreviewCount(0))
                     .or(Predicates.machines(GTMachines.ADVANCED_MONITOR))
                     .or(Predicates.blocks(GTBlocks.CASING_ALUMINIUM_FROSTPROOF.get()));
         }
@@ -87,14 +87,20 @@ public static PatternPredicate getMultiPredicate() {
     }
 
     @Override
-    public void invalidateStructure(String name) {
-        super.invalidateStructure(name);
-        this.clearPatternFindingState();
+    public CentralMonitorLogic getRecipeLogic() {
+        return (CentralMonitorLogic) super.getRecipeLogic();
     }
 
     @Override
-    public CentralMonitorLogic getRecipeLogic() {
-        return (CentralMonitorLogic) super.getRecipeLogic();
+    public void onLoad() {
+        super.onLoad();
+        updateStructureDimensions();
+    }
+
+    @Override
+    public void formStructure(String substructureName) {
+        super.formStructure(substructureName);
+        updateStructureDimensions();
     }
 
     public @Nullable EnergyContainerList getFormedEnergyContainer() {
@@ -126,42 +132,12 @@ public void tick() {
         recipeLogic.getSyncDataHolder().markClientSyncFieldDirty("status");
     }
 
-    @Override
-    public void onUnload() {
-        super.onUnload();
-        this.clearPatternFindingState();
-    }
-
-    protected void clearPatternFindingState() {
-        // if (this.patternFindingState != null)
-        // this.patternFindingState.clean();
-        // this.patternFindingState = null;
-    }
-
-    protected CurrentBlockInfo getPatternFindingState() {
-        if (this.patternFindingState == null) {
-            this.patternFindingState = new CurrentBlockInfo();
-            patternFindingState.setLevel(getLevel());
-            patternFindingState.setCurrentPos(getBlockPos());
-            // this.patternFindingState.clean();
-        }
-        return this.patternFindingState;
-    }
-
-    public boolean isValidMonitorBlock(Level level, BlockPos pos) {
+    public static boolean isValidMonitorBlock(Level level, BlockPos pos) {
         if (level.isOutsideBuildHeight(pos)) return false;
-
-        CurrentBlockInfo state = getPatternFindingState();
-        /*
-         * if (!state.update(pos, getMultiPredicate())) {
-         * return false;
-         * }
-         * state.io = IO.BOTH;
-         *
-         * return Stream.concat(state.predicate.common.stream(), state.predicate.limited.stream())
-         * .anyMatch(predicate -> predicate.test(state));
-         */
-        return false;
+        CurrentBlockInfo info = new CurrentBlockInfo();
+        info.setLevel(level);
+        info.setCurrentPos(pos);
+        return getMultiPredicate().test(info, new Object2IntOpenHashMap<>(), null).isEmpty();
     }
 
     public void updateStructureDimensions() {
@@ -170,19 +146,32 @@ public void updateStructureDimensions() {
 
         Direction front = getFrontFacing();
         Direction spin = getUpwardsFacing();
+        IntList bounds = getBounds(level, getBlockPos().mutable(), front, spin);
+        this.upDist = bounds.getInt(0);
+        this.downDist = bounds.getInt(1);
+        this.leftDist = bounds.getInt(2);
+        this.rightDist = bounds.getInt(3);
+
+        getSyncDataHolder().markClientSyncFieldDirty("leftDist");
+        getSyncDataHolder().markClientSyncFieldDirty("rightDist");
+        getSyncDataHolder().markClientSyncFieldDirty("upDist");
+        getSyncDataHolder().markClientSyncFieldDirty("downDist");
+    }
 
-        Direction left = RelativeDirection.LEFT.getRelativeFacing(front, spin, false);
-        Direction right = RelativeDirection.RIGHT.getRelativeFacing(front, spin, false);
-        Direction up = RelativeDirection.UP.getRelativeFacing(front, spin, false);
-        Direction down = RelativeDirection.DOWN.getRelativeFacing(front, spin, false);
-        BlockPos.MutableBlockPos posLeft = getBlockPos().mutable().move(left);
-        BlockPos.MutableBlockPos posRight = getBlockPos().mutable().move(right);
-        BlockPos.MutableBlockPos posUp = getBlockPos().mutable().move(up);
-        BlockPos.MutableBlockPos posDown = getBlockPos().mutable().move(down);
-        this.leftDist = 0;
-        this.rightDist = 0;
-        this.upDist = 0;
-        this.downDist = 0;
+    public static IntList getBounds(Level level, BlockPos.MutableBlockPos controllerPos, Direction front,
+                                    Direction upFace) {
+        Direction left = RelativeDirection.LEFT.getRelativeFacing(front, upFace, false);
+        Direction right = RelativeDirection.RIGHT.getRelativeFacing(front, upFace, false);
+        Direction up = RelativeDirection.UP.getRelativeFacing(front, upFace, false);
+        Direction down = RelativeDirection.DOWN.getRelativeFacing(front, upFace, false);
+        BlockPos.MutableBlockPos posLeft = controllerPos.mutable().move(left);
+        BlockPos.MutableBlockPos posRight = controllerPos.mutable().move(right);
+        BlockPos.MutableBlockPos posUp = controllerPos.mutable().move(up);
+        BlockPos.MutableBlockPos posDown = controllerPos.mutable().move(down);
+        int leftDist = 0;
+        int rightDist = 0;
+        int upDist = 0;
+        int downDist = 0;
 
         while (isValidMonitorBlock(level, posLeft)) {
             posLeft.move(left);
@@ -200,14 +189,19 @@ public void updateStructureDimensions() {
             posDown.move(down);
             downDist++;
         }
-        getSyncDataHolder().markClientSyncFieldDirty("leftDist");
-        getSyncDataHolder().markClientSyncFieldDirty("rightDist");
-        getSyncDataHolder().markClientSyncFieldDirty("upDist");
-        getSyncDataHolder().markClientSyncFieldDirty("downDist");
+
+        if (leftDist + rightDist + upDist + downDist == 0) {
+            upDist = 1;
+            downDist = 1;
+            leftDist = 3;
+        }
+
+        return IntList.of(upDist, downDist, leftDist, rightDist, 0, 0);
     }
 
-    private boolean isValidMonitorBlockRow(Level level, BlockPos pos, int leftDist, int rightDist, Direction left,
-                                           Direction right) {
+    private static boolean isValidMonitorBlockRow(Level level, BlockPos pos, int leftDist, int rightDist,
+                                                  Direction left,
+                                                  Direction right) {
         BlockPos.MutableBlockPos mutable = pos.mutable();
         mutable.move(left, leftDist);
         for (int i = 0; i < leftDist + rightDist; i++) {
@@ -217,6 +211,30 @@ private boolean isValidMonitorBlockRow(Level level, BlockPos pos, int leftDist,
         return isValidMonitorBlock(level, mutable);
     }
 
+    public static List<IntIntPair> getConstraints() {
+        return List.of(
+                IntIntPair.of(0, 10),
+                IntIntPair.of(0, 10),
+                IntIntPair.of(0, 10),
+                IntIntPair.of(0, 10),
+                IntIntPair.of(0, 0),
+                IntIntPair.of(0, 0));
+    }
+
+    public static IBlockPattern getPattern(MultiblockMachineDefinition definition) {
+        PatternPredicate predicate = getMultiPredicate();
+        return ExpandableMultiblockPatternBuilder
+                .start()
+                .boundsProvider(CentralMonitorMachine::getBounds)
+                .constraintProvider(CentralMonitorMachine::getConstraints)
+                .predicateProvider((pos, bounds) -> {
+                    if (pos.equals(BlockPos.ZERO))
+                        return Predicates.controller(definition);
+                    return predicate;
+                })
+                .build();
+    }
+
     @Override
     public IBlockPattern getDefaultStructurePattern() {
         updateStructureDimensions();
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/AutoMaintenanceHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/AutoMaintenanceHatchPartMachine.java
index aa2d578a96e..c281add196e 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/AutoMaintenanceHatchPartMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/AutoMaintenanceHatchPartMachine.java
@@ -5,6 +5,10 @@
 import com.gregtechceu.gtceu.api.capability.recipe.IO;
 import com.gregtechceu.gtceu.api.machine.trait.notifiable.NotifiableItemStackHandler;
 
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.BlockHitResult;
+
 import brachy.modularui.factory.PosGuiData;
 import brachy.modularui.screen.UISettings;
 import brachy.modularui.value.sync.PanelSyncManager;
@@ -58,4 +62,9 @@ public void setTimeActive(int time) {}
     @Override
     public void buildMainUI(ParentWidget<?> mainWidget, PosGuiData guiData, PanelSyncManager syncManager,
                             UISettings settings) {}
+
+    @Override
+    public boolean shouldOpenUI(Player player, InteractionHand hand, BlockHitResult hit) {
+        return false;
+    }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java
index 322c3238c0e..79e3a3ca34d 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java
@@ -255,7 +255,7 @@ public void buildMainUI(ParentWidget<?> mainWidget, PosGuiData guiData, PanelSyn
     }
 
     protected Flow createSingleSlotUI(PanelSyncManager syncManager) {
-        BooleanSyncValue locked = new BooleanSyncValue(this.tank::isLocked, this.tank::setLocked);
+        BooleanSyncValue locked = new BooleanSyncValue(this.tank::isLocked, this.tank::setLocked).allowC2S();
         syncManager.syncValue("locked", locked);
         return Flow.col()
                 .width(MachineUIPanel.DEFAULT_CONTENT_WIDTH)
@@ -271,12 +271,13 @@ protected Flow createSingleSlotUI(PanelSyncManager syncManager) {
                         .coverChildren()
                         .childIf(io.support(IO.OUT), () -> new FluidSlot()
                                 .name("lockedFluid")
-                                .syncHandler(new FluidSlotSyncHandler(tank.getLockedFluid()))
+                                .syncHandler(new FluidSlotSyncHandler(tank.getLockedFluid()).phantom(true))
                                 .alwaysShowFull(true)
                                 .tooltip(t -> t.addLine("Locked Fluid")))
                         .childIf(io.support(IO.OUT), () -> new ToggleButton()
                                 .syncHandler("locked")
-                                .tooltip(t -> t.addLine("gtceu.gui.fluid_lock.tooltip"))
+                                .tooltipDynamic(t -> t.addLine(Component.translatable("gtceu.gui.fluid_lock.tooltip." +
+                                        (locked.getBoolValue() ? "enabled" : "disabled"))))
                                 .overlay(false, GTGuiTextures.BUTTON_LOCK)
                                 .overlay(true, GTGuiTextures.BUTTON_LOCK)
                                 .background(GuiTextures.MC_BUTTON)
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java
index 9996e5a405c..0b007475a2a 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java
@@ -124,6 +124,12 @@ public void onUnload() {
         }
     }
 
+    @Override
+    public void onMachineDestroyed() {
+        if (filterHandler.isFilterPresent())
+            Block.popResource(getLevel(), getBlockPos(), filterHandler.getFilterItem());
+    }
+
     @Override
     public void onPaintingColorChanged(int color) {
         getHandlerList().setColor(color, true);
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java
index f5dd95b8450..647cb3850eb 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java
@@ -66,7 +66,7 @@ public class RotorHolderPartMachine extends TieredPartMachine implements IMuiMac
 
     public RotorHolderPartMachine(BlockEntityCreationInfo info, int tier) {
         super(info, tier);
-        this.inventory = attachTrait(new NotifiableItemStackHandler(1, IO.NONE, IO.BOTH));
+        this.inventory = attachTrait(new NotifiableItemStackHandler(1, IO.NONE, IO.NONE));
         this.maxRotorHolderSpeed = 2000 + 1000 * tier;
     }
 
@@ -239,7 +239,7 @@ public InteractionResult onUse(ExtendedUseOnContext context) {
     public void buildMainUI(ParentWidget<?> mainWidget, PosGuiData guiData, PanelSyncManager syncManager,
                             UISettings settings) {
         var slot = new ItemSlot()
-                .slot(new ModularSlot(inventory, 0).slotGroup(new SlotGroup("rotor", 1)))
+                .slot(new ModularSlot(inventory.storage, 0).slotGroup(new SlotGroup("rotor", 1)))
                 .background(GTGuiTextures.SLOT, GTGuiTextures.TURBINE_OVERLAY).center();
 
         var rotorSync = new IntSyncValue(this::getRotorSpeed);
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java
index 09a7de53345..dc15e72cb7b 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java
@@ -114,11 +114,11 @@ public void collectImplicitComponents(DataComponentMap.Builder components) {
     public InteractionResult onUseWithItem(ExtendedUseOnContext context) {
         if (!isRemote()) {
             if (FluidUtil.interactWithFluidHandler(context.getPlayer(), context.getHand(), cache)) {
-                return InteractionResult.SUCCESS;
+                return InteractionResult.CONSUME;
             }
             return InteractionResult.PASS;
         }
-        return super.onUseWithItem(context);
+        return getLevel().isClientSide() ? InteractionResult.SUCCESS : InteractionResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java
index bd813e70620..3bc7ba25947 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java
@@ -437,6 +437,7 @@ protected NotifiableAccountedInvWrapper getCachedItemHandler() {
         if (cachedItemHandler == null) {
             cachedItemHandler = new NotifiableAccountedInvWrapper(getRLMachine()
                     .getCapabilitiesFlat(IO.OUT, ItemRecipeCapability.CAP).stream()
+                    .filter(cap -> cap instanceof IItemHandlerModifiable)
                     .map(IItemHandlerModifiable.class::cast)
                     .toArray(IItemHandlerModifiable[]::new));
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/mui/GTByteBufAdapters.java b/src/main/java/com/gregtechceu/gtceu/common/mui/GTByteBufAdapters.java
index 5f2e21b4ebc..438c8c92de3 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/mui/GTByteBufAdapters.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/mui/GTByteBufAdapters.java
@@ -10,6 +10,7 @@
 
 import brachy.modularui.utils.EqualityTest;
 import brachy.modularui.utils.serialization.network.*;
+import com.google.gson.JsonObject;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 
@@ -56,8 +57,8 @@ public T decode(FriendlyByteBuf buffer) {
 
             @Override
             public boolean areEqual(T a, T b) {
-                String encoded1 = codec.encodeStart(JsonOps.INSTANCE, a).result().orElseThrow().toString();
-                String encoded2 = codec.encodeStart(JsonOps.INSTANCE, b).result().orElseThrow().toString();
+                JsonObject encoded1 = codec.encodeStart(JsonOps.INSTANCE, a).result().orElseThrow().getAsJsonObject();
+                JsonObject encoded2 = codec.encodeStart(JsonOps.INSTANCE, b).result().orElseThrow().getAsJsonObject();
                 return Objects.equals(encoded1, encoded2);
             }
         };
diff --git a/src/main/java/com/gregtechceu/gtceu/common/mui/GTGuiTextures.java b/src/main/java/com/gregtechceu/gtceu/common/mui/GTGuiTextures.java
index 924b4c103a5..f46bc29970b 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/mui/GTGuiTextures.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/mui/GTGuiTextures.java
@@ -215,6 +215,8 @@ interface IDs {
             "textures/gui/widget/button_distinct_buses.png",
             16, 32, 16, 16, ColorType.DEFAULT);
 
+    UITexture[] BUTTON_BATCH = slice("textures/gui/widget/button_batch.png", 16, 32, 16, 16, ColorType.DEFAULT);
+
     UITexture[] FLUID_TRANSFER_MODE_OVERLAY = slice(
             "textures/gui/overlay/fluid_transfer_mode_overlay.png",
             18, 18 * 3, 18, 18, ColorType.DEFAULT);
diff --git a/src/main/java/com/gregtechceu/gtceu/common/mui/GTMuiWidgets.java b/src/main/java/com/gregtechceu/gtceu/common/mui/GTMuiWidgets.java
index d3e685df2b0..c803dd6cc43 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/mui/GTMuiWidgets.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/mui/GTMuiWidgets.java
@@ -9,6 +9,7 @@
 import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IVoidable;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IDistinctPart;
+import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
 import com.gregtechceu.gtceu.common.cover.data.BucketMode;
 import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour;
 import com.gregtechceu.gtceu.common.machine.trait.AutoOutputTrait;
@@ -156,7 +157,8 @@ public static FluidSlot createTankWidget() {
     }
 
     public static ItemSlot createBatterySlot(BatterySlotTrait batterySlot, PanelSyncManager syncManager) {
-        ItemSlotSyncHandler battery = new ItemSlotSyncHandler(new ModularSlot(batterySlot.getStorage(), 0));
+        ItemSlotSyncHandler battery = new ItemSlotSyncHandler(
+                new ModularSlot(batterySlot.getStorage(), 0).singletonSlotGroup(-10));
         syncManager.syncValue("battery", battery);
         return new ItemSlot().syncHandler("battery").background(GTGuiTextures.SLOT, GTGuiTextures.CHARGER_OVERLAY);
     }
@@ -178,6 +180,12 @@ public static ToggleButton createDistinctnessButton(IDistinctPart distinct) {
                 "gtceu.multiblock.universal.distinct");
     }
 
+    public static ToggleButton createBatchModeButton(WorkableElectricMultiblockMachine workableElectricMultiblockMachine) {
+        return createToggleButton(workableElectricMultiblockMachine::isBatchEnabled,
+                workableElectricMultiblockMachine::setBatchEnabled,
+                GTGuiTextures.BUTTON_BATCH[0], GTGuiTextures.BUTTON_BATCH[1], "gtceu.machine.batching");
+    }
+
     public static ToggleButton createAutoOutputItemButton(AutoOutputTrait autoOutput) {
         return createToggleButton(autoOutput::isAutoOutputItems, autoOutput::setAllowAutoOutputItems,
                 GTGuiTextures.BUTTON_ITEM_OUTPUT, "gtceu.gui.item_auto_output");
@@ -380,10 +388,10 @@ public static <T, S extends Filter<T, S>> ParentWidget<?> createFilterRow(Flow e
         syncManager.syncValue("filterSlotHandler", filterSlotHandler);
 
         IPanelHandler panelHandler = syncManager.syncedPanel("filterPanel", true,
-                (sm, sh) -> filterHandler.loadFilter(filterSlotHandler.getSlot().getItem()).getPanel(data, sm,
-                        settings, false));
+                (sm, sh) -> filterHandler.getFilter().getPanel(data, sm, settings, false));
 
-        modSlot.changeListener((newItem, onlyAmountChanged, client, init) -> {
+        modSlot.changeListener((oldStack, newStack, client, init) -> {
+            if (init || ItemStack.isSameItem(oldStack, newStack)) return;
             panelHandler.closePanel();
             panelHandler.deleteCachedPanel();
         });
diff --git a/src/main/java/com/gregtechceu/gtceu/common/mui/factory/CentralMonitorUIFactory.java b/src/main/java/com/gregtechceu/gtceu/common/mui/factory/CentralMonitorUIFactory.java
index 11f7d7ec9dc..4dfeac49f56 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/mui/factory/CentralMonitorUIFactory.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/mui/factory/CentralMonitorUIFactory.java
@@ -32,6 +32,7 @@
 import brachy.modularui.value.BoolValue;
 import brachy.modularui.value.sync.*;
 import brachy.modularui.widgets.*;
+import brachy.modularui.widgets.dynamic.DynamicWidget;
 import brachy.modularui.widgets.layout.Flow;
 import brachy.modularui.widgets.layout.Grid;
 import brachy.modularui.widgets.slot.ItemSlot;
@@ -167,7 +168,7 @@ public ModularPanel<?> buildUIFunction(PosGuiData data, PanelSyncManager syncMan
                                                     groupSync.setValue(groups, true, false);
                                                 })))
                                 .widthRel(1).height(20))
-                        .child(new DynamicSyncedWidget<>()
+                        .child(new DynamicWidget<>()
                                 .overlay(new BorderDrawable(0xFF555555, 4))
                                 .syncHandler(listHandler)
                                 .padding(4)
@@ -258,6 +259,7 @@ private ModularPanel<?> createGroupEditorPanel(PanelSyncManager syncManager,
         int matrixHeight = matrix.size() * 20;
         BoolValue moduleChanged = new BoolValue(false);
         return new ModularPanel<>("editor_%d_panel".formatted(groupIndex))
+                .closeOnOutOfBoundsClick(true)
                 .width(Math.max(matrixWidth, 150))
                 .height(matrixHeight + 60)
                 .excludeAreaInRecipeViewer()
@@ -278,7 +280,8 @@ private ModularPanel<?> createGroupEditorPanel(PanelSyncManager syncManager,
                                         .name("module_slot")
                                         .slot(new ModularSlot(group.getItemStackHandler(), 0)
                                                 .changeListener((item, amount, client, init) -> {
-                                                    groupSync.setValue(groups, true, false);
+                                                    if (!init)
+                                                        groupSync.setValue(groups, true, false);
                                                 })))
                                 .child(new ButtonWidget<>()
                                         .overlay(GuiTextures.EDIT)
diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
index de25dfff541..aeed75ba86a 100644
--- a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
+++ b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
@@ -1178,8 +1178,8 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("gtceu.multiblock.total_runs", "Performing %d Recipes at once");
         provider.add("gtceu.multiblock.batch_enabled", "- %dx from Batching");
         provider.add("gtceu.multiblock.subtick_parallels", "- %dx from Overclocking");
-        provider.add("gtceu.machine.batch_enabled", "Batching Enabled");
-        provider.add("gtceu.machine.batch_disabled", "Batching Disabled");
+        provider.add("gtceu.machine.batching.enabled", "Batching Enabled");
+        provider.add("gtceu.machine.batching.disabled", "Batching Disabled");
         provider.add("gtceu.multiblock.progress_percent", "Progress: %s%%");
         provider.add("gtceu.multiblock.progress", "Progress: %ss / %ss (%s%%)");
         provider.add("gtceu.multiblock.output_line.0", "%s x §e%s§r (%ss/ea)");
diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java
index 93348fc679d..bc6a1463dd2 100644
--- a/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java
+++ b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java
@@ -460,9 +460,9 @@ protected static void init(RegistrateLangProvider provider) {
                 "You can fill and empty any fluid containers with the Fluid Canner (e.g. Buckets or Fluid Cells)");
 
         provider.add("gtceu.machine.large_combustion_engine.tooltip.boost_regular",
-                "Supply §f20 mB/s§7 of Oxygen to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.");
+                "Supply §f20 mB/s§7 of §bOxygen§7 to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.");
         provider.add("gtceu.machine.large_combustion_engine.tooltip.boost_extreme",
-                "Supply §f80 mB/s§7 of Liquid Oxygen to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.");
+                "Supply §f80 mB/s§7 of §9Liquid Oxygen§7 to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.");
 
         provider.add("gtceu.machine.fusion_reactor.capacity", "§7Maximum Energy Storage: §e%sM EU");
         provider.add("gtceu.machine.fusion_reactor.overclocking",
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java
index c4465b1c4e9..3f70e49086e 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java
@@ -1,16 +1,25 @@
 package com.gregtechceu.gtceu.integration.ae2.machine;
 
 import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo;
+import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability;
+import com.gregtechceu.gtceu.api.capability.recipe.IFilteredHandler;
 import com.gregtechceu.gtceu.api.capability.recipe.IO;
+import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler;
+import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability;
+import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
 import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.machine.TickableSubscription;
 import com.gregtechceu.gtceu.api.machine.feature.IDataStickInteractable;
 import com.gregtechceu.gtceu.api.machine.mui.MachineUIPanelBuilder;
 import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
+import com.gregtechceu.gtceu.api.machine.trait.MachineTraitType;
 import com.gregtechceu.gtceu.api.machine.trait.notifiable.NotifiableFluidTank;
 import com.gregtechceu.gtceu.api.machine.trait.notifiable.NotifiableItemStackHandler;
+import com.gregtechceu.gtceu.api.machine.trait.notifiable.NotifiableRecipeHandlerTrait;
+import com.gregtechceu.gtceu.api.machine.trait.recipe.RecipeHandlerGroupDistinctness;
 import com.gregtechceu.gtceu.api.machine.trait.recipe.RecipeHandlerList;
+import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredientExtensions;
 import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
 import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
@@ -21,20 +30,23 @@
 import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
 import com.gregtechceu.gtceu.common.mui.GTMuiMachineUtil;
 import com.gregtechceu.gtceu.common.mui.widgets.PopupPanel;
-import com.gregtechceu.gtceu.integration.ae2.machine.trait.InternalSlotRecipeHandler;
 import com.gregtechceu.gtceu.utils.GTMath;
 import com.gregtechceu.gtceu.utils.ItemStackHashStrategy;
 
+import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.common.crafting.SizedIngredient;
 import net.neoforged.neoforge.common.util.INBTSerializable;
 import net.neoforged.neoforge.fluids.FluidStack;
@@ -71,8 +83,6 @@
 import brachy.modularui.widgets.slot.ItemSlot;
 import brachy.modularui.widgets.slot.SlotGroup;
 import brachy.modularui.widgets.textfield.TextFieldWidget;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import com.mojang.blaze3d.platform.InputConstants;
 import it.unimi.dsi.fastutil.objects.*;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenCustomHashMap;
@@ -91,6 +101,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
 @ExtensionMethod(SizedIngredientExtensions.class)
 public class MEPatternBufferPartMachine extends MEBusPartMachine
                                         implements ICraftingProvider, PatternContainer, IDataStickInteractable {
@@ -131,11 +145,10 @@ public void setItemDirect(int slotIndex, ItemStack stack) {
     @SaveField
     protected final NotifiableFluidTank shareTank;
 
-    @Getter
     @SaveField
     protected final InternalSlot[] internalInventory = new InternalSlot[MAX_PATTERN_COUNT];
 
-    private final BiMap<IPatternDetails, InternalSlot> detailsSlotMap = HashBiMap.create(MAX_PATTERN_COUNT);
+    private final @Nullable IPatternDetails[] patternSlotDetails = new IPatternDetails[MAX_PATTERN_COUNT];
 
     @SyncToClient
     @SaveField
@@ -147,12 +160,19 @@ public void setItemDirect(int slotIndex, ItemStack stack) {
     private final Set<BlockPos> proxies = new ObjectOpenHashSet<>();
     private final Set<MEPatternBufferProxyPartMachine> proxyMachines = new ReferenceOpenHashSet<>();
 
-    @Getter
-    protected final InternalSlotRecipeHandler internalRecipeHandler;
-
     @Nullable
     protected TickableSubscription updateSubs;
 
+    private final List<Worker> workers = new ArrayList<>();
+
+    @Getter
+    private final AggregateItemHandler aggregateItemHandler;
+    @Getter
+    private final AggregateFluidHandler aggregateFluidHandler;
+    @Getter
+    private final RecipeHandlerList bufferRecipeHandler;
+    private final List<RecipeHandlerList> bufferHandlers;
+
     public MEPatternBufferPartMachine(BlockEntityCreationInfo info) {
         super(info, IO.IN, new NotifiableItemStackHandler(9, IO.IN, IO.NONE));
         patternInventory.setOnContentsChanged(() -> getSyncDataHolder().markClientSyncFieldDirty("patternInventory"));
@@ -160,10 +180,16 @@ public MEPatternBufferPartMachine(BlockEntityCreationInfo info) {
         for (int i = 0; i < this.internalInventory.length; i++) {
             this.internalInventory[i] = new InternalSlot();
         }
+
         getMainNode().addService(ICraftingProvider.class, this);
+
         this.shareInventory = attachTrait(new NotifiableItemStackHandler(9, IO.IN, IO.NONE));
         this.shareTank = attachTrait(new NotifiableFluidTank(9, 8 * FluidType.BUCKET_VOLUME, IO.IN, IO.NONE));
-        this.internalRecipeHandler = new InternalSlotRecipeHandler(this, internalInventory);
+        this.aggregateItemHandler = attachTrait(new AggregateItemHandler());
+        this.aggregateFluidHandler = attachTrait(new AggregateFluidHandler());
+        this.bufferRecipeHandler = new BufferRecipeHandlerList();
+        this.bufferHandlers = List.of(bufferRecipeHandler);
+        addWorker();
     }
 
     @Override
@@ -171,19 +197,354 @@ public void onLoad() {
         super.onLoad();
         if (!isRemote()) {
             for (int i = 0; i < patternInventory.getSlots(); i++) {
-                var pattern = patternInventory.getStackInSlot(i);
-                var patternDetails = PatternDetailsHelper.decodePattern(pattern, getLevel());
-                if (patternDetails != null) {
-                    this.detailsSlotMap.put(patternDetails, this.internalInventory[i]);
-                }
+                patternSlotDetails[i] = PatternDetailsHelper.decodePattern(patternInventory.getStackInSlot(i),
+                        getLevel());
             }
             needPatternSync = true;
+            syncWorkerCount();
+        }
+    }
+
+    private void syncWorkerCount() {
+        int target = Mth.clamp(proxies.size() + 1, 1, MAX_PATTERN_COUNT);
+        while (workers.size() < target) {
+            addWorker();
+        }
+        while (workers.size() > target) {
+            removeLastWorker();
+        }
+    }
+
+    private void addWorker() {
+        int idx = workers.size();
+        if (idx >= MAX_PATTERN_COUNT) {
+            return;
+        }
+        InternalSlot slot = internalInventory[idx];
+        slot.setOnContentsChanged(this::onSlotChanged);
+        workers.add(new Worker(slot));
+    }
+
+    private void removeLastWorker() {
+        int last = workers.size() - 1;
+        if (last < 0) return;
+        Worker worker = workers.get(last);
+        worker.slot.refund();
+        worker.slot.setOnContentsChanged(() -> {});
+        workers.remove(last);
+        onSlotChanged();
+    }
+
+    private void onSlotChanged() {
+        aggregateItemHandler.notifyListeners();
+        aggregateFluidHandler.notifyListeners();
+    }
+
+    static boolean couldSlotMatchContents(InternalSlot slot, Map<RecipeCapability<?>, List<Object>> contents) {
+        List<Object> itemContents = contents.get(ItemRecipeCapability.CAP);
+        if (itemContents != null && !slot.isItemEmpty()) {
+            Set<Item> itemTypes = slot.getItemTypes();
+            for (Object obj : itemContents) {
+                if (!(obj instanceof SizedIngredient ing) || ing.ingredient().isEmpty()) {
+                    continue;
+                }
+                for (ItemStack stack : ing.getItems()) {
+                    if (itemTypes.contains(stack.getItem())) {
+                        return true;
+                    }
+                }
+            }
+        }
+        List<Object> fluidContents = contents.get(FluidRecipeCapability.CAP);
+        if (fluidContents != null && !slot.isFluidEmpty()) {
+            Set<Fluid> fluidTypes = slot.getFluidTypes();
+            for (Object obj : fluidContents) {
+                if (!(obj instanceof SizedFluidIngredient ing) || ing.getFluids().length == 0 ||
+                        Arrays.stream(ing.getFluids()).allMatch(FluidStack::isEmpty)) {
+                    continue;
+                }
+                for (FluidStack stack : ing.getFluids()) {
+                    if (fluidTypes.contains(stack.getFluid())) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    static class Worker {
+
+        final InternalSlot slot;
+        @Nullable
+        IPatternDetails pattern;
+        final SlotItemHandler itemHandler;
+        final SlotFluidHandler fluidHandler;
+
+        Worker(InternalSlot slot) {
+            this.slot = slot;
+            this.itemHandler = new SlotItemHandler(slot);
+            this.fluidHandler = new SlotFluidHandler(slot);
+        }
+    }
+
+    static class SlotItemHandler implements IRecipeHandler<SizedIngredient> {
+
+        private final InternalSlot slot;
+
+        SlotItemHandler(InternalSlot slot) {
+            this.slot = slot;
+        }
+
+        @Override
+        public List<SizedIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<SizedIngredient> left,
+                                                       boolean simulate) {
+            if (io != IO.IN || slot.isItemEmpty()) {
+                return left;
+            }
+            return slot.handleItemInternal(left, simulate);
+        }
+
+        @Override
+        public List<Object> getContents() {
+            return new ArrayList<>(slot.getItems());
+        }
+
+        @Override
+        public double getTotalContentAmount() {
+            return slot.getItems().stream().mapToLong(ItemStack::getCount).sum();
+        }
+
+        @Override
+        public RecipeCapability<SizedIngredient> getCapability() {
+            return ItemRecipeCapability.CAP;
+        }
+
+        @Override
+        public boolean isDistinct() {
+            return true;
+        }
+
+        @Override
+        public int getPriority() {
+            return IFilteredHandler.HIGH;
+        }
+    }
+
+    static class SlotFluidHandler implements IRecipeHandler<SizedFluidIngredient> {
+
+        private final InternalSlot slot;
+
+        SlotFluidHandler(InternalSlot slot) {
+            this.slot = slot;
+        }
+
+        @Override
+        public List<SizedFluidIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<SizedFluidIngredient> left,
+                                                            boolean simulate) {
+            if (io != IO.IN || slot.isFluidEmpty()) return left;
+            return slot.handleFluidInternal(left, simulate);
+        }
+
+        @Override
+        public List<Object> getContents() {
+            return new ArrayList<>(slot.getFluids());
+        }
+
+        @Override
+        public double getTotalContentAmount() {
+            return slot.getFluids().stream().mapToLong(FluidStack::getAmount).sum();
+        }
+
+        @Override
+        public RecipeCapability<SizedFluidIngredient> getCapability() {
+            return FluidRecipeCapability.CAP;
+        }
+
+        @Override
+        public boolean isDistinct() {
+            return true;
+        }
+
+        @Override
+        public int getPriority() {
+            return IFilteredHandler.HIGH;
+        }
+    }
+
+    @Getter
+    class AggregateItemHandler extends NotifiableRecipeHandlerTrait<SizedIngredient> {
+
+        static final MachineTraitType<AggregateItemHandler> TYPE = new MachineTraitType<>(AggregateItemHandler.class);
+
+        private final RecipeCapability<SizedIngredient> capability = ItemRecipeCapability.CAP;
+        private final IO handlerIO = IO.IN;
+        private final boolean isDistinct = true;
+
+        @Override
+        public MachineTraitType<AggregateItemHandler> getTraitType() {
+            return TYPE;
+        }
+
+        @Override
+        public List<SizedIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<SizedIngredient> left,
+                                                       boolean simulate) {
+            return left;
+        }
+
+        @Override
+        public List<Object> getContents() {
+            List<Object> contents = new ArrayList<>();
+            for (Worker worker : workers) {
+                contents.addAll(worker.slot.getItems());
+            }
+            return contents;
+        }
+
+        @Override
+        public double getTotalContentAmount() {
+            double sum = 0;
+            for (Worker worker : workers) {
+                sum += worker.slot.getItems().stream().mapToLong(ItemStack::getCount).sum();
+            }
+            return sum;
+        }
+
+        @Override
+        public int getPriority() {
+            return IFilteredHandler.HIGH;
+        }
+    }
+
+    @Getter
+    class AggregateFluidHandler extends NotifiableRecipeHandlerTrait<SizedFluidIngredient> {
+
+        static final MachineTraitType<AggregateFluidHandler> TYPE = new MachineTraitType<>(AggregateFluidHandler.class);
+
+        private final RecipeCapability<SizedFluidIngredient> capability = FluidRecipeCapability.CAP;
+        private final IO handlerIO = IO.IN;
+        private final boolean isDistinct = true;
+
+        @Override
+        public MachineTraitType<AggregateFluidHandler> getTraitType() {
+            return TYPE;
+        }
+
+        @Override
+        public List<SizedFluidIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<SizedFluidIngredient> left,
+                                                            boolean simulate) {
+            return left;
+        }
+
+        @Override
+        public List<Object> getContents() {
+            List<Object> contents = new ArrayList<>();
+            for (Worker worker : workers) {
+                contents.addAll(worker.slot.getFluids());
+            }
+            return contents;
+        }
+
+        @Override
+        public double getTotalContentAmount() {
+            double sum = 0;
+            for (Worker worker : workers) {
+                sum += worker.slot.getFluids().stream().mapToLong(FluidStack::getAmount).sum();
+            }
+            return sum;
+        }
+
+        @Override
+        public int getPriority() {
+            return IFilteredHandler.HIGH;
+        }
+    }
+
+    class BufferRecipeHandlerList extends RecipeHandlerList {
+
+        BufferRecipeHandlerList() {
+            super(IO.IN);
+            addHandlers(getCircuitSlot(), getShareInventory(), getShareTank(), aggregateItemHandler,
+                    aggregateFluidHandler);
+            setGroup(RecipeHandlerGroupDistinctness.BUS_DISTINCT);
+        }
+
+        @Override
+        public Map<RecipeCapability<?>, List<Object>> handleRecipe(IO io, GTRecipe recipe,
+                                                                   Map<RecipeCapability<?>, List<Object>> contents,
+                                                                   boolean simulate) {
+            if (io != IO.IN || contents.isEmpty()) {
+                return contents;
+            }
+
+            for (Worker worker : workers) {
+                InternalSlot slot = worker.slot;
+                if (slot.isItemEmpty() && slot.isFluidEmpty()) {
+                    continue;
+                }
+                if (!couldSlotMatchContents(slot, contents)) {
+                    continue;
+                }
+
+                Map<RecipeCapability<?>, List<Object>> left = consumeWorker(worker, io, recipe, contents, true);
+                if (!left.isEmpty()) {
+                    continue;
+                }
+
+                if (!simulate) {
+                    return consumeWorker(worker, io, recipe, contents, false);
+                }
+                return left;
+            }
+            return contents;
+        }
+
+        private Map<RecipeCapability<?>, List<Object>> consumeWorker(Worker worker, IO io, GTRecipe recipe,
+                                                                     Map<RecipeCapability<?>, List<Object>> contents,
+                                                                     boolean simulate) {
+            var copy = new Reference2ObjectOpenHashMap<>(contents);
+            for (var it = copy.reference2ObjectEntrySet().fastIterator(); it.hasNext();) {
+                var entry = it.next();
+                List<IRecipeHandler<?>> handlers = handlersFor(entry.getKey(), worker);
+                for (var handler : handlers) {
+                    if (io == IO.IN && handler.getTotalContentAmount() == 0 &&
+                            !handler.getCapability().skipEmptyContentCheck()) {
+                        continue;
+                    }
+                    var handlerLeft = handler.handleRecipe(io, recipe, entry.getValue(), simulate);
+                    if (handlerLeft.isEmpty()) {
+                        it.remove();
+                        break;
+                    } else {
+                        entry.setValue(new ArrayList<>(handlerLeft));
+                    }
+                }
+            }
+            return copy;
+        }
+
+        private List<IRecipeHandler<?>> handlersFor(RecipeCapability<?> cap, Worker worker) {
+            if (cap == ItemRecipeCapability.CAP) {
+                return List.of(getCircuitSlot(), getShareInventory(), worker.itemHandler);
+            }
+            if (cap == FluidRecipeCapability.CAP) {
+                return List.of(getShareTank(), worker.fluidHandler);
+            }
+            return List.of();
+        }
+
+        @Override
+        public boolean isDistinct() {
+            return true;
         }
+
+        @Override
+        public void setDistinct(boolean ignored, boolean notify) {}
     }
 
     @Override
-    public List<RecipeHandlerList> getRecipeHandlers() {
-        return internalRecipeHandler.getSlotHandlers();
+    public @UnmodifiableView List<RecipeHandlerList> getRecipeHandlers() {
+        return bufferHandlers;
     }
 
     @Override
@@ -233,11 +594,13 @@ protected void update() {
     public void addProxy(MEPatternBufferProxyPartMachine proxy) {
         proxies.add(proxy.getBlockPos());
         proxyMachines.add(proxy);
+        syncWorkerCount();
     }
 
     public void removeProxy(MEPatternBufferProxyPartMachine proxy) {
         proxies.remove(proxy.getBlockPos());
         proxyMachines.remove(proxy);
+        syncWorkerCount();
     }
 
     @UnmodifiableView
@@ -254,8 +617,8 @@ public Set<MEPatternBufferProxyPartMachine> getProxies() {
     }
 
     private void refundAll() {
-        for (InternalSlot internalSlot : internalInventory) {
-            internalSlot.refund();
+        for (InternalSlot slot : internalInventory) {
+            slot.refund();
         }
     }
 
@@ -263,14 +626,18 @@ private void refundAll() {
     public void onPatternChange(int index) {
         if (isRemote()) return;
 
-        // remove old if applicable
-        var internalInv = internalInventory[index];
-        var newPattern = patternInventory.getStackInSlot(index);
-        var newPatternDetails = PatternDetailsHelper.decodePattern(newPattern, getLevel());
-        var oldPatternDetails = detailsSlotMap.inverse().get(internalInv);
-        detailsSlotMap.forcePut(newPatternDetails, internalInv);
-        if (oldPatternDetails != null && !oldPatternDetails.equals(newPatternDetails)) {
-            internalInv.refund();
+        IPatternDetails oldPattern = patternSlotDetails[index];
+        IPatternDetails newPatternDetails = PatternDetailsHelper.decodePattern(patternInventory.getStackInSlot(index),
+                getLevel());
+        patternSlotDetails[index] = newPatternDetails;
+        if (oldPattern != null && !oldPattern.equals(newPatternDetails)) {
+            for (Worker worker : workers) {
+                if (oldPattern.equals(worker.pattern)) {
+                    worker.slot.refund();
+                    worker.pattern = null;
+                    break;
+                }
+            }
         }
 
         needPatternSync = true;
@@ -325,69 +692,69 @@ public MachineUIPanelBuilder getPanelBuilder(PosGuiData data, PanelSyncManager s
 
         syncManager.registerServerSyncedAction("refundButtonPressed", packet -> refundAll());
 
-        return MachineUIPanelBuilder.panelBuilder(this).leftConfigurators(f -> {
-            f.child(new ButtonWidget<>() // Shared items subpanel
-                    .size(18)
-                    .onMousePressed((context, b) -> {
-                        if (b == InputConstants.MOUSE_BUTTON_LEFT) {
-                            sharedItemsPanelHandler.openPanel();
-                            return true;
-                        }
-                        return false;
-                    })
-                    .overlay(GTGuiTextures.BUTTON_ITEM_OUTPUT)
-                    .tooltip(new RichTooltip()
-                            .addLine(Text.lang("gui.gtceu.share_inventory.desc.0"))
-                            .addLine(Text.lang("gui.gtceu.share_inventory.desc.1"))))
-                    .child(new ButtonWidget<>() // Shared fluids subpanel
-                            .size(18)
-                            .onMousePressed((context, b) -> {
-                                if (b == InputConstants.MOUSE_BUTTON_LEFT) {
-                                    sharedFluidsPanelHandler.openPanel();
-                                    return true;
-                                }
-                                return false;
-                            })
-                            .overlay(GTGuiTextures.BUTTON_FLUID_OUTPUT)
-                            .tooltip(new RichTooltip()
-                                    .addLine(Text.lang("gui.gtceu.share_tank.desc.0"))
-                                    .addLine(Text.lang("gui.gtceu.share_inventory.desc.1"))))
-                    .child(new ButtonWidget<>() // Refund button
-                            .size(18)
-                            .onMousePressed((context, b) -> {
-                                if (canRefundValue.getBoolValue() && b == InputConstants.MOUSE_BUTTON_LEFT) {
-                                    syncManager.callSyncedAction("refundButtonPressed");
-                                    return true;
-                                }
-                                return false;
-                            })
-                            .overlay(new DynamicDrawable(() -> {
-                                if (canRefundValue.getBoolValue()) {
-                                    return GTGuiTextures.REFUND_OVERLAY
-                                            .asIcon().size(16);
-                                } else {
-                                    return new DrawableStack(GTGuiTextures.REFUND_OVERLAY,
-                                            new ItemDrawable(Items.BARRIER))
-                                            .asIcon().size(16);
-                                }
-                            }))
-                            .tooltip(new RichTooltip()
-                                    .addLine(Text.lang("gui.gtceu.refund_all.desc"))))
-                    .child(new ButtonWidget<>() // Renaming button
-                            .size(18)
-                            .onMousePressed((context, b) -> {
-                                if (b == InputConstants.MOUSE_BUTTON_LEFT) {
-                                    renamingPanelHandler.openPanel();
-                                    return true;
-                                }
-                                return false;
-                            })
-                            .overlay(Text.str("✎")
-                                    .asIcon()
-                                    .size(16))
-                            .tooltip(new RichTooltip()
-                                    .addLine(Text.lang("gui.gtceu.rename.desc"))));
-        });
+        return MachineUIPanelBuilder.panelBuilder(this).leftConfigurators(f -> f.child(new ButtonWidget<>() // Shared
+                                                                                                            // items
+                                                                                                            // subpanel
+                .size(18)
+                .onMousePressed((context, b) -> {
+                    if (b == InputConstants.MOUSE_BUTTON_LEFT) {
+                        sharedItemsPanelHandler.openPanel();
+                        return true;
+                    }
+                    return false;
+                })
+                .overlay(GTGuiTextures.BUTTON_ITEM_OUTPUT)
+                .tooltip(new RichTooltip()
+                        .addLine(Text.lang("gui.gtceu.share_inventory.desc.0"))
+                        .addLine(Text.lang("gui.gtceu.share_inventory.desc.1"))))
+                .child(new ButtonWidget<>() // Shared fluids subpanel
+                        .size(18)
+                        .onMousePressed((context, b) -> {
+                            if (b == InputConstants.MOUSE_BUTTON_LEFT) {
+                                sharedFluidsPanelHandler.openPanel();
+                                return true;
+                            }
+                            return false;
+                        })
+                        .overlay(GTGuiTextures.BUTTON_FLUID_OUTPUT)
+                        .tooltip(new RichTooltip()
+                                .addLine(Text.lang("gui.gtceu.share_tank.desc.0"))
+                                .addLine(Text.lang("gui.gtceu.share_inventory.desc.1"))))
+                .child(new ButtonWidget<>() // Refund button
+                        .size(18)
+                        .onMousePressed((context, b) -> {
+                            if (canRefundValue.getBoolValue() && b == InputConstants.MOUSE_BUTTON_LEFT) {
+                                syncManager.callSyncedAction("refundButtonPressed");
+                                return true;
+                            }
+                            return false;
+                        })
+                        .overlay(new DynamicDrawable(() -> {
+                            if (canRefundValue.getBoolValue()) {
+                                return GTGuiTextures.REFUND_OVERLAY
+                                        .asIcon().size(16);
+                            } else {
+                                return new DrawableStack(GTGuiTextures.REFUND_OVERLAY,
+                                        new ItemDrawable(Items.BARRIER))
+                                        .asIcon().size(16);
+                            }
+                        }))
+                        .tooltip(new RichTooltip()
+                                .addLine(Text.lang("gui.gtceu.refund_all.desc"))))
+                .child(new ButtonWidget<>() // Renaming button
+                        .size(18)
+                        .onMousePressed((context, b) -> {
+                            if (b == InputConstants.MOUSE_BUTTON_LEFT) {
+                                renamingPanelHandler.openPanel();
+                                return true;
+                            }
+                            return false;
+                        })
+                        .overlay(Text.str("✎")
+                                .asIcon()
+                                .size(16))
+                        .tooltip(new RichTooltip()
+                                .addLine(Text.lang("gui.gtceu.rename.desc")))));
     }
 
     @Override
@@ -427,19 +794,41 @@ public boolean canRefund() {
 
     @Override
     public List<IPatternDetails> getAvailablePatterns() {
-        return detailsSlotMap.keySet().stream().toList();
+        ArrayList<IPatternDetails> result = new ArrayList<>(MAX_PATTERN_COUNT);
+        for (IPatternDetails p : patternSlotDetails) {
+            if (p != null) result.add(p);
+        }
+        return result;
     }
 
     @Override
     public boolean pushPattern(IPatternDetails patternDetails, KeyCounter[] inputHolder) {
-        if (!isFormed() || !getMainNode().isActive() || !detailsSlotMap.containsKey(patternDetails) ||
-                !checkInput(inputHolder)) {
+        if (!isFormed() || !getMainNode().isActive() || !checkInput(inputHolder)) {
             return false;
         }
+        boolean knownPattern = false;
+        for (IPatternDetails p : patternSlotDetails) {
+            if (patternDetails.equals(p)) {
+                knownPattern = true;
+                break;
+            }
+        }
+        if (!knownPattern) return false;
 
-        var slot = detailsSlotMap.get(patternDetails);
-        if (slot != null) {
-            slot.pushPattern(patternDetails, inputHolder);
+        for (Worker worker : workers) {
+            if (worker.slot.isEmpty()) worker.pattern = null;
+        }
+        Worker free = null;
+        for (Worker worker : workers) {
+            if (patternDetails.equals(worker.pattern)) {
+                worker.slot.pushPattern(patternDetails, inputHolder);
+                return true;
+            }
+            if (free == null && worker.slot.isEmpty()) free = worker;
+        }
+        if (free != null) {
+            free.pattern = patternDetails;
+            free.slot.pushPattern(patternDetails, inputHolder);
             return true;
         }
         return false;
@@ -547,6 +936,8 @@ public class InternalSlot implements INBTSerializable<CompoundTag> {
         private final Object2LongOpenHashMap<FluidStack> fluidInventory = new Object2LongOpenHashMap<>();
         private @Nullable List<ItemStack> itemStacks = null;
         private @Nullable List<FluidStack> fluidStacks = null;
+        private @Nullable Set<Item> cachedItemTypes = null;
+        private @Nullable Set<Fluid> cachedFluidTypes = null;
 
         public InternalSlot() {}
 
@@ -562,9 +953,27 @@ public boolean isEmpty() {
             return isItemEmpty() && isFluidEmpty();
         }
 
+        public Set<Item> getItemTypes() {
+            if (cachedItemTypes == null) {
+                cachedItemTypes = new ReferenceOpenHashSet<>(itemInventory.size());
+                itemInventory.keySet().forEach(s -> cachedItemTypes.add(s.getItem()));
+            }
+            return cachedItemTypes;
+        }
+
+        public Set<Fluid> getFluidTypes() {
+            if (cachedFluidTypes == null) {
+                cachedFluidTypes = new ReferenceOpenHashSet<>(fluidInventory.size());
+                fluidInventory.keySet().forEach(s -> cachedFluidTypes.add(s.getFluid()));
+            }
+            return cachedFluidTypes;
+        }
+
         public void onContentsChanged() {
             itemStacks = null;
             fluidStacks = null;
+            cachedItemTypes = null;
+            cachedFluidTypes = null;
             onContentsChanged.run();
         }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java
index b60ad2a6a09..22c26cc515e 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferProxyPartMachine.java
@@ -51,7 +51,7 @@ public class MEPatternBufferProxyPartMachine extends TieredIOPartMachine
 
     public MEPatternBufferProxyPartMachine(BlockEntityCreationInfo info) {
         super(info, GTValues.LuV, IO.IN);
-        proxySlotRecipeHandler = new ProxySlotRecipeHandler(this, MEPatternBufferPartMachine.MAX_PATTERN_COUNT);
+        proxySlotRecipeHandler = new ProxySlotRecipeHandler(this);
     }
 
     @Override
@@ -62,6 +62,12 @@ public void onLoad() {
 
     @Override
     public List<RecipeHandlerList> getRecipeHandlers() {
+        var buf = getBuffer();
+        if (buf != null) {
+            proxySlotRecipeHandler.updateProxy(buf);
+        } else {
+            proxySlotRecipeHandler.clearProxy();
+        }
         return proxySlotRecipeHandler.getProxySlotHandlers();
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java
deleted file mode 100644
index be5441172c8..00000000000
--- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.gregtechceu.gtceu.integration.ae2.machine.trait;
-
-import com.gregtechceu.gtceu.api.capability.recipe.*;
-import com.gregtechceu.gtceu.api.machine.trait.MachineTraitType;
-import com.gregtechceu.gtceu.api.machine.trait.notifiable.NotifiableRecipeHandlerTrait;
-import com.gregtechceu.gtceu.api.machine.trait.recipe.RecipeHandlerGroupDistinctness;
-import com.gregtechceu.gtceu.api.machine.trait.recipe.RecipeHandlerList;
-import com.gregtechceu.gtceu.api.recipe.GTRecipe;
-import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine;
-import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine.InternalSlot;
-
-import net.minecraft.world.item.ItemStack;
-import net.neoforged.neoforge.common.crafting.SizedIngredient;
-import net.neoforged.neoforge.fluids.FluidStack;
-import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
-
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class InternalSlotRecipeHandler {
-
-    @Getter
-    private final List<RecipeHandlerList> slotHandlers;
-
-    public InternalSlotRecipeHandler(MEPatternBufferPartMachine buffer, InternalSlot[] slots) {
-        this.slotHandlers = new ArrayList<>(slots.length);
-        for (int i = 0; i < slots.length; i++) {
-            var rhl = new SlotRHL(buffer, slots[i], i);
-            slotHandlers.add(rhl);
-        }
-    }
-
-    @Getter
-    protected static class SlotRHL extends RecipeHandlerList {
-
-        private final SlotItemRecipeHandler itemRecipeHandler;
-        private final SlotFluidRecipeHandler fluidRecipeHandler;
-
-        public SlotRHL(MEPatternBufferPartMachine buffer, InternalSlot slot, int idx) {
-            super(IO.IN);
-            itemRecipeHandler = buffer.attachTrait(new SlotItemRecipeHandler(slot, idx));
-            fluidRecipeHandler = buffer.attachTrait(new SlotFluidRecipeHandler(slot, idx));
-            addHandlers(buffer.getCircuitSlot(), buffer.getShareInventory(), buffer.getShareTank(),
-                    itemRecipeHandler, fluidRecipeHandler);
-            this.setGroup(RecipeHandlerGroupDistinctness.BUS_DISTINCT);
-        }
-
-        @Override
-        public boolean isDistinct() {
-            return true;
-        }
-
-        @Override
-        public void setDistinct(boolean ignored, boolean notify) {}
-    }
-
-    @Getter
-    private static class SlotItemRecipeHandler extends NotifiableRecipeHandlerTrait<SizedIngredient> {
-
-        public static final MachineTraitType<SlotItemRecipeHandler> TYPE = new MachineTraitType<>(
-                SlotItemRecipeHandler.class);
-
-        @Override
-        public MachineTraitType<SlotItemRecipeHandler> getTraitType() {
-            return TYPE;
-        }
-
-        private final InternalSlot slot;
-        private final int priority;
-
-        private final int size = 81;
-        private final RecipeCapability<SizedIngredient> capability = ItemRecipeCapability.CAP;
-        private final IO handlerIO = IO.IN;
-        private final boolean isDistinct = true;
-
-        private SlotItemRecipeHandler(InternalSlot slot, int index) {
-            super();
-            this.slot = slot;
-            this.priority = IFilteredHandler.HIGH + index + 1;
-            slot.setOnContentsChanged(this::notifyListeners);
-        }
-
-        @Override
-        public List<SizedIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<SizedIngredient> left,
-                                                       boolean simulate) {
-            if (io != IO.IN || slot.isItemEmpty()) return left;
-            return slot.handleItemInternal(left, simulate);
-        }
-
-        @Override
-        public List<Object> getContents() {
-            return new ArrayList<>(slot.getItems());
-        }
-
-        @Override
-        public double getTotalContentAmount() {
-            return slot.getItems().stream().mapToLong(ItemStack::getCount).sum();
-        }
-    }
-
-    @Getter
-    private static class SlotFluidRecipeHandler extends NotifiableRecipeHandlerTrait<SizedFluidIngredient> {
-
-        public static final MachineTraitType<SlotFluidRecipeHandler> TYPE = new MachineTraitType<>(
-                SlotFluidRecipeHandler.class);
-
-        @Override
-        public MachineTraitType<SlotFluidRecipeHandler> getTraitType() {
-            return TYPE;
-        }
-
-        private final InternalSlot slot;
-        private final int priority;
-
-        private final int size = 81;
-        private final RecipeCapability<SizedFluidIngredient> capability = FluidRecipeCapability.CAP;
-        private final IO handlerIO = IO.IN;
-        private final boolean isDistinct = true;
-
-        private SlotFluidRecipeHandler(InternalSlot slot, int index) {
-            super();
-            this.slot = slot;
-            this.priority = IFilteredHandler.HIGH + index + 1;
-            slot.setOnContentsChanged(this::notifyListeners);
-        }
-
-        @Override
-        public List<SizedFluidIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<SizedFluidIngredient> left,
-                                                            boolean simulate) {
-            if (io != IO.IN || slot.isFluidEmpty()) return left;
-            return slot.handleFluidInternal(left, simulate);
-        }
-
-        @Override
-        public List<Object> getContents() {
-            return new ArrayList<>(slot.getFluids());
-        }
-
-        @Override
-        public double getTotalContentAmount() {
-            return slot.getFluids().stream().mapToLong(FluidStack::getAmount).sum();
-        }
-    }
-}
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java
index 00c1e0a870e..45a3f453d29 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java
@@ -9,7 +9,6 @@
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine;
 import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferProxyPartMachine;
-import com.gregtechceu.gtceu.integration.ae2.machine.trait.InternalSlotRecipeHandler.SlotRHL;
 import com.gregtechceu.gtceu.utils.ISubscription;
 
 import net.neoforged.neoforge.common.crafting.SizedIngredient;
@@ -18,35 +17,27 @@
 import lombok.Getter;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public final class ProxySlotRecipeHandler {
 
     @Getter
     private final List<RecipeHandlerList> proxySlotHandlers;
+    private final ProxyRHL proxyRHL;
 
-    public ProxySlotRecipeHandler(MEPatternBufferProxyPartMachine machine, int slots) {
-        proxySlotHandlers = new ArrayList<>(slots);
-        for (int i = 0; i < slots; ++i) {
-            proxySlotHandlers.add(new ProxyRHL(machine));
-        }
+    public ProxySlotRecipeHandler(MEPatternBufferProxyPartMachine machine) {
+        this.proxyRHL = new ProxyRHL(machine);
+        this.proxySlotHandlers = List.of(proxyRHL);
     }
 
     public void updateProxy(MEPatternBufferPartMachine patternBuffer) {
-        var slotHandlers = patternBuffer.getInternalRecipeHandler().getSlotHandlers();
-        for (int i = 0; i < proxySlotHandlers.size(); ++i) {
-            ProxyRHL proxyRHL = (ProxyRHL) proxySlotHandlers.get(i);
-            SlotRHL slotRHL = (SlotRHL) slotHandlers.get(i);
-            proxyRHL.setBuffer(patternBuffer, slotRHL);
-        }
+        proxyRHL.setBuffer(patternBuffer);
     }
 
     public void clearProxy() {
-        for (var slotHandler : proxySlotHandlers) {
-            ((ProxyRHL) slotHandler).clearBuffer();
-        }
+        proxyRHL.clearBuffer();
     }
 
     private static class ProxyRHL extends RecipeHandlerList {
@@ -57,6 +48,8 @@ private static class ProxyRHL extends RecipeHandlerList {
         private final ProxyFluidRecipeHandler sharedFluid;
         private final ProxyFluidRecipeHandler slotFluid;
 
+        private @Nullable MEPatternBufferPartMachine buffer;
+
         public ProxyRHL(MEPatternBufferProxyPartMachine machine) {
             super(IO.IN);
             circuit = machine.attachTrait(new ProxyItemRecipeHandler());
@@ -68,15 +61,17 @@ public ProxyRHL(MEPatternBufferProxyPartMachine machine) {
             this.setGroup(RecipeHandlerGroupDistinctness.BUS_DISTINCT);
         }
 
-        public void setBuffer(MEPatternBufferPartMachine buffer, SlotRHL slotRHL) {
+        public void setBuffer(MEPatternBufferPartMachine buffer) {
+            this.buffer = buffer;
             circuit.setProxy(buffer.getCircuitSlot());
             sharedItem.setProxy(buffer.getShareInventory());
             sharedFluid.setProxy(buffer.getShareTank());
-            slotItem.setProxy(slotRHL.getItemRecipeHandler());
-            slotFluid.setProxy(slotRHL.getFluidRecipeHandler());
+            slotItem.setProxy(buffer.getAggregateItemHandler());
+            slotFluid.setProxy(buffer.getAggregateFluidHandler());
         }
 
         public void clearBuffer() {
+            this.buffer = null;
             circuit.setProxy(null);
             sharedItem.setProxy(null);
             sharedFluid.setProxy(null);
@@ -84,6 +79,15 @@ public void clearBuffer() {
             slotFluid.setProxy(null);
         }
 
+        @Override
+        public Map<RecipeCapability<?>, List<Object>> handleRecipe(IO io, GTRecipe recipe,
+                                                                   Map<RecipeCapability<?>, List<Object>> contents,
+                                                                   boolean simulate) {
+            MEPatternBufferPartMachine buf = buffer;
+            if (buf == null) return contents;
+            return buf.getBufferRecipeHandler().handleRecipe(io, recipe, contents, simulate);
+        }
+
         @Override
         public boolean isDistinct() {
             return true;
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
index 707e5e7110f..5ba6f4325d8 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
@@ -44,6 +44,7 @@
 import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.multiblock.Predicates;
 import com.gregtechceu.gtceu.api.multiblock.pattern.MultiblockPatternBuilder;
+import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.recipe.OverclockingLogic;
 import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory;
@@ -85,10 +86,10 @@
 import com.gregtechceu.gtceu.integration.kjs.builders.material.MaterialBuilderWrapper;
 import com.gregtechceu.gtceu.integration.kjs.builders.prefix.OreTagPrefixBuilder;
 import com.gregtechceu.gtceu.integration.kjs.builders.prefix.TagPrefixBuilder;
-import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockFluidBuilder;
-import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockOreBuilder;
+import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockFluidDefinitionBuilderJS;
+import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockOreDefinitionBuilderJS;
 import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.DimensionMarkerBuilder;
-import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.OreVeinDefinitionBuilder;
+import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.OreVeinDefinitionBuilderJS;
 import com.gregtechceu.gtceu.integration.kjs.helpers.GTResourceLocation;
 import com.gregtechceu.gtceu.integration.kjs.helpers.MachineConstructors;
 import com.gregtechceu.gtceu.integration.kjs.helpers.MachineModifiers;
@@ -163,10 +164,12 @@ public void registerBuilderTypes(BuilderTypeRegistry registry) {
             reg.add(GTCEu.id("coil"), CoilBlockBuilder.class, CoilBlockBuilder::new);
         });
 
-        registry.addDefault(GTRegistries.Keys.ORE_VEIN, OreVeinDefinitionBuilder.class,
-                OreVeinDefinitionBuilder::new);
-        registry.addDefault(GTRegistries.Keys.BEDROCK_FLUID, BedrockFluidBuilder.class, BedrockFluidBuilder::new);
-        registry.addDefault(GTRegistries.Keys.BEDROCK_ORE, BedrockOreBuilder.class, BedrockOreBuilder::new);
+        registry.addDefault(GTRegistries.Keys.ORE_VEIN, OreVeinDefinitionBuilderJS.class,
+                OreVeinDefinitionBuilderJS::new);
+        registry.addDefault(GTRegistries.Keys.BEDROCK_FLUID, BedrockFluidDefinitionBuilderJS.class,
+                BedrockFluidDefinitionBuilderJS::new);
+        registry.addDefault(GTRegistries.Keys.BEDROCK_ORE, BedrockOreDefinitionBuilderJS.class,
+                BedrockOreDefinitionBuilderJS::new);
     }
 
     @Override
@@ -273,6 +276,7 @@ public void registerBindings(BindingRegistry event) {
         event.add("FactoryBlockPattern", MultiblockPatternBuilder.class);
         event.add("Predicates", Predicates.class);
         event.add("PartAbility", PartAbility.class);
+        event.add("RelativeDirection", RelativeDirection.class);
         // Recipe related
         event.add("GTRecipeTypes", GTRecipeTypes.class);
         event.add("GTRecipeCategories", GTRecipeCategories.class);
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidDefinitionBuilderJS.java
similarity index 80%
rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java
rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidDefinitionBuilderJS.java
index 9745cad9732..cc937c25042 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidDefinitionBuilderJS.java
@@ -17,7 +17,7 @@
 import java.util.*;
 
 @Accessors(chain = true, fluent = true)
-public class BedrockFluidBuilder extends BuilderBase<BedrockFluidDefinition> {
+public class BedrockFluidDefinitionBuilderJS extends BuilderBase<BedrockFluidDefinition> {
 
     @Setter
     private int weight; // weight value for determining which vein will appear
@@ -35,12 +35,12 @@ public class BedrockFluidBuilder extends BuilderBase<BedrockFluidDefinition> {
 
     private final transient Set<ResourceKey<Level>> dimensions = new HashSet<>();
 
-    public BedrockFluidBuilder(ResourceLocation id) {
+    public BedrockFluidDefinitionBuilderJS(ResourceLocation id) {
         super(id);
     }
 
-    public static BedrockFluidBuilder from(BedrockFluidDefinition definition, ResourceLocation id) {
-        var builder = new BedrockFluidBuilder(id);
+    public static BedrockFluidDefinitionBuilderJS from(BedrockFluidDefinition definition, ResourceLocation id) {
+        var builder = new BedrockFluidDefinitionBuilderJS(id);
         builder.weight(definition.getWeight());
         builder.minimumYield(definition.getMinimumYield()).maximumYield(definition.getMaximumYield());
         builder.depletionAmount(definition.getDepletionAmount()).depletionChance(definition.getDepletionChance());
@@ -51,17 +51,17 @@ public static BedrockFluidBuilder from(BedrockFluidDefinition definition, Resour
         return builder;
     }
 
-    public BedrockFluidBuilder yield(int min, int max) {
+    public BedrockFluidDefinitionBuilderJS yield(int min, int max) {
         return minimumYield(min).maximumYield(max);
     }
 
     @SafeVarargs
-    public final BedrockFluidBuilder addSpawnDimension(ResourceKey<Level>... dimensions) {
+    public final BedrockFluidDefinitionBuilderJS addSpawnDimension(ResourceKey<Level>... dimensions) {
         this.dimensions.addAll(Arrays.asList(dimensions));
         return this;
     }
 
-    public BedrockFluidBuilder biomes(int weight, HolderSet<Biome> biomes) {
+    public BedrockFluidDefinitionBuilderJS biomes(int weight, HolderSet<Biome> biomes) {
         this.biomes.add(new BiomeWeightModifier(biomes, weight));
         return this;
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreDefinitionBuilderJS.java
similarity index 80%
rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java
rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreDefinitionBuilderJS.java
index 60ef3aa704f..6de85f3d28d 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreDefinitionBuilderJS.java
@@ -20,7 +20,7 @@
 import java.util.*;
 
 @Accessors(chain = true, fluent = true)
-public class BedrockOreBuilder extends BuilderBase<BedrockOreDefinition> {
+public class BedrockOreDefinitionBuilderJS extends BuilderBase<BedrockOreDefinition> {
 
     @Setter
     private int weight; // weight value for determining which vein will appear
@@ -39,12 +39,12 @@ public class BedrockOreBuilder extends BuilderBase<BedrockOreDefinition> {
     private final transient Set<ResourceKey<Level>> dimensions = new HashSet<>();
     private final List<BiomeWeightModifier> biomes = new LinkedList<>();
 
-    public BedrockOreBuilder(ResourceLocation id) {
+    public BedrockOreDefinitionBuilderJS(ResourceLocation id) {
         super(id);
     }
 
-    public static BedrockOreBuilder from(BedrockOreDefinition definition, ResourceLocation id) {
-        var builder = new BedrockOreBuilder(id);
+    public static BedrockOreDefinitionBuilderJS from(BedrockOreDefinition definition, ResourceLocation id) {
+        var builder = new BedrockOreDefinitionBuilderJS(id);
         builder.weight(definition.weight());
         builder.yield(definition.yield());
         builder.depletionAmount(definition.depletionAmount());
@@ -56,22 +56,22 @@ public static BedrockOreBuilder from(BedrockOreDefinition definition, ResourceLo
         return builder;
     }
 
-    public BedrockOreBuilder material(Material material, int amount) {
+    public BedrockOreDefinitionBuilderJS material(Material material, int amount) {
         this.materials.add(new WeightedMaterial(material, amount));
         return this;
     }
 
-    public BedrockOreBuilder yield(int min, int max) {
+    public BedrockOreDefinitionBuilderJS yield(int min, int max) {
         return this.yield(UniformInt.of(min, max));
     }
 
     @SafeVarargs
-    public final BedrockOreBuilder addSpawnDimension(ResourceKey<Level>... dimensions) {
+    public final BedrockOreDefinitionBuilderJS addSpawnDimension(ResourceKey<Level>... dimensions) {
         this.dimensions.addAll(Arrays.asList(dimensions));
         return this;
     }
 
-    public BedrockOreBuilder biomes(int weight, HolderSet<Biome> biomes) {
+    public BedrockOreDefinitionBuilderJS biomes(int weight, HolderSet<Biome> biomes) {
         this.biomes.add(new BiomeWeightModifier(biomes, weight));
         return this;
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilderJS.java
similarity index 84%
rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java
rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilderJS.java
index 52ef7a87e9d..da9d3088b10 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilderJS.java
@@ -31,7 +31,7 @@
 import java.util.function.Supplier;
 
 @Accessors(chain = true, fluent = true)
-public class OreVeinDefinitionBuilder extends BuilderBase<GTOreDefinition> {
+public class OreVeinDefinitionBuilderJS extends BuilderBase<GTOreDefinition> {
 
     private final InferredProperties inferredProperties = new InferredProperties();
 
@@ -60,17 +60,17 @@ public class OreVeinDefinitionBuilder extends BuilderBase<GTOreDefinition> {
     @Setter
     private List<IndicatorGenerator> indicatorGenerators = new ArrayList<>();;
 
-    public OreVeinDefinitionBuilder(ResourceLocation id) {
+    public OreVeinDefinitionBuilderJS(ResourceLocation id) {
         super(id);
     }
 
     @Tolerate
-    public OreVeinDefinitionBuilder clusterSize(int clusterSize) {
+    public OreVeinDefinitionBuilderJS clusterSize(int clusterSize) {
         this.clusterSize = ConstantInt.of(clusterSize);
         return this;
     }
 
-    public OreVeinDefinitionBuilder layer(IWorldGenLayer layer) {
+    public OreVeinDefinitionBuilderJS layer(IWorldGenLayer layer) {
         this.layer = layer;
         if (this.dimensionFilter.isEmpty()) {
             dimensions(layer.getLevels());
@@ -78,7 +78,7 @@ public OreVeinDefinitionBuilder layer(IWorldGenLayer layer) {
         return this;
     }
 
-    public OreVeinDefinitionBuilder dimensions(Collection<?> dimensions) {
+    public OreVeinDefinitionBuilderJS dimensions(Collection<?> dimensions) {
         Set<ResourceKey<Level>> keys = new HashSet<>();
         for (Object dim : dimensions) {
             keys.add(wrapDimension(dim));
@@ -94,19 +94,19 @@ private static ResourceKey<Level> wrapDimension(Object dim) {
         return ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(dim.toString()));
     }
 
-    public OreVeinDefinitionBuilder heightRangeUniform(int min, int max) {
+    public OreVeinDefinitionBuilderJS heightRangeUniform(int min, int max) {
         heightRange(HeightRangePlacement.uniform(VerticalAnchor.absolute(min), VerticalAnchor.absolute(max)));
         inferredProperties.heightRange = Pair.of(min, max);
         return this;
     }
 
-    public OreVeinDefinitionBuilder heightRangeTriangle(int min, int max) {
+    public OreVeinDefinitionBuilderJS heightRangeTriangle(int min, int max) {
         heightRange(HeightRangePlacement.triangle(VerticalAnchor.absolute(min), VerticalAnchor.absolute(max)));
         inferredProperties.heightRange = Pair.of(min, max);
         return this;
     }
 
-    public OreVeinDefinitionBuilder standardVeinGenerator(Consumer<StandardVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS standardVeinGenerator(Consumer<StandardVeinGenerator> config) {
         var veinGenerator = new StandardVeinGenerator();
 
         config.accept(veinGenerator);
@@ -115,7 +115,7 @@ public OreVeinDefinitionBuilder standardVeinGenerator(Consumer<StandardVeinGener
         return this;
     }
 
-    public OreVeinDefinitionBuilder layeredVeinGenerator(Consumer<LayeredVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS layeredVeinGenerator(Consumer<LayeredVeinGenerator> config) {
         var veinGenerator = new LayeredVeinGenerator();
 
         config.accept(veinGenerator);
@@ -124,7 +124,7 @@ public OreVeinDefinitionBuilder layeredVeinGenerator(Consumer<LayeredVeinGenerat
         return this;
     }
 
-    public OreVeinDefinitionBuilder geodeVeinGenerator(Consumer<GeodeVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS geodeVeinGenerator(Consumer<GeodeVeinGenerator> config) {
         var veinGenerator = new GeodeVeinGenerator();
 
         config.accept(veinGenerator);
@@ -133,7 +133,7 @@ public OreVeinDefinitionBuilder geodeVeinGenerator(Consumer<GeodeVeinGenerator>
         return this;
     }
 
-    public OreVeinDefinitionBuilder dikeVeinGenerator(Consumer<DikeVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS dikeVeinGenerator(Consumer<DikeVeinGenerator> config) {
         var veinGenerator = new DikeVeinGenerator();
         if (inferredProperties.heightRange != null) {
             veinGenerator.minYLevel(inferredProperties.heightRange.getFirst());
@@ -146,7 +146,7 @@ public OreVeinDefinitionBuilder dikeVeinGenerator(Consumer<DikeVeinGenerator> co
         return this;
     }
 
-    public OreVeinDefinitionBuilder veinedVeinGenerator(Consumer<VeinedVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS veinedVeinGenerator(Consumer<VeinedVeinGenerator> config) {
         var veinGenerator = new VeinedVeinGenerator();
         if (inferredProperties.heightRange != null) {
             veinGenerator.minYLevel(inferredProperties.heightRange.getFirst());
@@ -159,7 +159,7 @@ public OreVeinDefinitionBuilder veinedVeinGenerator(Consumer<VeinedVeinGenerator
         return this;
     }
 
-    public OreVeinDefinitionBuilder classicVeinGenerator(Consumer<ClassicVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS classicVeinGenerator(Consumer<ClassicVeinGenerator> config) {
         var veinGenerator = new ClassicVeinGenerator();
 
         config.accept(veinGenerator);
@@ -168,7 +168,7 @@ public OreVeinDefinitionBuilder classicVeinGenerator(Consumer<ClassicVeinGenerat
         return this;
     }
 
-    public OreVeinDefinitionBuilder cuboidVeinGenerator(Consumer<CuboidVeinGenerator> config) {
+    public OreVeinDefinitionBuilderJS cuboidVeinGenerator(Consumer<CuboidVeinGenerator> config) {
         var veinGenerator = new CuboidVeinGenerator();
         if (inferredProperties.heightRange != null) {
             veinGenerator.minY(inferredProperties.heightRange.getFirst());
@@ -192,7 +192,7 @@ public VeinGenerator veinGenerator(ResourceLocation id) {
         return veinGenerator;
     }
 
-    public OreVeinDefinitionBuilder surfaceIndicatorGenerator(Consumer<SurfaceIndicatorGenerator> config) {
+    public OreVeinDefinitionBuilderJS surfaceIndicatorGenerator(Consumer<SurfaceIndicatorGenerator> config) {
         config.accept(getOrCreateIndicatorGenerator(SurfaceIndicatorGenerator.class, SurfaceIndicatorGenerator::new));
         return this;
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/WorldGenLayerBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/WorldGenLayerBuilder.java
similarity index 95%
rename from src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/WorldGenLayerBuilder.java
rename to src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/WorldGenLayerBuilder.java
index 711de780191..74dcfa99765 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/WorldGenLayerBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/WorldGenLayerBuilder.java
@@ -1,4 +1,4 @@
-package com.gregtechceu.gtceu.integration.kjs.builders;
+package com.gregtechceu.gtceu.integration.kjs.builders.worldgen;
 
 import com.gregtechceu.gtceu.api.data.worldgen.IWorldGenLayer;
 import com.gregtechceu.gtceu.api.data.worldgen.SimpleWorldGenLayer;
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java
index 2131cc4c470..f2411ab1d6a 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockFluidVeinEventJS.java
@@ -3,7 +3,7 @@
 import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier;
 import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
-import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockFluidBuilder;
+import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockFluidDefinitionBuilderJS;
 
 import net.minecraft.core.RegistrationInfo;
 import net.minecraft.core.WritableRegistry;
@@ -30,8 +30,8 @@ public GTBedrockFluidVeinEventJS(WritableRegistry<BedrockFluidDefinition> regist
         this.registry = registry;
     }
 
-    public void add(Context cx, ResourceLocation id, Consumer<BedrockFluidBuilder> consumer) {
-        BedrockFluidBuilder builder = new BedrockFluidBuilder(id);
+    public void add(Context cx, ResourceLocation id, Consumer<BedrockFluidDefinitionBuilderJS> consumer) {
+        BedrockFluidDefinitionBuilderJS builder = new BedrockFluidDefinitionBuilderJS(id);
         consumer.accept(builder);
         register(id, builder.createTransformedObject());
     }
@@ -40,20 +40,20 @@ private void register(ResourceLocation id, BedrockFluidDefinition def) {
         registry.register(createKey(id), def, RegistrationInfo.BUILT_IN);
     }
 
-    public void modify(Context cx, ResourceLocation id, Consumer<BedrockFluidBuilder> consumer) {
+    public void modify(Context cx, ResourceLocation id, Consumer<BedrockFluidDefinitionBuilderJS> consumer) {
         var vein = registry.get(id);
         if (vein == null) throw new IllegalArgumentException("Fluid vein doesn't exist: " + id);
-        var builder = BedrockFluidBuilder.from(vein, id);
+        var builder = BedrockFluidDefinitionBuilderJS.from(vein, id);
         consumer.accept(builder);
         register(id, builder.createTransformedObject());
     }
 
-    public void modifyAll(Context cx, BiConsumer<ResourceLocation, BedrockFluidBuilder> consumer) {
+    public void modifyAll(Context cx, BiConsumer<ResourceLocation, BedrockFluidDefinitionBuilderJS> consumer) {
         Set<ResourceLocation> keys = Set.copyOf(registry.keySet());
         keys.forEach(id -> {
             var vein = registry.get(id);
             if (vein == null) throw new IllegalArgumentException("Fluid vein doesn't exist: " + id);
-            var builder = BedrockFluidBuilder.from(vein, id);
+            var builder = BedrockFluidDefinitionBuilderJS.from(vein, id);
             consumer.accept(id, builder);
             register(id, builder.createTransformedObject());
         });
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java
index f2b8181615a..9491e29c185 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/GTBedrockOreVeinEventJS.java
@@ -3,7 +3,7 @@
 import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier;
 import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
-import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockOreBuilder;
+import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.BedrockOreDefinitionBuilderJS;
 
 import net.minecraft.core.RegistrationInfo;
 import net.minecraft.core.WritableRegistry;
@@ -29,8 +29,8 @@ public GTBedrockOreVeinEventJS(WritableRegistry<BedrockOreDefinition> registry)
         this.registry = registry;
     }
 
-    public void add(Context cx, ResourceLocation id, Consumer<BedrockOreBuilder> consumer) {
-        BedrockOreBuilder builder = new BedrockOreBuilder(id);
+    public void add(Context cx, ResourceLocation id, Consumer<BedrockOreDefinitionBuilderJS> consumer) {
+        BedrockOreDefinitionBuilderJS builder = new BedrockOreDefinitionBuilderJS(id);
         consumer.accept(builder);
         register(id, builder.createTransformedObject());
     }
@@ -39,20 +39,20 @@ private void register(ResourceLocation id, BedrockOreDefinition def) {
         registry.register(createKey(id), def, RegistrationInfo.BUILT_IN);
     }
 
-    public void modify(Context cx, ResourceLocation id, Consumer<BedrockOreBuilder> consumer) {
+    public void modify(Context cx, ResourceLocation id, Consumer<BedrockOreDefinitionBuilderJS> consumer) {
         var vein = registry.get(id);
         if (vein == null) throw new IllegalArgumentException("Bedrock ore vein doesn't exist: " + id);
-        var builder = BedrockOreBuilder.from(vein, id);
+        var builder = BedrockOreDefinitionBuilderJS.from(vein, id);
         consumer.accept(builder);
         register(id, builder.createTransformedObject());
     }
 
-    public void modifyAll(Context cx, BiConsumer<ResourceLocation, BedrockOreBuilder> consumer) {
+    public void modifyAll(Context cx, BiConsumer<ResourceLocation, BedrockOreDefinitionBuilderJS> consumer) {
         Set<ResourceLocation> keys = registry.keySet();
         keys.forEach(id -> {
             var vein = registry.get(id);
             if (vein == null) throw new IllegalArgumentException("Bedrock ore vein doesn't exist: " + id);
-            var builder = BedrockOreBuilder.from(vein, id);
+            var builder = BedrockOreDefinitionBuilderJS.from(vein, id);
             consumer.accept(id, builder);
             register(id, builder.createTransformedObject());
         });
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java
index bb55f1e873c..998150e4eb7 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/events/WorldGenLayerEventJS.java
@@ -1,7 +1,7 @@
 package com.gregtechceu.gtceu.integration.kjs.events;
 
 import com.gregtechceu.gtceu.api.data.worldgen.SimpleWorldGenLayer;
-import com.gregtechceu.gtceu.integration.kjs.builders.WorldGenLayerBuilder;
+import com.gregtechceu.gtceu.integration.kjs.builders.worldgen.WorldGenLayerBuilder;
 
 import net.minecraft.resources.ResourceLocation;