Add syncIsHost config

zbx1425 · Aug 20, 2023 · 2b5581f · 2b5581f
1 parent b94ca09
commit 2b5581f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -72,7 +72,7 @@ subprojects {
 	}
 
 	dependencies {
-		annotationProcessor 'systems.manifold:manifold-preprocessor:2023.1.11'
+		annotationProcessor 'systems.manifold:manifold-preprocessor:+'
 		minecraft "com.mojang:minecraft:${minecraft_version}"
 		mappings parchment_not_avail ? loom.officialMojangMappings() : loom.layered() {
 			officialMojangMappings()

diff --git a/common/src/main/java/cn/zbx1425/worldcomment/Config.java b/common/src/main/java/cn/zbx1425/worldcomment/Config.java
@@ -11,24 +11,25 @@
 public class Config {
 
     public String redisUrl = "";
+    public boolean syncIsHost = true;
 
     public String uplinkUrl = "";
     public String uplinkAuthKey = "";
 
     public void load(Path configPath) throws IOException {
-        if (!Files.exists(configPath)) {
-            return;
-        }
+        if (!Files.exists(configPath)) save(configPath);
 
         JsonObject json = JsonParser.parseString(Files.readString(configPath)).getAsJsonObject();
         redisUrl = json.get("redisUrl").getAsString();
+        syncIsHost = json.get("syncIsHost").getAsBoolean();
         uplinkUrl = json.get("uplinkUrl").getAsString();
         uplinkAuthKey = json.get("uplinkAuthKey").getAsString();
     }
 
     public void save(Path configPath) throws IOException {
         JsonObject json = new JsonObject();
         json.addProperty("redisUrl", redisUrl);
+        json.addProperty("syncIsHost", syncIsHost);
         json.addProperty("uplinkUrl", uplinkUrl);
         json.addProperty("uplinkAuthKey", uplinkAuthKey);
 

diff --git a/common/src/main/java/cn/zbx1425/worldcomment/Main.java b/common/src/main/java/cn/zbx1425/worldcomment/Main.java
@@ -48,7 +48,7 @@ public static void init(RegistriesWrapper registries) {
 				CONFIG.load(server.getServerDirectory().toPath()
 						.resolve("config").resolve("world-comment.json"));
 
-				DATABASE = new ServerWorldData(server);
+				DATABASE = new ServerWorldData(server, CONFIG.syncIsHost);
 				if (!CONFIG.redisUrl.isEmpty()) {
 					DATABASE.peerChannel = new RedisSynchronizer(CONFIG.redisUrl, DATABASE);
 				}

diff --git a/common/src/main/java/cn/zbx1425/worldcomment/data/ServerWorldData.java b/common/src/main/java/cn/zbx1425/worldcomment/data/ServerWorldData.java
@@ -17,17 +17,18 @@ public class ServerWorldData {
     public final MinecraftServer server;
     public final Path basePath;
 
-    public boolean isHost = true;
+    public boolean isHost;
 
     public final CommentCache comments = new CommentCache();
 
     public final FileSerializer fileSerializer;
     public Synchronizer peerChannel;
 
-    public ServerWorldData(MinecraftServer server) {
+    public ServerWorldData(MinecraftServer server, boolean isHost) {
         this.server = server;
         this.basePath = Path.of(server.getWorldPath(LevelResource.ROOT).toString(), "world-comment");
         fileSerializer = new FileSerializer(basePath);
+        this.isHost = isHost;
         this.peerChannel = Synchronizer.NOOP;
     }