Merge branch 'master' into feature/1.20.5

.github/workflows/build.yml

@@ -136,14 +136,15 @@ jobs:
         run: |
           cat metadata.json
           echo
+          mv metadata.json metadata.json.tmp
           version=$(cat gradle.properties | grep -o "version=[0-9\\.]*" | cut -d"=" -f2)
-          cat metadata.json | jq --arg project "${PROJECT}" --arg version "${version}" '
+          jq --arg project "${PROJECT}" --arg version "${version}" '
             .
             | .changes |= map({"commit", "summary", "message"}) 
             | .downloads |= map_values({"name", "sha256"})
             | {$project, "repo", $version, "number": .build, "changes", "downloads"}
-          ' | tee metadata.json
+          ' metadata.json.tmp > metadata.json
-          echo
+          cat metadata.json
       - name: Publish to Downloads API
         if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
         shell: bash

.github/workflows/preview.yml

@@ -69,11 +69,13 @@ jobs:
         run: |
           cat metadata.json
           echo
-          cat metadata.json | jq --arg project "${PROJECT}" --arg version "${VERSION}" --arg number "${BUILD}" '
+          mv metadata.json metadata.json.tmp
+          jq --arg project "${PROJECT}" --arg version "${VERSION}" --arg number "${BUILD}" '
             .
             | .downloads |= map_values({"name", "sha256"})
             | {$project, "repo", $version, "number": $number | tonumber, "changes": [], "downloads"}
-          ' | tee metadata.json
+          ' metadata.json.tmp > metadata.json
+          cat metadata.json
       - name: Publish to Downloads API
         if: success()
         shell: bash

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

@@ -28,14 +28,15 @@ package org.geysermc.geyser.platform.fabric;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.world.entity.player.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.platform.mod.GeyserModBootstrap;
 import org.geysermc.geyser.platform.mod.GeyserModUpdateListener;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class GeyserFabricBootstrap extends GeyserModBootstrap implements ModInitializer {
 
@@ -45,21 +46,37 @@ public class GeyserFabricBootstrap extends GeyserModBootstrap implements ModInit
 
     @Override
     public void onInitialize() {
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
+        if (isServer()) {
             // Set as an event, so we can get the proper IP and port if needed
             ServerLifecycleEvents.SERVER_STARTED.register((server) -> {
                 this.setServer(server);
                 onGeyserEnable();
             });
+        } else {
+            ClientLifecycleEvents.CLIENT_STOPPING.register(($)-> {
+                onGeyserShutdown();
+            });
         }
 
         // These are only registered once
-        ServerLifecycleEvents.SERVER_STOPPING.register((server) -> onGeyserShutdown());
+        ServerLifecycleEvents.SERVER_STOPPING.register((server) -> {
+            if (isServer()) {
+                onGeyserShutdown();
+            } else {
+                onGeyserDisable();
+            }
+        });
+
         ServerPlayConnectionEvents.JOIN.register((handler, $, $$) -> GeyserModUpdateListener.onPlayReady(handler.getPlayer()));
 
         this.onGeyserInitialize();
     }
 
+    @Override
+    public boolean isServer() {
+        return FabricLoader.getInstance().getEnvironmentType().equals(EnvType.SERVER);
+    }
+
     @Override
     public boolean hasPermission(@NonNull Player source, @NonNull String permissionNode) {
         return Permissions.check(source, permissionNode);

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

@@ -27,10 +27,10 @@ package org.geysermc.geyser.platform.neoforge;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.world.entity.player.Player;
-import net.neoforged.api.distmarker.Dist;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.GameShuttingDownEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
@@ -46,9 +46,11 @@ public class GeyserNeoForgeBootstrap extends GeyserModBootstrap {
     public GeyserNeoForgeBootstrap() {
         super(new GeyserNeoForgePlatform());
 
-        if (FMLLoader.getDist() == Dist.DEDICATED_SERVER) {
+        if (isServer()) {
             // Set as an event so we can get the proper IP and port if needed
             NeoForge.EVENT_BUS.addListener(this::onServerStarted);
+        } else {
+            NeoForge.EVENT_BUS.addListener(this::onClientStopping);
         }
 
         NeoForge.EVENT_BUS.addListener(this::onServerStopping);
@@ -64,6 +66,14 @@ public class GeyserNeoForgeBootstrap extends GeyserModBootstrap {
     }
 
     private void onServerStopping(ServerStoppingEvent event) {
+        if (isServer()) {
+            this.onGeyserShutdown();
+        } else {
+            this.onGeyserDisable();
+        }
+    }
+
+    private void onClientStopping(GameShuttingDownEvent ignored) {
         this.onGeyserShutdown();
     }
 
@@ -71,6 +81,11 @@ public class GeyserNeoForgeBootstrap extends GeyserModBootstrap {
         GeyserModUpdateListener.onPlayReady(event.getEntity());
     }
 
+    @Override
+    public boolean isServer() {
+        return FMLLoader.getDist().isDedicatedServer();
+    }
+
     @Override
     public boolean hasPermission(@NonNull Player source, @NonNull String permissionNode) {
         return this.permissionHandler.hasPermission(source, permissionNode);

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

@@ -128,7 +128,9 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
         // We want to do this late in the server startup process to allow other mods
         // To do their job injecting, then connect into *that*
         this.geyserInjector = new GeyserModInjector(server, this.platform);
+        if (isServer()) {
             this.geyserInjector.initializeLocalChannel(this);
+        }
 
         // Start command building
         // Set just "geyser" as the help command
@@ -248,7 +250,19 @@ 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();
+        }
+    }
+
+    public abstract boolean isServer();
+
+    @Override
+    public @Nullable SocketAddress getSocketAddress() {
+        return this.geyserInjector.getServerSocketAddress();
     }
 
     @Override

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/mixin/client/IntegratedServerMixin.java

@@ -54,8 +54,10 @@ public class IntegratedServerMixin implements GeyserServerPortGetter {
     private void onOpenToLan(GameType gameType, boolean cheatsAllowed, int port, CallbackInfoReturnable<Boolean> cir) {
         if (cir.getReturnValueZ()) {
             // If the LAN is opened, starts Geyser.
-            GeyserModBootstrap.getInstance().setServer((MinecraftServer) (Object) this);
+            GeyserModBootstrap instance = GeyserModBootstrap.getInstance();
-            GeyserModBootstrap.getInstance().onGeyserEnable();
+            instance.setServer((MinecraftServer) (Object) this);
+            instance.getGeyserConfig().getRemote().setPort(port);
+            instance.onGeyserEnable();
             // Ensure player locale has been loaded, in case it's different from Java system language
             GeyserLocale.loadGeyserLocale(this.minecraft.options.languageCode);
             // Give indication that Geyser is loaded

bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyConfiguration.java

@@ -26,7 +26,7 @@ package org.geysermc.geyser.platform.viaproxy;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.viaproxy.cli.options.Options;
+import net.raphimc.viaproxy.ViaProxy;
 import org.geysermc.geyser.configuration.GeyserJacksonConfiguration;
 
 import java.io.File;
@@ -43,7 +43,7 @@ public class GeyserViaProxyConfiguration extends GeyserJacksonConfiguration {
     @Override
     public int getPingPassthroughInterval() {
         int interval = super.getPingPassthroughInterval();
-        if (interval < 15 && Options.PROTOCOL_VERSION != null && Options.PROTOCOL_VERSION.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
+        if (interval < 15 && ViaProxy.getConfig().getTargetVersion() != null && ViaProxy.getConfig().getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
             // <= 1.6.4 servers sometimes block incoming connections from an IP address if too many connections are made
             interval = 15;
         }

bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyDumpInfo.java

@@ -26,7 +26,6 @@ package org.geysermc.geyser.platform.viaproxy;
 
 import lombok.Getter;
 import net.raphimc.viaproxy.ViaProxy;
-import net.raphimc.viaproxy.cli.options.Options;
 import net.raphimc.viaproxy.plugins.ViaProxyPlugin;
 import org.geysermc.geyser.dump.BootstrapDumpInfo;
 import org.geysermc.geyser.text.AsteriskSerializer;
@@ -49,8 +48,8 @@ public class GeyserViaProxyDumpInfo extends BootstrapDumpInfo {
 
     public GeyserViaProxyDumpInfo() {
         this.platformVersion = ViaProxy.VERSION;
-        this.onlineMode = Options.ONLINE_MODE;
+        this.onlineMode = ViaProxy.getConfig().isProxyOnlineMode();
-        if (Options.BIND_ADDRESS instanceof InetSocketAddress inetSocketAddress) {
+        if (ViaProxy.getConfig().getBindAddress() instanceof InetSocketAddress inetSocketAddress) {
             this.serverIP = inetSocketAddress.getHostString();
             this.serverPort = inetSocketAddress.getPort();
         } else {

bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyMain.java

@@ -25,7 +25,6 @@
 
 package org.geysermc.geyser.platform.viaproxy;
 
-import net.raphimc.viaproxy.plugins.PluginManager;
 import org.geysermc.geyser.GeyserMain;
 
 public class GeyserViaProxyMain extends GeyserMain {
@@ -39,7 +38,7 @@ public class GeyserViaProxyMain extends GeyserMain {
     }
 
     public String getPluginFolder() {
-        return PluginManager.PLUGINS_DIR.getName();
+        return "plugins";
     }
 
 }

bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java

@@ -27,7 +27,6 @@ package org.geysermc.geyser.platform.viaproxy;
 import net.lenni0451.lambdaevents.EventHandler;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.viaproxy.ViaProxy;
-import net.raphimc.viaproxy.cli.options.Options;
 import net.raphimc.viaproxy.plugins.PluginManager;
 import net.raphimc.viaproxy.plugins.ViaProxyPlugin;
 import net.raphimc.viaproxy.plugins.events.ConsoleCommandEvent;
@@ -137,7 +136,7 @@ public class GeyserViaProxyPlugin extends ViaProxyPlugin implements GeyserBootst
 
         GeyserImpl.start();
 
-        if (Options.PROTOCOL_VERSION != null && Options.PROTOCOL_VERSION.newerThanOrEqualTo(LegacyProtocolVersion.b1_8tob1_8_1)) {
+        if (ViaProxy.getConfig().getTargetVersion() != null && ViaProxy.getConfig().getTargetVersion().newerThanOrEqualTo(LegacyProtocolVersion.b1_8tob1_8_1)) {
             // Only initialize the ping passthrough if the protocol version is above beta 1.7.3, as that's when the status protocol was added
             this.pingPassthrough = GeyserLegacyPingPassthrough.init(this.geyser);
         }
@@ -186,19 +185,19 @@ public class GeyserViaProxyPlugin extends ViaProxyPlugin implements GeyserBootst
     @NotNull
     @Override
     public String getServerBindAddress() {
-        if (Options.BIND_ADDRESS instanceof InetSocketAddress socketAddress) {
+        if (ViaProxy.getConfig().getBindAddress() instanceof InetSocketAddress socketAddress) {
             return socketAddress.getHostString();
         } else {
-            throw new IllegalStateException("Unsupported bind address type: " + Options.BIND_ADDRESS.getClass().getName());
+            throw new IllegalStateException("Unsupported bind address type: " + ViaProxy.getConfig().getBindAddress().getClass().getName());
         }
     }
 
     @Override
     public int getServerPort() {
-        if (Options.BIND_ADDRESS instanceof InetSocketAddress socketAddress) {
+        if (ViaProxy.getConfig().getBindAddress() instanceof InetSocketAddress socketAddress) {
             return socketAddress.getPort();
         } else {
-            throw new IllegalStateException("Unsupported bind address type: " + Options.BIND_ADDRESS.getClass().getName());
+            throw new IllegalStateException("Unsupported bind address type: " + ViaProxy.getConfig().getBindAddress().getClass().getName());
         }
     }
 

bootstrap/viaproxy/src/main/resources/viaproxy.yml

@@ -2,4 +2,4 @@ name: "${name}-ViaProxy"
 version: "${version}"
 author: "${author}"
 main: "org.geysermc.geyser.platform.viaproxy.GeyserViaProxyPlugin"
-min-version: "3.2.0"
+min-version: "3.2.1"

gradle/libs.versions.toml

@@ -29,7 +29,7 @@ adapters = "1.12-SNAPSHOT"
 commodore = "2.2"
 bungeecord = "a7c6ede"
 velocity = "3.1.1"
-viaproxy = "3.2.0-SNAPSHOT"
+viaproxy = "3.2.1"
 fabric-minecraft = "1.20.5"
 fabric-loader = "0.15.10"
 fabric-api = "0.97.6+1.20.5"