Revert remainder of fc90978 and reset config value if =0 (temporary w…

…orkaround)
TeamLapen · Oct 15, 2023 · 4f3e42e · 4f3e42e
1 parent a947e53
commit 4f3e42e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/client/gui/overlay/FactionLevelOverlay.java b/src/main/java/de/teamlapen/vampirism/client/gui/overlay/FactionLevelOverlay.java
@@ -31,7 +31,7 @@ public void render(@NotNull ForgeGui gui, @NotNull GuiGraphics graphics, float p
                         text = String.valueOf(handler.getCurrentLevel());
                     }
                     int x = (this.mc.getWindow().getGuiScaledWidth() - this.mc.font.width(text)) / 2 + VampirismConfig.CLIENT.guiLevelOffsetX.get();
-                    int y = this.mc.getWindow().getGuiScaledHeight() - VampirismConfig.CLIENT.guiLevelOffsetY.get() - gui.rightHeight;
+                    int y = this.mc.getWindow().getGuiScaledHeight() - VampirismConfig.CLIENT.guiLevelOffsetY.get();
                     graphics.drawString(this.mc.font, text, x + 1, y, 0, false);
                     graphics.drawString(this.mc.font, text, x - 1, y, 0, false);
                     graphics.drawString(this.mc.font, text, x, y + 1, 0, false);

diff --git a/src/main/java/de/teamlapen/vampirism/config/VampirismConfig.java b/src/main/java/de/teamlapen/vampirism/config/VampirismConfig.java
@@ -111,7 +111,10 @@ public static void finalizeAndRegisterConfig() {
     public static void onLoad(final ModConfigEvent.@NotNull Loading configEvent) {
         if (configEvent.getConfig().getType() == ModConfig.Type.SERVER) {
             ((SundamageRegistry) VampirismAPI.sundamageRegistry()).reloadConfiguration();
-
+        } else if (configEvent.getConfig().getType() == ModConfig.Type.CLIENT) {
+            if (CLIENT.guiLevelOffsetY.get() == 0) {
+                CLIENT.guiLevelOffsetY.set(47); //Temporary workaround to reset incorrect values
+            }
         }
     }
 
@@ -252,7 +255,7 @@ public static class Client {
 
             builder.comment("Configure GUI").push("gui");
             guiLevelOffsetX = builder.comment("X-Offset of the level indicator from the center in pixels").defineInRange("levelOffsetX", 0, -250, 250);
-            guiLevelOffsetY = builder.comment("Y-Offset of the level indicator from the bottom in pixels").defineInRange("levelOffsetY", 0, 0, 270);
+            guiLevelOffsetY = builder.comment("Y-Offset of the level indicator from the bottom in pixels. Must be > 0").defineInRange("levelOffsetY", 47, 0, 270);
             guiSkillButton = builder.comment("Render skill menu button in inventory").define("skillButtonEnable", true);
             overrideGuiSkillButtonX = builder.comment("Force the guiSkillButton to the following x position from the center of the inventory, default value is 125").defineInRange("overrideGuiSkillButtonX", 125, Integer.MIN_VALUE, Integer.MAX_VALUE);
             overrideGuiSkillButtonY = builder.comment("Force the guiSkillButton to the following y position from the center of the inventory, default value is -22").defineInRange("overrideGuiSkillButtonY", -22, Integer.MIN_VALUE, Integer.MAX_VALUE);