Merge pull request RobertSkalko#198 from TUsama/spellbar

don't render spell hot bar when player doesn't equip any spells

Author: RobertSkalko

src/main/java/com/robertx22/mine_and_slash/config/forge/ClientConfigs.java

@@ -54,6 +54,7 @@ public class ClientConfigs {
         DONT_CULL_PARTICLES_UNDER = b.defineInRange("DONT_CULL_PARTICLES_UNDER", 50D, 0D, 5000D);
 
         HOTBAR_SWAPPING = b.comment("When OFF: 8 bars, 8 keybinds. When ON: 4 bars, 5 keybinds(4 for each bar, 1 for hotbar swap button)").define("HOTBAR_SWAPPING", false);
+        HIDE_SPELL_HOTBAR_WHEN_NO_SPELL = b.define("hide_spell_hotbar_when_no_spell", true);
 
         GUI_POSITION = b.defineEnum("GUI_POSITION", GuiPosition.TOP_LEFT);
         ITEM_RARITY_BACKGROUND_TYPE = b.defineEnum("ITEM_RARITY_BACKGROUND_TYPE", GlintType.FULL);
@@ -79,13 +80,15 @@ public class ClientConfigs {
                 OVERLAY_CONFIGS.put(type, b.defineEnum(type.name() + "_" + "CONFIG", type.getDefaultConfig()));
             }
         }
+        b.pop();
         b.comment("Buttons").push("buttons");
         ENABLE_QUICK_LOOT_BUTTON = b.define("enable_quick_loot_button", true);
         QUICK_LOOT_BUTTON_X_OFFSET = b.define("quick_loot_button_x_offset", 0);
         QUICK_LOOT_BUTTON_Y_OFFSET = b.define("quick_loot_button_y_offset", 0);
 
         b.pop();
 
+
     }
 
 
@@ -100,6 +103,7 @@ public class ClientConfigs {
     public ForgeConfigSpec.BooleanValue MODIFY_TOOLTIP_LENGTH;
     public ForgeConfigSpec.BooleanValue IN_DEPTH_TOOLTIPS_BY_DEFAULT;
     public ForgeConfigSpec.BooleanValue HOTBAR_SWAPPING;
+    public ForgeConfigSpec.BooleanValue HIDE_SPELL_HOTBAR_WHEN_NO_SPELL;
     public ForgeConfigSpec.BooleanValue USE_SPELL_ANIMATIONS;
     public ForgeConfigSpec.EnumValue<GuiBarRenderOption> RENDER_FILLED_GUI_BARS;
 

src/main/java/com/robertx22/mine_and_slash/gui/overlays/spell_hotbar/SpellHotbarOverlay.java

@@ -13,6 +13,10 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 
+import java.util.ArrayList;
+import java.util.List;
+
+
 public class SpellHotbarOverlay {
 
 
@@ -51,20 +55,23 @@ public void onHudRender(GuiGraphics gui, OverlayConfig config, OverlayType type)
             int x = config.getPos().x;
             int y = config.getPos().y;
 
-
-            renderHotbarBackground(type, type.getSize(), gui, x, y);
-
             int spells = 8;
-
+            List<SpellOnHotbarRender> list = new ArrayList<>();
 
             for (int i = 0; i < spells; i++) {
-
                 int place = i;
                 int xp = x + 3;
                 int yp = y + 3;
-
-                var spellRen = new SpellOnHotbarRender(type == OverlayType.SPELL_HOTBAR_HORIZONTAL, place, gui, xp, yp);
-                spellRen.render();
+                list.add(new SpellOnHotbarRender(type == OverlayType.SPELL_HOTBAR_HORIZONTAL, place, gui, xp, yp)) ;
+            }
+            if (ClientConfigs.getConfig().HIDE_SPELL_HOTBAR_WHEN_NO_SPELL.get()){
+                if (list.stream().anyMatch(spell -> spell.spell != null)){
+                    renderHotbarBackground(type, type.getSize(), gui, x, y);
+                    list.forEach(SpellOnHotbarRender::render);
+                }
+            } else {
+                renderHotbarBackground(type, type.getSize(), gui, x, y);
+                list.forEach(SpellOnHotbarRender::render);
             }
 
             RenderSystem.disableBlend(); // enables transparency