Merge branch 'minekube:master' into master

Author: raphael-goetz

.examples/bedrock/README.md

@@ -1,80 +1,70 @@
-# Gate + Geyser Bedrock Support Example
+# Gate + geyserlite Bedrock Support Example
 
-This example demonstrates how to set up Gate with Geyser for Bedrock Edition support, allowing both Java and Bedrock players to join the same server.
+This example demonstrates Gate's managed Bedrock mode. Gate starts geyserlite automatically so Java and Bedrock players can join the same Paper backend.
 
 ## Quick Start
 
-1. **Generate Floodgate Key** (first time only):
-
-   ```bash
-   # Generate a new Floodgate key
-   docker run --rm -v $(pwd)/geyser:/data itzg/minecraft-server \
-     sh -c "mkdir -p /data && openssl genpkey -algorithm RSA -out /data/key.pem -pkcs8"
-   ```
-
-2. **Start the services**:
+1. **Start the services**:
 
    ```bash
    docker compose up -d
    ```
 
-3. **Check logs**:
+2. **Check logs**:
 
    ```bash
    docker compose logs -f
    ```
 
-4. **Connect**:
+3. **Connect**:
    - **Java players**: Connect to `localhost:25565`
    - **Bedrock players**: Connect to `localhost:19132`
 
 ## Architecture
 
 ```
-Bedrock Players (19132/udp) → Geyser → Gate (25567) → Backend Servers
+Bedrock Players (19132/udp) → Gate managed geyserlite → Paper
 Java Players (25565/tcp) → Gate → Backend Servers
 ```
 
 ## Services
 
 - **Gate**: Main proxy server handling both Java and translated Bedrock connections
-- **Geyser**: Protocol translator converting Bedrock to Java Edition protocol
-- **Server1**: Backend Minecraft server (no plugins required)
-- **Volumes**: Persistent world data
+- **geyserlite**: Native Geyser engine downloaded and started by Gate managed mode
+- **Server1**: Paper `26.1.2` backend running on Java 25
+- **Volumes**: Persistent Gate cache/data and Paper world data
 
 ## Configuration Files
 
-- `gate.yml` - Gate proxy configuration with Bedrock support enabled
-- `geyser/config.yml` - Geyser standalone configuration
-
+- `gate.yml` - Gate proxy configuration with `bedrock: true`
 - `server.properties` - Backend server properties
+- `spigot.yml` - Enables Bungee/legacy forwarding for Gate
 - `docker-compose.yml` - Docker services orchestration
 
 ## Security Notes
 
-- The Gate Bedrock listener (port 25567) should only accept connections from Geyser
-- In production, use firewall rules to restrict access to this port
-- The `key.pem` file enables secure authentication between Geyser and Gate (no backend plugins required)
+- The backend runs with `online-mode=false` because Gate authenticates players.
+- Restrict backend access so players cannot bypass Gate.
+- `spigot.yml` enables Bungee/legacy forwarding, which is required for Gate to pass player identity data.
 
 ## Troubleshooting
 
 ### Bedrock players can't connect
 
 - Check that UDP port 19132 is accessible
-- Verify Geyser logs for connection errors
-- Ensure the Floodgate key is properly shared
+- Verify Gate logs for geyserlite startup errors
+- Ensure the Gate container can write to its cache/data volumes
 
 ### Authentication errors
 
-- Verify the `key.pem` is accessible by both Geyser and Gate
-- Check file permissions on the key file
-- Ensure backend servers have `online-mode=false` (since Gate handles authentication)
+- Ensure backend servers have `online-mode=false`
+- Ensure `settings.bungeecord: true` is present in `spigot.yml`
+- Keep backend access restricted to Gate
 
 ### Performance issues
 
-- Adjust Geyser's `compression-level` and `mtu` settings
-- Monitor resource usage of the Geyser container
-- Consider using `use-direct-connection: true` in Geyser config
+- Monitor resource usage of the Gate container
+- Configure advanced managed options in `gate.yml` if you need custom geyserlite settings
 
 ## Customization
 

.examples/bedrock/docker-compose.yml

@@ -6,42 +6,30 @@ services:
       - GATE_CONFIG_PATH=/gate/gate.yml
     volumes:
       - ./gate.yml:/gate/gate.yml
-      - ./geyser/key.pem:/gate/floodgate.pem
+      - gate-cache:/gate/.cache
+      - gate-data:/gate/data
     ports:
       - '25565:25565' # Java Edition
-      - '25567:25567' # Geyser listener
-    depends_on:
-      - server1
-
-  geyser:
-    image: itzg/minecraft-server
-    restart: unless-stopped
-    environment:
-      EULA: 'TRUE'
-      TYPE: 'CUSTOM'
-      CUSTOM_SERVER: 'https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/standalone'
-    ports:
       - '19132:19132/udp' # Bedrock Edition
-    volumes:
-      - ./geyser/config.yml:/data/config.yml
-      - ./geyser/key.pem:/data/key.pem
     depends_on:
-      - gate
+      - server1
 
   server1:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java25
     restart: unless-stopped
     environment:
       EULA: 'TRUE'
       TYPE: PAPER
-      VERSION: 1.21.4
+      VERSION: 26.1.2
       PAPER_BUILD: latest
-      EXTRA_ARGS: '--world-dir ./worlds/'
     volumes:
-      - worlds:/worlds
+      - server-data:/data
       - ./server.properties:/data/server.properties
+      - ./spigot.yml:/data/spigot.yml
     expose:
       - '25565'
 
 volumes:
-  worlds:
+  gate-cache:
+  gate-data:
+  server-data:

.examples/bedrock/gate.yml

@@ -2,24 +2,15 @@ config:
   bind: 0.0.0.0:25565
   onlineMode: true
   servers:
-    server1: server1:25566
+    server1: server1:25565
   try:
     - server1
-  # forwarding:
-  # mode: legacy
-  # velocitySecret: 'bedrock-crossplay-secret'
+  forwarding:
+    mode: legacy
   status:
     motd: |
-      §bGate + Geyser Cross-Play
+      §bGate + geyserlite Cross-Play
       §eJava & Bedrock Players Welcome!
 
-  # Enable Bedrock edition support (Manual mode - Geyser runs as separate container)
-  bedrock:
-    enabled: true
-    # Gate ↔ Geyser connection (Geyser container connects to Gate container)
-    geyserListenAddr: 'gate:25567'
-    # Bedrock player settings
-    usernameFormat: '.%s'
-    # Floodgate authentication key (shared between containers)
-    floodgateKeyPath: '/gate/floodgate.pem'
-    # managed: false (default - Docker manages Geyser container, not Gate)
+  # Simplest managed setup: Gate starts geyserlite with defaults.
+  bedrock: true

.examples/bedrock/geyser/config.yml

@@ -0,0 +1,4 @@
+settings:
+  # Gate uses legacy/Bungee forwarding for backend player identity data.
+  # Keep backend access restricted to the proxy when online-mode=false.
+  bungeecord: true

.examples/bedrock/geyser/key.pem

@@ -5,47 +5,38 @@
 
 set -e
 
-echo "🚀 Starting Gate + Geyser Bedrock Support Example"
+echo "Starting Gate + geyserlite Bedrock Support Example"
 echo "================================================="
 
 # Check if Docker is running
 if ! docker info > /dev/null 2>&1; then
-    echo "❌ Docker is not running. Please start Docker and try again."
+    echo "Docker is not running. Please start Docker and try again."
     exit 1
 fi
 
-# Check if key.pem exists
-if [ ! -f "geyser/key.pem" ]; then
-    echo "🔑 Generating Floodgate key..."
-    openssl genpkey -algorithm RSA -out geyser/key.pem
-    echo "✅ Floodgate key generated at geyser/key.pem"
-else
-    echo "✅ Floodgate key already exists"
-fi
-
 # Start services
-echo "📦 Starting Docker services..."
+echo "Starting Docker services..."
 docker compose up -d
 
 echo ""
-echo "🎉 Services started successfully!"
+echo "Services started successfully."
 echo ""
-echo "📊 Service Status:"
+echo "Service Status:"
 docker compose ps
 
 echo ""
-echo "🎮 Connection Information:"
+echo "Connection Information:"
 echo "  Java Players:    localhost:25565"
 echo "  Bedrock Players: localhost:19132"
 echo ""
-echo "📋 Useful Commands:"
+echo "Useful Commands:"
 echo "  View logs:       docker compose logs -f"
 echo "  Stop services:   docker compose down"
 echo "  Restart:         docker compose restart"
 echo ""
-echo "🔍 Troubleshooting:"
+echo "Troubleshooting:"
 echo "  - Check logs if players can't connect"
 echo "  - Ensure ports 25565 (Java) and 19132/udp (Bedrock) are open"
-echo "  - Verify the Floodgate key is shared between all services"
+echo "  - Ensure Paper has settings.bungeecord=true via spigot.yml"
 echo ""
-echo "📖 Documentation: https://gate.minekube.com/guide/bedrock"
+echo "Documentation: https://gate.minekube.com/guide/bedrock"