diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-10-03 10:25:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-03 11:25:16 +0200 |
commit | 60deb9882e6d46a0fc25270bf8e4b3af388f8498 (patch) | |
tree | 3558506be62016deb3cfdaea4f33b54a3f5d0113 /src/main/java/gregtech/common/items | |
parent | 5513f14edb59f31a4f1b675759e2143cc55e8873 (diff) | |
download | GT5-Unofficial-60deb9882e6d46a0fc25270bf8e4b3af388f8498.tar.gz GT5-Unofficial-60deb9882e6d46a0fc25270bf8e4b3af388f8498.tar.bz2 GT5-Unofficial-60deb9882e6d46a0fc25270bf8e4b3af388f8498.zip |
Add additional number formatting to GT5u and fix localisation issue with volumetric flasks (#1431)
* Format large cells.
* Add number formatting and fix localisation issue.
* Add number formatting for radioactive cells.
* Add number formatting for coal boiler.
* Add number formatting for GT turbine items.
* Add number formatting for GT credits.
* Add number formatting for breeder cells.
* spotlessApply (#1432)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/GT_VolumetricFlask.java | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 5ec670aea5..a36c3cced1 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -129,9 +129,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { tLastID = 2, "Silver GT Credit", "8 Credits", new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Credit_Greg_Gold.set(addItem(tLastID = 3, "Gold GT Credit", "64 Credits")); ItemList.Credit_Greg_Platinum.set(addItem(tLastID = 4, "Platinum GT Credit", "512 Credits")); - ItemList.Credit_Greg_Osmium.set(addItem(tLastID = 5, "Osmium GT Credit", "4096 Credits")); - ItemList.Credit_Greg_Naquadah.set(addItem(tLastID = 6, "Naquadah GT Credit", "32768 Credits")); - ItemList.Credit_Greg_Neutronium.set(addItem(tLastID = 7, "Neutronium GT Credit", "262144 Credits")); + ItemList.Credit_Greg_Osmium.set(addItem(tLastID = 5, "Osmium GT Credit", "4,096 Credits")); + ItemList.Credit_Greg_Naquadah.set(addItem(tLastID = 6, "Naquadah GT Credit", "32,768 Credits")); + ItemList.Credit_Greg_Neutronium.set(addItem(tLastID = 7, "Neutronium GT Credit", "262,144 Credits")); ItemList.Coin_Gold_Ancient.set(addItem( tLastID = 8, "Ancient Gold Coin", diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index e2549462e3..428bfce632 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -1,6 +1,7 @@ package gregtech.common.items; import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.util.GT_Utility.formatNumbers; import static ic2.core.util.LiquidUtil.drainContainerStack; import static ic2.core.util.LiquidUtil.fillContainerStack; import static ic2.core.util.LiquidUtil.placeFluid; @@ -10,6 +11,7 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.INetworkUpdatableItem; import gregtech.api.items.GT_Generic_Item; +import gregtech.api.util.GT_Utility; import ic2.core.util.LiquidUtil; import java.util.List; import net.minecraft.block.Block; @@ -210,9 +212,9 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain super.addInformation(stack, player, info, b); FluidStack fs = getFluid(stack); if (fs != null) { - info.add(String.format("< %s, %d mB >", FluidRegistry.getFluidName(fs), fs.amount)); + info.add(String.format("< %s, %s mB >", GT_Utility.getFluidName(fs, true), formatNumbers(fs.amount))); } else { - info.add(String.format("< Empty, %d mB >", getCapacity(stack))); + info.add(String.format("< Empty, %s mB >", formatNumbers(getCapacity(stack)))); } info.add("Rightclick on air to set volume (only while empty)"); } |