Bootstrap for entity data

gradle.properties

@@ -9,7 +9,7 @@ author = masa
 mod_file_name = litematica-fabric
 
 # Current mod version
-mod_version = 0.18.999-sakura.11
+mod_version = 0.18.999-sakura.11-entity_data.1
 
 # Required malilib version
 malilib_version = 0.19.999-sakura.4

src/main/java/fi/dy/masa/litematica/InitHandler.java

@@ -4,17 +4,12 @@
 
 import fi.dy.masa.litematica.config.Configs;
 import fi.dy.masa.litematica.data.DataManager;
-import fi.dy.masa.litematica.event.InputHandler;
-import fi.dy.masa.litematica.event.KeyCallbacks;
-import fi.dy.masa.litematica.event.RenderHandler;
-import fi.dy.masa.litematica.event.WorldLoadListener;
+import fi.dy.masa.litematica.data.EntitiesDataStorage;
+import fi.dy.masa.litematica.event.*;
 import fi.dy.masa.litematica.render.infohud.StatusInfoRenderer;
 import fi.dy.masa.litematica.scheduler.ClientTickHandler;
 import fi.dy.masa.malilib.config.ConfigManager;
-import fi.dy.masa.malilib.event.InputEventHandler;
-import fi.dy.masa.malilib.event.RenderEventHandler;
-import fi.dy.masa.malilib.event.TickHandler;
-import fi.dy.masa.malilib.event.WorldLoadHandler;
+import fi.dy.masa.malilib.event.*;
 import fi.dy.masa.malilib.interfaces.IInitializationHandler;
 import fi.dy.masa.malilib.interfaces.IRenderer;
 
@@ -24,6 +19,7 @@ public class InitHandler implements IInitializationHandler
     public void registerModHandlers()
     {
         ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs());
+        EntitiesDataStorage.getInstance().onGameInit();
 
         InputEventHandler.getKeybindManager().registerKeybindProvider(InputHandler.getInstance());
         InputEventHandler.getInputManager().registerKeyboardInputHandler(InputHandler.getInstance());
@@ -33,7 +29,11 @@ public void registerModHandlers()
         RenderEventHandler.getInstance().registerGameOverlayRenderer(renderer);
         RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);
 
+        ServerListener serverListener = new ServerListener();
+        ServerHandler.getInstance().registerServerHandler(serverListener);
+
         TickHandler.getInstance().registerClientTickHandler(new ClientTickHandler());
+        TickHandler.getInstance().registerClientTickHandler(EntitiesDataStorage.getInstance());
 
         WorldLoadListener listener = new WorldLoadListener();
         WorldLoadHandler.getInstance().registerWorldLoadPreHandler(listener);

src/main/java/fi/dy/masa/litematica/Reference.java

@@ -1,10 +1,14 @@
 package fi.dy.masa.litematica;
 
+import net.minecraft.MinecraftVersion;
 import fi.dy.masa.malilib.util.StringUtils;
 
 public class Reference
 {
     public static final String MOD_ID = "litematica";
     public static final String MOD_NAME = "Litematica";
     public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID);
+    public static final String MC_VERSION = MinecraftVersion.CURRENT.getName();
+    public static final String MOD_TYPE = "fabric";
+    public static final String MOD_STRING = MOD_ID+"-"+MOD_TYPE+"-"+MC_VERSION+"-"+MOD_VERSION;
 }

src/main/java/fi/dy/masa/litematica/config/Configs.java

@@ -81,6 +81,7 @@ public static class Generic
         public static final ConfigBoolean       PLACEMENT_RESTRICTION       = new ConfigBoolean("placementRestriction", false, "When enabled, the use key can only be used\nwhen holding the correct item for the targeted position,\nand the targeted position must have a missing block in the schematic", "Placement Restriction");
         public static final ConfigBoolean       RENDER_MATERIALS_IN_GUI     = new ConfigBoolean("renderMaterialListInGuis", true, "Whether or not the material list should\nbe rendered inside GUIs");
         public static final ConfigBoolean       RENDER_THREAD_NO_TIMEOUT    = new ConfigBoolean("renderThreadNoTimeout", true, "Removes the timeout from the rendering worker threads.\nIf you get very stuttery rendering when moving around\nor dealing with large schematics, try disabling this. It will however make\nthe schematic rendering a lot slower in some cases.");
+        public static final ConfigInteger       SERVER_NBT_REQUEST_RATE     = new ConfigInteger("serverNbtRequestRate", 2, "Limit request rate for server entity data syncer");
         public static final ConfigBoolean       SIGN_TEXT_PASTE             = new ConfigBoolean("signTextPaste", true, "Automatically set the text in the sign GUIs from the schematic");
         public static final ConfigString        TOOL_ITEM                   = new ConfigString( "toolItem", "minecraft:stick", "The item to use as the \"tool\" for selections etc.");
         public static final ConfigBoolean       TOOL_ITEM_ENABLED           = new ConfigBoolean("toolItemEnabled", true, "If true, then the \"tool\" item can be used to control selections etc.", "Tool Item Enabled");
@@ -131,6 +132,7 @@ public static class Generic
                 PLACEMENT_RESTRICTION_WARN,
                 RENDER_MATERIALS_IN_GUI,
                 RENDER_THREAD_NO_TIMEOUT,
+                SERVER_NBT_REQUEST_RATE,
                 SIGN_TEXT_PASTE,
                 TOOL_ITEM_ENABLED,
                 UNHIDE_SCHEMATIC_PROJECTS,

src/main/java/fi/dy/masa/litematica/data/DataManager.java

@@ -46,6 +46,7 @@ public class DataManager implements IDirectoryCache
     private static boolean canSave;
     private static boolean isCarpetServer;
     private static long clientTickStart;
+    private boolean hasIntegratedServer = false;
 
     public static Identifier CARPET_HELLO = Identifier.of("carpet", "hello");
     private final SelectionManager selectionManager = new SelectionManager();
@@ -66,6 +67,19 @@ public static DataManager getInstance()
         return INSTANCE;
     }
 
+    public void reset(boolean isLogout)
+    {
+        if (isLogout)
+        {
+            Litematica.debugLog("DataManager#reset() - log-out");
+            this.hasIntegratedServer = false;
+        }
+        else
+        {
+            Litematica.debugLog("DataManager#reset() - dimension change or log-in");
+        }
+    }
+
     public static IDirectoryCache getDirectoryCache()
     {
         return INSTANCE;
@@ -96,6 +110,13 @@ public static boolean isCarpetServer()
         return isCarpetServer;
     }
 
+    public boolean hasIntegratedServer() { return this.hasIntegratedServer; }
+
+    public void setHasIntegratedServer(boolean toggle)
+    {
+        this.hasIntegratedServer = toggle;
+    }
+
     public static void addChatListener(ToBooleanFunction<Text> listener)
     {
         synchronized (CHAT_LISTENERS)
@@ -334,6 +355,8 @@ private void savePerDimensionData()
         this.schematicProjectsManager.saveCurrentProject();
         JsonObject root = this.toJson();
 
+        root.add("block_entities", EntitiesDataStorage.getInstance().toJson());
+
         File file = getCurrentStorageFile(false);
         JsonUtils.writeJsonToFile(root, file);
     }
@@ -352,6 +375,11 @@ private void loadPerDimensionData()
         {
             JsonObject root = element.getAsJsonObject();
             this.fromJson(root);
+
+            if (JsonUtils.hasObject(root, "block_entities"))
+            {
+                EntitiesDataStorage.getInstance().fromJson(JsonUtils.getNestedObject(root, "block_entities", false));
+            }
         }
     }