From 53de9f4a31cd52dea3c6526f799e41f96a4fcfa6 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Wed, 26 Jan 2022 12:10:15 +0100
Subject: [PATCH] Deploy the Cumulus changes for Geyser so Floodgate can use
 them

---
 Jenkinsfile                                               | 1 +
 ap/pom.xml                                                | 4 ++--
 api/base/pom.xml                                          | 2 +-
 api/geyser/pom.xml                                        | 4 ++--
 api/pom.xml                                               | 2 +-
 bootstrap/bungeecord/pom.xml                              | 4 ++--
 bootstrap/pom.xml                                         | 4 ++--
 bootstrap/spigot/pom.xml                                  | 4 ++--
 bootstrap/sponge/pom.xml                                  | 4 ++--
 bootstrap/standalone/pom.xml                              | 4 ++--
 bootstrap/velocity/pom.xml                                | 4 ++--
 common/pom.xml                                            | 2 +-
 core/pom.xml                                              | 8 ++++----
 .../protocol/java/JavaCustomPayloadTranslator.java        | 2 +-
 pom.xml                                                   | 2 +-
 15 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 481c02310..d1081b0d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,6 +23,7 @@ pipeline {
         stage ('Deploy') {
             when {
                 branch "master"
+                branch "feature/cumulus-1.1" // allow Floodgate to build
             }
 
             steps {
diff --git a/ap/pom.xml b/ap/pom.xml
index cc282dd55..e14829ab1 100644
--- a/ap/pom.xml
+++ b/ap/pom.xml
@@ -6,9 +6,9 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
 
     <artifactId>ap</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-cumulus-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/api/base/pom.xml b/api/base/pom.xml
index 0d7ed05da..c584885ce 100644
--- a/api/base/pom.xml
+++ b/api/base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>api-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api/geyser/pom.xml b/api/geyser/pom.xml
index 89349e8ac..7cee80208 100644
--- a/api/geyser/pom.xml
+++ b/api/geyser/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>api-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>base-api</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/api/pom.xml b/api/pom.xml
index b3d0262ea..d79922690 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-parent</artifactId>
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 9dcd0943e..73cea9ec4 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- Used for better working with internals without reflection -->
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 3b0bdda55..e4710e085 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>ap</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 5aa2c59cf..7aca462c9 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
 
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index fa7989b43..0587e811f 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-sponge</artifactId>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index 00c0410e4..cb6b01b6a 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-standalone</artifactId>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index e1e3331ef..87fa95637 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-velocity</artifactId>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/common/pom.xml b/common/pom.xml
index 54a65ab99..6c204aa9b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>common</artifactId>
 
diff --git a/core/pom.xml b/core/pom.xml
index 4da6bdbe0..121b58548 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-cumulus-SNAPSHOT</version>
     </parent>
     <artifactId>core</artifactId>
 
@@ -21,19 +21,19 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>ap</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>geyser-api</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-cumulus-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- Jackson JSON and YAML serialization -->
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
index 6a65d85f1..5713465eb 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
@@ -60,7 +60,7 @@ public class JavaCustomPayloadTranslator extends PacketTranslator<ClientboundCus
             // receive: first byte is form type, second and third are the id, remaining is the form data
             // respond: first and second byte id, remaining is form response data
 
-            FormType type = FormType.getByOrdinal(data[0]);
+            FormType type = FormType.fromOrdinal(data[0]);
             if (type == null) {
                 throw new NullPointerException(
                         "Got type " + data[0] + " which isn't a valid form type!");
diff --git a/pom.xml b/pom.xml
index 004d58666..dd5b9a4c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.geysermc</groupId>
     <artifactId>geyser-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-cumulus-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geyser</name>
     <description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description>