Fluid Drill multiblock

Author: Zorbatron

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

@@ -1,5 +1,7 @@
 package gregtech.api.fluids;
 
+import com.cleanroommc.modularui.api.drawable.IKey;
+
 import gregtech.api.fluids.attribute.AttributedFluid;
 import gregtech.api.fluids.attribute.FluidAttribute;
 import gregtech.api.unification.material.Material;
@@ -78,6 +80,23 @@ public GTMaterialFluid(@NotNull String fluidName, ResourceLocation still, Resour
             return localizedName;
         }
 
+        public @NotNull IKey toIKey() {
+            IKey localizedName;
+            String customMaterialTranslation = "fluid." + material.getUnlocalizedName();
+
+            if (net.minecraft.util.text.translation.I18n.canTranslate(customMaterialTranslation)) {
+                localizedName = IKey.lang(customMaterialTranslation);
+            } else {
+                localizedName = IKey.lang(material.getUnlocalizedName());
+            }
+
+            if (translationKey != null) {
+                return IKey.lang(translationKey, localizedName);
+            }
+
+            return localizedName;
+        }
+
         @Override
         @SideOnly(Side.CLIENT)
         public String getLocalizedName(FluidStack stack) {

src/main/java/gregtech/api/util/GTUtility.java

@@ -1,5 +1,7 @@
 package gregtech.api.util;
 
+import com.cleanroommc.modularui.api.drawable.IKey;
+
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
 import gregtech.api.block.machines.MachineItemBlock;
@@ -894,6 +896,15 @@ public static TextComponentTranslation getFluidTranslation(@Nullable Fluid fluid
         return new TextComponentTranslation(fluid.getUnlocalizedName());
     }
 
+    @Contract("null -> null")
+    public static IKey getFluidIKey(@Nullable Fluid fluid) {
+        if (fluid == null) return null;
+        if (fluid instanceof GTFluid.GTMaterialFluid materialFluid) {
+            return materialFluid.toIKey();
+        }
+        return IKey.lang(fluid.getUnlocalizedName());
+    }
+
     public static @NotNull Pair<DoubleSupplier, DoubleSupplier> createPairedSupplier(int ticksPerCycle, int width,
                                                                                      double splitPoint) {
         AtomicDouble tracker = new AtomicDouble(0.0);

src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java

@@ -164,60 +164,40 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) {
     }
 
     @Override
-    protected void addDisplayText(List<ITextComponent> textList) {
-        MultiblockDisplayText.builder(textList, isStructureFormed())
-                .setWorkingStatus(minerLogic.isWorkingEnabled(), minerLogic.isActive())
+    protected void configureDisplayText(MultiblockUIFactory.Builder builder) {
+        builder.setWorkingStatus(minerLogic.isWorkingEnabled(), minerLogic.isActive())
                 .setWorkingStatusKeys(
                         "gregtech.multiblock.idling",
                         "gregtech.multiblock.work_paused",
                         "gregtech.multiblock.miner.drilling")
                 .addEnergyUsageLine(energyContainer)
-                .addCustom(tl -> {
+                .addCustom(list -> {
                     if (isStructureFormed()) {
                         if (minerLogic.getDrilledFluid() != null) {
                             // Fluid name
                             Fluid drilledFluid = minerLogic.getDrilledFluid();
-                            ITextComponent fluidInfo = TextComponentUtil
-                                    .setColor(GTUtility.getFluidTranslation(drilledFluid), TextFormatting.GREEN);
-                            tl.add(TextComponentUtil.translationWithColor(
-                                    TextFormatting.GRAY,
-                                    "gregtech.multiblock.fluid_rig.drilled_fluid",
-                                    fluidInfo));
-
-                            // Fluid amount
-                            ITextComponent amountInfo = TextComponentUtil.stringWithColor(
-                                    TextFormatting.BLUE,
-                                    TextFormattingUtil.formatNumbers(
-                                            minerLogic.getFluidToProduce() * 20L / FluidDrillLogic.MAX_PROGRESS) +
-                                            " L/s");
-                            tl.add(TextComponentUtil.translationWithColor(
-                                    TextFormatting.GRAY,
-                                    "gregtech.multiblock.fluid_rig.fluid_amount",
-                                    amountInfo));
+                            IKey fluidInfo = GTUtility.getFluidIKey(drilledFluid).style(TextFormatting.GREEN);
+                            list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.fluid_rig.drilled_fluid", fluidInfo));
+
+                            IKey amountInfo = KeyUtil.lang(TextFormatting.BLUE, TextFormattingUtil.formatNumbers(minerLogic.getFluidToProduce() * 20L / FluidDrillLogic.MAX_PROGRESS) + " L/s");
+                            list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.fluid_rig.fluid_amount", amountInfo));
                         } else {
-                            ITextComponent noFluid = TextComponentUtil.translationWithColor(TextFormatting.RED,
-                                    "gregtech.multiblock.fluid_rig.no_fluid_in_area");
-                            tl.add(TextComponentUtil.translationWithColor(
-                                    TextFormatting.GRAY,
-                                    "gregtech.multiblock.fluid_rig.drilled_fluid",
-                                    noFluid));
+                            IKey noFluid = KeyUtil.lang(TextFormatting.RED, "gregtech.multiblock.fluid_rig.no_fluid_in_area");
+                            list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.fluid_rig.drilled_fluid", noFluid));
                         }
                     }
                 })
-                .addWorkingStatusLine()
-                .addProgressLine(minerLogic.getProgressPercent());
+                .addProgressLine(minerLogic.getProgressPercent())
+                .addWorkingStatusLine();
     }
 
     @Override
-    protected void addWarningText(List<ITextComponent> textList) {
-        MultiblockDisplayText.builder(textList, isStructureFormed(), false)
-                .addLowPowerLine(isStructureFormed() && !drainEnergy(true))
-                .addCustom(tl -> {
-                    if (isStructureFormed() && minerLogic.isInventoryFull()) {
-                        tl.add(TextComponentUtil.translationWithColor(
-                                TextFormatting.YELLOW,
-                                "gregtech.machine.miner.invfull"));
-                    }
+    protected void configureWarningText(MultiblockUIFactory.Builder builder) {
+        builder.addLowPowerLine(isStructureFormed() && !drainEnergy(true))
+                .addCustom(list -> {
+                   if (isStructureFormed() && minerLogic.isInventoryFull()) {
+                       list.add(KeyUtil.lang(TextFormatting.YELLOW, "gregtech.machine.miner.invfull"));
+                   }
                 });
     }