Port Multiblocks to MUI2

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -99,6 +99,7 @@ public static int assignId() {
     public static final int UPDATE_UPWARDS_FACING = assignId();
     public static final int UPDATE_FLIP = assignId();
     public static final int LOCK_FILL = assignId();
+    public static final int MUFFLER_OBSTRUCTED = assignId();
 
     // Item Bus Item Stack Auto Collapsing
     public static final int TOGGLE_COLLAPSE_ITEMS = assignId();

src/main/java/gregtech/api/capability/IHPCAComponentHatch.java

@@ -1,6 +1,9 @@
 package gregtech.api.capability;
 
-import gregtech.api.gui.resources.TextureArea;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.mui.GTGuiTextures;
+
+import com.cleanroommc.modularui.drawable.UITexture;
 
 public interface IHPCAComponentHatch {
 
@@ -46,5 +49,17 @@ default void setDamaged(boolean damaged) {}
     /**
      * The icon for this component in the HPCA's UI. Should be a 13x13 px sprite.
      */
-    TextureArea getComponentIcon();
+    default UITexture getComponentIcon() {
+        return GTGuiTextures.HPCA_ICON_EMPTY_COMPONENT;
+    }
+
+    /**
+     * The untranslated name of the tile implementing an HPCA component
+     */
+    default String getTileName() {
+        if (this instanceof MetaTileEntity mte) {
+            return mte.getMetaFullName();
+        }
+        return "";
+    }
 }

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

@@ -43,6 +43,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static gregtech.api.GTValues.ULV;
@@ -70,8 +71,10 @@ public abstract class AbstractRecipeLogic extends MTETrait implements IWorkable,
     protected int progressTime;
     protected int maxProgressTime;
     protected long recipeEUt;
-    protected List<FluidStack> fluidOutputs;
-    protected List<ItemStack> itemOutputs;
+    @NotNull
+    protected List<FluidStack> fluidOutputs = Collections.emptyList();
+    @NotNull
+    protected List<ItemStack> itemOutputs = Collections.emptyList();
 
     protected boolean isActive;
     protected boolean workingEnabled = true;
@@ -338,6 +341,10 @@ public void setParallelRecipesPerformed(int amount) {
         this.parallelRecipesPerformed = amount;
     }
 
+    public int getParallelRecipesPerformed() {
+        return parallelRecipesPerformed;
+    }
+
     /**
      * Update the current running recipe's progress
      * <p>
@@ -974,8 +981,8 @@ protected void completeRecipe() {
         this.progressTime = 0;
         setMaxProgress(0);
         this.recipeEUt = 0;
-        this.fluidOutputs = null;
-        this.itemOutputs = null;
+        this.fluidOutputs = Collections.emptyList();
+        this.itemOutputs = Collections.emptyList();
         this.hasNotEnoughEnergy = false;
         this.wasActiveAndNeedsUpdate = true;
         this.parallelRecipesPerformed = 0;
@@ -1135,8 +1142,8 @@ public void invalidate() {
         progressTime = 0;
         maxProgressTime = 0;
         recipeEUt = 0;
-        fluidOutputs = null;
-        itemOutputs = null;
+        fluidOutputs = Collections.emptyList();
+        itemOutputs = Collections.emptyList();
         parallelRecipesPerformed = 0;
         isOutputsFull = false;
         invalidInputsForRecipes = false;
@@ -1211,7 +1218,7 @@ public void deserializeNBT(@NotNull NBTTagCompound compound) {
                 this.itemOutputs.add(new ItemStack(itemOutputsList.getCompoundTagAt(i)));
             }
             NBTTagList fluidOutputsList = compound.getTagList("FluidOutputs", Constants.NBT.TAG_COMPOUND);
-            this.fluidOutputs = new ArrayList<>();
+            this.fluidOutputs = new ArrayList<>(fluidOutputsList.tagCount());
             for (int i = 0; i < fluidOutputsList.tagCount(); i++) {
                 this.fluidOutputs.add(FluidStack.loadFluidStackFromNBT(fluidOutputsList.getCompoundTagAt(i)));
             }

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

@@ -49,8 +49,6 @@ public class BoilerRecipeLogic extends AbstractRecipeLogic implements ICategoryO
 
     public BoilerRecipeLogic(MetaTileEntityLargeBoiler tileEntity) {
         super(tileEntity, null);
-        this.fluidOutputs = Collections.emptyList();
-        this.itemOutputs = Collections.emptyList();
     }
 
     @Override

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

@@ -23,6 +23,7 @@
 public class MultiblockFuelRecipeLogic extends MultiblockRecipeLogic {
 
     protected long totalContinuousRunningTime;
+    private int previousDuration = 0;
 
     public MultiblockFuelRecipeLogic(RecipeMapMultiblockController tileEntity) {
         super(tileEntity);
@@ -127,18 +128,24 @@ public String getRecipeFluidInputInfo() {
         } else {
             recipe = previousRecipe;
         }
+        previousDuration = recipe.getDuration();
         FluidStack requiredFluidInput = recipe.getFluidInputs().get(0).getInputFluidStack();
 
         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;
         }
         return TextFormatting.RED + TextFormattingUtil.formatNumbers(neededAmount) + "L";
     }
 
+    @Override
+    public int getPreviousRecipeDuration() {
+        return previousDuration;
+    }
+
     public FluidStack getInputFluidStack() {
         // Previous Recipe is always null on first world load, so try to acquire a new recipe
         if (previousRecipe == null) {

src/main/java/gregtech/api/fluids/GTFluid.java

@@ -4,15 +4,16 @@
 import gregtech.api.fluids.attribute.FluidAttribute;
 import gregtech.api.unification.material.Material;
 
-import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import com.cleanroommc.modularui.api.drawable.IKey;
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
@@ -62,6 +63,8 @@ public GTMaterialFluid(@NotNull String fluidName, ResourceLocation still, Resour
             return this.material;
         }
 
+        @Deprecated
+        @ApiStatus.ScheduledForRemoval(inVersion = "2.10")
         public @NotNull TextComponentTranslation toTextComponentTranslation() {
             TextComponentTranslation localizedName;
             String customMaterialTranslation = "fluid." + material.getUnlocalizedName();
@@ -78,22 +81,27 @@ public GTMaterialFluid(@NotNull String fluidName, ResourceLocation still, Resour
             return localizedName;
         }
 
-        @Override
-        @SideOnly(Side.CLIENT)
-        public String getLocalizedName(FluidStack stack) {
-            String localizedName;
+        public @NotNull IKey getLocalizedKey() {
+            IKey localizedName;
             String customMaterialTranslation = "fluid." + material.getUnlocalizedName();
 
-            if (I18n.hasKey(customMaterialTranslation)) {
-                localizedName = I18n.format(customMaterialTranslation);
+            if (net.minecraft.util.text.translation.I18n.canTranslate(customMaterialTranslation)) {
+                localizedName = IKey.lang(customMaterialTranslation);
             } else {
-                localizedName = I18n.format(material.getUnlocalizedName());
+                localizedName = IKey.lang(material.getUnlocalizedName());
             }
 
             if (translationKey != null) {
-                return I18n.format(translationKey, localizedName);
+                return IKey.lang(translationKey, localizedName);
             }
+
             return localizedName;
         }
+
+        @Override
+        @SideOnly(Side.CLIENT)
+        public String getLocalizedName(FluidStack stack) {
+            return getLocalizedKey().get();
+        }
     }
 }

src/main/java/gregtech/api/gui/widgets/ProgressWidget.java

@@ -5,6 +5,7 @@
 import gregtech.api.gui.resources.TextureArea;
 import gregtech.api.util.Position;
 import gregtech.api.util.Size;
+import gregtech.api.util.function.impl.TimedProgressSupplier;
 import gregtech.common.ConfigHolder;
 
 import net.minecraft.client.renderer.GlStateManager;
@@ -295,38 +296,4 @@ public void drawInForeground(int mouseX, int mouseY) {
             }
         }
     }
-
-    public static class TimedProgressSupplier implements DoubleSupplier {
-
-        private final int msPerCycle;
-        private final int maxValue;
-        private final boolean countDown;
-        private long startTime;
-
-        public TimedProgressSupplier(int ticksPerCycle, int maxValue, boolean countDown) {
-            this.msPerCycle = ticksPerCycle * 50;
-            this.maxValue = maxValue;
-            this.countDown = countDown;
-            this.startTime = System.currentTimeMillis();
-        }
-
-        public void resetCountdown() {
-            startTime = System.currentTimeMillis();
-        }
-
-        @Override
-        public double getAsDouble() {
-            return calculateTime();
-        }
-
-        private double calculateTime() {
-            long currentTime = System.currentTimeMillis();
-            long msPassed = (currentTime - startTime) % msPerCycle;
-            double currentValue = 1.0 * msPassed * maxValue / msPerCycle;
-            if (countDown) {
-                return (maxValue - currentValue) / maxValue;
-            }
-            return currentValue / maxValue;
-        }
-    }
 }

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;
     }
 
@@ -892,7 +892,11 @@ private void updateSound() {
         if (sound == null) {
             return;
         }
-        if (isValid() && isActive()) {
+        boolean canPlay = isValid() && isActive();
+        if (this instanceof IControllable controllable) {
+            canPlay &= controllable.isWorkingEnabled();
+        }
+        if (canPlay) {
             if (--playSoundCooldown > 0) {
                 return;
             }

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.MultiblockUIBuilder;
+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;
@@ -41,16 +48,22 @@ protected void initializeAbilities() {
     }
 
     @Override
-    protected void addDisplayText(List<ITextComponent> textList) {
+    protected void configureDisplayText(MultiblockUIBuilder builder) {
         MultiblockFuelRecipeLogic recipeLogic = (MultiblockFuelRecipeLogic) recipeMapWorkable;
 
-        MultiblockDisplayText.builder(textList, isStructureFormed())
-                .setWorkingStatus(recipeLogic.isWorkingEnabled(), recipeLogic.isActive())
+        builder.setWorkingStatus(recipeLogic.isWorkingEnabled(), recipeLogic.isActive())
                 .addEnergyProductionLine(getMaxVoltage(), recipeLogic.getRecipeEUt())
                 .addFuelNeededLine(recipeLogic.getRecipeFluidInputInfo(), recipeLogic.getPreviousRecipeDuration())
                 .addWorkingStatusLine();
     }
 
+    @Override
+    protected void configureWarningText(MultiblockUIBuilder builder) {
+        builder.addLowDynamoTierLine(isDynamoTierTooLow());
+        if (hasMaintenanceMechanics())
+            builder.addMaintenanceProblemLines(getMaintenanceProblems(), true);
+    }
+
     protected long getMaxVoltage() {
         IEnergyContainer energyContainer = recipeMapWorkable.getEnergyContainer();
         if (energyContainer != null && energyContainer.getEnergyCapacity() > 0) {
@@ -60,13 +73,6 @@ protected long getMaxVoltage() {
         }
     }
 
-    @Override
-    protected void addWarningText(List<ITextComponent> textList) {
-        MultiblockDisplayText.builder(textList, isStructureFormed(), false)
-                .addLowDynamoTierLine(isDynamoTierTooLow())
-                .addMaintenanceProblemLines(getMaintenanceProblems());
-    }
-
     protected boolean isDynamoTierTooLow() {
         if (isStructureFormed()) {
             IEnergyContainer energyContainer = recipeMapWorkable.getEnergyContainer();
@@ -138,6 +144,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 +177,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"));
+        }
+    }
 }