add api to add custom screens, use a color theme builder instead of a direct method

Author: douira

common/src/api/java/net/caffeinemc/mods/sodium/api/config/structure/ColorThemeBuilder.java

@@ -0,0 +1,7 @@
+package net.caffeinemc.mods.sodium.api.config.structure;
+
+public interface ColorThemeBuilder {
+    ColorThemeBuilder setBaseThemeRGB(int theme);
+
+    ColorThemeBuilder setFullThemeRGB(int theme, int themeHighlight, int themeDisabled);
+}

common/src/api/java/net/caffeinemc/mods/sodium/api/config/structure/ConfigBuilder.java

@@ -7,8 +7,12 @@ public interface ConfigBuilder {
 
     ModOptionsBuilder registerOwnModOptions();
 
+    ColorThemeBuilder createColorTheme();
+
     OptionPageBuilder createOptionPage();
 
+    ExternalPageBuilder createExternalPage();
+
     OptionGroupBuilder createOptionGroup();
 
     BooleanOptionBuilder createBooleanOption(ResourceLocation id);

common/src/api/java/net/caffeinemc/mods/sodium/api/config/structure/ExternalPageBuilder.java

@@ -0,0 +1,12 @@
+package net.caffeinemc.mods.sodium.api.config.structure;
+
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+import java.util.function.Consumer;
+
+public interface ExternalPageBuilder extends PageBuilder {
+    ExternalPageBuilder setName(Component name);
+
+    ExternalPageBuilder setScreenProvider(Consumer<Screen> currentScreenConsumer);
+}

common/src/api/java/net/caffeinemc/mods/sodium/api/config/structure/ModOptionsBuilder.java

@@ -5,9 +5,7 @@ public interface ModOptionsBuilder {
 
     ModOptionsBuilder setVersion(String version);
 
-    ModOptionsBuilder setColorThemeRGB(int theme, int themeHighlight, int themeDisabled);
+    ModOptionsBuilder setColorTheme(ColorThemeBuilder colorTheme);
 
-    ModOptionsBuilder setColorThemeRGB(int theme);
-
-    ModOptionsBuilder addPage(OptionPageBuilder page);
+    ModOptionsBuilder addPage(PageBuilder page);
 }

common/src/api/java/net/caffeinemc/mods/sodium/api/config/structure/OptionPageBuilder.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.network.chat.Component;
 
-public interface OptionPageBuilder {
+public interface OptionPageBuilder extends PageBuilder {
     OptionPageBuilder setName(Component name);
 
     OptionPageBuilder addOptionGroup(OptionGroupBuilder group);

common/src/api/java/net/caffeinemc/mods/sodium/api/config/structure/PageBuilder.java

@@ -0,0 +1,4 @@
+package net.caffeinemc.mods.sodium.api.config.structure;
+
+public interface PageBuilder {
+}

common/src/main/java/net/caffeinemc/mods/sodium/client/config/ConfigManager.java

@@ -83,7 +83,7 @@ private static void registerConfigs(BiConsumer<ConfigEntryPoint, ConfigBuilder>
                 registerMethod.accept(entryPoint, builder);
                 builtConfigs = builder.build();
             } catch (Exception e) {
-                Minecraft.getInstance().emergencySaveAndCrash(new CrashReport("Failed to build options config for mod " + configUser.modId, e));
+                crashWithMessage("Failed to build options config for mod " + configUser.modId, e);
                 return;
             }
 
@@ -114,7 +114,12 @@ private static void registerConfigs(BiConsumer<ConfigEntryPoint, ConfigBuilder>
         try {
             CONFIG = new Config(ImmutableList.copyOf(modConfigs));
         } catch (Exception e) {
-            Minecraft.getInstance().emergencySaveAndCrash(new CrashReport("Failed to build options config", e));
+            crashWithMessage("Failed to build options config", e);
         }
     }
+
+    private static void crashWithMessage(String message, Exception e) {
+        var instance = Minecraft.getInstance();
+        Minecraft.crash(instance, instance.gameDirectory, new CrashReport(message, e));
+    }
 }

common/src/main/java/net/caffeinemc/mods/sodium/client/config/structure/ColorThemeBuilderImpl.java

@@ -0,0 +1,36 @@
+package net.caffeinemc.mods.sodium.client.config.structure;
+
+import net.caffeinemc.mods.sodium.api.config.structure.ColorThemeBuilder;
+import net.caffeinemc.mods.sodium.client.gui.ColorTheme;
+
+public class ColorThemeBuilderImpl implements ColorThemeBuilder {
+    private int baseTheme;
+    private int themeHighlight;
+    private int themeDisabled;
+
+    ColorTheme build() {
+        if (this.baseTheme == 0) {
+            throw new IllegalStateException("Base theme must be set");
+        }
+
+        if (this.themeHighlight == 0 || this.themeDisabled == 0) {
+            return new ColorTheme(this.baseTheme);
+        } else {
+            return new ColorTheme(this.baseTheme, this.themeHighlight, this.themeDisabled);
+        }
+    }
+
+    @Override
+    public ColorThemeBuilder setBaseThemeRGB(int theme) {
+        this.baseTheme = theme;
+        return this;
+    }
+
+    @Override
+    public ColorThemeBuilder setFullThemeRGB(int theme, int themeHighlight, int themeDisabled) {
+        this.baseTheme = theme;
+        this.themeHighlight = themeHighlight;
+        this.themeDisabled = themeDisabled;
+        return this;
+    }
+}

common/src/main/java/net/caffeinemc/mods/sodium/client/config/structure/ConfigBuilderImpl.java

@@ -32,11 +32,21 @@ public ModOptionsBuilder registerOwnModOptions() {
         return this.registerModOptions(this.defaultNamespace, this.defaultName, this.defaultVersion);
     }
 
+    @Override
+    public ColorThemeBuilder createColorTheme() {
+        return new ColorThemeBuilderImpl();
+    }
+
     @Override
     public OptionPageBuilder createOptionPage() {
         return new OptionPageBuilderImpl();
     }
 
+    @Override
+    public ExternalPageBuilder createExternalPage() {
+        return new ExternalPageBuilderImpl();
+    }
+
     @Override
     public OptionGroupBuilder createOptionGroup() {
         return new OptionGroupBuilderImpl();

common/src/main/java/net/caffeinemc/mods/sodium/client/config/structure/ExternalPage.java

@@ -0,0 +1,14 @@
+package net.caffeinemc.mods.sodium.client.config.structure;
+
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+import java.util.function.Consumer;
+
+public record ExternalPage(Component name, Consumer<Screen> currentScreenConsumer) implements Page {
+    @Override
+    public ImmutableList<OptionGroup> groups() {
+        return ImmutableList.of();
+    }
+}