diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/ConfigServiceImpl.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/ConfigServiceImpl.java index 81dada1ca..8005d23ca 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/grpc/ConfigServiceImpl.java +++ b/src/main/java/net/pistonmaster/serverwrecker/grpc/ConfigServiceImpl.java @@ -22,8 +22,8 @@ import io.grpc.stub.StreamObserver; import lombok.RequiredArgsConstructor; import net.pistonmaster.serverwrecker.ServerWreckerBootstrap; +import net.pistonmaster.serverwrecker.ServerWreckerServer; import net.pistonmaster.serverwrecker.grpc.generated.*; -import net.pistonmaster.serverwrecker.settings.lib.SettingsManager; import javax.inject.Inject; import java.util.ArrayList; @@ -31,7 +31,7 @@ @RequiredArgsConstructor(onConstructor_ = @Inject) public class ConfigServiceImpl extends ConfigServiceGrpc.ConfigServiceImplBase { - private final SettingsManager settingsManager; + private final ServerWreckerServer serverWreckerServer; @Override public void getUIClientData(ClientDataRequest request, StreamObserver responseObserver) { diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/RPCServer.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/RPCServer.java index d0bf3f8e8..154e8ad04 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/grpc/RPCServer.java +++ b/src/main/java/net/pistonmaster/serverwrecker/grpc/RPCServer.java @@ -57,6 +57,7 @@ public ServerCall.Listener interceptCall(ServerCall. + */ package net.pistonmaster.serverwrecker.gui.navigation; import net.pistonmaster.serverwrecker.grpc.generated.ClientPluginSettingsPage; diff --git a/src/main/java/net/pistonmaster/serverwrecker/settings/lib/Property.java b/src/main/java/net/pistonmaster/serverwrecker/settings/lib/Property.java index 361bee298..1c0c0bab2 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/settings/lib/Property.java +++ b/src/main/java/net/pistonmaster/serverwrecker/settings/lib/Property.java @@ -1,3 +1,22 @@ +/* + * ServerWrecker + * + * Copyright (C) 2023 ServerWrecker + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + */ package net.pistonmaster.serverwrecker.settings.lib; public interface Property { diff --git a/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingId.java b/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingId.java index e2ceff0ea..82d6fa2ba 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingId.java +++ b/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingId.java @@ -1,3 +1,22 @@ +/* + * ServerWrecker + * + * Copyright (C) 2023 ServerWrecker + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + */ package net.pistonmaster.serverwrecker.settings.lib; import java.lang.annotation.ElementType; diff --git a/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingsManager.java b/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingsManager.java index 7ae3f947c..0ffa77307 100644 --- a/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingsManager.java +++ b/src/main/java/net/pistonmaster/serverwrecker/settings/lib/SettingsManager.java @@ -174,14 +174,14 @@ public JsonElement serialize(Object src, Type typeOfSrc, JsonSerializationContex var settingClass = classMap.inverse().get(src.getClass()); Objects.requireNonNull(settingClass, "Setting name for " + src.getClass().getSimpleName() + " is null!"); - jsonObject.addProperty("settingType", settingClass); + jsonObject.addProperty("settingsId", settingClass); return jsonObject; } @Override public Object deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { var jsonObject = json.getAsJsonObject(); - var settingType = jsonObject.get("settingType").getAsString(); + var settingType = jsonObject.get("settingId").getAsString(); var clazz = classMap.get(settingType); Objects.requireNonNull(clazz, "Class for " + settingType + " is null!");