From 26c8407b9d22dbe4e3b98b4e08acfcdbfdd89f45 Mon Sep 17 00:00:00 2001 From: Abdiel Kavash <19243993+AbdielKavash@users.noreply.github.com> Date: Tue, 12 Mar 2024 19:00:02 -0600 Subject: Numeric widget and localized number formatting. (#2532) * Cover widgets * Volumetric flask * Misc textfields * Update GT_MetaTileEntity_MultiBlockBase.java * Update GT_MetaTileEntity_MultiBlockBase.java * Fixes decimal digits --------- Co-authored-by: Martin Robertz --- .../tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java | 9 ++++++--- .../tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/storage') diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index fa4147f34c..91ff46c007 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; +import com.gtnewhorizons.modularui.api.NumberFormatMUI; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; @@ -522,6 +523,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti return true; } + protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); + @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( @@ -545,9 +548,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(10, 20)) .widget( - TextWidget - .dynamicString( - () -> GT_Utility.parseNumberToString( + new TextWidget() + .setStringSupplier( + () -> numberFormat.format( this instanceof GT_MetaTileEntity_QuantumChest ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount : 0)) diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java index 0c640d9ace..bb4ef5e709 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java @@ -26,6 +26,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.gtnewhorizons.modularui.api.NumberFormatMUI; import com.gtnewhorizons.modularui.api.math.Alignment; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -543,6 +544,8 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit return true; } + protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); + @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { fluidTank.setAllowOverflow(allowOverflow()); @@ -570,7 +573,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(10, 20)) .widget( - TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) + new TextWidget().setStringSupplier(() -> numberFormat.format(mFluid != null ? mFluid.amount : 0)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(10, 30)) .widget( -- cgit