From 759017a5377d57ffbae7ac0d90370364fa54fa19 Mon Sep 17 00:00:00 2001
From: AxolotlMaid <124442837+AxolotlMaid@users.noreply.github.com>
Date: Sat, 2 Dec 2023 23:27:51 +0000
Subject: [PATCH] Fix SodiumConfigLoader and Forge

---
 .../profiles/SodiumConfigLoader.java             | 11 ++++++++---
 forge/src/main/resources/META-INF/mods.toml      |  2 +-
 gradle.properties                                | 16 ++++------------
 settings.gradle                                  |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumConfigLoader.java b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumConfigLoader.java
index 1d31401..4a56d6f 100644
--- a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumConfigLoader.java
+++ b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/SodiumConfigLoader.java
@@ -26,14 +26,17 @@ public class SodiumConfigLoader {
         SodiumClientMod.options().quality.leavesQuality = SodiumGameOptions.GraphicsQuality.valueOf(configData.quality.leaves_quality);
         SodiumClientMod.options().quality.enableVignette = configData.quality.enable_vignette;
 
+        SodiumClientMod.options().advanced.arenaMemoryAllocator = SodiumGameOptions.ArenaMemoryAllocator.valueOf(configData.advanced.arena_memory_allocator);
+        SodiumClientMod.options().advanced.allowDirectMemoryAccess = configData.advanced.allow_direct_memory_access;
         SodiumClientMod.options().advanced.enableMemoryTracing = configData.advanced.enable_memory_tracing;
         SodiumClientMod.options().advanced.useAdvancedStagingBuffers = configData.advanced.use_advanced_staging_buffers;
         SodiumClientMod.options().advanced.cpuRenderAheadLimit = configData.advanced.cpu_render_ahead_limit;
 
         SodiumClientMod.options().performance.chunkBuilderThreads = configData.performance.chunk_builder_threads;
-        SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configData.performance.always_defer_chunk_updates_v2;
+        SodiumClientMod.options().performance.alwaysDeferChunkUpdates = configData.performance.always_defer_chunk_updates;
         SodiumClientMod.options().performance.animateOnlyVisibleTextures = configData.performance.animate_only_visible_textures;
         SodiumClientMod.options().performance.useEntityCulling = configData.performance.use_entity_culling;
+        SodiumClientMod.options().performance.useParticleCulling = configData.performance.use_particle_culling;
         SodiumClientMod.options().performance.useFogOcclusion = configData.performance.use_fog_occlusion;
         SodiumClientMod.options().performance.useBlockFaceCulling = configData.performance.use_block_face_culling;
 
@@ -59,6 +62,8 @@ public class SodiumConfigLoader {
         }
 
         public static class Advanced {
+            public String arena_memory_allocator;
+            public boolean allow_direct_memory_access;
             public boolean enable_memory_tracing;
             public boolean use_advanced_staging_buffers;
             public int cpu_render_ahead_limit;
@@ -66,12 +71,12 @@ public class SodiumConfigLoader {
 
         public static class Performance {
             public int chunk_builder_threads;
-            public boolean always_defer_chunk_updates_v2;
+            public boolean always_defer_chunk_updates;
             public boolean animate_only_visible_textures;
             public boolean use_entity_culling;
+            public boolean use_particle_culling;
             public boolean use_fog_occlusion;
             public boolean use_block_face_culling;
-            public boolean use_no_error_g_l_context;
         }
 
         public static class Notifications {
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 88c9dde..17c8b66 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[47,)"
+loaderVersion = "[40,)"
 #issueTrackerURL = ""
 license = "GNU GPL 3.0"
 
diff --git a/gradle.properties b/gradle.properties
index f8fdce3..c7174a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,17 +7,9 @@ archives_base_name=optionsprofiles
 mod_version=1.1
 maven_group=com.axolotlmaid.optionsprofiles
 
-#architectury_version=9.1.12
-#
-#fabric_loader_version=0.14.23
-#fabric_api_version=0.90.4+1.20.1
-#
-#forge_version=1.20.1-47.2.1
+architectury_version=4.11.93
 
+fabric_loader_version=0.14.23
+fabric_api_version=0.76.0+1.18.2
 
-architectury_version=4.11.90
-
-fabric_loader_version=0.14.22
-fabric_api_version=0.77.0+1.18.2
-
-forge_version=1.18.2-40.2.0
\ No newline at end of file
+forge_version=1.18.2-40.2.10
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 762c15a..03230de 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,4 +11,4 @@ include("common")
 include("fabric")
 include("forge")
 
-rootProject.name = "optionsprofiles-v1.1-1.20.2"
+rootProject.name = "optionsprofiles-v1.1-1.18.2"