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 --- .../basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java | 11 +++++++---- .../machines/basic/GT_MetaTileEntity_Teleporter.java | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/basic') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java index d7ddd84d21..fc6afbd06f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java @@ -18,6 +18,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import com.gtnewhorizons.modularui.api.NumberFormatMUI; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -412,6 +413,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt return true; } + protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); + @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( @@ -419,19 +422,19 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt .setSize(90, 72) .setPos(43, 4)) .widget( - TextWidget.dynamicString(() -> "X: " + GT_Utility.parseNumberToString(mTargetX)) + new TextWidget().setStringSupplier(() -> "X: " + numberFormat.format(mTargetX)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 8)) .widget( - TextWidget.dynamicString(() -> "Y: " + GT_Utility.parseNumberToString(mTargetY)) + new TextWidget().setStringSupplier(() -> "Y: " + numberFormat.format(mTargetY)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 16)) .widget( - TextWidget.dynamicString(() -> "Z: " + GT_Utility.parseNumberToString(mTargetZ)) + new TextWidget().setStringSupplier(() -> "Z: " + numberFormat.format(mTargetZ)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 24)) .widget( - TextWidget.dynamicString(() -> "Dim: " + GT_Utility.parseNumberToString(mTargetD)) + new TextWidget().setStringSupplier(() -> "Dim: " + numberFormat.format(mTargetD)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 32)) .widget( diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 6b343b5ca8..0666c55ac4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -41,6 +41,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import com.gtnewhorizons.modularui.api.NumberFormatMUI; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -520,6 +521,8 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank return true; } + protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); + @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( @@ -527,19 +530,19 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank .setSize(90, 72) .setPos(43, 4)) .widget( - TextWidget.dynamicString(() -> "X: " + GT_Utility.parseNumberToString(mTargetX)) + new TextWidget().setStringSupplier(() -> "X: " + numberFormat.format(mTargetX)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 8)) .widget( - TextWidget.dynamicString(() -> "Y: " + GT_Utility.parseNumberToString(mTargetY)) + new TextWidget().setStringSupplier(() -> "Y: " + numberFormat.format(mTargetY)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 16)) .widget( - TextWidget.dynamicString(() -> "Z: " + GT_Utility.parseNumberToString(mTargetZ)) + new TextWidget().setStringSupplier(() -> "Z: " + numberFormat.format(mTargetZ)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 24)) .widget( - TextWidget.dynamicString(() -> "Dim: " + GT_Utility.parseNumberToString(mTargetD)) + new TextWidget().setStringSupplier(() -> "Dim: " + numberFormat.format(mTargetD)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 32)) .widget( -- cgit