Manually solve some merge issues

common/src/main/java/org/geysermc/common/form/Form.java

@@ -26,12 +26,14 @@
 package org.geysermc.common.form;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.geysermc.common.form.response.FormResponse;
+import org.geysermc.common.form.util.FormAdaptor;
 
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -39,7 +41,11 @@ import java.util.function.Consumer;
 
 @Getter
 public abstract class Form {
-    protected static final Gson GSON = new Gson();
+    protected static final Gson GSON =
+            new GsonBuilder()
+                    .registerTypeAdapter(ModalForm.class, new FormAdaptor())
+                    .create();
+
     private final Type type;
 
     @Getter(AccessLevel.NONE)
@@ -51,6 +57,10 @@ public abstract class Form {
         this.type = type;
     }
 
+    public static <T extends Form> T fromJson(String json, Class<T> formClass) {
+        return GSON.fromJson(json, formClass);
+    }
+
     public String getJsonData() {
         if (hardcodedJsonData != null) {
             return hardcodedJsonData;

connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019-2020 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.connector.network.translators.java;
+
+import com.github.steveice10.mc.protocol.packet.ingame.client.ClientPluginMessagePacket;
+import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPluginMessagePacket;
+import com.google.common.base.Charsets;
+import org.geysermc.common.form.Form;
+import org.geysermc.connector.common.AuthType;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.Translator;
+
+import java.nio.charset.StandardCharsets;
+
+@Translator(packet = ServerPluginMessagePacket.class)
+public class JavaPluginMessageTranslator extends PacketTranslator<ServerPluginMessagePacket> {
+    @Override
+    public void translate(ServerPluginMessagePacket packet, GeyserSession session) {
+        // The only plugin messages to listen for are Floodgate plugin messages
+        if (session.getConnector().getAuthType() != AuthType.FLOODGATE) {
+            return;
+        }
+
+        String channel = packet.getChannel();
+
+        if (channel.equals("floodgate:form")) {
+            byte[] data = packet.getData();
+
+            // 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
+
+            Form.Type type = Form.Type.getByOrdinal(data[0]);
+            if (type == null) {
+                throw new NullPointerException(
+                        "Got type " + data[0] + " which isn't a valid form type!");
+            }
+
+            String dataString = new String(data, 3, data.length - 3, Charsets.UTF_8);
+
+            Form form = Form.fromJson(dataString, type.getTypeClass());
+            form.setResponseHandler(response -> {
+                byte[] raw = response.getBytes(StandardCharsets.UTF_8);
+                byte[] finalData = new byte[raw.length + 2];
+
+                finalData[0] = data[1];
+                finalData[1] = data[2];
+                System.arraycopy(raw, 0, finalData, 2, raw.length);
+
+                session.sendDownstreamPacket(new ClientPluginMessagePacket(channel, finalData));
+            });
+            session.sendForm(form);
+        }
+    }
+}