diff options
| -rw-r--r-- | src/main/java/tectech/loader/ConfigHandler.java | 20 | ||||
| -rw-r--r-- | src/main/java/tectech/proxy/CommonProxy.java | 1 | ||||
| -rw-r--r-- | src/main/java/tectech/recipe/EyeOfHarmonyFrontend.java | 26 | ||||
| -rw-r--r-- | src/main/resources/assets/tectech/lang/en_US.lang | 1 |
4 files changed, 39 insertions, 9 deletions
diff --git a/src/main/java/tectech/loader/ConfigHandler.java b/src/main/java/tectech/loader/ConfigHandler.java index e360b5f671..b47c8085a7 100644 --- a/src/main/java/tectech/loader/ConfigHandler.java +++ b/src/main/java/tectech/loader/ConfigHandler.java @@ -12,6 +12,8 @@ public class ConfigHandler { public static Debug debug = new Debug(); public static TeslaTweaks teslaTweaks = new TeslaTweaks(); + public static Visual visual = new Visual(); + @Config.Comment("Debug section") public static class Debug { @@ -58,4 +60,22 @@ public class ConfigHandler { @Config.DefaultBoolean(true) public boolean TESLA_VISUAL_EFFECT; } + + @Config.Comment("Visual section") + public static class Visual { + + @Config.Comment({ "Eye of Harmony energy input and output display:", " - 'Numerical': Shows the entire number", + " - 'Scientific': Uses scientific notation", " - 'SI': Uses the SI notation", }) + + @Config.DefaultEnum("Scientific") + @Config.RequiresMcRestart + public EOHNumberFormat EOH_NOTATION = EOHNumberFormat.Scientific; + + public enum EOHNumberFormat { + Numerical, + Scientific, + SI + } + } + } diff --git a/src/main/java/tectech/proxy/CommonProxy.java b/src/main/java/tectech/proxy/CommonProxy.java index 209e1e4181..aa3841a5be 100644 --- a/src/main/java/tectech/proxy/CommonProxy.java +++ b/src/main/java/tectech/proxy/CommonProxy.java @@ -90,5 +90,4 @@ public class CommonProxy implements IGuiHandler { } return false; } - } diff --git a/src/main/java/tectech/recipe/EyeOfHarmonyFrontend.java b/src/main/java/tectech/recipe/EyeOfHarmonyFrontend.java index 4e1c40eb41..4bd4e7d486 100644 --- a/src/main/java/tectech/recipe/EyeOfHarmonyFrontend.java +++ b/src/main/java/tectech/recipe/EyeOfHarmonyFrontend.java @@ -9,6 +9,7 @@ import static net.minecraft.util.EnumChatFormatting.RESET; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; import static tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; +import static tectech.util.TTUtility.toExponentForm; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,7 @@ import gregtech.common.gui.modularui.UIHelper; import gregtech.nei.GTNEIDefaultHandler; import gregtech.nei.RecipeDisplayInfo; import gregtech.nei.formatter.INEISpecialInfoFormatter; +import tectech.loader.ConfigHandler; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @@ -155,25 +157,33 @@ public class EyeOfHarmonyFrontend extends RecipeMapFrontend { GTLanguageManager.addStringLocalization("EOH.Recipe.SpacetimeTier", "Spacetime Tier") + ": " + EOH_TIER_FANCY_NAMES[(int) recipe.getSpacetimeCasingTierRequired()]); - if (recipe.getEUOutput() < TRILLION) { - result.add( + // Energy Output + switch (ConfigHandler.visual.EOH_NOTATION) { + case Numerical -> result.add( GTLanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " + formatNumbers(recipe.getEUOutput()) + " EU"); - } else { - result.add( + case Scientific -> result.add( + GTLanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " + + toExponentForm(recipe.getEUOutput()) + + " EU"); + case SI -> result.add( GTLanguageManager.addStringLocalization("EOH.Recipe.EU.Out", "EU Output") + ": " + ReadableNumberConverter.INSTANCE.toWideReadableForm(recipe.getEUOutput()) + " EU"); } - if (recipe.getEUOutput() < TRILLION) { - result.add( + // Energy Input + switch (ConfigHandler.visual.EOH_NOTATION) { + case Numerical -> result.add( GTLanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " + formatNumbers(recipe.getEUStartCost()) + " EU"); - } else { - result.add( + case Scientific -> result.add( + GTLanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " + + toExponentForm(recipe.getEUStartCost()) + + " EU"); + case SI -> result.add( GTLanguageManager.addStringLocalization("EOH.Recipe.EU.In", "EU Input") + ": " + ReadableNumberConverter.INSTANCE.toWideReadableForm(recipe.getEUStartCost()) + " EU"); diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index adadc268b9..0fc1e2c017 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -1823,3 +1823,4 @@ tt.chat.debug.generator=Laser mode: %s GT5U.gui.config.general.debug=Debug GT5U.gui.config.general.features=Features GT5U.gui.config.general.teslatweaks=Tesla Tweaks +GT5U.gui.config.general.visual=Visual |