From ce62824899e59990e7720fb4a557d172b6f075e6 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Mon, 12 Aug 2024 23:29:00 +0200
Subject: [PATCH] Feature: Add method to close forms in the API (#4957)

* Add closeForm api method

* Move version check to GameProtocol
---
 .../geyser/api/connection/GeyserConnection.java   | 15 ++++++++++-----
 .../org/geysermc/geyser/network/GameProtocol.java |  4 ++++
 .../geysermc/geyser/session/GeyserSession.java    |  9 +++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java b/api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
index ba559a462..0a580f975 100644
--- a/api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
+++ b/api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
@@ -60,6 +60,16 @@ public interface GeyserConnection extends Connection, CommandSource {
      */
     @NonNull EntityData entities();
 
+    /**
+     * Returns the current ping of the connection.
+     */
+    int ping();
+
+    /**
+     * Closes the currently open form on the client.
+     */
+    void closeForm();
+
     /**
      * @param javaId the Java entity ID to look up.
      * @return a {@link GeyserEntity} if present in this connection's entity tracker.
@@ -132,9 +142,4 @@ public interface GeyserConnection extends Connection, CommandSource {
     @Deprecated
     @NonNull
     Set<String> fogEffects();
-
-    /**
-     * Returns the current ping of the connection.
-     */
-    int ping();
 }
diff --git a/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java b/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
index 087ecf5cc..422fa3d5a 100644
--- a/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
+++ b/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
@@ -97,6 +97,10 @@ public final class GameProtocol {
         return session.getUpstream().getProtocolVersion() < Bedrock_v685.CODEC.getProtocolVersion();
     }
 
+    public static boolean isPre1_21_2(GeyserSession session) {
+        return session.getUpstream().getProtocolVersion() < Bedrock_v686.CODEC.getProtocolVersion();
+    }
+
     /**
      * Gets the {@link PacketCodec} for Minecraft: Java Edition.
      *
diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index 9a990865e..9137c4756 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -79,6 +79,7 @@ import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 import org.cloudburstmc.protocol.bedrock.packet.BiomeDefinitionListPacket;
 import org.cloudburstmc.protocol.bedrock.packet.CameraPresetsPacket;
 import org.cloudburstmc.protocol.bedrock.packet.ChunkRadiusUpdatedPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ClientboundCloseFormPacket;
 import org.cloudburstmc.protocol.bedrock.packet.CraftingDataPacket;
 import org.cloudburstmc.protocol.bedrock.packet.CreativeContentPacket;
 import org.cloudburstmc.protocol.bedrock.packet.EmoteListPacket;
@@ -140,6 +141,7 @@ import org.geysermc.geyser.item.type.BlockItem;
 import org.geysermc.geyser.level.BedrockDimension;
 import org.geysermc.geyser.level.JavaDimension;
 import org.geysermc.geyser.level.physics.CollisionManager;
+import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.network.netty.LocalSession;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.registry.type.BlockMappings;
@@ -2114,6 +2116,13 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
         return (int) Math.floor(rakSessionCodec.getPing());
     }
 
+    @Override
+    public void closeForm() {
+        if (!GameProtocol.isPre1_21_2(this)) {
+            sendUpstreamPacket(new ClientboundCloseFormPacket());
+        }
+    }
+
     public void addCommandEnum(String name, String enums) {
         softEnumPacket(name, SoftEnumUpdateType.ADD, enums);
     }