aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api/items')
-rw-r--r--src/main/java/gregtech/api/items/GT_BreederCell_Item.java6
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaBase_Item.java11
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java36
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java6
4 files changed, 35 insertions, 24 deletions
diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
index c30987183b..fa16c0edea 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
@@ -1,5 +1,7 @@
package gregtech.api.items;
+import static gregtech.api.util.GT_Utility.formatNumbers;
+
import gregtech.api.GregTech_API;
import gregtech.api.util.GT_Utility;
import ic2.api.reactor.IReactor;
@@ -69,8 +71,8 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
}
aList.add(String.format(
transItem("020", "Progress: %s/%s"),
- "" + color2 + aStack.getItemDamage() + EnumChatFormatting.RESET,
- "" + getMaxDamage()));
+ "" + color2 + formatNumbers(aStack.getItemDamage()) + EnumChatFormatting.RESET,
+ "" + formatNumbers(getMaxDamage())));
if (aStack.getItemDamage() > 0) aList.add(EnumChatFormatting.RED + transItem("021", "Radiation Hazard"));
}
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
index bf2b0d2d96..feffa9e9a5 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
@@ -2,6 +2,7 @@ package gregtech.api.items;
import static gregtech.api.enums.GT_Values.D1;
import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.util.GT_Utility.formatNumbers;
import gregtech.api.enums.SubTag;
import gregtech.api.interfaces.IItemBehaviour;
@@ -233,7 +234,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
aList.add(EnumChatFormatting.AQUA
+ String.format(
transItem("009", "Contains %s EU Tier: %s"),
- GT_Utility.formatNumbers(tStats[3]),
+ formatNumbers(tStats[3]),
"" + (tStats[2] >= 0 ? tStats[2] : 0))
+ EnumChatFormatting.GRAY);
} else {
@@ -246,8 +247,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
aList.add(String.valueOf(EnumChatFormatting.AQUA)
+ String.format(
transItem("011", "%s / %s EU - Voltage: %s"),
- GT_Utility.formatNumbers(tCharge),
- GT_Utility.formatNumbers(Math.abs(tStats[0])),
+ formatNumbers(tCharge),
+ formatNumbers(Math.abs(tStats[0])),
""
+ V[
(int)
@@ -269,7 +270,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
+ EnumChatFormatting.GRAY);
aList.add(EnumChatFormatting.BLUE
+ String.format(
- transItem("013", "%sL / %sL"), "" + (tFluid == null ? 0 : tFluid.amount), "" + tStats[0])
+ transItem("013", "%sL / %sL"),
+ "" + (tFluid == null ? 0 : formatNumbers(tFluid.amount)),
+ "" + formatNumbers(tStats[0]))
+ EnumChatFormatting.GRAY);
}
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index a7d31332a8..dc3ffdf8f6 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -2,6 +2,7 @@ package gregtech.api.items;
import static gregtech.api.enums.GT_Values.MOD_ID_FR;
import static gregtech.api.enums.GT_Values.MOD_ID_RC;
+import static gregtech.api.util.GT_Utility.formatNumbers;
import static gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam.calculateLooseFlow;
import buildcraft.api.tools.IToolWrench;
@@ -448,8 +449,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
EnumChatFormatting.GRAY
+ String.format(
transItem("001", "Durability: %s/%s"),
- "" + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " ",
- " " + tMaxDamage)
+ "" + EnumChatFormatting.GREEN
+ + formatNumbers(tMaxDamage - getToolDamage(aStack)) + " ",
+ " " + formatNumbers(tMaxDamage))
+ EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
@@ -472,13 +474,13 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+ String.format(
transItem("006", "Optimal Steam flow: %s L/t"),
"" + EnumChatFormatting.GOLD
- + GT_Utility.safeInt((long) (Math.max(
+ + formatNumbers(GT_Utility.safeInt((long) (Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier()
* getPrimaryMaterial(aStack).mToolSpeed
* (1000
* getPrimaryMaterial(aStack).mSteamMultiplier
- / 20))))
+ / 20)))))
+ EnumChatFormatting.GRAY));
aList.add(
tOffset + 4,
@@ -486,7 +488,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+ String.format(
transItem("900", "Energy from Optimal Steam Flow: %s EU/t"),
"" + EnumChatFormatting.GOLD
- + GT_Utility.safeInt((long) (Math.max(
+ + formatNumbers(GT_Utility.safeInt((long) (Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier()
* getPrimaryMaterial(aStack).mToolSpeed
@@ -495,7 +497,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
.mSteamMultiplier
/ 20))
* (50.0F + (10.0F * getToolCombatDamage(aStack)))
- / 200))
+ / 200)))
+ EnumChatFormatting.GRAY));
{
long[] calculatedFlow = calculateLooseFlow(aOptFlow, aBaseEff);
@@ -515,7 +517,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+ String.format(
transItem("501", "Optimal Steam flow (Loose): %s L/t"),
"" + EnumChatFormatting.GOLD
- + (aOptFlowLoose * getPrimaryMaterial(aStack).mSteamMultiplier)
+ + formatNumbers((aOptFlowLoose
+ * getPrimaryMaterial(aStack).mSteamMultiplier))
+ EnumChatFormatting.GRAY));
aList.add(
tOffset + 7,
@@ -523,10 +526,10 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+ String.format(
transItem("901", "Energy from Optimal Steam Flow (Loose): %s EU/t"),
"" + EnumChatFormatting.GOLD
- + (aOptFlowLoose
+ + formatNumbers((aOptFlowLoose
* getPrimaryMaterial(aStack).mSteamMultiplier
/ 10000)
- * (aBaseEffLoose / 2)
+ * (aBaseEffLoose / 2))
+ EnumChatFormatting.GRAY));
aList.add(
tOffset + 8,
@@ -538,14 +541,14 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+ String.format(
transItem("007", "Energy from Optimal Gas Flow: %s EU/t"),
"" + EnumChatFormatting.GOLD
- + GT_Utility.safeInt((long) (Math.max(
+ + formatNumbers(GT_Utility.safeInt((long) (Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier()
* getPrimaryMaterial(aStack).mToolSpeed
* 50
* getPrimaryMaterial(aStack).mGasMultiplier)
* (50.0F + (10.0F * getToolCombatDamage(aStack)))
- / 100))
+ / 100)))
+ EnumChatFormatting.GRAY));
aList.add(
tOffset + 10,
@@ -553,14 +556,14 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
+ String.format(
transItem("008", "Energy from Optimal Plasma Flow: %s EU/t"),
"" + EnumChatFormatting.GOLD
- + GT_Utility.safeInt((long) (Math.max(
+ + formatNumbers(GT_Utility.safeInt((long) (Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier()
* getPrimaryMaterial(aStack).mToolSpeed
* 2000
* getPrimaryMaterial(aStack).mPlasmaMultiplier)
* (50.0F + (10.0F * getToolCombatDamage(aStack)))
- * (1.05 / 100)))
+ * (1.05 / 100))))
+ EnumChatFormatting.GRAY));
aList.add(
tOffset + 12,
@@ -583,12 +586,13 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
} else {
aList.add(
- tOffset + 0,
+ tOffset,
EnumChatFormatting.WHITE
+ String.format(
transItem("001", "Durability: %s/%s"),
- "" + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " ",
- " " + tMaxDamage)
+ "" + EnumChatFormatting.GREEN
+ + formatNumbers(tMaxDamage - getToolDamage(aStack)) + " ",
+ " " + formatNumbers(tMaxDamage))
+ EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index cff5bf38a8..a49ca4998d 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -1,5 +1,7 @@
package gregtech.api.items;
+import static gregtech.api.util.GT_Utility.formatNumbers;
+
import gregtech.common.items.GT_DepletetCell_Item;
import ic2.api.item.IBoxable;
import ic2.core.util.StackUtil;
@@ -153,8 +155,8 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable
aList.add(color1
+ String.format(
transItem("001", "Durability: %s/%s"),
- "" + color2 + (this.maxDmg - getDurabilityOfStack(aStack)) + color1,
- "" + this.maxDmg));
+ "" + color2 + formatNumbers(this.maxDmg - getDurabilityOfStack(aStack)) + color1,
+ "" + formatNumbers(this.maxDmg)));
}
@Override
generated by cgit (git 2.46.0) at 2025-03-05 19:09:54 +0000