From c37189e303cf9339e19bb2974d41bf05db700025 Mon Sep 17 00:00:00 2001
From: Vice <vicerust@gmail.com>
Date: Thu, 15 Feb 2024 13:22:07 -0500
Subject: [PATCH] fix Sodium Extras imcompat, update publish script

---
 build.gradle.kts                              | 20 +++++++++++++++----
 .../sodium/client/gui/SodiumOptionsGUI.java   |  2 +-
 .../client/gui/SodiumVideoOptionsScreen.java  | 12 +++--------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 000b56c9..41437f8f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -216,28 +216,40 @@ publishing {
 
 publishMods {
     file = tasks.jar.get().archiveFile
-    changelog = ""
+    changelog = "https://github.com/anthxnymc/xenon/wiki/Changelog"
     type = STABLE
     modLoaders.add("forge")
     modLoaders.add("neoforge")
 
     curseforge {
-        projectId = "908741"
-        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+        projectId = "564239"
+        accessToken = providers.environmentVariable("CF_API_TOKEN")
         minecraftVersions.add("minecraft_version"())
 
         incompatible {
             slug = "rubidium"
         }
+
+        incompatible {
+            slug = "embeddium"
+        }
+
+        incompatible {
+            slug = "magnesium-extras"
+        }
     }
     modrinth {
-        projectId = "sk9rgfiA"
+        projectId = "aWDwN8NN"
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
         minecraftVersions.add("minecraft_version"())
 
         incompatible {
             slug = "rubidium"
         }
+
+        incompatible {
+            slug = "embeddium"
+        }
     }
 
     displayName = "[${"minecraft_version"()}] Xenon ${"mod_version"()}"
diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java
index 67144260..c37275c5 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java
@@ -75,7 +75,7 @@ public SodiumOptionsGUI(Screen prevScreen) {
         pages.add(new EntityCullingPage());
         pages.add(new OthersPage());
 
-        this.checkPromptTimers();
+        //this.checkPromptTimers();
     }
 
     private void checkPromptTimers() {
diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/reesesoptions/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/reesesoptions/client/gui/SodiumVideoOptionsScreen.java
index 0c9add28..8ea20f49 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/gui/reesesoptions/client/gui/SodiumVideoOptionsScreen.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/reesesoptions/client/gui/SodiumVideoOptionsScreen.java
@@ -4,6 +4,7 @@
 import me.jellysquid.mods.sodium.client.data.fingerprint.HashedFingerprint;
 import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
 import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
+import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
 import me.jellysquid.mods.sodium.client.gui.options.Option;
 import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
 import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
@@ -66,15 +67,8 @@ public SodiumVideoOptionsScreen(Screen prev) {
         super(Component.literal("Reese's Sodium Menu"));
         this.prevScreen = prev;
 
-        this.pages.add(SodiumGameOptionPages.general());
-        this.pages.add(SodiumGameOptionPages.quality());
-        this.pages.add(new QualityPlusPage());
-        this.pages.add(SodiumGameOptionPages.performance());
-        this.pages.add(SodiumGameOptionPages.advanced());
-
-        pages.add(new TrueDarknessPage());
-        pages.add(new EntityCullingPage());
-        pages.add(new OthersPage());
+        var original = new SodiumOptionsGUI(this);
+        pages.addAll(original.pages);
 
         this.checkPromptTimers();
     }