diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java index f6ec16b78..13d209555 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java @@ -21,9 +21,7 @@ import com.google.gson.*; import com.google.gson.annotations.JsonAdapter; import javafx.beans.InvalidationListener; import javafx.beans.Observable; -import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; -import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleIntegerProperty; import org.jackhuang.hmcl.util.javafx.ObservableHelper; import org.jackhuang.hmcl.util.javafx.PropertyUtils; @@ -33,7 +31,7 @@ import java.lang.reflect.Type; import java.util.*; @JsonAdapter(GlobalConfig.Serializer.class) -public class GlobalConfig implements Cloneable, Observable { +public final class GlobalConfig implements Cloneable, Observable { @Nullable public static GlobalConfig fromJson(String json) throws JsonParseException { @@ -47,17 +45,13 @@ public class GlobalConfig implements Cloneable, Observable { return instance; } - private IntegerProperty agreementVersion = new SimpleIntegerProperty(); + private final IntegerProperty agreementVersion = new SimpleIntegerProperty(); - private IntegerProperty platformPromptVersion = new SimpleIntegerProperty(); - - private BooleanProperty multiplayerRelay = new SimpleBooleanProperty(); - - private IntegerProperty multiplayerAgreementVersion = new SimpleIntegerProperty(0); + private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty(); private final Map unknownFields = new HashMap<>(); - private transient ObservableHelper helper = new ObservableHelper(this); + private final transient ObservableHelper helper = new ObservableHelper(this); public GlobalConfig() { PropertyUtils.attachListener(this, helper); @@ -106,37 +100,10 @@ public class GlobalConfig implements Cloneable, Observable { this.platformPromptVersion.set(platformPromptVersion); } - public boolean isMultiplayerRelay() { - return multiplayerRelay.get(); - } - - public BooleanProperty multiplayerRelayProperty() { - return multiplayerRelay; - } - - public void setMultiplayerRelay(boolean multiplayerRelay) { - this.multiplayerRelay.set(multiplayerRelay); - } - - public int getMultiplayerAgreementVersion() { - return multiplayerAgreementVersion.get(); - } - - public IntegerProperty multiplayerAgreementVersionProperty() { - return multiplayerAgreementVersion; - } - - public void setMultiplayerAgreementVersion(int multiplayerAgreementVersion) { - this.multiplayerAgreementVersion.set(multiplayerAgreementVersion); - } - - public static class Serializer implements JsonSerializer, JsonDeserializer { + public static final class Serializer implements JsonSerializer, JsonDeserializer { private static final Set knownFields = new HashSet<>(Arrays.asList( "agreementVersion", - "platformPromptVersion", - "multiplayerToken", - "multiplayerRelay", - "multiplayerAgreementVersion" + "platformPromptVersion" )); @Override @@ -148,8 +115,6 @@ public class GlobalConfig implements Cloneable, Observable { JsonObject jsonObject = new JsonObject(); jsonObject.add("agreementVersion", context.serialize(src.getAgreementVersion())); jsonObject.add("platformPromptVersion", context.serialize(src.getPlatformPromptVersion())); - jsonObject.add("multiplayerRelay", context.serialize(src.isMultiplayerRelay())); - jsonObject.add("multiplayerAgreementVersion", context.serialize(src.getMultiplayerAgreementVersion())); for (Map.Entry entry : src.unknownFields.entrySet()) { jsonObject.add(entry.getKey(), context.serialize(entry.getValue())); } @@ -166,8 +131,6 @@ public class GlobalConfig implements Cloneable, Observable { GlobalConfig config = new GlobalConfig(); config.setAgreementVersion(Optional.ofNullable(obj.get("agreementVersion")).map(JsonElement::getAsInt).orElse(0)); config.setPlatformPromptVersion(Optional.ofNullable(obj.get("platformPromptVersion")).map(JsonElement::getAsInt).orElse(0)); - config.setMultiplayerRelay(Optional.ofNullable(obj.get("multiplayerRelay")).map(JsonElement::getAsBoolean).orElse(false)); - config.setMultiplayerAgreementVersion(Optional.ofNullable(obj.get("multiplayerAgreementVersion")).map(JsonElement::getAsInt).orElse(0)); for (Map.Entry entry : obj.entrySet()) { if (!knownFields.contains(entry.getKey())) {