Some more API changes

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

@@ -28,6 +28,7 @@ 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;
@@ -66,11 +67,34 @@ public interface GeyserApiBase {
      */
     boolean isBedrockPlayer(@NonNull UUID uuid);
 
-    boolean sendForm(UUID uuid, Form form);
+    /**
+     * 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);
 
-    boolean sendForm(UUID uuid, FormBuilder<?, ?, ?> formBuilder);
+    /**
+     * 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);
 
-    boolean transfer(UUID uuid, String address, int port);
+    /**
+     * 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);
 
 
     /**

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

@@ -28,6 +28,11 @@ 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;
 
@@ -36,43 +41,80 @@ import java.util.UUID;
  */
 public interface Connection {
     /**
-     * Gets the bedrock name of the connection.
-     *
-     * @return the bedrock name of the connection
+     * Returns the bedrock name of the connection.
      */
-    @NonNull
-    String bedrockUsername();
+    @NonNull String bedrockUsername();
 
     /**
-     * Gets the java name of the connection.
-     *
-     * @return the java name of the connection
+     * Returns the java name of the connection.
      */
     @MonotonicNonNull
     String javaUsername();
 
     /**
-     * Gets the {@link UUID} of the connection.
-     *
-     * @return the UUID of the connection
+     * Returns the UUID of the connection.
      */
     @MonotonicNonNull
     UUID javaUuid();
 
     /**
-     * Gets the XUID of the connection.
-     *
-     * @return the XUID of the connection
+     * Returns the XUID of the connection.
      */
-    @NonNull
-    String xuid();
+    @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
+     * @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/BedrockPlatform.java

@@ -0,0 +1,70 @@
+/*
+ * 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;
+
+public enum BedrockPlatform {
+    UNKNOWN("Unknown"),
+    GOOGLE("Android"),
+    IOS("iOS"),
+    OSX("macOS"),
+    AMAZON("Amazon"),
+    GEARVR("Gear VR"),
+    HOLOLENS("Hololens"),
+    UWP("Windows 10"),
+    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();
+
+    private final String displayName;
+
+    BedrockPlatform(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * Get the BedrockPlatform from the identifier.
+     *
+     * @param id the BedrockPlatform identifier
+     * @return The BedrockPlatform or {@link #UNKNOWN} if the platform wasn't found
+     */
+    public static BedrockPlatform fromId(int id) {
+        return id < VALUES.length ? VALUES[id] : VALUES[0];
+    }
+
+    /**
+     * @return friendly display name of platform.
+     */
+    @Override
+    public String toString() {
+        return displayName;
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+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
+     */
+    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

@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+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
+     */
+    public static UiProfile fromId(int id) {
+        return VALUES.length > id ? VALUES[id] : VALUES[0];
+    }
+}