The configuration is gone. Long live the config.

bootstrap/mod/fabric/build.gradle.kts

@@ -50,6 +50,7 @@ application {
 relocate("org.cloudburstmc.netty")
 relocate("org.cloudburstmc.protocol")
 relocate("com.github.steveice10.mc.auth")
+platformRelocate("org.bstats")
 
 tasks {
     remapJar {
@@ -67,4 +68,4 @@ modrinth {
     dependencies {
         required.project("fabric-api")
     }
-}
+}

bootstrap/mod/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricPlatform.java

@@ -73,7 +73,7 @@ public class GeyserFabricPlatform implements GeyserModPlatform {
         Optional<ModContainer> floodgate = FabricLoader.getInstance().getModContainer("floodgate");
         if (floodgate.isPresent()) {
             Path floodgateDataFolder = FabricLoader.getInstance().getConfigDir().resolve("floodgate");
-            bootstrap.getGeyserConfig().loadFloodgate(bootstrap, floodgateDataFolder);
+            bootstrap.loadFloodgate(floodgateDataFolder);
             return true;
         }
 

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePlatform.java

@@ -73,7 +73,7 @@ public class GeyserNeoForgePlatform implements GeyserModPlatform {
     public boolean testFloodgatePluginPresent(@NonNull GeyserModBootstrap bootstrap) {
         if (ModList.get().isLoaded("floodgate")) {
             Path floodgateDataFolder = FMLPaths.CONFIGDIR.get().resolve("floodgate");
-            bootstrap.getGeyserConfig().loadFloodgate(bootstrap, floodgateDataFolder);
+            bootstrap.loadFloodgate(floodgateDataFolder);
             return true;
         }
         return false;

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java

@@ -36,14 +36,16 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.geysermc.geyser.GeyserBootstrap;
+import org.geysermc.geyser.FloodgateKeyLoader;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.GeyserLogger;
+import org.geysermc.geyser.GeyserPluginBootstrap;
 import org.geysermc.geyser.api.command.Command;
 import org.geysermc.geyser.api.extension.Extension;
 import org.geysermc.geyser.command.GeyserCommand;
 import org.geysermc.geyser.command.GeyserCommandManager;
-import org.geysermc.geyser.configuration.GeyserConfiguration;
+import org.geysermc.geyser.configuration.ConfigLoaderTemp;
+import org.geysermc.geyser.configuration.GeyserPluginConfig;
 import org.geysermc.geyser.dump.BootstrapDumpInfo;
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough;
@@ -52,18 +54,15 @@ import org.geysermc.geyser.platform.mod.command.GeyserModCommandExecutor;
 import org.geysermc.geyser.platform.mod.platform.GeyserModPlatform;
 import org.geysermc.geyser.platform.mod.world.GeyserModWorldManager;
 import org.geysermc.geyser.text.GeyserLocale;
-import org.geysermc.geyser.util.FileUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.SocketAddress;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.UUID;
 
 @RequiredArgsConstructor
-public abstract class GeyserModBootstrap implements GeyserBootstrap {
+public abstract class GeyserModBootstrap implements GeyserPluginBootstrap {
 
     @Getter
     private static GeyserModBootstrap instance;
@@ -77,7 +76,7 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
     private MinecraftServer server;
 
     private GeyserCommandManager geyserCommandManager;
-    private GeyserModConfiguration geyserConfig;
+    private GeyserPluginConfig geyserConfig;
     private GeyserModInjector geyserInjector;
     private final GeyserModLogger geyserLogger = new GeyserModLogger();
     private IGeyserPingPassthrough geyserPingPassthrough;
@@ -91,8 +90,7 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
         if (!loadConfig()) {
             return;
         }
-        this.geyserLogger.setDebug(geyserConfig.isDebugMode());
-        GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
+        this.geyserLogger.setDebug(geyserConfig.debugMode());
         this.geyser = GeyserImpl.load(this.platform.platformType(), this);
 
         // Create command manager here, since the permission handler on neo needs it
@@ -105,13 +103,12 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
             if (!loadConfig()) {
                 return;
             }
-            this.geyserLogger.setDebug(geyserConfig.isDebugMode());
-            GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
+            this.geyserLogger.setDebug(geyserConfig.debugMode());
         }
 
         GeyserImpl.start();
 
-        if (geyserConfig.isLegacyPingPassthrough()) {
+        if (!geyserConfig.integratedPingPassthrough()) {
             this.geyserPingPassthrough = GeyserLegacyPingPassthrough.init(geyser);
         } else {
             this.geyserPingPassthrough = new ModPingPassthrough(server, geyserLogger);
@@ -196,7 +193,7 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
     }
 
     @Override
-    public GeyserModConfiguration getGeyserConfig() {
+    public GeyserPluginConfig config() {
         return geyserConfig;
     }
 
@@ -249,12 +246,8 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
 
     @Override
     public int getServerPort() {
-        if (isServer()) {
-            return ((GeyserServerPortGetter) server).geyser$getServerPort();
-        } else {
-            // Set in the IntegratedServerMixin
-            return geyserConfig.getRemote().port();
-        }
+        // TODO test
+        return ((GeyserServerPortGetter) server).geyser$getServerPort();
     }
 
     public abstract boolean isServer();
@@ -264,6 +257,17 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
         return this.platform.testFloodgatePluginPresent(this);
     }
 
+    private Path floodgateKeyPath;
+
+    public void loadFloodgate(Path floodgateDataFolder) {
+        floodgateKeyPath = FloodgateKeyLoader.getKeyPath(geyserConfig, floodgateDataFolder, dataFolder, geyserLogger);
+    }
+
+    @Override
+    public Path getFloodgateKeyPath() {
+        return floodgateKeyPath;
+    }
+
     @Nullable
     @Override
     public InputStream getResourceOrNull(String resource) {
@@ -282,13 +286,10 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
                 dataFolder.toFile().mkdir();
             }
 
-            File configFile = FileUtils.fileOrCopiedFromResource(dataFolder.resolve("config.yml").toFile(), "config.yml",
-                    (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString()), this);
-            this.geyserConfig = FileUtils.loadConfig(configFile, GeyserModConfiguration.class);
+            this.geyserConfig = ConfigLoaderTemp.load(dataFolder.resolve("config.yml").toFile(), GeyserPluginConfig.class);
             return true;
         } catch (IOException ex) {
             geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
-            ex.printStackTrace();
             return false;
         }
     }

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModConfiguration.java

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @author GeyserMC
- * @link https://github.com/GeyserMC/Geyser
- */
-
-package org.geysermc.geyser.platform.mod;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.geysermc.geyser.FloodgateKeyLoader;
-import org.geysermc.geyser.configuration.GeyserJacksonConfiguration;
-
-import java.nio.file.Path;
-
-public class GeyserModConfiguration extends GeyserJacksonConfiguration {
-    @JsonIgnore
-    private Path floodgateKeyPath;
-
-    public void loadFloodgate(GeyserModBootstrap geyser, Path floodgateDataFolder) {
-        Path geyserDataFolder = geyser.getConfigFolder();
-
-        floodgateKeyPath = FloodgateKeyLoader.getKeyPath(this, floodgateDataFolder, geyserDataFolder, geyser.getGeyserLogger());
-    }
-
-    @Override
-    public Path getFloodgateKeyPath() {
-        return floodgateKeyPath;
-    }
-}

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModInjector.java

@@ -38,6 +38,7 @@ import net.minecraft.server.network.ServerConnectionListener;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.GeyserBootstrap;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.GeyserPluginBootstrap;
 import org.geysermc.geyser.network.netty.GeyserInjector;
 import org.geysermc.geyser.network.netty.LocalServerChannelWrapper;
 import org.geysermc.geyser.platform.mod.platform.GeyserModPlatform;
@@ -63,7 +64,7 @@ public class GeyserModInjector extends GeyserInjector {
     }
 
     @Override
-    protected void initializeLocalChannel0(GeyserBootstrap bootstrap) throws Exception {
+    protected void initializeLocalChannel0(GeyserPluginBootstrap bootstrap) throws Exception {
         ServerConnectionListener connection = this.server.getConnection();
 
         // Find the channel that Minecraft uses to listen to connections
@@ -96,7 +97,7 @@ public class GeyserModInjector extends GeyserInjector {
                         int index = ch.pipeline().names().indexOf("encoder");
                         String baseName = index != -1 ? "encoder" : "outbound_config";
 
-                        if (bootstrap.config().asPluginConfig().orElseThrow().disableCompression()) {
+                        if (bootstrap.config().disableCompression()) {
                             ch.pipeline().addAfter(baseName, "geyser-compression-disabler", new GeyserModCompressionDisabler());
                         }
                     }