Port Multiblocks to MUI2

src/main/java/gregtech/api/capability/impl/MultiblockFuelRecipeLogic.java

@@ -142,7 +142,7 @@ public String getRecipeFluidInputInfo() {
         int ocAmount = GTUtility.safeCastLongToInt(getMaxVoltage() / recipe.getEUt());
         int neededAmount = ocAmount * requiredFluidInput.amount;
         if (rotorHolder != null && rotorHolder.hasRotor()) {
-            neededAmount /= (rotorHolder.getTotalEfficiency() / 100.0);
+            neededAmount /= (int) (rotorHolder.getTotalEfficiency() / 100.0);
         } else if (rotorHolder != null && !rotorHolder.hasRotor()) {
             return null;
         }

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

@@ -492,7 +492,7 @@ public GTGuiTheme getUITheme() {
     }
 
     @Override
-    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
         return null;
     }
 

src/main/java/gregtech/api/metatileentity/multiblock/FuelMultiblockController.java

@@ -5,6 +5,8 @@
 import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.capability.impl.EnergyContainerList;
 import gregtech.api.capability.impl.MultiblockFuelRecipeLogic;
+import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
+import gregtech.api.mui.sync.FixedIntArraySyncValue;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.TextComponentUtil;
@@ -16,8 +18,13 @@
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.screen.RichTooltip;
+import com.cleanroommc.modularui.value.sync.StringSyncValue;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -51,6 +58,22 @@ protected void addDisplayText(List<ITextComponent> textList) {
                 .addWorkingStatusLine();
     }
 
+    @Override
+    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
+        MultiblockFuelRecipeLogic recipeLogic = (MultiblockFuelRecipeLogic) recipeMapWorkable;
+
+        builder.setWorkingStatus(recipeLogic.isWorkingEnabled(), recipeLogic.isActive())
+                .addEnergyProductionLine(getMaxVoltage(), recipeLogic.getRecipeEUt())
+                .addFuelNeededLine(recipeLogic.getRecipeFluidInputInfo(), recipeLogic.getPreviousRecipeDuration())
+                .addWorkingStatusLine();
+    }
+
+    @Override
+    protected void configureWarningText(MultiblockUIFactory.Builder builder) {
+        builder.addLowDynamoTierLine(isDynamoTierTooLow())
+                .addMaintenanceProblemLines(getMaintenanceProblems());
+    }
+
     protected long getMaxVoltage() {
         IEnergyContainer energyContainer = recipeMapWorkable.getEnergyContainer();
         if (energyContainer != null && energyContainer.getEnergyCapacity() > 0) {
@@ -138,6 +161,7 @@ protected int[] getTotalFluidAmount(FluidStack testStack, IMultipleTankHandler m
         return new int[] { fluidAmount, fluidCapacity };
     }
 
+    @Deprecated
     protected void addFuelText(List<ITextComponent> textList) {
         // Fuel
         int fuelStored = 0;
@@ -170,4 +194,26 @@ protected void addFuelText(List<ITextComponent> textList) {
                     "0 / 0 L"));
         }
     }
+
+    /**
+     * @param tooltip       the tooltip to populate
+     * @param amounts       the sync value containing an array of [fuel stored, fuel capacity]
+     * @param fuelNameValue the name of the fuel
+     */
+    protected void createFuelTooltip(@NotNull RichTooltip tooltip, @NotNull FixedIntArraySyncValue amounts,
+                                     @NotNull StringSyncValue fuelNameValue) {
+        if (isStructureFormed()) {
+            Fluid fluid = fuelNameValue.getStringValue() == null ? null :
+                    FluidRegistry.getFluid(fuelNameValue.getStringValue());
+            if (fluid == null) {
+                tooltip.addLine(IKey.lang("gregtech.multiblock.large_combustion_engine.fuel_none"));
+            } else {
+                tooltip.addLine(
+                        IKey.lang("gregtech.multiblock.large_combustion_engine.fuel_amount", amounts.getValue(0),
+                                amounts.getValue(1), fluid.getLocalizedName(new FluidStack(fluid, 1))));
+            }
+        } else {
+            tooltip.addLine(IKey.lang("gregtech.multiblock.invalid_structure"));
+        }
+    }
 }

src/main/java/gregtech/api/metatileentity/multiblock/IProgressBarMultiblock.java

@@ -2,11 +2,19 @@
 
 import gregtech.api.gui.GuiTextures;
 import gregtech.api.gui.resources.TextureArea;
+import gregtech.api.mui.GTGuiTextures;
 
 import net.minecraft.util.text.ITextComponent;
 
+import com.cleanroommc.modularui.drawable.UITexture;
+import com.cleanroommc.modularui.screen.Tooltip;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
+@ApiStatus.ScheduledForRemoval
+@Deprecated
 public interface IProgressBarMultiblock {
 
     default boolean showProgressBar() {
@@ -24,14 +32,26 @@ default int getNumProgressBars() {
     double getFillPercentage(int index);
 
     /** Textures for the progress bar(s). */
+    @Deprecated
     default TextureArea getProgressBarTexture(int index) {
         return GuiTextures.PROGRESS_BAR_MULTI_ENERGY_YELLOW;
     }
 
+    default UITexture getProgressBarTexture2(int index) {
+        return GTGuiTextures.PROGRESS_BAR_MULTI_ENERGY_YELLOW;
+    }
+
+    default int getProgressBarTextureHeight(int index) {
+        return 18;
+    }
+
     /**
      * Add hover text to your progress bar(s).
      *
      * @param index The index, 0, 1, or 2, of your progress bar. Only relevant if you have multiple bars.
      */
+    @Deprecated
     default void addBarHoverText(List<ITextComponent> hoverList, int index) {}
+
+    default void addBarHoverText2(@NotNull Tooltip tooltip, int index) {}
 }

src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java

@@ -3,12 +3,10 @@
 import gregtech.api.capability.GregtechDataCodes;
 import gregtech.api.capability.GregtechTileCapabilities;
 import gregtech.api.capability.IMultipleRecipeMaps;
-import gregtech.api.gui.GuiTextures;
-import gregtech.api.gui.Widget;
-import gregtech.api.gui.widgets.ImageCycleButtonWidget;
+import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
+import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.recipes.RecipeMap;
-import gregtech.api.util.LocalizationUtils;
 
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,7 +23,9 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import codechicken.lib.raytracer.CuboidRayTraceResult;
-import org.jetbrains.annotations.NotNull;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.value.sync.IntSyncValue;
+import com.cleanroommc.modularui.widgets.CycleButtonWidget;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -133,17 +133,27 @@ public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkM
     }
 
     @Override
-    protected @NotNull Widget getFlexButton(int x, int y, int width, int height) {
-        if (getAvailableRecipeMaps() != null && getAvailableRecipeMaps().length > 1) {
-            return new ImageCycleButtonWidget(x, y, width, height, GuiTextures.BUTTON_MULTI_MAP,
-                    getAvailableRecipeMaps().length, this::getRecipeMapIndex, this::setRecipeMapIndex)
-                            .shouldUseBaseBackground().singleTexture()
-                            .setTooltipHoverString(i -> LocalizationUtils
-                                    .format("gregtech.multiblock.multiple_recipemaps.header") + " " +
-                                    LocalizationUtils.format(
-                                            "recipemap." + getAvailableRecipeMaps()[i].getUnlocalizedName() + ".name"));
-        }
-        return super.getFlexButton(x, y, width, height);
+    protected MultiblockUIFactory createUIFactory() {
+        IntSyncValue recipeMapValue = new IntSyncValue(this::getRecipeMapIndex, this::setRecipeMapIndex);
+        return super.createUIFactory()
+                .createFlexButton((panel, syncManager) -> {
+                    if (getAvailableRecipeMaps() == null || getAvailableRecipeMaps().length <= 1)
+                        return null;
+
+                    return new CycleButtonWidget()
+                            // .textureGetter(i -> GTGuiTextures.BUTTON_MULTI_MAP)
+                            .overlay(GTGuiTextures.BUTTON_MULTI_MAP)
+                            .background(GTGuiTextures.BUTTON)
+                            // TODO find out why this needs to be called
+                            .disableHoverBackground()
+                            .value(recipeMapValue)
+                            .length(getAvailableRecipeMaps().length)
+                            .tooltip(tooltip -> tooltip.setAutoUpdate(true))
+                            .tooltipBuilder(t -> t.addLine(IKey.comp(
+                                    IKey.lang("gregtech.multiblock.multiple_recipemaps.value",
+                                            IKey.lang(getAvailableRecipeMaps()[recipeMapValue.getIntValue()]
+                                                    .getTranslationKey())))));
+                });
     }
 
     @Override

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java

@@ -5,14 +5,14 @@
 import gregtech.api.capability.*;
 import gregtech.api.gui.GuiTextures;
 import gregtech.api.gui.ModularUI;
-import gregtech.api.gui.Widget;
 import gregtech.api.gui.Widget.ClickData;
 import gregtech.api.gui.resources.TextureArea;
 import gregtech.api.gui.widgets.AdvancedTextWidget;
 import gregtech.api.gui.widgets.ImageCycleButtonWidget;
 import gregtech.api.gui.widgets.ImageWidget;
 import gregtech.api.gui.widgets.IndicatorImageWidget;
 import gregtech.api.gui.widgets.ProgressWidget;
+import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
 import gregtech.api.pattern.PatternMatchContext;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.unification.OreDictUnifier;
@@ -33,10 +33,14 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
+import java.util.function.BiFunction;
 
 import static gregtech.api.capability.GregtechDataCodes.IS_WORKING;
 import static gregtech.api.capability.GregtechDataCodes.STORE_TAPED;
@@ -46,6 +50,7 @@ public abstract class MultiblockWithDisplayBase extends MultiblockControllerBase
     private static final String NBT_VOIDING_MODE = "VoidingMode";
     private static final String NBT_VOIDING_ITEMS = "VoidingItems";
     private static final String NBT_VOIDING_FLUIDS = "VoidingFluids";
+    private MultiblockUIFactory uiFactory;
 
     private boolean voidingItems = false;
     private boolean voidingFluids = false;
@@ -366,6 +371,7 @@ protected TraceabilityPredicate maintenancePredicate() {
      * each element of list is displayed on new line
      * to use translation, use TextComponentTranslation
      */
+    @Deprecated
     protected void addDisplayText(List<ITextComponent> textList) {
         MultiblockDisplayText.builder(textList, isStructureFormed());
     }
@@ -458,7 +464,7 @@ protected ModularUI.Builder createUITemplate(EntityPlayer entityPlayer) {
         if (shouldShowVoidingModeButton()) {
             builder.widget(new ImageCycleButtonWidget(173, 161, 18, 18, GuiTextures.BUTTON_VOID_MULTIBLOCK,
                     4, this::getVoidingMode, this::setVoidingMode)
-                            .setTooltipHoverString(MultiblockWithDisplayBase::getVoidingModeTooltip));
+                            .setTooltipHoverString(this::getVoidingModeTooltip));
         } else {
             builder.widget(new ImageWidget(173, 161, 18, 18, GuiTextures.BUTTON_VOID_NONE)
                     .setTooltip("gregtech.gui.multiblock_voiding_not_supported"));
@@ -483,15 +489,17 @@ protected ModularUI.Builder createUITemplate(EntityPlayer entityPlayer) {
     }
 
     /**
-     * Add a custom third button to the Multiblock UI. By default, this is a placeholder
-     * stating that there is no additional functionality for this Multiblock.
+     * Add a custom third button to the Multiblock UI. By default, this is a placeholder stating that there is no
+     * additional functionality for this Multiblock.
      * <br>
      * <br>
      * Parameters should be passed directly to the created widget. Size will be 18x18.
+     *
+     * @deprecated override {@link MultiblockUIFactory#createFlexButton(BiFunction)}
      */
+    @Deprecated
     @SuppressWarnings("SameParameterValue")
-    @NotNull
-    protected Widget getFlexButton(int x, int y, int width, int height) {
+    protected gregtech.api.gui.@NotNull Widget getFlexButton(int x, int y, int width, int height) {
         return new ImageWidget(x, y, width, height, GuiTextures.BUTTON_NO_FLEX)
                 .setTooltip("gregtech.multiblock.universal.no_flex_button");
     }
@@ -512,6 +520,7 @@ protected Widget getFlexButton(int x, int y, int width, int height) {
      * Returns a list of text indicating any current warnings in this Multiblock.
      * Recommended to only display warnings if the structure is already formed.
      */
+    @Deprecated
     protected void addWarningText(List<ITextComponent> textList) {
         MultiblockDisplayText.builder(textList, isStructureFormed(), false)
                 .addMaintenanceProblemLines(getMaintenanceProblems());
@@ -521,20 +530,21 @@ protected void addWarningText(List<ITextComponent> textList) {
      * Returns a list of translation keys indicating any current errors in this Multiblock.
      * Prioritized over any warnings provided by {@link MultiblockWithDisplayBase#addWarningText}.
      */
+    @Deprecated
     protected void addErrorText(List<ITextComponent> textList) {
         MultiblockDisplayText.builder(textList, isStructureFormed())
                 .addMufflerObstructedLine(hasMufflerMechanics() && !isMufflerFaceFree());
     }
 
-    protected boolean shouldShowVoidingModeButton() {
+    public boolean shouldShowVoidingModeButton() {
         return true;
     }
 
-    protected int getVoidingMode() {
+    public final int getVoidingMode() {
         return voidingMode.ordinal();
     }
 
-    protected void setVoidingMode(int mode) {
+    public final void setVoidingMode(int mode) {
         this.voidingMode = VoidingMode.VALUES[mode];
 
         this.voidingFluids = mode >= 2;
@@ -551,10 +561,34 @@ protected void setVoidingMode(int mode) {
         markDirty();
     }
 
-    protected static String getVoidingModeTooltip(int mode) {
+    public @NotNull String getVoidingModeTooltip(int mode) {
         return VoidingMode.VALUES[mode].getName();
     }
 
+    @Override
+    public boolean usesMui2() {
+        return true;
+    }
+
+    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {}
+
+    protected void configureErrorText(MultiblockUIFactory.Builder builder) {}
+
+    protected void configureWarningText(MultiblockUIFactory.Builder builder) {}
+
+    protected MultiblockUIFactory createUIFactory() {
+        return new MultiblockUIFactory(this)
+                .configureDisplayText(this::configureDisplayText)
+                .configureWarningText(this::configureWarningText)
+                .configureErrorText(this::configureErrorText);
+    }
+
+    @Override
+    public final ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager) {
+        if (uiFactory == null) uiFactory = createUIFactory();
+        return this.uiFactory.buildUI(guiData, panelSyncManager);
+    }
+
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return createUITemplate(entityPlayer).build(getHolder(), entityPlayer);