move classes/interfaces out of MultiblockUIFactory

Author: ghzdude

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

@@ -5,7 +5,7 @@
 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.metatileentity.multiblock.ui.MultiblockUIBuilder;
 import gregtech.api.mui.sync.FixedIntArraySyncValue;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.util.GTUtility;
@@ -48,7 +48,7 @@ protected void initializeAbilities() {
     }
 
     @Override
-    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
+    protected void configureDisplayText(MultiblockUIBuilder builder) {
         MultiblockFuelRecipeLogic recipeLogic = (MultiblockFuelRecipeLogic) recipeMapWorkable;
 
         builder.setWorkingStatus(recipeLogic.isWorkingEnabled(), recipeLogic.isActive())
@@ -58,7 +58,7 @@ protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
     }
 
     @Override
-    protected void configureWarningText(MultiblockUIFactory.Builder builder) {
+    protected void configureWarningText(MultiblockUIBuilder builder) {
         builder.addLowDynamoTierLine(isDynamoTierTooLow())
                 .addMaintenanceProblemLines(getMaintenanceProblems());
     }

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

@@ -12,6 +12,7 @@
 import gregtech.api.gui.widgets.ImageWidget;
 import gregtech.api.gui.widgets.IndicatorImageWidget;
 import gregtech.api.gui.widgets.ProgressWidget;
+import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder;
 import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
 import gregtech.api.pattern.PatternMatchContext;
 import gregtech.api.pattern.TraceabilityPredicate;
@@ -572,11 +573,11 @@ public boolean usesMui2() {
         return true;
     }
 
-    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {}
+    protected void configureDisplayText(MultiblockUIBuilder builder) {}
 
-    protected void configureErrorText(MultiblockUIFactory.Builder builder) {}
+    protected void configureErrorText(MultiblockUIBuilder builder) {}
 
-    protected void configureWarningText(MultiblockUIFactory.Builder builder) {}
+    protected void configureWarningText(MultiblockUIBuilder builder) {}
 
     protected MultiblockUIFactory createUIFactory() {
         return new MultiblockUIFactory(this)

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

@@ -10,7 +10,7 @@
 import gregtech.api.capability.impl.MultiblockRecipeLogic;
 import gregtech.api.items.itemhandlers.GTItemStackHandler;
 import gregtech.api.metatileentity.IDataInfoProvider;
-import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
+import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder;
 import gregtech.api.pattern.PatternMatchContext;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.recipes.Recipe;
@@ -145,7 +145,7 @@ protected boolean allowSameFluidFillForOutputs() {
         return true;
     }
 
-    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
+    protected void configureDisplayText(MultiblockUIBuilder builder) {
         builder.setWorkingStatus(recipeMapWorkable.isWorkingEnabled(), recipeMapWorkable.isActive())
                 .addEnergyUsageLine(this.getEnergyContainer())
                 .addEnergyTierLine(GTUtility.getTierByVoltage(recipeMapWorkable.getMaxVoltage()))
@@ -154,7 +154,7 @@ protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
                 .addProgressLine(recipeMapWorkable.getProgressPercent());
     }
 
-    protected void configureWarningText(MultiblockUIFactory.Builder builder) {
+    protected void configureWarningText(MultiblockUIBuilder builder) {
         builder.addLowPowerLine(recipeMapWorkable.isHasNotEnoughEnergy());
     }
 

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

@@ -10,7 +10,7 @@
 import gregtech.api.gui.widgets.IndicatorImageWidget;
 import gregtech.api.items.itemhandlers.GTItemStackHandler;
 import gregtech.api.metatileentity.MTETrait;
-import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory;
+import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder;
 import gregtech.api.pattern.PatternMatchContext;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.recipes.Recipe;
@@ -100,7 +100,7 @@ private void resetTileAbilities() {
     }
 
     @Override
-    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
+    protected void configureDisplayText(MultiblockUIBuilder builder) {
         builder.setWorkingStatus(recipeMapWorkable.isWorkingEnabled(), recipeMapWorkable.isActive())
                 .addCustom(keyManager -> {
                     // custom steam tank line
@@ -121,7 +121,7 @@ protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
     }
 
     @Override
-    protected void configureWarningText(MultiblockUIFactory.Builder builder) {
+    protected void configureWarningText(MultiblockUIBuilder builder) {
         builder.addCustom(list -> {
             if (isStructureFormed() && recipeMapWorkable.isHasNotEnoughEnergy()) {
                 list.add(KeyUtil.lang(TextFormatting.YELLOW, "gregtech.multiblock.steam.low_steam"));

src/main/java/gregtech/api/metatileentity/multiblock/ui/KeyManager.java

@@ -0,0 +1,16 @@
+package gregtech.api.metatileentity.multiblock.ui;
+
+import com.cleanroommc.modularui.api.drawable.IDrawable;
+
+public interface KeyManager {
+
+    default void add(IDrawable drawable) {
+        add(drawable, Operation.NEW_LINE_SPACE);
+    }
+
+    void add(IDrawable drawable, Operation op);
+
+    default void addAll(Iterable<? extends IDrawable> drawables) {
+        drawables.forEach(this::add);
+    }
+}