Distinct Fluid Behaviour and Recipe Runner Refactor

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -1797,6 +1797,7 @@
   "config.gtceu.option.machines": "sǝuıɥɔɐɯ",
   "config.gtceu.option.machinesEmissiveTextures": "sǝɹnʇxǝ⟘ǝʌıssıɯƎsǝuıɥɔɐɯ",
   "config.gtceu.option.meHatchEnergyUsage": "ǝbɐs∩ʎbɹǝuƎɥɔʇɐHǝɯ",
+  "config.gtceu.option.minerSpeed": "pǝǝdSɹǝuıɯ",
   "config.gtceu.option.minimap": "dɐɯıuıɯ",
   "config.gtceu.option.nanoSaber": "ɹǝqɐSouɐu",
   "config.gtceu.option.nanoSaberBaseDamage": "ǝbɐɯɐᗡǝsɐᗺɹǝqɐSouɐu",
@@ -3516,6 +3517,7 @@
   "gtceu.top.allow_output_input": "ʇnduI ʍoןןⱯ",
   "gtceu.top.auto_output": "ʇndʇnO oʇnⱯ",
   "gtceu.top.buffer_bound_pos": "%s :Z '%s :ʎ '%s :X - o⟘ punoᗺ",
+  "gtceu.top.buffer_not_bound": "punoᗺ ʎןʇuǝɹɹnƆ ʇoN ɹǝɟɟnᗺ",
   "gtceu.top.cable_amperage": " :ǝbɐɹǝdɯⱯ",
   "gtceu.top.cable_voltage": " :ǝbɐʇןoΛ",
   "gtceu.top.convert_eu": "ɹ§ƎℲɔ§ >- ɹ§∩Ǝǝ§ buıʇɹǝʌuoƆ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1797,6 +1797,7 @@
   "config.gtceu.option.machines": "machines",
   "config.gtceu.option.machinesEmissiveTextures": "machinesEmissiveTextures",
   "config.gtceu.option.meHatchEnergyUsage": "meHatchEnergyUsage",
+  "config.gtceu.option.minerSpeed": "minerSpeed",
   "config.gtceu.option.minimap": "minimap",
   "config.gtceu.option.nanoSaber": "nanoSaber",
   "config.gtceu.option.nanoSaberBaseDamage": "nanoSaberBaseDamage",
@@ -3516,6 +3517,7 @@
   "gtceu.top.allow_output_input": "Allow Input",
   "gtceu.top.auto_output": "Auto Output",
   "gtceu.top.buffer_bound_pos": "Bound To - X: %s, Y: %s, Z: %s",
+  "gtceu.top.buffer_not_bound": "Buffer Not Currently Bound",
   "gtceu.top.cable_amperage": "Amperage: ",
   "gtceu.top.cable_voltage": "Voltage: ",
   "gtceu.top.convert_eu": "Converting §eEU§r -> §cFE§r",

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/EURecipeCapability.java

@@ -84,7 +84,7 @@ public int getMaxParallelRatio(IRecipeCapabilityHolder holder, GTRecipe recipe,
      */
     public static List<Content> makeEUContent(Long eu) {
         return List.of(
-                new Content(eu, ChanceLogic.getMaxChancedValue(), ChanceLogic.getMaxChancedValue(), 0, null, null));
+                new Content(eu, ChanceLogic.getMaxChancedValue(), ChanceLogic.getMaxChancedValue(), 0));
     }
 
     /**

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java

@@ -152,10 +152,7 @@ public int limitParallel(GTRecipe recipe, IRecipeCapabilityHolder holder, int mu
         int maxMultiplier = multiplier;
 
         OverlayedTankHandler overlayedFluidHandler = new OverlayedTankHandler(
-                Objects.requireNonNullElseGet(
-                        holder.getCapabilitiesProxy().get(IO.OUT, FluidRecipeCapability.CAP),
-                        Collections::emptyList)
-                        .stream()
+                holder.getCapabilitiesFlat(IO.OUT, FluidRecipeCapability.CAP).stream()
                         .filter(NotifiableFluidTank.class::isInstance)
                         .map(NotifiableFluidTank.class::cast)
                         .toList());
@@ -200,10 +197,7 @@ public int limitParallel(GTRecipe recipe, IRecipeCapabilityHolder holder, int mu
     @Override
     public int getMaxParallelRatio(IRecipeCapabilityHolder holder, GTRecipe recipe, int parallelAmount) {
         // Find all the fluids in the combined Fluid Input inventories and create oversized FluidStacks
-        Map<FluidKey, Integer> fluidStacks = Objects
-                .requireNonNullElseGet(holder.getCapabilitiesProxy().get(IO.IN, FluidRecipeCapability.CAP),
-                        Collections::<IRecipeHandler<?>>emptyList)
-                .stream()
+        Map<FluidKey, Integer> fluidStacks = holder.getCapabilitiesFlat(IO.IN, FluidRecipeCapability.CAP).stream()
                 .map(container -> container.getContents().stream().filter(FluidStack.class::isInstance)
                         .map(FluidStack.class::cast).toList())
                 .flatMap(container -> GTHashMaps.fromFluidCollection(container).entrySet().stream())

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeCapabilityHolder.java

@@ -1,16 +1,43 @@
 package com.gregtechceu.gtceu.api.capability.recipe;
 
-import com.google.common.collect.Table;
+import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList;
+
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public interface IRecipeCapabilityHolder {
 
-    default boolean hasProxies() {
+    default boolean hasCapabilityProxies() {
         return !getCapabilitiesProxy().isEmpty();
     }
 
     @NotNull
-    Table<IO, RecipeCapability<?>, List<IRecipeHandler<?>>> getCapabilitiesProxy();
+    Map<IO, List<RecipeHandlerList>> getCapabilitiesProxy();
+
+    Map<IO, Map<RecipeCapability<?>, List<IRecipeHandler<?>>>> getCapabilitiesFlat();
+
+    default List<RecipeHandlerList> getCapabilitiesForIO(IO io) {
+        return getCapabilitiesProxy().getOrDefault(io, Collections.emptyList());
+    }
+
+    default List<IRecipeHandler<?>> getCapabilitiesFlat(IO io, RecipeCapability<?> cap) {
+        return getCapabilitiesFlat()
+                .getOrDefault(io, Collections.emptyMap())
+                .getOrDefault(cap, Collections.emptyList());
+    }
+
+    default void addHandlerList(RecipeHandlerList handler) {
+        if (handler == RecipeHandlerList.NO_DATA) return;
+        IO io = handler.getHandlerIO();
+        getCapabilitiesProxy().computeIfAbsent(io, i -> new ArrayList<>()).add(handler);
+        var inner = getCapabilitiesFlat().computeIfAbsent(io, i -> new Reference2ObjectOpenHashMap<>());
+        for (var entry : handler.getHandlerMap().entrySet()) {
+            inner.computeIfAbsent(entry.getKey(), c -> new ArrayList<>()).addAll(entry.getValue());
+        }
+    }
 }

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeHandler.java

@@ -3,11 +3,9 @@
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author KilaBash
@@ -35,21 +33,12 @@ public interface IRecipeHandler<K> extends IFilteredHandler<K> {
      * @param io       the IO type of this recipe. always be one of the {@link IO#IN} or {@link IO#OUT}
      * @param recipe   recipe.
      * @param left     left contents for to be handled.
-     * @param slotName specific slot name.
      * @param simulate simulate.
      * @return left contents for continue handling by other proxies.
      *         <br>
      *         null - nothing left. handling successful/finish. you should always return null as a handling-done mark.
      */
-    List<K> handleRecipeInner(IO io, GTRecipe recipe, List<K> left, @Nullable String slotName, boolean simulate);
-
-    /**
-     * Slot name, it makes sense if recipe contents specify a slot name.
-     */
-    @Nullable
-    default Set<String> getSlotNames() {
-        return null;
-    }
+    List<K> handleRecipeInner(IO io, GTRecipe recipe, List<K> left, boolean simulate);
 
     /**
      * container size, if it has one. otherwise -1.
@@ -80,12 +69,12 @@ default K copyContent(Object content) {
         return getCapability().copyInner((K) content);
     }
 
-    default List<K> handleRecipe(IO io, GTRecipe recipe, List<?> left, @Nullable String slotName, boolean simulate) {
+    default List<K> handleRecipe(IO io, GTRecipe recipe, List<?> left, boolean simulate) {
         List<K> contents = new ObjectArrayList<>(left.size());
         for (Object leftObj : left) {
             contents.add(copyContent(leftObj));
         }
-        return handleRecipeInner(io, recipe, contents, slotName, simulate);
+        return handleRecipeInner(io, recipe, contents, simulate);
     }
 
     default void preWorking(IRecipeCapabilityHolder holder, IO io, GTRecipe recipe) {}

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java

@@ -245,9 +245,7 @@ public int limitParallel(GTRecipe recipe, IRecipeCapabilityHolder holder, int mu
         int maxMultiplier = multiplier;
 
         OverlayedItemHandler itemHandler = new OverlayedItemHandler(new CombinedInvWrapper(
-                Objects.requireNonNullElseGet(holder.getCapabilitiesProxy().get(IO.OUT, ItemRecipeCapability.CAP),
-                        Collections::emptyList)
-                        .stream()
+                holder.getCapabilitiesFlat(IO.OUT, ItemRecipeCapability.CAP).stream()
                         .filter(IItemHandlerModifiable.class::isInstance)
                         .map(IItemHandlerModifiable.class::cast)
                         .toArray(IItemHandlerModifiable[]::new)));
@@ -382,10 +380,7 @@ private Object2IntMap<ItemStack> getIngredientStacks(IRecipeCapabilityHolder hol
                 ItemStackHashStrategy.comparingAllButCount());
         Object2IntMap<ItemStack> result = new Object2IntOpenHashMap<>();
 
-        List<IRecipeHandler<?>> recipeHandlerList = Objects
-                .requireNonNullElseGet(holder.getCapabilitiesProxy().get(IO.IN, ItemRecipeCapability.CAP),
-                        Collections::<IRecipeHandler<?>>emptyList)
-                .stream()
+        var recipeHandlerList = holder.getCapabilitiesFlat(IO.IN, ItemRecipeCapability.CAP).stream()
                 .filter(handler -> !handler.isProxy()).toList();
 
         for (IRecipeHandler<?> container : recipeHandlerList) {

src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java

@@ -12,7 +12,9 @@
 import com.gregtechceu.gtceu.api.item.IGTTool;
 import com.gregtechceu.gtceu.api.item.tool.aoe.AoESymmetrical;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler;
+import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
+import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
 import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredient;
 import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;
@@ -64,8 +66,6 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Table;
-import com.google.common.collect.Tables;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -412,22 +412,25 @@ public static void applyHammerDropConversion(ServerLevel world, BlockPos pos, It
                 // Stack lists can be immutable going into Recipe#matches barring no rewrites
                 // Search for forge hammer recipes from all drops individually (only LV or under)
 
-                Table<IO, RecipeCapability<?>, List<IRecipeHandler<?>>> caps = Tables
-                        .newCustomTable(new EnumMap<>(IO.class), IdentityHashMap::new);
+                Map<IO, List<RecipeHandlerList>> caps = new IdentityHashMap<>();
                 DummyMachineBlockEntity be = new DummyMachineBlockEntity(GTValues.LV,
                         GTRecipeTypes.FORGE_HAMMER_RECIPES, GTMachineUtils.defaultTankSizeFunction, caps);
-                caps.put(IO.IN, EURecipeCapability.CAP, List.of(new InfiniteEnergyContainer(be.getMetaMachine(),
-                        GTValues.V[GTValues.LV], GTValues.V[GTValues.LV], 1, GTValues.V[GTValues.LV], 1)));
-                caps.put(IO.IN, ItemRecipeCapability.CAP, List.of(new NotifiableItemStackHandler(be.getMetaMachine(), 1,
-                        IO.IN, IO.IN, (slots) -> new CustomItemStackHandler(silktouchDrop))));
-                caps.put(IO.OUT, ItemRecipeCapability.CAP,
-                        List.of(new NotifiableItemStackHandler(be.getMetaMachine(), 2, IO.OUT)));
-                be.getMetaMachine().reinitializeCapabilities(caps);
-
-                Iterator<GTRecipe> hammerRecipes = GTRecipeTypes.FORGE_HAMMER_RECIPES.searchRecipe(be.metaMachine);
+                RecipeHandlerList dummyInputs = new RecipeHandlerList(IO.IN);
+                dummyInputs.addHandlers(
+                        new InfiniteEnergyContainer(be.getMetaMachine(), GTValues.V[GTValues.LV],
+                                GTValues.V[GTValues.LV], 1, GTValues.V[GTValues.LV], 1),
+                        new NotifiableItemStackHandler(be.getMetaMachine(), 1, IO.IN, IO.IN,
+                                (slots) -> new CustomItemStackHandler(silktouchDrop)));
+
+                RecipeHandlerList dummyOutputs = RecipeHandlerList.of(IO.OUT,
+                        new NotifiableItemStackHandler(be.getMetaMachine(), 2, IO.OUT));
+                be.getMetaMachine().reinitializeHandlers(List.of(dummyInputs, dummyOutputs));
+
+                Iterator<GTRecipe> hammerRecipes = GTRecipeTypes.FORGE_HAMMER_RECIPES.searchRecipe(be.metaMachine,
+                        r -> RecipeHelper.matchContents(be.metaMachine, r).isSuccess());
                 GTRecipe hammerRecipe = hammerRecipes == null || !hammerRecipes.hasNext() ? null : hammerRecipes.next();
-                if (hammerRecipe != null && hammerRecipe.handleRecipeIO(IO.IN, be.metaMachine,
-                        be.getMetaMachine().recipeLogic.getChanceCaches())) {
+                if (hammerRecipe != null && RecipeHelper.handleRecipeIO(IO.IN, be.metaMachine, hammerRecipe,
+                        be.getMetaMachine().recipeLogic.getChanceCaches()).isSuccess()) {
                     drops.clear();
                     TagPrefix prefix = ChemicalHelper.getPrefix(silktouchDrop.getItem());
                     if (prefix == null) {

src/main/java/com/gregtechceu/gtceu/api/machine/WorkableTieredMachine.java

@@ -12,8 +12,6 @@
 import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;
 import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder;
 
-import com.google.common.collect.Table;
-import com.google.common.collect.Tables;
 import com.mojang.blaze3d.MethodsReturnNonnullByDefault;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import lombok.Getter;
@@ -67,7 +65,9 @@ public abstract class WorkableTieredMachine extends TieredEnergyMachine implemen
     @Persisted
     public final NotifiableComputationContainer exportComputation;
     @Getter
-    protected final Table<IO, RecipeCapability<?>, List<IRecipeHandler<?>>> capabilitiesProxy;
+    protected final Map<IO, List<RecipeHandlerList>> capabilitiesProxy;
+    @Getter
+    protected Map<IO, Map<RecipeCapability<?>, List<IRecipeHandler<?>>>> capabilitiesFlat;
     @Persisted
     @Getter
     protected int overclockTier;
@@ -86,7 +86,8 @@ public WorkableTieredMachine(IMachineBlockEntity holder, int tier, Int2IntFuncti
         this.recipeTypes = getDefinition().getRecipeTypes();
         this.activeRecipeType = 0;
         this.tankScalingFunction = tankScalingFunction;
-        this.capabilitiesProxy = Tables.newCustomTable(new EnumMap<>(IO.class), IdentityHashMap::new);
+        this.capabilitiesProxy = new EnumMap<>(IO.class);
+        this.capabilitiesFlat = new EnumMap<>(IO.class);
         this.traitSubscriptions = new ArrayList<>();
         this.recipeLogic = createRecipeLogic(args);
         this.importItems = createImportItemHandler(args);
@@ -162,22 +163,30 @@ protected RecipeLogic createRecipeLogic(Object... args) {
     @Override
     public void onLoad() {
         super.onLoad();
+        // attach self traits
+        Map<IO, List<IRecipeHandler<?>>> ioTraits = new EnumMap<>(IO.class);
+
         for (MachineTrait trait : getTraits()) {
             if (trait instanceof IRecipeHandlerTrait<?> handlerTrait) {
-                if (!capabilitiesProxy.contains(handlerTrait.getHandlerIO(), handlerTrait.getCapability())) {
-                    capabilitiesProxy.put(handlerTrait.getHandlerIO(), handlerTrait.getCapability(), new ArrayList<>());
-                }
-                capabilitiesProxy.get(handlerTrait.getHandlerIO(), handlerTrait.getCapability()).add(handlerTrait);
-                traitSubscriptions.add(handlerTrait.addChangedListener(recipeLogic::updateTickSubscription));
+                ioTraits.computeIfAbsent(handlerTrait.getHandlerIO(), i -> new ArrayList<>()).add(handlerTrait);
             }
         }
+
+        for (var entry : ioTraits.entrySet()) {
+            RecipeHandlerList handlerList = new RecipeHandlerList(entry.getKey());
+            handlerList.addHandlers(entry.getValue());
+            this.addHandlerList(handlerList);
+            traitSubscriptions.addAll(handlerList.addChangeListeners(recipeLogic::updateTickSubscription));
+        }
     }
 
     @Override
     public void onUnload() {
         super.onUnload();
         traitSubscriptions.forEach(ISubscription::unsubscribe);
         traitSubscriptions.clear();
+        capabilitiesProxy.clear();
+        capabilitiesFlat.clear();
         recipeLogic.inValid();
     }
 

src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java

@@ -6,6 +6,7 @@
 import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
+import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 
 import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ default void notifyStatusChanged(RecipeLogic.Status oldStatus, RecipeLogic.Statu
     RecipeLogic getRecipeLogic();
 
     default GTRecipe fullModifyRecipe(GTRecipe recipe) {
-        return doModifyRecipe(recipe.trimRecipeOutputs(this.getOutputLimits()));
+        return doModifyRecipe(RecipeHelper.trimRecipeOutputs(recipe, this.getOutputLimits()));
     }
 
     /**

src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java

@@ -4,7 +4,7 @@
 import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IMachineFeature;
 import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine;
-import com.gregtechceu.gtceu.api.machine.trait.IRecipeHandlerTrait;
+import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList;
 import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 
@@ -64,7 +64,7 @@ default boolean canShared() {
     /**
      * Get all available traits for recipe logic.
      */
-    List<IRecipeHandlerTrait> getRecipeHandlers();
+    List<RecipeHandlerList> getRecipeHandlers();
 
     /**
      * whether its base model can be replaced by controller when it is formed.

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java

@@ -192,17 +192,17 @@ public long getOverclockVoltage() {
 
     public EnergyContainerList getEnergyContainer() {
         List<IEnergyContainer> containers = new ArrayList<>();
-        var capabilities = capabilitiesProxy.get(IO.IN, EURecipeCapability.CAP);
-        if (capabilities != null) {
-            for (IRecipeHandler<?> handler : capabilities) {
+        var handlers = getCapabilitiesFlat(IO.IN, EURecipeCapability.CAP);
+        if (!handlers.isEmpty()) {
+            for (IRecipeHandler<?> handler : handlers) {
                 if (handler instanceof IEnergyContainer container) {
                     containers.add(container);
                 }
             }
         } else {
-            capabilities = capabilitiesProxy.get(IO.OUT, EURecipeCapability.CAP);
-            if (capabilities != null) {
-                for (IRecipeHandler<?> handler : capabilities) {
+            handlers = getCapabilitiesFlat(IO.OUT, EURecipeCapability.CAP);
+            if (!handlers.isEmpty()) {
+                for (IRecipeHandler<?> handler : handlers) {
                     if (handler instanceof IEnergyContainer container) {
                         containers.add(container);
                     }