From 37df8eef9387d865f7bc72dbfdbe8f07a0784ade Mon Sep 17 00:00:00 2001 From: Markil3 <75867393+Markil3@users.noreply.github.com> Date: Tue, 2 Mar 2021 10:07:51 -0700 Subject: [PATCH] Removed the need for the "name" field. It kept getting picked up by the autoconfig API. --- .../markil3/immersive_hud/ConfigManager.java | 54 +++---------------- src/main/java/markil3/immersive_hud/Main.java | 26 ++++----- 2 files changed, 19 insertions(+), 61 deletions(-) diff --git a/src/main/java/markil3/immersive_hud/ConfigManager.java b/src/main/java/markil3/immersive_hud/ConfigManager.java index 7ff6242..dbf6ce8 100644 --- a/src/main/java/markil3/immersive_hud/ConfigManager.java +++ b/src/main/java/markil3/immersive_hud/ConfigManager.java @@ -29,24 +29,10 @@ public class ConfigManager implements ConfigData private static final int FADE_IN = TICKS_PER_SECOND / 2; private static final int FADE_OUT = TICKS_PER_SECOND; - @ConfigEntry.Gui.Excluded - private final String name; private int maxTime = SHOW_TIME; private int fadeIn = FADE_IN; private int fadeOut = FADE_OUT; - TimeValues(String name) - { - final int MAX_TIME = 10 * 60 * TICKS_PER_SECOND; - - this.name = name; - } - - public String getName() - { - return this.name; - } - /** * Obtains the maximum time that the hotbar can be on the screen, * including fading. @@ -94,44 +80,16 @@ public class ConfigManager implements ConfigData } } - @ConfigEntry.Gui.TransitiveObject - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText - private TimeValues hotbarTime = new TimeValues("hotbar"); - @ConfigEntry.Gui.TransitiveObject - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText - private TimeValues experienceTime = new TimeValues("experience"); - @ConfigEntry.Gui.TransitiveObject - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText - private TimeValues jumpTime = new TimeValues("jump"); - @ConfigEntry.Gui.TransitiveObject - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText - private TimeValues healthTime = new TimeValues("health"); - @ConfigEntry.Gui.TransitiveObject - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText - private TimeValues hungerTime = new TimeValues("hunger"); - @ConfigEntry.Gui.TransitiveObject - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText - private TimeValues effectTime = new TimeValues("effect"); - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText + private TimeValues hotbarTime = new TimeValues(); + private TimeValues experienceTime = new TimeValues(); + private TimeValues jumpTime = new TimeValues(); + private TimeValues healthTime = new TimeValues(); + private TimeValues hungerTime = new TimeValues(); + private TimeValues effectTime = new TimeValues(); private int crosshairTime = 6 * TICKS_PER_SECOND; - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText private int handTime = 30 * TICKS_PER_SECOND; - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText private boolean showArmor = true; - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText private double minHealth = 0.5; - @ConfigEntry.Gui.Tooltip - @ConfigEntry.Gui.PrefixText @ConfigEntry.BoundedDiscrete(max = 20) private int minHunger = 17; diff --git a/src/main/java/markil3/immersive_hud/Main.java b/src/main/java/markil3/immersive_hud/Main.java index db06e84..d62b2df 100644 --- a/src/main/java/markil3/immersive_hud/Main.java +++ b/src/main/java/markil3/immersive_hud/Main.java @@ -46,7 +46,7 @@ public class Main implements ModInitializer, ModMenuApi AutoConfig.register(ConfigManager.class, Toml4jConfigSerializer::new); } - private void startTimeField(ConfigEntryBuilder entryBuilder, + private void startTimeField(String name, ConfigEntryBuilder entryBuilder, ConfigCategory cat, ConfigManager.TimeValues value) { @@ -56,42 +56,42 @@ public class Main implements ModInitializer, ModMenuApi DoubleListEntry maxTime = entryBuilder.startDoubleField(new TranslatableText( - "option.immersive_hud." + value.getName() + + "option.immersive_hud." + name + "MaxTime"), (float) value.getMaxTime() / TICKS_PER_SECOND) .setDefaultValue(SHOW_TIME) .setMin(0) .setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes .setTooltip(new TranslatableText( - "tooltip.immersive_hud." + value.getName() + + "tooltip.immersive_hud." + name + "MaxTime")) .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND))) .build(); DoubleListEntry fadeIn = entryBuilder.startDoubleField(new TranslatableText( - "option.immersive_hud." + value.getName() + + "option.immersive_hud." + name + "FadeIn"), (float) value.getFadeInTime() / TICKS_PER_SECOND) .setDefaultValue(FADE_IN) .setMin(0) .setMax(10 * 60 * TICKS_PER_SECOND) .setTooltip(new TranslatableText( - "tooltip.immersive_hud." + value.getName() + + "tooltip.immersive_hud." + name + "FadeIn")) .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND))) .build(); DoubleListEntry fadeOut = entryBuilder.startDoubleField(new TranslatableText( - "option.immersive_hud." + value.getName() + + "option.immersive_hud." + name + "FadeOut"), (float) value.getFadeOutTime() / TICKS_PER_SECOND) .setDefaultValue(FADE_OUT) .setMin(0) .setMax(10 * 60 * TICKS_PER_SECOND) .setTooltip(new TranslatableText( - "tooltip.immersive_hud." + value.getName() + + "tooltip.immersive_hud." + name + "FadeOut")) .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND))) .build(); @@ -120,22 +120,22 @@ public class Main implements ModInitializer, ModMenuApi "category.immersive_hud.general")); entryBuilder = builder.entryBuilder(); - startTimeField(entryBuilder, + startTimeField("hotbar", entryBuilder, general, instance.getHotbarTime()); - startTimeField(entryBuilder, + startTimeField("experience", entryBuilder, general, instance.getExperienceTime()); - startTimeField(entryBuilder, + startTimeField("jump", entryBuilder, general, instance.getJumpTime()); - startTimeField(entryBuilder, + startTimeField("jump", entryBuilder, general, instance.getHealthTime()); - startTimeField(entryBuilder, + startTimeField("hunger", entryBuilder, general, instance.getHungerTime()); - startTimeField(entryBuilder, + startTimeField("effect", entryBuilder, general, instance.getPotionTime());