From 3b4838f1f3e585ce27f61af71722c0c388eb3249 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Mon, 27 May 2024 19:56:36 -0700
Subject: [PATCH] Fix overriding default world type when config is set to false

---
 .../java/thedarkcolour/exdeorum/client/ClientHandler.java | 8 +++-----
 src/main/java/thedarkcolour/exdeorum/config/EConfig.java  | 4 ----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/thedarkcolour/exdeorum/client/ClientHandler.java b/src/main/java/thedarkcolour/exdeorum/client/ClientHandler.java
index 63b06da6..052c29d8 100644
--- a/src/main/java/thedarkcolour/exdeorum/client/ClientHandler.java
+++ b/src/main/java/thedarkcolour/exdeorum/client/ClientHandler.java
@@ -135,11 +135,9 @@ public class ClientHandler {
 
     // Sets Ex Deorum world type as default
     private static void onScreenOpen(ScreenEvent.Opening event) {
-        if (EConfig.CLIENT.setVoidWorldAsDefault.get() && EConfig.COMMON.setVoidWorldAsDefault.get()) {
-            if (event.getNewScreen() instanceof CreateWorldScreen screen) {
-                var ctx = screen.getUiState().getSettings();
-                screen.getUiState().setWorldType(new WorldCreationUiState.WorldTypeEntry(ctx.worldgenLoadContext().registryOrThrow(Registries.WORLD_PRESET).getHolder(ASMHooks.overrideDefaultWorldPreset()).orElse(null)));
-            }
+        if (event.getNewScreen() instanceof CreateWorldScreen screen && EConfig.COMMON.setVoidWorldAsDefault.get()) {
+            var ctx = screen.getUiState().getSettings();
+            screen.getUiState().setWorldType(new WorldCreationUiState.WorldTypeEntry(ctx.worldgenLoadContext().registryOrThrow(Registries.WORLD_PRESET).getHolder(ASMHooks.overrideDefaultWorldPreset()).orElse(null)));
         }
     }
 
diff --git a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java
index cba01100..a4714cda 100644
--- a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java
+++ b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java
@@ -40,7 +40,6 @@ public class EConfig {
 
     public static class Client {
         public final BooleanValue useFastInfestedLeaves;
-        public final BooleanValue setVoidWorldAsDefault;
 
         public Client(ModConfigSpec.Builder builder) {
             builder.comment("Client configuration for Ex Deorum").push("client");
@@ -48,9 +47,6 @@ public class EConfig {
             this.useFastInfestedLeaves = builder
                     .comment("Whether to use a simplified renderer for infested leaves (reduces FPS lag with lots of infested trees)")
                     .define("use_fast_infested_leaves", false);
-            this.setVoidWorldAsDefault = builder
-                    .comment("Whether the Void World type is set as the default world preset. (DEPRECATED - USE THE OPTION IN THE COMMON CONFIG INSTEAD)")
-                    .define("set_void_world_as_default", true);
 
             builder.pop();
         }