Update Settings screen

src/main/java/net/vulkanmod/Initializer.java

@@ -6,7 +6,6 @@
 import net.vulkanmod.config.Config;
 import net.vulkanmod.config.Platform;
 import net.vulkanmod.config.UpdateChecker;
-import net.vulkanmod.config.video.VideoModeManager;
 import net.vulkanmod.render.chunk.build.frapi.VulkanModRenderer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -44,14 +43,7 @@ public void onInitializeClient() {
 	}
 
 	private static Config loadConfig(Path path) {
-		Config config = Config.load(path);
-
-		if(config == null) {
-			config = new Config();
-			config.write();
-		}
-
-		return config;
+        return Config.load(path);
 	}
 
 	public static String getVersion() {

src/main/java/net/vulkanmod/config/Platform.java

@@ -13,7 +13,7 @@ public abstract class Platform {
 
     public static void init() {
         GLFW.glfwInitHint(GLFW_PLATFORM, activePlat);
-        LOGGER.info("Selecting Platform: {}", getStringFromPlat(activePlat));
+        LOGGER.info("Selecting Platform: {}", getStringFromPlat());
         LOGGER.info("GLFW: {}", GLFW.glfwGetVersionString());
         GLFW.glfwInit();
     }
@@ -40,14 +40,14 @@ private static int getSupportedPlat() {
         return GLFW_ANY_PLATFORM; //Unknown platform
     }
 
-    private static String getStringFromPlat(int plat) {
-        return switch (plat) {
+    private static String getStringFromPlat() {
+        return switch (Platform.activePlat) {
             case GLFW_PLATFORM_WIN32 -> "WIN32";
             case GLFW_PLATFORM_WAYLAND -> "WAYLAND";
             case GLFW_PLATFORM_X11 -> "X11";
             case GLFW_PLATFORM_COCOA -> "MACOS";
             case GLFW_ANY_PLATFORM -> "ANDROID";
-            default -> throw new IllegalStateException("Unexpected value: " + plat);
+            default -> throw new IllegalStateException("Unexpected value: " + Platform.activePlat);
         };
     }
 

src/main/java/net/vulkanmod/config/gui/GuiElement.java

@@ -7,7 +7,7 @@
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.navigation.FocusNavigationEvent;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.input.MouseButtonEvent;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class GuiElement implements GuiEventListener, NarratableEntry {
@@ -22,6 +22,7 @@ public abstract class GuiElement implements GuiEventListener, NarratableEntry {
     protected int hoverTime;
     protected long hoverStopTime;
 
+    @SuppressWarnings("unused") // this will surely be used some day
     public void setPosition(int x, int y) {
         this.x = x;
         this.y = y;
@@ -34,6 +35,7 @@ public void setPosition(int x, int y, int width, int height) {
         this.height = height;
     }
 
+    @SuppressWarnings("unused") // this will surely be used someday
     public void resize(int width, int height) {
         this.width = width;
         this.height = height;
@@ -102,7 +104,7 @@ public ComponentPath getCurrentFocusPath() {
     }
 
     @Override
-    public ScreenRectangle getRectangle() {
+    public @NotNull ScreenRectangle getRectangle() {
         return GuiEventListener.super.getRectangle();
     }
 
@@ -117,7 +119,7 @@ public boolean isFocused() {
     }
 
     @Override
-    public NarrationPriority narrationPriority() {
+    public @NotNull NarrationPriority narrationPriority() {
         return NarrationPriority.NONE;
     }
 

src/main/java/net/vulkanmod/config/gui/ModSettingsEntry.java

@@ -0,0 +1,46 @@
+package net.vulkanmod.config.gui;
+
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.resources.ResourceLocation;
+import net.vulkanmod.config.option.OptionPage;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+public class ModSettingsEntry {
+    public final FormattedText modName;
+    public final Supplier<ResourceLocation> iconSupplier;
+    private final Supplier<List<OptionPage>> optionPageSupplier;
+    private final Runnable onApply;
+
+    private ResourceLocation icon;
+    List<OptionPage> pages;
+
+    public ModSettingsEntry(FormattedText modName, Supplier<ResourceLocation> iconSupplier, Supplier<List<OptionPage>> optionPageSupplier, Runnable onApply) {
+        this.modName = modName;
+        this.iconSupplier = iconSupplier;
+        this.optionPageSupplier = optionPageSupplier;
+        this.onApply = onApply;
+    }
+
+    public List<OptionPage> initPages() {
+        this.pages = this.optionPageSupplier.get();
+        return this.pages;
+    }
+
+    public List<OptionPage> getPages() {
+        return pages;
+    }
+
+    public ResourceLocation getIcon() {
+        if (this.icon == null) {
+            this.icon = this.iconSupplier.get();
+        }
+
+        return icon;
+    }
+
+    public void runOnApply() {
+        onApply.run();
+    }
+}

src/main/java/net/vulkanmod/config/gui/ModSettingsRegistry.java

@@ -0,0 +1,34 @@
+package net.vulkanmod.config.gui;
+
+import it.unimi.dsi.fastutil.objects.ObjectArraySet;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.vulkanmod.Initializer;
+import net.vulkanmod.config.option.Options;
+
+import java.util.Set;
+
+public class ModSettingsRegistry {
+
+    public static final ModSettingsRegistry INSTANCE = new ModSettingsRegistry();
+
+    private final Set<ModSettingsEntry> modEntries = new ObjectArraySet<>();
+
+    ModSettingsRegistry() {
+        ModSettingsEntry vulkanModSettings = new ModSettingsEntry(Component.literal("VulkanMod").withStyle(ChatFormatting.DARK_RED),
+                                                                  () -> ResourceLocation.fromNamespaceAndPath("vulkanmod", "vlogo_transparent.png"),
+                                                                  Options::getOptionPages,
+                                                                  () -> Initializer.CONFIG.write());
+        this.addModEntry(vulkanModSettings);
+    }
+
+    public void addModEntry(ModSettingsEntry entry) {
+        this.modEntries.add(entry);
+    }
+
+    public Set<ModSettingsEntry> getModEntries() {
+        return modEntries;
+    }
+}

src/main/java/net/vulkanmod/config/gui/VOptionList.java

@@ -2,8 +2,10 @@
 
 import com.mojang.blaze3d.opengl.GlStateManager;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import net.vulkanmod.config.gui.render.GuiRenderer;
 import net.vulkanmod.config.gui.widget.OptionWidget;
@@ -31,14 +33,15 @@ public VOptionList(int x, int y, int width, int height, int itemHeight) {
         this.width = width;
         this.height = height;
 
-        this.itemWidth = (int) (0.95f * this.width);
+        this.itemWidth = this.width - 7;
         this.itemHeight = itemHeight;
         this.itemMargin = 3;
         this.totalItemHeight = this.itemHeight + this.itemMargin;
     }
 
+    @SuppressWarnings("unused")
     public void addButton(OptionWidget<?> widget) {
-        this.addEntry(new Entry(widget, this.itemMargin));
+        this.addEntry(new Entry(widget, this.itemMargin, null));
     }
 
     public void addAll(OptionBlock[] blocks) {
@@ -47,26 +50,30 @@ public void addAll(OptionBlock[] blocks) {
             int width = this.itemWidth;
             int height = this.itemHeight;
 
+            // add a header (this is MOSTLY for the search)
+            String title = block.title();
+            if (title != null && !title.isEmpty()) {
+                this.addEntry(new Entry(null, 8, title));
+            }
+
             var options = block.options();
             for (Option<?> option : options) {
-
                 int margin = this.itemMargin;
-
-                final OptionWidget<?> optionWidget = option.getWidget();
-                optionWidget.setDimensions(x0, 0, width, height);
-                this.addEntry(new Entry(optionWidget, margin));
+                OptionWidget<?> widget = option.getWidget();
+                widget.setDimensions(x0, 0, width, height);
+                this.addEntry(new Entry(widget, margin, null));
             }
 
-            this.addEntry(new Entry(null, 12));
+            this.addEntry(new Entry(null, 12, null));
         }
     }
 
     private void addEntry(Entry entry) {
         this.children.add(entry);
-
         this.listLength += entry.getTotalHeight();
     }
 
+    @SuppressWarnings("unused")
     public void clearEntries() {
         this.listLength = 0;
         this.children.clear();
@@ -229,7 +236,7 @@ public void renderWidget(int mouseX, int mouseY) {
     }
 
     protected int getScrollbarPosition() {
-        return this.x + this.itemWidth + 5;
+        return this.x + this.width;
     }
 
     public VAbstractWidget getHoveredWidget(double mouseX, double mouseY) {
@@ -254,13 +261,11 @@ protected void renderList(int mouseX, int mouseY) {
 
         int rowTop = this.y - (int) this.getScrollAmount();
         for (int j = 0; j < itemCount; ++j) {
-            int rowBottom = rowTop + this.itemHeight;
-
             VOptionList.Entry entry = this.getEntry(j);
-            if (rowBottom >= this.y && rowTop <= (this.y + this.height)) {
-                boolean updateState = this.focused == null;
 
-                entry.render(rowTop, mouseX, mouseY, updateState);
+            if (rowTop + entry.getTotalHeight() >= this.y && rowTop <= (this.y + this.height)) {
+                boolean updateState = this.focused == null;
+                entry.render(rowTop, mouseX, mouseY, updateState, this.x);
             }
 
             rowTop += entry.getTotalHeight();
@@ -278,13 +283,28 @@ protected boolean isValidClickButton(int i) {
     protected static class Entry implements GuiEventListener {
         final VAbstractWidget widget;
         final int margin;
+        final String headerTitle;
 
-        private Entry(OptionWidget<?> widget, int margin) {
+        private Entry(OptionWidget<?> widget, int margin, String headerTitle) {
             this.widget = widget;
             this.margin = margin;
+            this.headerTitle = headerTitle;
         }
 
-        public void render(int y, int mouseX, int mouseY, boolean updateState) {
+        public void render(int y, int mouseX, int mouseY, boolean updateState, int listX) {
+            // if there is a title, RENDER IT!!!
+            if (headerTitle != null && !headerTitle.isEmpty()) {
+                int headerY = y + 4;
+                GuiRenderer.drawString(
+                        Minecraft.getInstance().font,
+                        Component.literal(headerTitle),
+                        listX + 8,
+                        headerY,
+                        0xFFFFFFFF
+                );
+                return;
+            }
+
             if (widget == null)
                 return;
 
@@ -297,6 +317,9 @@ public void render(int y, int mouseX, int mouseY, boolean updateState) {
         }
 
         public int getTotalHeight() {
+            if (headerTitle != null && !headerTitle.isEmpty()) {
+                return Minecraft.getInstance().font.lineHeight + margin;
+            }
             if (widget != null)
                 return widget.height + margin;
             else
@@ -305,16 +328,19 @@ public int getTotalHeight() {
 
         @Override
         public boolean mouseClicked(MouseButtonEvent event, boolean bl) {
+            if (widget == null) return false;
             return widget.mouseClicked(event, bl);
         }
 
         @Override
         public boolean mouseReleased(MouseButtonEvent event) {
+            if (widget == null) return false;
             return widget.mouseReleased(event);
         }
 
         @Override
         public boolean mouseDragged(MouseButtonEvent event, double deltaX, double deltaY) {
+            if (widget == null) return false;
             return widget.mouseDragged(event, deltaX, deltaY);
         }
 
@@ -325,7 +351,8 @@ public boolean isFocused() {
 
         @Override
         public void setFocused(boolean bl) {
-            widget.setFocused(bl);
+            if (widget != null)
+                widget.setFocused(bl);
         }
     }
-}
+}