仍然没写完

build.gradle

@@ -78,6 +78,9 @@ subprojects {
 			officialMojangMappings()
 			parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
 		}
+
+		implementation 'io.lettuce:lettuce-core:6.2.3.RELEASE'
+		shadowCommon 'io.lettuce:lettuce-core:6.2.3.RELEASE'
 	}
 }
 

common/build.gradle

@@ -1,8 +1,6 @@
 dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 	modApi "${rootProject.architectury_id}:architectury:${rootProject.architectury_version}"
-
-	implementation 'io.lettuce:lettuce-core:6.2.3.RELEASE'
 }
 
 architectury {

common/src/main/java/cn/zbx1425/worldcomment/Main.java

@@ -1,7 +1,10 @@
 package cn.zbx1425.worldcomment;
 
 import cn.zbx1425.worldcomment.data.ServerWorldData;
+import cn.zbx1425.worldcomment.data.sync.RedisSynchronizer;
+import cn.zbx1425.worldcomment.data.sync.Synchronizer;
 import cn.zbx1425.worldcomment.item.CommentToolItem;
+import cn.zbx1425.worldcomment.mixin.CreativeModeTabsAccessor;
 import cn.zbx1425.worldcomment.network.PacketCollectionRequestC2S;
 import cn.zbx1425.worldcomment.network.PacketEntryActionC2S;
 import cn.zbx1425.worldcomment.network.PacketRegionRequestC2S;
@@ -10,10 +13,12 @@
 import cn.zbx1425.worldcomment.util.RegistryObject;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.storage.LevelResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.nio.file.Path;
 
 public class Main {
 
@@ -25,7 +30,7 @@ public class Main {
 	public static final RegistryObject<Item> ITEM_COMMENT_TOOL = new RegistryObject<>(CommentToolItem::new);
 
 	public static void init(RegistriesWrapper registries) {
-		registries.registerItem("comment_tool", ITEM_COMMENT_TOOL, CreativeModeTabs.TOOLS_AND_UTILITIES);
+		registries.registerItem("comment_tool", ITEM_COMMENT_TOOL, CreativeModeTabsAccessor.getTOOLS_AND_UTILITIES());
 
 		ServerPlatform.registerNetworkReceiver(
 				PacketRegionRequestC2S.IDENTIFIER, PacketRegionRequestC2S::handle);
@@ -38,7 +43,10 @@ public static void init(RegistriesWrapper registries) {
 
 		ServerPlatform.registerServerStartingEvent(server -> {
 			try {
-				DATABASE = new ServerWorldData(server);
+				//Todo: config inject here
+
+				Synchronizer synchronizer = new RedisSynchronizer("redis://192.168.1.148:6379/0", Path.of(server.getWorldPath(LevelResource.ROOT).toString(), "world-comment"), true);
+				DATABASE = new ServerWorldData(server, synchronizer);
 				DATABASE.load();
 			} catch (IOException e) {
 				LOGGER.error("Failed to open data storage", e);

common/src/main/java/cn/zbx1425/worldcomment/data/CommentEntry.java

@@ -1,6 +1,8 @@
 package cn.zbx1425.worldcomment.data;
 
 import cn.zbx1425.worldcomment.data.network.ThumbImage;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import io.netty.buffer.Unpooled;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
@@ -111,4 +113,29 @@ public void updateInFile(RandomAccessFile oFile) throws IOException {
         oFile.writeInt(like);
     }
 
+    public String toJson() {
+        //Todo: wth is this
+        JsonObject json = new JsonObject();
+        json.addProperty("id", id);
+        json.addProperty("timestamp", timestamp);
+        json.addProperty("level", level.toString());
+        json.addProperty("region", region.toString());
+        json.addProperty("location", location.toString());
+        json.addProperty("initiator", initiator.toString());
+        json.addProperty("initiatorName", initiatorName);
+        json.addProperty("messageType", messageType);
+        json.addProperty("message", message);
+        json.addProperty("image", image.url);
+        json.addProperty("thumb", image.thumbUrl);
+        json.addProperty("deleted", deleted);
+        json.addProperty("like", like);
+        return json.toString();
+    }
+
+
+    public static CommentEntry fromJson(String json) {
+        Gson g = new Gson();
+
+        return g.fromJson(json, CommentEntry.class);
+    }
 }

common/src/main/java/cn/zbx1425/worldcomment/data/ServerWorldData.java

@@ -21,44 +21,35 @@ public class ServerWorldData {
     public final CommentCache comments = new CommentCache();
 
     public final FileSerializer fileSerializer;
-    public final RedisSynchronizer synchronizer;
+    public final Synchronizer synchronizer;
 
-    public ServerWorldData(MinecraftServer server) {
+    public ServerWorldData(MinecraftServer server, Synchronizer synchronizer) {
         this.server = server;
         this.basePath = Path.of(server.getWorldPath(LevelResource.ROOT).toString(), "world-comment");
         fileSerializer = new FileSerializer(basePath);
         //Todo: sync config inject
-        this.synchronizer = new RedisSynchronizer("", true, basePath)
+        this.synchronizer = synchronizer;
     }
 
     public void load() throws IOException {
         if (isHost) {
             fileSerializer.loadInto(comments);
             synchronizer.kvWriteAll(comments.timeIndex);
         } else {
+            //will cover all data
             synchronizer.kvReadAllInto(comments);
         }
     }
 
-    public void insert(CommentEntry newEntry, boolean fromPeer) throws IOException {
+    public void insert(CommentEntry newEntry) throws IOException {
         comments.insert(newEntry);
-        if (isHost) {
-            fileSerializer.insert(newEntry);
-            synchronizer.kvWriteEntry(newEntry);
-        }
-        if (!fromPeer) {
-            synchronizer.notifyInsert(newEntry);
-        }
+        fileSerializer.insert(newEntry);
+        synchronizer.notifyInsert(newEntry);
     }
 
-    public void update(CommentEntry newEntry, boolean fromPeer) throws IOException {
+    public void update(CommentEntry newEntry) throws IOException {
         CommentEntry trustedEntry = comments.update(newEntry);
-        if (isHost) {
-            fileSerializer.update(trustedEntry);
-            synchronizer.kvWriteEntry(trustedEntry);
-        }
-        if (!fromPeer) {
-            synchronizer.notifyUpdate(trustedEntry);
-        }
+        fileSerializer.update(trustedEntry);
+        synchronizer.notifyUpdate(newEntry);
     }
 }

common/src/main/java/cn/zbx1425/worldcomment/data/persist/FileSerializer.java

@@ -63,6 +63,17 @@ public void insert(CommentEntry newEntry) throws IOException {
         }
     }
 
+    public void cover(CommentEntry newEntry, boolean append) throws IOException {
+        try {
+            Files.createDirectory(getLevelPath(newEntry.level));
+        } catch (FileAlreadyExistsException ignored) { }
+
+        Path targetFile = getLevelRegionPath(newEntry.level, newEntry.region);
+        try (FileOutputStream oStream = new FileOutputStream(targetFile.toFile(), append)) {
+            newEntry.writeFileStream(oStream);
+        }
+    }
+
     public void update(CommentEntry existingEntry) throws IOException {
         assert existingEntry.fileOffset > 0;
         Path targetFile = getLevelRegionPath(existingEntry.level, existingEntry.region);

common/src/main/java/cn/zbx1425/worldcomment/data/sync/Command.java

@@ -21,4 +21,25 @@ public static String Updated(String ID) {
         return "UPDATED#"+ID;
     }
 
+    public static String Delete(String ID) {
+        return "DELETE#"+ID;
+    }
+
+    public static long IsUpdated(String Command) {
+        if (!Command.startsWith("UPDATED#")) {
+            return 0;
+        };
+
+        return Long.parseLong(Command.substring(8));
+    }
+
+    public static long IsUpdate(String Command) {
+        if (!Command.startsWith("UPDATE#")) {
+            return 0;
+        };
+
+        return Long.parseLong(Command.substring(7));
+    }
+
+
 }

common/src/main/java/cn/zbx1425/worldcomment/data/sync/RedisChannelInterface.java

@@ -8,6 +8,7 @@
 
 import java.util.Map;
 
+//Todo: Notice that this class is COMPLETELY SYNC currently
 public class RedisChannelInterface {
     public RedisChannelMessageQueue Queue = new RedisChannelMessageQueue();
     private final StatefulRedisPubSubConnection<String, String> channel;
@@ -41,12 +42,20 @@ public void publish(String Channel, String Data) {
         this.channel.sync().publish(Channel, Data);
     }
 
+    public void del(String Key) {
+        this.instance.sync().del(Key);
+    }
+
+    public void hdel(String Key, String Field) {
+        this.instance.sync().hdel(Key, Field);
+    }
+
     public synchronized void recvChannel(String[] Channels) {
         if (StartedListening) {
             this.stop();
         }
 
-        RedisPubSubAdapter<String, String> adapter = new RedisPubSubAdapter<>() {
+        /*RedisPubSubAdapter<String, String> adapter = new RedisPubSubAdapter<>() {
             @Override
             public void message(String channel, String message) {
                 Queue.append(channel, message);
@@ -63,7 +72,7 @@ public void message(String channel, String message) {
             Thread.onSpinWait();
         }
 
-        this.channel.removeListener(adapter);
+        this.channel.removeListener(adapter);*/
     }
 
     public void stop() {

common/src/main/java/cn/zbx1425/worldcomment/data/sync/RedisChannelMessageQueue.java

@@ -13,6 +13,12 @@ public synchronized void append(String Channel, String Data) {
     }
 
     public synchronized String next() {
+        if (CachedMessage.isEmpty()) {
+            return "";
+        }
+
+
+
         String ret = CachedMessage.get(0);
         CachedMessage.remove(0);
         return ret;