aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-09-20 23:49:51 +0800
committerGlodBlock <1356392126@qq.com>2021-09-20 23:49:51 +0800
commitb9ba4ea78a1f507d711615ebcf2448b992aa0e6b (patch)
tree1b78818d63b56bd4c24bef09985d586268ed905a /src/main/java
parent994e6284fc686bd1ff3acc3bb5ceb5a170a4b659 (diff)
downloadGT5-Unofficial-b9ba4ea78a1f507d711615ebcf2448b992aa0e6b.tar.gz
GT5-Unofficial-b9ba4ea78a1f507d711615ebcf2448b992aa0e6b.tar.bz2
GT5-Unofficial-b9ba4ea78a1f507d711615ebcf2448b992aa0e6b.zip
fix string overflow
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java7
-rw-r--r--src/main/java/GoodGenerator/util/CharExchanger.java6
2 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java b/src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java
index c6605da9fe..97f6b60cf5 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java
@@ -3,7 +3,6 @@ package GoodGenerator.Blocks.TEs;
import GoodGenerator.Client.GUI.YOTTankGUIClient;
import GoodGenerator.Common.Container.YOTTankGUIContainer;
import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.CharExchanger;
import GoodGenerator.util.DescTextLocalization;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -283,9 +282,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_MultiblockBase_EM implemen
@Override
public String[] getInfoData() {
return new String[] {
- StatCollector.translateToLocal("scanner.info.YOTTank.0") + " " + EnumChatFormatting.GREEN + CharExchanger.formatNumber(getCap()) + EnumChatFormatting.RESET + " L",
- StatCollector.translateToLocal("scanner.info.YOTTank.1") + " " + EnumChatFormatting.YELLOW + CharExchanger.formatNumber(getFluidName()) + EnumChatFormatting.RESET,
- StatCollector.translateToLocal("scanner.info.YOTTank.2") + " " + EnumChatFormatting.BLUE + CharExchanger.formatNumber(getStored()) + EnumChatFormatting.RESET + " L",
+ StatCollector.translateToLocal("scanner.info.YOTTank.0") + " " + EnumChatFormatting.GREEN + getCap() + EnumChatFormatting.RESET + " L",
+ StatCollector.translateToLocal("scanner.info.YOTTank.1") + " " + EnumChatFormatting.YELLOW + getFluidName() + EnumChatFormatting.RESET,
+ StatCollector.translateToLocal("scanner.info.YOTTank.2") + " " + EnumChatFormatting.BLUE + getStored() + EnumChatFormatting.RESET + " L",
};
}
diff --git a/src/main/java/GoodGenerator/util/CharExchanger.java b/src/main/java/GoodGenerator/util/CharExchanger.java
index fd7146120f..bcc1554be1 100644
--- a/src/main/java/GoodGenerator/util/CharExchanger.java
+++ b/src/main/java/GoodGenerator/util/CharExchanger.java
@@ -90,18 +90,18 @@ public class CharExchanger {
for (int i = 0; i < exp.length(); ++i) {
if (Character.isDigit(exp.charAt(i))) {
int cnt = 0, prt = i;
- while (Character.isDigit(exp.charAt(i))) {
+ while (i < exp.length() && Character.isDigit(exp.charAt(i))) {
i ++;
cnt ++;
}
- while (Character.isDigit(exp.charAt(prt))) {
+ while (i < exp.length() && Character.isDigit(exp.charAt(prt))) {
sb.append(exp.charAt(prt));
prt ++;
cnt --;
if (cnt % 3 == 0 && cnt != 0) sb.append(" ");
}
}
- sb.append(exp.charAt(i));
+ if (i < exp.length()) sb.append(exp.charAt(i));
}
return sb.toString();
}