Merge and exit API removal hellscape

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

README.md

@@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
-### Currently supporting Minecraft Bedrock 1.19.20 - 1.19.51 and Minecraft Java 1.19.3.
+### Currently supporting Minecraft Bedrock 1.19.20 - 1.19.60 and Minecraft Java 1.19.3.
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

api/base/build.gradle.kts

@@ -1,7 +0,0 @@
-dependencies {
-    api(libs.cumulus)
-    api(libs.events) {
-        exclude(group = "com.google.guava", module = "guava")
-        exclude(group = "org.lanternpowered", module = "lmbda")
-    }
-}

api/base/src/main/java/org/geysermc/api/Geyser.java

@@ -1,95 +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.api;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * General API class for Geyser.
- */
-@NonNull
-public class Geyser {
-    private static GeyserApiBase api;
-
-    /**
-     * Returns the base api.
-     *
-     * @return the base api
-     */
-    @NonNull
-    public static GeyserApiBase api() {
-        if (api == null) {
-            throw new RuntimeException("Api has not been registered yet!");
-        }
-
-        return api;
-    }
-
-    /**
-     * Returns the api of the given type.
-     *
-     * @param apiClass the api class
-     * @param <T> the type
-     * @return the api of the given type
-     */
-    @SuppressWarnings("unchecked")
-    public static <T extends GeyserApiBase> T api(@NonNull Class<T> apiClass) {
-        if (apiClass.isInstance(api)) {
-            return (T) api;
-        }
-
-        if (api == null) {
-            throw new RuntimeException("Api has not been registered yet!");
-        } else {
-            throw new RuntimeException("Api was not an instance of " + apiClass + "! Was " + api.getClass().getCanonicalName());
-        }
-    }
-
-    /**
-     * Registers the given api type. The api cannot be
-     * registered if {@link #isRegistered()} is true as
-     * an api has already been specified.
-     *
-     * @param api the api
-     */
-    public static void set(@NonNull GeyserApiBase api) {
-        if (Geyser.api != null) {
-            throw new RuntimeException("Cannot redefine already registered api!");
-        }
-
-        Geyser.api = api;
-    }
-
-    /**
-     * Gets if the api has been registered and
-     * is ready for usage.
-     *
-     * @return if the api has been registered
-     */
-    public static boolean isRegistered() {
-        return api != null;
-    }
-}

api/base/src/main/java/org/geysermc/api/GeyserApiBase.java

@@ -1,130 +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.api;
-
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.checkerframework.common.value.qual.IntRange;
-import org.geysermc.api.connection.Connection;
-import org.geysermc.cumulus.form.Form;
-import org.geysermc.cumulus.form.util.FormBuilder;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * The base API class.
- */
-public interface GeyserApiBase {
-    /**
-     * Gets the connection from the given UUID, if applicable. The player must be logged in to the Java server
-     * for this to return a non-null value.
-     *
-     * @param uuid the UUID of the connection
-     * @return the connection from the given UUID, if applicable
-     */
-    @Nullable
-    Connection connectionByUuid(@NonNull UUID uuid);
-
-    /**
-     * Gets the connection from the given XUID, if applicable. This method only works for online connections.
-     *
-     * @param xuid the XUID of the session
-     * @return the connection from the given UUID, if applicable
-     */
-    @Nullable
-    Connection connectionByXuid(@NonNull String xuid);
-
-    /**
-     * Method to determine if the given <b>online</b> player is a Bedrock player.
-     *
-     * @param uuid the uuid of the online player
-     * @return true if the given online player is a Bedrock player
-     */
-    boolean isBedrockPlayer(@NonNull UUID uuid);
-
-    /**
-     * Sends a form to the given connection and opens it.
-     *
-     * @param uuid the uuid of the connection to open it on
-     * @param form the form to send
-     * @return whether the form was successfully sent
-     */
-    boolean sendForm(@NonNull UUID uuid, @NonNull Form form);
-
-    /**
-     * Sends a form to the given connection and opens it.
-     *
-     * @param uuid        the uuid of the connection to open it on
-     * @param formBuilder the formBuilder to send
-     * @return whether the form was successfully sent
-     */
-    boolean sendForm(@NonNull UUID uuid, @NonNull FormBuilder<?, ?, ?> formBuilder);
-
-    /**
-     * Transfer the given connection to a server. A Bedrock player can successfully transfer to the same server they are
-     * currently playing on.
-     *
-     * @param uuid    the uuid of the connection
-     * @param address the address of the server
-     * @param port    the port of the server
-     * @return true if the transfer was a success
-     */
-    boolean transfer(@NonNull UUID uuid, @NonNull String address, @IntRange(from = 0, to = 65535) int port);
-
-
-    /**
-     * Returns all the online connections.
-     */
-    @NonNull
-    List<? extends Connection> onlineConnections();
-
-    /**
-     * Returns the amount of online connections.
-     */
-    int onlineConnectionsCount();
-
-    /**
-     * Returns the prefix used by Floodgate. Will be null when the auth-type isn't Floodgate.
-     */
-    @MonotonicNonNull
-    String usernamePrefix();
-
-    /**
-     * Returns the major API version. Bumped whenever a significant breaking change or feature addition is added.
-     */
-    default int majorApiVersion() {
-        return 1;
-    }
-
-    /**
-     * Returns the minor API version. May be bumped for new API additions.
-     */
-    default int minorApiVersion() {
-        return 0;
-    }
-}

api/base/src/main/java/org/geysermc/api/connection/Connection.java

@@ -1,121 +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.api.connection;
-
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.common.value.qual.IntRange;
-import org.geysermc.api.util.BedrockPlatform;
-import org.geysermc.api.util.InputMode;
-import org.geysermc.api.util.UiProfile;
-import org.geysermc.cumulus.form.Form;
-import org.geysermc.cumulus.form.util.FormBuilder;
-
-import java.util.UUID;
-
-/**
- * Represents a player connection.
- */
-public interface Connection {
-    /**
-     * Returns the bedrock name of the connection.
-     */
-    @NonNull String bedrockUsername();
-
-    /**
-     * Returns the java name of the connection.
-     */
-    @MonotonicNonNull
-    String javaUsername();
-
-    /**
-     * Returns the UUID of the connection.
-     */
-    @MonotonicNonNull
-    UUID javaUuid();
-
-    /**
-     * Returns the XUID of the connection.
-     */
-    @NonNull String xuid();
-
-    /**
-     * Returns the version of the Bedrock client.
-     */
-    @NonNull String version();
-
-    /**
-     * Returns the platform that the connection is playing on.
-     */
-    @NonNull BedrockPlatform platform();
-
-    /**
-     * Returns the language code of the connection.
-     */
-    @NonNull String languageCode();
-
-    /**
-     * Returns the User Interface Profile of the connection.
-     */
-    @NonNull UiProfile uiProfile();
-
-    /**
-     * Returns the Input Mode of the Bedrock client.
-     */
-    @NonNull InputMode inputMode();
-
-    /**
-     * Returns whether the connection is linked.
-     * This will always return false when the auth-type isn't Floodgate.
-     */
-    boolean isLinked();
-
-    /**
-     * Sends a form to the connection and opens it.
-     *
-     * @param form the form to send
-     * @return whether the form was successfully sent
-     */
-    boolean sendForm(@NonNull Form form);
-
-    /**
-     * Sends a form to the connection and opens it.
-     *
-     * @param formBuilder the formBuilder to send
-     * @return whether the form was successfully sent
-     */
-    boolean sendForm(@NonNull FormBuilder<?, ?, ?> formBuilder);
-
-    /**
-     * Transfer the connection to a server. A Bedrock player can successfully transfer to the same server they are
-     * currently playing on.
-     *
-     * @param address the address of the server
-     * @param port    the port of the server
-     * @return true if the transfer was a success
-     */
-    boolean transfer(@NonNull String address, @IntRange(from = 0, to = 65535) int port);
-}

api/base/src/main/java/org/geysermc/api/util/InputMode.java

@@ -1,49 +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.api.util;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public enum InputMode {
-    UNKNOWN,
-    KEYBOARD_MOUSE,
-    TOUCH,
-    CONTROLLER,
-    VR;
-
-    private static final InputMode[] VALUES = values();
-
-    /**
-     * Get the InputMode from the identifier.
-     *
-     * @param id the InputMode identifier
-     * @return The InputMode or {@link #UNKNOWN} if the mode wasn't found
-     */
-    @NonNull
-    public static InputMode fromId(int id) {
-        return VALUES.length > id ? VALUES[id] : VALUES[0];
-    }
-}

api/base/src/main/java/org/geysermc/api/util/UiProfile.java

@@ -1,45 +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.api.util;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public enum UiProfile {
-    CLASSIC, POCKET;
-
-    private static final UiProfile[] VALUES = values();
-
-    /**
-     * Get the UiProfile from the identifier.
-     *
-     * @param id the UiProfile identifier
-     * @return The UiProfile or {@link #CLASSIC} if the profile wasn't found
-     */
-    @NonNull
-    public static UiProfile fromId(int id) {
-        return VALUES.length > id ? VALUES[id] : VALUES[0];
-    }
-}

api/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    id("geyser.publish-conventions")
+}
+
+dependencies {
+    api(libs.base.api)
+}

api/geyser/build.gradle.kts

@@ -1,14 +0,0 @@
-plugins {
-    id("geyser.api-conventions")
-}
-
-dependencies {
-    api(projects.api)
-}
-
-publishing {
-    publications.named<MavenPublication>("mavenJava") {
-        groupId = rootProject.group as String + ".geyser"
-        artifactId = "api"
-    }
-}

api/src/main/java/org/geysermc/geyser/api/event/bedrock/BedrockEmoteEvent.java

@@ -23,51 +23,44 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.api.util;
+package org.geysermc.geyser.api.event.bedrock;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.geysermc.event.Cancellable;
+import org.geysermc.geyser.api.connection.GeyserConnection;
+import org.geysermc.geyser.api.event.connection.ConnectionEvent;
 
-public enum BedrockPlatform {
+/**
-    UNKNOWN("Unknown"),
+ * Called whenever a Bedrock player performs an emote on their end, before it is broadcasted to the rest of the server.
-    GOOGLE("Android"),
+ */
-    IOS("iOS"),
+public final class BedrockEmoteEvent extends ConnectionEvent implements Cancellable {
-    OSX("macOS"),
+    private final String emoteId;
-    AMAZON("Amazon"),
+    private boolean cancelled;
-    GEARVR("Gear VR"),
-    HOLOLENS("Hololens"),
-    UWP("Windows"),
-    WIN32("Windows x86"),
-    DEDICATED("Dedicated"),
-    TVOS("Apple TV"),
-    PS4("PS4"),
-    NX("Switch"),
-    XBOX("Xbox One"),
-    WINDOWS_PHONE("Windows Phone");
 
-    private static final BedrockPlatform[] VALUES = values();
+    public BedrockEmoteEvent(@NonNull GeyserConnection connection, @NonNull String emoteId) {
-
+        super(connection);
-    private final String displayName;
+        this.emoteId = emoteId;
-
-    BedrockPlatform(String displayName) {
-        this.displayName = displayName;
     }
 
     /**
-     * Get the BedrockPlatform from the identifier.
+     * @return the emote ID that the Bedrock player is attempting to perform.
-     *
-     * @param id the BedrockPlatform identifier
-     * @return The BedrockPlatform or {@link #UNKNOWN} if the platform wasn't found
      */
     @NonNull
-    public static BedrockPlatform fromId(int id) {
+    public String emoteId() {
-        return id < VALUES.length ? VALUES[id] : VALUES[0];
+        return emoteId;
     }
 
     /**
-     * @return friendly display name of platform.
+     * @return the cancel status of this event. A Bedrock player will still play this emote on its end even if this
+     * event is cancelled, but other Bedrock players will not see.
      */
     @Override
-    public String toString() {
+    public boolean isCancelled() {
-        return displayName;
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
     }
 }

api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java

@@ -0,0 +1,86 @@
+/*
+ * 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.api.event.downstream;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.geysermc.event.Cancellable;
+import org.geysermc.geyser.api.connection.GeyserConnection;
+import org.geysermc.geyser.api.event.connection.ConnectionEvent;
+
+import java.util.Set;
+
+
+/**
+ * @deprecated please use {@link org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent}.
+ */
+@Deprecated(forRemoval = true)
+public class ServerDefineCommandsEvent extends ConnectionEvent implements Cancellable {
+    private final Set<? extends CommandInfo> commands;
+    private boolean cancelled;
+
+    public ServerDefineCommandsEvent(@NonNull GeyserConnection connection, @NonNull Set<? extends CommandInfo> commands) {
+        super(connection);
+        this.commands = commands;
+    }
+
+    /**
+     * A collection of commands sent from the server. Any element in this collection can be removed, but no element can
+     * be added.
+     *
+     * @return a collection of the commands sent over
+     */
+    @NonNull
+    public Set<? extends CommandInfo> commands() {
+        return this.commands;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    @Deprecated(forRemoval = true)
+    public interface CommandInfo {
+        /**
+         * Gets the name of the command.
+         *
+         * @return the name of the command
+         */
+        String name();
+
+        /**
+         * Gets the description of the command.
+         *
+         * @return the description of the command
+         */
+        String description();
+    }
+}

api/src/main/java/org/geysermc/geyser/api/event/java/ServerDefineCommandsEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2023 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
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.geyser.api.event.downstream;
+package org.geysermc.geyser.api.event.java;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.event.Cancellable;

build-logic/src/main/kotlin/geyser.api-conventions.gradle.kts

@@ -1,9 +0,0 @@
-plugins {
-    id("geyser.publish-conventions")
-}
-
-tasks {
-    shadowJar {
-        archiveBaseName.set(archiveBaseName.get() + "-api")
-    }
-}

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 allprojects {
-    group = "org.geysermc"
+    group = "org.geysermc.geyser"
     version = "2.1.0-SNAPSHOT"
     description = "Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers."
 
@@ -23,8 +23,6 @@ val platforms = setOf(
     projects.velocity
 ).map { it.dependencyProject }
 
-val api: Project = projects.api.dependencyProject
-
 subprojects {
     apply {
         plugin("java-library")
@@ -32,16 +30,8 @@ subprojects {
         plugin("geyser.build-logic")
     }
 
-    val relativePath = projectDir.relativeTo(rootProject.projectDir).path
+    when (this) {
-
+        in platforms -> plugins.apply("geyser.platform-conventions")
-    if (relativePath.contains("api")) {
+        else -> plugins.apply("geyser.base-conventions")
-        plugins.apply("geyser.api-conventions")
-    } else {
-        group = rootProject.group as String + ".geyser"
-        when (this) {
-            in platforms -> plugins.apply("geyser.platform-conventions")
-            api -> plugins.apply("geyser.publish-conventions")
-            else -> plugins.apply("geyser.base-conventions")
-        }
     }
 }

core/build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
 }
 
 dependencies {
-    api(projects.geyserApi)
     api(projects.common)
+    api(projects.api)
 
     // Jackson JSON and YAML serialization
     api(libs.bundles.jackson)

core/src/main/java/org/geysermc/geyser/Constants.java

@@ -50,6 +50,7 @@ public final class Constants {
         try {
             wsUri = new URI("wss://api.geysermc.org/ws");
         } catch (URISyntaxException e) {
+            GeyserImpl.getInstance().getLogger().error("Unable to resolve api.geysermc.org! Check your internet connection.");
             e.printStackTrace();
         }
         GLOBAL_API_WS_URI = wsUri;

core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java

@@ -119,6 +119,8 @@ public class PlayerEntity extends LivingEntity {
             setBelowNameText(objective);
         }
 
+        // Update in case this entity has been despawned, then respawned
+        this.nametag = this.username;
         // The name can't be updated later (the entity metadata for it is ignored), so we need to check for this now
         updateDisplayName(session.getWorldCache().getScoreboard().getTeamFor(username));
 

core/src/main/java/org/geysermc/geyser/network/GameProtocol.java

@@ -30,6 +30,7 @@ import com.github.steveice10.mc.protocol.codec.PacketCodec;
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.v557.Bedrock_v557;
 import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
+import com.nukkitx.protocol.bedrock.v567.Bedrock_v567;
 import org.geysermc.geyser.session.GeyserSession;
 
 import java.util.ArrayList;
@@ -63,6 +64,7 @@ public final class GameProtocol {
         SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC.toBuilder()
                 .minecraftVersion("1.19.50/1.19.51")
                 .build());
+        SUPPORTED_BEDROCK_CODECS.add(Bedrock_v567.V567_CODEC);
     }
 
     /**
@@ -85,6 +87,10 @@ public final class GameProtocol {
         return session.getUpstream().getProtocolVersion() >= Bedrock_v560.V560_CODEC.getProtocolVersion();
     }
 
+    public static boolean supports1_19_60(GeyserSession session) {
+        return session.getUpstream().getProtocolVersion() >= Bedrock_v567.V567_CODEC.getProtocolVersion();
+    }
+
     /**
      * Gets the {@link PacketCodec} for Minecraft: Java Edition.
      *

core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java

@@ -28,14 +28,11 @@ package org.geysermc.geyser.registry.populator;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.common.collect.ImmutableMap;
-import com.nukkitx.nbt.NBTInputStream;
+import com.nukkitx.nbt.*;
-import com.nukkitx.nbt.NbtList;
-import com.nukkitx.nbt.NbtMap;
-import com.nukkitx.nbt.NbtMapBuilder;
-import com.nukkitx.nbt.NbtType;
 import com.nukkitx.protocol.bedrock.data.BlockPropertyData;
 import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
 import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
+import com.nukkitx.protocol.bedrock.v567.Bedrock_v567;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -79,6 +76,7 @@ public final class BlockRegistryPopulator {
         ImmutableMap<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> blockMappers = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
                 .put(ObjectIntPair.of("1_19_20", Bedrock_v544.V544_CODEC.getProtocolVersion()), emptyMapper)
                 .put(ObjectIntPair.of("1_19_50", Bedrock_v560.V560_CODEC.getProtocolVersion()), emptyMapper)
+                .put(ObjectIntPair.of("1_19_60", Bedrock_v567.V567_CODEC.getProtocolVersion()), emptyMapper)
                 .build();
 
         for (Map.Entry<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> palette : blockMappers.entrySet()) {

core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java

@@ -38,21 +38,11 @@ import com.nukkitx.protocol.bedrock.data.inventory.ComponentItemData;
 import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
 import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
+import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
 import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import com.nukkitx.protocol.bedrock.v567.Bedrock_v567;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.*;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.*;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMaps;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import it.unimi.dsi.fastutil.objects.ObjectIntPair;
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserBootstrap;
@@ -100,6 +90,7 @@ public class ItemRegistryPopulator {
         Map<String, PaletteVersion> paletteVersions = new Object2ObjectOpenHashMap<>();
         paletteVersions.put("1_19_20", new PaletteVersion(Bedrock_v544.V544_CODEC.getProtocolVersion(), Collections.emptyMap()));
         paletteVersions.put("1_19_50", new PaletteVersion(Bedrock_v560.V560_CODEC.getProtocolVersion(), Collections.emptyMap()));
+        paletteVersions.put("1_19_60", new PaletteVersion(Bedrock_v567.V567_CODEC.getProtocolVersion(), Collections.emptyMap()));
 
         GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
 

core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java

@@ -48,6 +48,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import static org.geysermc.geyser.scoreboard.UpdateType.*;
 
 public final class Scoreboard {
+    private static final boolean SHOW_SCOREBOARD_LOGS = Boolean.parseBoolean(System.getProperty("Geyser.ShowScoreboardLogs", "true"));
+
     private final GeyserSession session;
     private final GeyserLogger logger;
     @Getter
@@ -134,7 +136,9 @@ public final class Scoreboard {
     public Team registerNewTeam(String teamName, String[] players) {
         Team team = teams.get(teamName);
         if (team != null) {
-            logger.info(GeyserLocale.getLocaleStringLog("geyser.network.translator.team.failed_overrides", teamName));
+            if (SHOW_SCOREBOARD_LOGS) {
+                logger.info(GeyserLocale.getLocaleStringLog("geyser.network.translator.team.failed_overrides", teamName));
+            }
             return team;
         }
 
@@ -352,7 +356,8 @@ public final class Scoreboard {
             // With the player's lack of a team in visibility checks
             updateEntityNames(remove, remove.getEntities(), true);
             for (String name : remove.getEntities()) {
-                playerToTeam.remove(name, remove);
+                // 1.19.3 Mojmap Scoreboard#removePlayerTeam(PlayerTeam)
+                playerToTeam.remove(name);
             }
 
             session.removeCommandEnum("Geyser_Teams", remove.getId());

core/src/main/java/org/geysermc/geyser/scoreboard/Team.java

@@ -65,7 +65,14 @@ public final class Team {
             if (entities.add(name)) {
                 added.add(name);
             }
-            scoreboard.getPlayerToTeam().put(name, this);
+            scoreboard.getPlayerToTeam().compute(name, (player, oldTeam) -> {
+                if (oldTeam != null) {
+                    // Remove old team from this map, and from the set of players of the old team.
+                    // Java 1.19.3 Mojmap: Scoreboard#addPlayerToTeam calls #removePlayerFromTeam
+                    oldTeam.entities.remove(player);
+                }
+                return this;
+            });
         }
 
         if (added.isEmpty()) {

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java

@@ -46,7 +46,7 @@ import lombok.ToString;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.geysermc.geyser.GeyserImpl;
-import org.geysermc.geyser.api.event.downstream.ServerDefineCommandsEvent;
+import org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent;
 import org.geysermc.geyser.command.GeyserCommandManager;
 import org.geysermc.geyser.inventory.item.Enchantment;
 import org.geysermc.geyser.registry.BlockRegistries;
@@ -150,12 +150,20 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
                     index -> new HashSet<>()).add(node.getName().toLowerCase());
         }
 
-        ServerDefineCommandsEvent event = new ServerDefineCommandsEvent(session, commands.keySet());
+        var eventBus = session.getGeyser().eventBus();
-        session.getGeyser().eventBus().fire(event);
+
+        var event = new ServerDefineCommandsEvent(session, commands.keySet());
+        eventBus.fire(event);
         if (event.isCancelled()) {
             return;
         }
 
+        var oldEvent = new org.geysermc.geyser.api.event.downstream.ServerDefineCommandsEvent(session, commands.keySet());
+        eventBus.fire(oldEvent);
+        if (oldEvent.isCancelled()) {
+            return;
+        }
+
         // The command flags, not sure what these do apart from break things
         List<CommandData.Flag> flags = Collections.emptyList();
 
@@ -259,7 +267,10 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
     /**
      * Stores the command description and parameter data for best optimizing the Bedrock commands packet.
      */
-    private record BedrockCommandInfo(String name, String description, CommandParamData[][] paramData) implements ServerDefineCommandsEvent.CommandInfo {
+    private record BedrockCommandInfo(String name, String description, CommandParamData[][] paramData) implements
+            org.geysermc.geyser.api.event.downstream.ServerDefineCommandsEvent.CommandInfo,
+            ServerDefineCommandsEvent.CommandInfo
+    {
     }
 
     /**

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java

@@ -46,6 +46,7 @@ import org.geysermc.geyser.inventory.recipe.GeyserRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserShapedRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserShapelessRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserStonecutterData;
+import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
@@ -144,10 +145,16 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
                         for (ItemStack addition : recipeData.getAddition().getOptions()) {
                             ItemDescriptorWithCount bedrockAddition = ItemDescriptorWithCount.fromItem(ItemTranslator.translateToBedrock(session, addition));
 
-                            UUID uuid = UUID.randomUUID();
+                            if (GameProtocol.supports1_19_60(session)) {
-                            craftingDataPacket.getCraftingData().add(CraftingData.fromShapeless(uuid.toString(),
+                                // Note: vanilla inputs use aux value of Short.MAX_VALUE
-                                    List.of(bedrockBase, bedrockAddition),
+                                craftingDataPacket.getCraftingData().add(CraftingData.fromSmithingTransform(recipe.getIdentifier(),
-                                    Collections.singletonList(output), uuid, "smithing_table", 2, netId++));
+                                        bedrockBase, bedrockAddition, output, "smithing_table", netId++));
+                            } else {
+                                UUID uuid = UUID.randomUUID();
+                                craftingDataPacket.getCraftingData().add(CraftingData.fromShapeless(uuid.toString(),
+                                        List.of(bedrockBase, bedrockAddition),
+                                        Collections.singletonList(output), uuid, "smithing_table", 2, netId++));
+                            }
                         }
                     }
                 }

core/src/main/java/org/geysermc/geyser/translator/protocol/java/scoreboard/JavaSetScoreTranslator.java

@@ -44,6 +44,8 @@ import org.geysermc.geyser.translator.protocol.Translator;
 
 @Translator(packet = ClientboundSetScorePacket.class)
 public class JavaSetScoreTranslator extends PacketTranslator<ClientboundSetScorePacket> {
+    private static final boolean SHOW_SCOREBOARD_LOGS = Boolean.parseBoolean(System.getProperty("Geyser.ShowScoreboardLogs", "true"));
+
     private final GeyserLogger logger;
 
     public JavaSetScoreTranslator() {
@@ -58,7 +60,9 @@ public class JavaSetScoreTranslator extends PacketTranslator<ClientboundSetScore
 
         Objective objective = scoreboard.getObjective(packet.getObjective());
         if (objective == null && packet.getAction() != ScoreboardAction.REMOVE) {
-            logger.info(GeyserLocale.getLocaleStringLog("geyser.network.translator.score.failed_objective", packet.getObjective()));
+            if (SHOW_SCOREBOARD_LOGS) {
+                logger.info(GeyserLocale.getLocaleStringLog("geyser.network.translator.score.failed_objective", packet.getObjective()));
+            }
             return;
         }
 

gradle/libs.versions.toml

@@ -1,11 +1,14 @@
 [versions]
+base-api = "1.0.0-SNAPSHOT"
+cumulus = "1.1.1"
+events = "1.0-SNAPSHOT"
 jackson = "2.14.0"
 fastutil = "8.5.2"
 netty = "4.1.80.Final"
 guava = "29.0-jre"
 gson = "2.3.1" # Provided by Spigot 1.8.8
 websocket = "1.5.1"
-protocol = "2.9.15-20230106.005737-3"
+protocol = "2.9.16-20230205.181702-1"
 raknet = "1.6.28-20220125.214016-6"
 mcauthlib = "d9d773e"
 mcprotocollib = "1.19.3-20230107.194116-10"
@@ -14,9 +17,7 @@ adventure = "4.12.0-20220629.025215-9"
 adventure-platform = "4.1.2"
 junit = "4.13.1"
 checkerframework = "3.19.0"
-cumulus  = "1.1.1"
+log4j = "2.17.1"
-events = "1.0-SNAPSHOT"
-log4j  = "2.17.1"
 jline = "3.21.0"
 terminalconsoleappender = "1.2.0"
 paper = "1.19-R0.1-SNAPSHOT"
@@ -31,6 +32,10 @@ fabric-loader = "0.14.8"
 fabric-api = "0.58.5+1.19.1"
 
 [libraries]
+base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }
+cumulus = { group = "org.geysermc.cumulus", name = "cumulus", version.ref = "cumulus" }
+events = { group = "org.geysermc.event", name = "events", version.ref = "events" }
+
 jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" }
 jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
 jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" }
@@ -74,15 +79,13 @@ adapters-spigot = { group = "org.geysermc.geyser.adapters", name = "spigot-all",
 bungeecord-proxy = { group = "com.github.SpigotMC.BungeeCord", name = "bungeecord-proxy", version.ref = "bungeecord" }
 checker-qual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerframework" }
 commodore = { group = "me.lucko", name = "commodore", version.ref = "commodore" }
-cumulus = { group = "org.geysermc.cumulus", name = "cumulus", version.ref = "cumulus" }
-events = { group = "org.geysermc.event", name = "events", version.ref = "events" }
 guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" }
 mcprotocollib = { group = "com.github.steveice10", name = "mcprotocollib", version.ref = "mcprotocollib" }
 packetlib = { group = "com.github.steveice10", name = "packetlib", version.ref = "packetlib" }
-protocol = { group = "com.nukkitx.protocol", name = "bedrock-v560", version.ref = "protocol" }
+protocol = { group = "com.nukkitx.protocol", name = "bedrock-v567", version.ref = "protocol" }
 raknet = { group = "com.nukkitx.network", name = "raknet", version.ref = "raknet" }
 sponge-api = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" }
 terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" }
@@ -91,8 +94,8 @@ viaversion = { group = "com.viaversion", name = "viaversion", version.ref = "via
 websocket = { group = "org.java-websocket", name = "Java-WebSocket", version.ref = "websocket" }
 
 [bundles]
-jackson = [ "jackson-annotations", "jackson-core", "jackson-dataformat-yaml" ]
+jackson = ["jackson-annotations", "jackson-core", "jackson-dataformat-yaml"]
-fastutil = [ "fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps" ]
+fastutil = ["fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps"]
-adventure = [ "adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-text-serializer-plain" ]
+adventure = ["adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-text-serializer-plain"]
-log4j = [ "log4j-api", "log4j-core", "log4j-slf4j18-impl" ]
+log4j = ["log4j-api", "log4j-core", "log4j-slf4j18-impl"]
-jline = [ "jline-terminal", "jline-terminal-jna", "jline-reader" ]
+jline = ["jline-terminal", "jline-terminal-jna", "jline-reader"]

settings.gradle.kts

@@ -62,7 +62,6 @@ rootProject.name = "geyser-parent"
 
 include(":ap")
 include(":api")
-include(":geyser-api")
 include(":bungeecord")
 include(":fabric")
 include(":spigot")
@@ -73,8 +72,6 @@ include(":common")
 include(":core")
 
 // Specify project dirs
-project(":api").projectDir = file("api/base")
-project(":geyser-api").projectDir = file("api/geyser")
 project(":bungeecord").projectDir = file("bootstrap/bungeecord")
 project(":fabric").projectDir = file("bootstrap/fabric")
 project(":spigot").projectDir = file("bootstrap/spigot")