Skip to content

Commit

Permalink
cleanup + refactor milestone formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss committed Sep 30, 2024
1 parent 36296a0 commit cb5d1df
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 97 deletions.
194 changes: 97 additions & 97 deletions src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;

Expand Down Expand Up @@ -151,7 +152,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable,
private boolean batteryCharging = false;
private boolean inversion = false;
private boolean gravitonShardEjection = false;
private boolean noFormatting = false;
private FormattingMode formattingMode = FormattingMode.NONE;
private boolean isRenderActive = false;
private boolean secretUpgrade = false;
private boolean rainbowMode = false;
Expand Down Expand Up @@ -1406,7 +1407,7 @@ protected ModularWindow createIndividualMilestoneWindow(final EntityPlayer playe
.widget(new ButtonWidget().setOnClick((clickData, widget) -> {
TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click");
if (clickData.mouseButton == 0) {
noFormatting = !noFormatting;
formattingMode = formattingMode.cycle();
}
})
.setSize(10, 10)
Expand All @@ -1415,7 +1416,10 @@ protected ModularWindow createIndividualMilestoneWindow(final EntityPlayer playe
.setPos(5, 135)
.setTooltipShowUpDelay(TOOLTIP_DELAY)
.attachSyncer(
new FakeSyncWidget.BooleanSyncer(() -> noFormatting, val -> noFormatting = val),
new FakeSyncWidget.ByteSyncer(
() -> (byte) formattingMode.ordinal(),
val -> formattingMode = FormattingMode.VALUES[MathHelper
.clamp_int(val, 0, FormattingMode.VALUES.length - 1)]),
builder));

return builder.build();
Expand Down Expand Up @@ -3440,11 +3444,55 @@ private Text gravitonShardAmountText(int milestoneID) {
translateToLocal("gt.blockmachines.multimachine.FOG.shardgain") + ": " + EnumChatFormatting.GRAY + sum);
}

private enum FormattingMode {

NONE,
COMMA,
EXPONENT;

static final FormattingMode[] VALUES = values();

FormattingMode cycle() {
return switch (this) {
case NONE -> COMMA;
case COMMA -> EXPONENT;
case EXPONENT -> NONE;
};
}

String format(Number number) {
return switch (this) {
case NONE -> number.toString();
case COMMA -> {
if (number instanceof BigInteger bi) yield formatNumbers(bi);
else yield formatNumbers(number.longValue());
}
case EXPONENT -> {
if (number instanceof BigInteger bi) {
if (bi.compareTo(BigInteger.valueOf(1_000L)) > 0) {
yield toExponentForm(bi);
}
yield bi.toString();
} else {
long value = number.longValue();
if (value > 1_000L) {
yield toExponentForm(value);
}
yield Long.toString(value);
}
}
};
}
}

private Text totalMilestoneProgress(int milestoneID) {
long progress;
BigInteger bigProgress;
Number progress;
String suffix;
switch (milestoneID) {
case 0 -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.power");
progress = totalPowerConsumed;
}
case 1 -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.recipes");
progress = totalRecipesProcessed;
Expand All @@ -3457,42 +3505,14 @@ private Text totalMilestoneProgress(int milestoneID) {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.extensions");
progress = milestoneProgress[3];
}
default -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.power");
bigProgress = totalPowerConsumed;
if (!noFormatting && (totalPowerConsumed.compareTo(BigInteger.valueOf(1_000L)) > 0)) {
return new Text(
translateToLocal("gt.blockmachines.multimachine.FOG.totalprogress") + ": "
+ EnumChatFormatting.GRAY
+ toExponentForm(bigProgress)
+ " "
+ suffix);
} else {
return new Text(
translateToLocal("gt.blockmachines.multimachine.FOG.totalprogress") + ": "
+ EnumChatFormatting.GRAY
+ bigProgress
+ " "
+ suffix);
}
}
default -> throw new IllegalArgumentException("Invalid Milestone ID");
}
if (!noFormatting) {
return new Text(
translateToLocal("gt.blockmachines.multimachine.FOG.totalprogress") + ": "
+ EnumChatFormatting.GRAY
+ formatNumbers(progress)
+ " "
+ suffix);
} else {
return new Text(
translateToLocal("gt.blockmachines.multimachine.FOG.totalprogress") + ": "
+ EnumChatFormatting.GRAY
+ progress
+ " "
+ suffix);
}

return new Text(
translateToLocal("gt.blockmachines.multimachine.FOG.totalprogress") + ": "
+ EnumChatFormatting.GRAY
+ formattingMode.format(progress)
+ " "
+ suffix);
}

private Text currentMilestone(int milestoneID) {
Expand All @@ -3503,75 +3523,55 @@ private Text currentMilestone(int milestoneID) {
}

private Text milestoneProgressText(int milestoneID) {
long max;
BigInteger bigMax;
Number max;
String suffix;
String progressText = translateToLocal("gt.blockmachines.multimachine.FOG.progress");
Text done = new Text(translateToLocal("gt.blockmachines.multimachine.FOG.milestonecomplete"));
if (noFormatting) {
done = new Text(
translateToLocal("gt.blockmachines.multimachine.FOG.milestonecomplete") + EnumChatFormatting.DARK_RED
+ "?");

// todo what is this for?
// if (noFormatting) {
// done = new Text(
// translateToLocal("gt.blockmachines.multimachine.FOG.milestonecomplete") + EnumChatFormatting.DARK_RED
// + "?");
// }

if (milestoneProgress[milestoneID] >= 7 && !inversion) {
return done;
}

switch (milestoneID) {
case 0:
if (milestoneProgress[0] < 7 || inversion) {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.power");
if (inversion) {
bigMax = POWER_MILESTONE_T7_CONSTANT.multiply(BigInteger.valueOf(milestoneProgress[0] - 5));
} else {
bigMax = BigInteger.valueOf(LongMath.pow(9, milestoneProgress[0]))
.multiply(BigInteger.valueOf(LongMath.pow(10, 15)));
}
if (!noFormatting && (bigMax.compareTo(BigInteger.valueOf(1_000L)) > 0)) {
return new Text(
progressText + ": " + EnumChatFormatting.GRAY + toExponentForm(bigMax) + " " + suffix);
} else {
return new Text(progressText + ": " + EnumChatFormatting.GRAY + bigMax + " " + suffix);
}
} else {
return done;
}
case 1:
if (milestoneProgress[1] < 7 || inversion) {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.recipes");
if (inversion) {
max = RECIPE_MILESTONE_T7_CONSTANT * (milestoneProgress[1] - 5);
} else {
max = LongMath.pow(6, milestoneProgress[1]) * LongMath.pow(10, 7);
}
break;
case 0 -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.power");
if (inversion) {
max = POWER_MILESTONE_T7_CONSTANT.multiply(BigInteger.valueOf(milestoneProgress[0] - 5));
} else {
return done;
max = BigInteger.valueOf(LongMath.pow(9, milestoneProgress[0]))
.multiply(BigInteger.valueOf(LongMath.pow(10, 15)));
}
case 2:
if (milestoneProgress[2] < 7 || inversion) {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.fuelconsumed");
if (inversion) {
max = FUEL_MILESTONE_T7_CONSTANT * (milestoneProgress[2] - 5);
} else {
max = LongMath.pow(3, milestoneProgress[2]) * LongMath.pow(10, 4);
}
break;
}
case 1 -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.recipes");
if (inversion) {
max = RECIPE_MILESTONE_T7_CONSTANT * (milestoneProgress[1] - 5);
} else {
return done;
max = LongMath.pow(6, milestoneProgress[1]) * LongMath.pow(10, 7);
}
case 3:
if (milestoneProgress[3] < 7 || inversion) {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.extensions");
max = milestoneProgress[3] + 1;
break;
}
case 2 -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.fuelconsumed");
if (inversion) {
max = FUEL_MILESTONE_T7_CONSTANT * (milestoneProgress[2] - 5);
} else {
return done;
max = LongMath.pow(3, milestoneProgress[2]) * LongMath.pow(10, 4);
}
default:
return new Text("Error");
}
if (!noFormatting) {
return new Text(progressText + ": " + EnumChatFormatting.GRAY + formatNumbers(max) + " " + suffix);
} else {
return new Text(progressText + ": " + EnumChatFormatting.GRAY + max + " " + suffix);
}
case 3 -> {
suffix = translateToLocal("gt.blockmachines.multimachine.FOG.extensions");
max = milestoneProgress[3] + 1;
}
default -> throw new IllegalArgumentException("Invalid Milestone ID");
}
return new Text(progressText + ": " + EnumChatFormatting.GRAY + formattingMode.format(max) + " " + suffix);
}

private Text inversionHeaderText() {
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/tectech/util/TTUtility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@ public static String toExponentForm(BigInteger number) {
String strNum = abs.toString();
int exponent = strNum.length() - 1;
return (number.signum() == -1 ? "-" : "") + strNum.charAt(0) + "." + strNum.substring(1, 3) + "e" + exponent;
}

public static String toExponentForm(long number) {
long abs = Math.abs(number);
String strNum = Long.toString(abs);
int exponent = strNum.length() - 1;
return (Long.signum(number) == -1 ? "-" : "") + strNum
.charAt(0) + "." + strNum.substring(1, 3) + "e" + exponent;
}

public static int bitStringToInt(String bits) {
Expand Down

0 comments on commit cb5d1df

Please sign in to comment.