MUI Recipe type UIs

dependencies.gradle

@@ -14,7 +14,7 @@ dependencies {
     compileOnly(libs.evalEx.get())
 
     // MUI
-    jarJar(modImplementation(forge.mui.get()))
+    jarJar(implementation(files("libs/modularui-mc1.20.1-3.2.0-dev.jar")))
 
     // Mixin (& Extras)
     annotationProcessor(variantOf(libs.mixin) { classifier("processor") })

docs/content/Development/MUI2/Syncing/Sync-Basics.md

@@ -27,12 +27,12 @@ The first method is using dynamic widgets, which update every frame regardless o
 This method is easiest if you just need to sync some data over and display or edit it in a single widget. 
 Some examples are:
 
-- `IKey.dynamic(Supplier<Component>)` - Queries the supplier every frame to retrieve the component to display  
+- `Text.dynamic(Supplier<Component>)` - Queries the supplier every frame to retrieve the component to display  
 - `new DynamicDrawable(Supplier<IDrawable>)` - Queries the supplier every frame to retrieve the drawable to display  
 
 
 !!! Note
-    To convert IKeys or Drawables to Widgets, you need to chain `.asWidget()`
+    To convert Texts or Drawables to Widgets, you need to chain `.asWidget()`
 
 ```java
 public class MuiTestMachine extends MetaMachine implements IMuiMachine {
@@ -52,7 +52,7 @@ public class MuiTestMachine extends MetaMachine implements IMuiMachine {
 
         var column = Flow.column();
 
-        column.child(IKey.dynamic(() -> Component.literal("Ticks: " + this.ticks)) // note that this is a Supplier<Component> instead of a Component
+        column.child(Text.dynamic(() -> Component.literal("Ticks: " + this.ticks)) // note that this is a Supplier<Component> instead of a Component
                 .asWidget()
                 .margin(4));
 
@@ -112,7 +112,7 @@ public class MuiTestMachine extends MetaMachine implements IMuiMachine {
                     int tickValue = intSyncHandler.getValue(); // It is also possible to just reference this.ticks directly
                     int amountOfItems = 1 + (tickValue % 200) / 20;
                     for (int i = 0; i < amountOfItems; i++) {
-                        list.child(IKey.str("Value nr. " + (i + 1)).asWidget()); // No need for IKey.dynamic since we have the value as a variable here, inside the lambda
+                        list.child(Text.str("Value nr. " + (i + 1)).asWidget()); // No need for Text.dynamic since we have the value as a variable here, inside the lambda
                     }
                     return list;
                 });
@@ -159,7 +159,7 @@ public class MuiTestMachine extends MetaMachine implements IMuiMachine {
         var column = Flow.column().paddingTop(3);
 
         column.child(
-                IKey.dynamic(() -> Component.literal("Pressed: " + this.buttonPressed))
+                Text.dynamic(() -> Component.literal("Pressed: " + this.buttonPressed))
                     .asWidget());
 
         var buttonSyncValue = new BooleanSyncValue(() -> this.buttonPressed, (newValue) -> this.buttonPressed = newValue);
@@ -220,7 +220,7 @@ public class MuiTestMachine extends MetaMachine implements IMuiMachine {
             for (int rowNr = 0; rowNr < this.rows; rowNr++) {
                 Flow row = Flow.row();
                 for (int columnNr = 0; columnNr < this.columns; columnNr++) {
-                    row.child(IKey.str(rowNr + ", " + columnNr).asWidget().width(20));
+                    row.child(Text.str(rowNr + ", " + columnNr).asWidget().width(20));
                 }
                 grid.child(row);
             }

docs/content/Development/MUI2/Syncing/Synced-Actions.md

@@ -21,14 +21,14 @@ public class MuiTestMachine extends MetaMachine implements IMuiMachine {
         });
 
         Column contents = new Column();
-        contents.child(IKey.dynamic(() -> Component.literal("Number: " + number))
+        contents.child(Text.dynamic(() -> Component.literal("Number: " + number))
                 .asWidget()
                 .width(100)
                 .height(16)
                 .margin(4));
 
         contents.child(new ButtonWidget<>()
-                .onMousePressed((x, y, button) -> {
+                .onMousePressed((context,  button) -> {
                     if (button == 0) {
                         syncManager.callSyncedAction("randomButtonPressed");
                     }

docs/content/Development/MUI2/Test-Machine.md

@@ -13,7 +13,7 @@ public class MuiTestMachine extends MetaMachine implements IMuiMachine {
         var panel = GTGuis.createPanel(this, 176, 168);
         // Do stuff with your panel here, add children, etc.
         // For example:
-        panel.child(IKey.str("Test machine")
+        panel.child(Text.str("Test machine")
                 .asWidget()
                 .margin(4));
 

docs/content/Development/MUI2/Widget-Layout.md

@@ -172,8 +172,8 @@ Flow column = Flow.column()
         .widthRel(1f)
         .padding(10)
         .crossAxisAlignment(Alignment.CrossAxis.START)
-        .child(new TextWidget<>(IKey.str("Title")).marginBottom(4))
-        .child(new TextWidget<>(IKey.str("Body")));
+        .child(new TextWidget<>(Text.str("Title")).marginBottom(4))
+        .child(new TextWidget<>(Text.str("Body")));
 ```
 
 ### Slot grid using absolute positioning

gradle/forge.versions.toml

@@ -6,9 +6,9 @@ mixinExtras = "0.5.0-rc.3"
 
 jei = "15.20.0.115"
 rei = "12.1.785"
-emi = "1.1.13+1.20.1"
+emi = "1.1.22+1.20.1"
 ae2 = "15.0.18"
-mui = "3.1.5"
+mui = "3.2.0-SNAPSHOT"
 kubejs = "2001.6.5-build.16"
 rhino = "2001.2.3-build.10"
 architectury = "9.2.14"

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

@@ -1,18 +1,7 @@
 package com.gregtechceu.gtceu.api.capability.recipe;
 
-import com.gregtechceu.gtceu.api.recipe.GTRecipe;
-import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.content.ContentModifier;
 import com.gregtechceu.gtceu.api.recipe.content.SerializerInteger;
-import com.gregtechceu.gtceu.utils.FormattingUtil;
-
-import com.lowdragmc.lowdraglib.gui.widget.LabelWidget;
-import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
-import com.lowdragmc.lowdraglib.utils.LocalizationUtils;
-
-import org.apache.commons.lang3.mutable.MutableInt;
-
-import java.util.List;
 
 public class CWURecipeCapability extends RecipeCapability<Integer> {
 
@@ -32,18 +21,4 @@ public Integer copyWithModifier(Integer content, ContentModifier modifier) {
         return modifier.apply(content);
     }
 
-    @Override
-    public void addXEIInfo(WidgetGroup group, int xOffset, GTRecipe recipe, List<Content> contents, boolean perTick,
-                           boolean isInput, MutableInt yOffset) {
-        if (perTick) {
-            int cwu = contents.stream().map(Content::getContent).mapToInt(CWURecipeCapability.CAP::of).sum();
-            group.addWidget(new LabelWidget(3 - xOffset, yOffset.addAndGet(10),
-                    LocalizationUtils.format("gtceu.recipe.computation_per_tick", FormattingUtil.formatNumbers(cwu))));
-        }
-        if (recipe.data.getBoolean("duration_is_total_cwu")) {
-            group.addWidget(new LabelWidget(3 - xOffset, yOffset.addAndGet(10),
-                    LocalizationUtils.format("gtceu.recipe.total_computation",
-                            FormattingUtil.formatNumbers(recipe.duration))));
-        }
-    }
 }

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

@@ -61,7 +61,7 @@ public int limitMaxParallelByOutput(IRecipeCapabilityHolder holder, GTRecipe rec
             int maxMultiplier = multiplier;
 
             long totalEU = 0L;
-            for (var content : outputs) totalEU += of(content.content).getTotalEU();
+            for (var content : outputs) totalEU += of(content.content()).getTotalEU();
             if (totalEU != 0 && multiplier > Long.MAX_VALUE / totalEU) {
                 maxMultiplier = multiplier = GTMath.saturatedCast(Long.MAX_VALUE / totalEU);
             }
@@ -104,8 +104,8 @@ public int getMaxParallelByInput(IRecipeCapabilityHolder holder, GTRecipe recipe
             long nonConsumable = 0;
             long consumable = 0;
             for (Content content : inputs) {
-                EnergyStack s = of(content.content);
-                if (content.chance == 0) nonConsumable += s.getTotalEU();
+                EnergyStack s = of(content.content());
+                if (content.chance() == 0) nonConsumable += s.getTotalEU();
                 else consumable += s.getTotalEU();
             }
 

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

@@ -1,11 +1,8 @@
 package com.gregtechceu.gtceu.api.capability.recipe;
 
-import com.gregtechceu.gtceu.api.gui.widget.TankWidget;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroup;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList;
+import com.gregtechceu.gtceu.api.machine.MetaMachine;
+import com.gregtechceu.gtceu.api.machine.trait.*;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
-import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.content.ContentModifier;
 import com.gregtechceu.gtceu.api.recipe.content.SerializerFluidIngredient;
@@ -14,36 +11,20 @@
 import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient;
 import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.fluid.*;
 import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic;
-import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI;
-import com.gregtechceu.gtceu.client.TooltipsHandler;
 import com.gregtechceu.gtceu.common.valueprovider.*;
-import com.gregtechceu.gtceu.integration.recipeviewer.entry.fluid.FluidEntryList;
-import com.gregtechceu.gtceu.integration.recipeviewer.entry.fluid.FluidStackList;
-import com.gregtechceu.gtceu.integration.recipeviewer.entry.fluid.FluidTagList;
-import com.gregtechceu.gtceu.integration.recipeviewer.handlers.fluid.CycleFluidEntryHandler;
-import com.gregtechceu.gtceu.integration.recipeviewer.widgets.GTRecipeWidget;
 import com.gregtechceu.gtceu.utils.GTMath;
 
-import com.lowdragmc.lowdraglib.gui.texture.ProgressTexture;
-import com.lowdragmc.lowdraglib.gui.widget.Widget;
-import com.lowdragmc.lowdraglib.jei.IngredientIO;
-
-import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.valueproviders.IntProvider;
-import net.minecraft.world.item.TooltipFlag;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 
+import brachy.modularui.integration.recipeviewer.entry.fluid.FluidEntryList;
+import brachy.modularui.integration.recipeviewer.entry.fluid.FluidStackList;
+import brachy.modularui.integration.recipeviewer.entry.fluid.FluidTagList;
 import it.unimi.dsi.fastutil.objects.*;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static com.gregtechceu.gtceu.api.recipe.RecipeHelper.addToRecipeHandlerMap;
 
@@ -146,7 +127,7 @@ public int limitMaxParallelByOutput(IRecipeCapabilityHolder holder, GTRecipe rec
         int maxAmount = 0;
         List<FluidIngredient> ingredients = new ArrayList<>(outputContents.size());
         for (var content : outputContents) {
-            var ing = this.of(content.content);
+            var ing = this.of(content.content());
             maxAmount = Math.max(maxAmount, ing.getAmount());
             ingredients.add(ing);
         }
@@ -191,13 +172,13 @@ public int getMaxParallelByInput(IRecipeCapabilityHolder holder, GTRecipe recipe
         var nonConsumables = new Object2LongOpenHashMap<FluidIngredient>();
         var consumables = new Object2LongOpenHashMap<FluidIngredient>();
         for (Content content : inputs) {
-            FluidIngredient ing = of(content.content);
+            FluidIngredient ing = of(content.content());
 
             int amount;
             if (ing instanceof IntProviderFluidIngredient provider) amount = provider.getCountProvider().getMaxValue();
             else amount = ing.getAmount();
 
-            if (content.chance == 0) {
+            if (content.chance() == 0) {
                 nonConsumables.addTo(ing, amount);
             } else {
                 boolean has = false;
@@ -326,89 +307,8 @@ private static List<Object2LongMap<FluidStack>> getInputContents(IRecipeCapabili
         return invs;
     }
 
-    @Override
-    public @NotNull List<Object> createXEIContainerContents(List<Content> contents, GTRecipe recipe, IO io) {
-        List<Object> entryLists = contents.stream()
-                .map(Content::getContent)
-                .map(this::of)
-                .map(FluidRecipeCapability::mapFluid)
-                .collect(Collectors.toList());
-
-        while (entryLists.size() < recipe.recipeType.getMaxOutputs(this)) entryLists.add(null);
-        return entryLists;
-    }
-
-    public Object createXEIContainer(List<?> contents) {
-        // cast is safe if you don't pass the wrong thing.
-        // noinspection unchecked
-        return new CycleFluidEntryHandler((List<FluidEntryList>) contents);
-    }
-
-    @NotNull
-    @Override
-    public Widget createWidget() {
-        TankWidget tank = new TankWidget();
-        tank.initTemplate();
-        tank.setFillDirection(ProgressTexture.FillDirection.ALWAYS_FULL);
-        return tank;
-    }
-
-    @NotNull
-    @Override
-    public Class<? extends Widget> getWidgetClass() {
-        return TankWidget.class;
-    }
-
-    @Override
-    public void applyWidgetInfo(@NotNull Widget widget,
-                                int index,
-                                boolean isXEI,
-                                IO io,
-                                GTRecipeTypeUI.@UnknownNullability("null when storage == null") RecipeHolder recipeHolder,
-                                @NotNull GTRecipeType recipeType,
-                                @UnknownNullability("null when content == null") GTRecipe recipe,
-                                @Nullable Content content,
-                                @Nullable Object storage, int recipeTier, int chanceTier) {
-        if (widget instanceof TankWidget tank) {
-            if (storage instanceof IFluidHandler fluidHandler) {
-                tank.setFluidTank(fluidHandler, index);
-            }
-            tank.setIngredientIO(io == IO.IN ? IngredientIO.INPUT : IngredientIO.OUTPUT);
-            tank.setAllowClickFilled(!isXEI);
-            tank.setAllowClickDrained(!isXEI && io.support(IO.IN));
-            if (isXEI) tank.setShowAmount(false);
-            if (content != null) {
-                float chance = (float) recipeType.getChanceFunction()
-                        .getBoostedChance(content, recipeTier, chanceTier) / content.maxChance;
-                tank.setXEIChance(chance);
-                tank.setOnAddedTooltips((w, tooltips) -> {
-                    FluidIngredient ingredient = FluidRecipeCapability.CAP.of(content.content);
-                    if (!isXEI && ingredient.getStacks().length > 0) {
-                        FluidStack stack = ingredient.getStacks()[0];
-                        TooltipsHandler.appendFluidTooltips(stack, tooltips::add, TooltipFlag.NORMAL);
-                    }
-                    if (ingredient instanceof IntProviderFluidIngredient provider) {
-                        IntProvider countProvider = provider.getCountProvider();
-                        tooltips.add(Component.translatable("gtceu.gui.content.fluid_range",
-                                countProvider.getMinValue(), countProvider.getMaxValue())
-                                .withStyle(ChatFormatting.GOLD));
-                    }
-                    GTRecipeWidget.setConsumedChance(content,
-                            recipe.getChanceLogicForCapability(this, io, isTickSlot(index, io, recipe)),
-                            tooltips, recipeTier, chanceTier, recipeType.getChanceFunction());
-                    if (isTickSlot(index, io, recipe)) {
-                        tooltips.add(Component.translatable("gtceu.gui.content.per_tick"));
-                    }
-                });
-                if (io == IO.IN && (content.chance == 0)) {
-                    tank.setIngredientIO(IngredientIO.CATALYST);
-                }
-            }
-        }
-    }
-
     // Maps fluids to a FluidEntryList for XEI: either a FluidTagList or a FluidStackList
-    public static FluidEntryList mapFluid(FluidIngredient ingredient) {
+    public static FluidEntryList mapIngredientToEntryList(FluidIngredient ingredient) {
         int amount;
         if (ingredient instanceof IntProviderFluidIngredient) {
             amount = 1;
@@ -456,4 +356,9 @@ public interface ICustomParallel {
     public boolean shouldBypassDistinct() {
         return false;
     }
+
+    public @Nullable NotifiableFluidTank getCapabilityHandler(MetaMachine machine, IO io) {
+        var handlers = machine.getTraitHolder().getTraits(NotifiableFluidTank.TYPE);
+        return handlers.stream().filter(v -> v.handlerIO == io).findFirst().orElse(null);
+    }
 }