Merge remote-tracking branch 'refs/remotes/upstream/master'

.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
-          echo
+          ' metadata.json.tmp > metadata.json
+          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 @@
 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 GeyserFabricBootstrap() {
 
     @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 @@
 
 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,13 +66,26 @@ private void onServerStarted(ServerStartedEvent event) {
     }
 
     private void onServerStopping(ServerStoppingEvent event) {
+        if (isServer()) {
+            this.onGeyserShutdown();
+        } else {
+            this.onGeyserDisable();
+        }
+    }
+
+    private void onClientStopping(GameShuttingDownEvent ignored) {
         this.onGeyserShutdown();
     }
 
     private void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
         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

@@ -58,6 +58,7 @@
 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;
@@ -127,7 +128,9 @@ public void onGeyserEnable() {
         // 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);
-        this.geyserInjector.initializeLocalChannel(this);
+        if (isServer()) {
+            this.geyserInjector.initializeLocalChannel(this);
+        }
 
         // Start command building
         // Set just "geyser" as the help command
@@ -242,7 +245,19 @@ public String getServerBindAddress() {
 
     @Override
     public int getServerPort() {
-        return ((GeyserServerPortGetter) server).geyser$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.getInstance().onGeyserEnable();
+            GeyserModBootstrap instance = GeyserModBootstrap.getInstance();
+            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