diff options
author | Julienraptor01 <julienraptor01@gmail.com> | 2024-07-18 10:12:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-18 16:12:11 +0800 |
commit | e2d64c18fdf3fea60a3d482dfd00bd8f49298f55 (patch) | |
tree | 88e1cca448eee8fceb6b33febb26637b8a94fa1e /src/main/java/de/hysky/skyblocker/skyblock/end | |
parent | cceaa38e7c1783d0446a50dbb09e42b8287e38d1 (diff) | |
download | Skyblocker-e2d64c18fdf3fea60a3d482dfd00bd8f49298f55.tar.gz Skyblocker-e2d64c18fdf3fea60a3d482dfd00bd8f49298f55.tar.bz2 Skyblocker-e2d64c18fdf3fea60a3d482dfd00bd8f49298f55.zip |
make all formatting use static instances of numberformat using US locale (#765)
Co-authored-by: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/end')
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java index 86e8d23e..a2869447 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java @@ -1,41 +1,34 @@ package de.hysky.skyblocker.skyblock.end; +import com.mojang.authlib.properties.PropertyMap; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.tabhud.widget.Widget; import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent; import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.ProfileComponent; -import net.minecraft.enchantment.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.registry.BuiltinRegistries; -import net.minecraft.registry.RegistryKeys; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import java.text.NumberFormat; +import java.util.Locale; import java.util.Optional; -import com.mojang.authlib.properties.PropertyMap; - public class EndHudWidget extends Widget { private static final MutableText TITLE = Text.literal("The End").formatted(Formatting.LIGHT_PURPLE, Formatting.BOLD); public static final EndHudWidget INSTANCE = new EndHudWidget(TITLE, Formatting.DARK_PURPLE.getColorValue()); - - public EndHudWidget(MutableText title, Integer colorValue) { - super(title, colorValue); - this.setX(5); - this.setY(5); - this.update(); - } - + private static final NumberFormat DECIMAL_FORMAT = NumberFormat.getInstance(Locale.US); private static final ItemStack ENDERMAN_HEAD = new ItemStack(Items.PLAYER_HEAD); private static final ItemStack POPPY = new ItemStack(Items.POPPY); static { + DECIMAL_FORMAT.setMinimumFractionDigits(0); + DECIMAL_FORMAT.setMaximumFractionDigits(2); + ENDERMAN_HEAD.set(DataComponentTypes.PROFILE, new ProfileComponent(Optional.of("MHF_Enderman"), Optional.empty(), new PropertyMap())); POPPY.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true); @@ -43,6 +36,12 @@ public class EndHudWidget extends Widget { INSTANCE.setY(SkyblockerConfigManager.get().otherLocations.end.y); } + public EndHudWidget(MutableText title, Integer colorValue) { + super(title, colorValue); + this.setX(5); + this.setY(5); + this.update(); + } @Override public void updateContent() { @@ -51,10 +50,7 @@ public class EndHudWidget extends Widget { addComponent(new IcoTextComponent(ENDERMAN_HEAD, Text.literal("Zealots").formatted(Formatting.BOLD))); addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.zealotsSinceLastEye", TheEnd.zealotsSinceLastEye))); addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.zealotsTotalKills", TheEnd.zealotsKilled))); - NumberFormat instance = NumberFormat.getInstance(); - instance.setMinimumFractionDigits(0); - instance.setMaximumFractionDigits(2); - String avg = TheEnd.eyes == 0 ? "???" : instance.format((float) TheEnd.zealotsKilled / TheEnd.eyes); + String avg = TheEnd.eyes == 0 ? "???" : DECIMAL_FORMAT.format((float) TheEnd.zealotsKilled / TheEnd.eyes); addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.avgKillsPerEye", avg))); } |