GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Manually solve some merge issues

Browse source
This commit is contained in:
Tim203 2020-10-30 01:14:34 +01:00
parent 0e7dca551e
commit dc8fb46428
No known key found for this signature in database
GPG key ID: 064EE9F5BF7C3EE8
2 changed files with 89 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/src/main/java/org/geysermc/common/form/Form.java
View file

@ -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;