markil3/MinecraftImmersiveHUD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the need for the "name" field.

Browse Source 
It kept getting picked up by the autoconfig API.
This commit is contained in:
Markil3
2021-03-02 10:07:51 -07:00
parent 9cd7488f67
commit 37df8eef93
2 changed files with 19 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/markil3/immersive_hud/ConfigManager.java
View File

@@ -29,24 +29,10 @@ public class ConfigManager implements ConfigData
private static final int FADE_IN = TICKS_PER_SECOND / 2; private static final int FADE_IN = TICKS_PER_SECOND / 2;
private static final int FADE_OUT = TICKS_PER_SECOND; private static final int FADE_OUT = TICKS_PER_SECOND;
@ConfigEntry.Gui.Excluded
private final String name;
private int maxTime = SHOW_TIME; private int maxTime = SHOW_TIME;
private int fadeIn = FADE_IN; private int fadeIn = FADE_IN;
private int fadeOut = FADE_OUT; 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, * Obtains the maximum time that the hotbar can be on the screen,
* including fading. * including fading.
@@ -94,44 +80,16 @@ public class ConfigManager implements ConfigData
} }
} }
@ConfigEntry.Gui.TransitiveObject private TimeValues hotbarTime = new TimeValues();
@ConfigEntry.Gui.Tooltip private TimeValues experienceTime = new TimeValues();
@ConfigEntry.Gui.PrefixText private TimeValues jumpTime = new TimeValues();
private TimeValues hotbarTime = new TimeValues("hotbar"); private TimeValues healthTime = new TimeValues();
@ConfigEntry.Gui.TransitiveObject private TimeValues hungerTime = new TimeValues();
@ConfigEntry.Gui.Tooltip private TimeValues effectTime = new TimeValues();
@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 int crosshairTime = 6 * TICKS_PER_SECOND; private int crosshairTime = 6 * TICKS_PER_SECOND;
@ConfigEntry.Gui.Tooltip
@ConfigEntry.Gui.PrefixText
private int handTime = 30 * TICKS_PER_SECOND; private int handTime = 30 * TICKS_PER_SECOND;
@ConfigEntry.Gui.Tooltip
@ConfigEntry.Gui.PrefixText
private boolean showArmor = true; private boolean showArmor = true;
@ConfigEntry.Gui.Tooltip
@ConfigEntry.Gui.PrefixText
private double minHealth = 0.5; private double minHealth = 0.5;
@ConfigEntry.Gui.Tooltip
@ConfigEntry.Gui.PrefixText
@ConfigEntry.BoundedDiscrete(max = 20) @ConfigEntry.BoundedDiscrete(max = 20)
private int minHunger = 17; private int minHunger = 17;

26
src/main/java/markil3/immersive_hud/Main.java
View File

@@ -46,7 +46,7 @@ public class Main implements ModInitializer, ModMenuApi
AutoConfig.register(ConfigManager.class, Toml4jConfigSerializer::new); AutoConfig.register(ConfigManager.class, Toml4jConfigSerializer::new);
} }
private void startTimeField(ConfigEntryBuilder entryBuilder, private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
ConfigCategory cat, ConfigCategory cat,
ConfigManager.TimeValues value) ConfigManager.TimeValues value)
{ {
@@ -56,42 +56,42 @@ public class Main implements ModInitializer, ModMenuApi
DoubleListEntry maxTime = DoubleListEntry maxTime =
entryBuilder.startDoubleField(new TranslatableText( entryBuilder.startDoubleField(new TranslatableText(
"option.immersive_hud." + value.getName() + "option.immersive_hud." + name +
"MaxTime"), "MaxTime"),
(float) value.getMaxTime() / TICKS_PER_SECOND) (float) value.getMaxTime() / TICKS_PER_SECOND)
.setDefaultValue(SHOW_TIME) .setDefaultValue(SHOW_TIME)
.setMin(0) .setMin(0)
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes .setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
.setTooltip(new TranslatableText( .setTooltip(new TranslatableText(
"tooltip.immersive_hud." + value.getName() + "tooltip.immersive_hud." + name +
"MaxTime")) "MaxTime"))
.setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND))) .setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
.build(); .build();
DoubleListEntry fadeIn = DoubleListEntry fadeIn =
entryBuilder.startDoubleField(new TranslatableText( entryBuilder.startDoubleField(new TranslatableText(
"option.immersive_hud." + value.getName() + "option.immersive_hud." + name +
"FadeIn"), "FadeIn"),
(float) value.getFadeInTime() / TICKS_PER_SECOND) (float) value.getFadeInTime() / TICKS_PER_SECOND)
.setDefaultValue(FADE_IN) .setDefaultValue(FADE_IN)
.setMin(0) .setMin(0)
.setMax(10 * 60 * TICKS_PER_SECOND) .setMax(10 * 60 * TICKS_PER_SECOND)
.setTooltip(new TranslatableText( .setTooltip(new TranslatableText(
"tooltip.immersive_hud." + value.getName() + "tooltip.immersive_hud." + name +
"FadeIn")) "FadeIn"))
.setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND))) .setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
.build(); .build();
DoubleListEntry fadeOut = DoubleListEntry fadeOut =
entryBuilder.startDoubleField(new TranslatableText( entryBuilder.startDoubleField(new TranslatableText(
"option.immersive_hud." + value.getName() + "option.immersive_hud." + name +
"FadeOut"), "FadeOut"),
(float) value.getFadeOutTime() / TICKS_PER_SECOND) (float) value.getFadeOutTime() / TICKS_PER_SECOND)
.setDefaultValue(FADE_OUT) .setDefaultValue(FADE_OUT)
.setMin(0) .setMin(0)
.setMax(10 * 60 * TICKS_PER_SECOND) .setMax(10 * 60 * TICKS_PER_SECOND)
.setTooltip(new TranslatableText( .setTooltip(new TranslatableText(
"tooltip.immersive_hud." + value.getName() + "tooltip.immersive_hud." + name +
"FadeOut")) "FadeOut"))
.setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND))) .setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
.build(); .build();
@@ -120,22 +120,22 @@ public class Main implements ModInitializer, ModMenuApi
"category.immersive_hud.general")); "category.immersive_hud.general"));
entryBuilder = builder.entryBuilder(); entryBuilder = builder.entryBuilder();
startTimeField(entryBuilder, startTimeField("hotbar", entryBuilder,
general, general,
instance.getHotbarTime()); instance.getHotbarTime());
startTimeField(entryBuilder, startTimeField("experience", entryBuilder,
general, general,
instance.getExperienceTime()); instance.getExperienceTime());
startTimeField(entryBuilder, startTimeField("jump", entryBuilder,
general, general,
instance.getJumpTime()); instance.getJumpTime());
startTimeField(entryBuilder, startTimeField("jump", entryBuilder,
general, general,
instance.getHealthTime()); instance.getHealthTime());
startTimeField(entryBuilder, startTimeField("hunger", entryBuilder,
general, general,
instance.getHungerTime()); instance.getHungerTime());
startTimeField(entryBuilder, startTimeField("effect", entryBuilder,
general, general,
instance.getPotionTime()); instance.getPotionTime());