sync sakura-ryoko/litematica 1.21-0.19.54-sakura.6

CHANGELOG.md

@@ -1,3 +1,4 @@
 ## Change
-- sync `sakura-ryoko/litematica` 1.21-0.19.3-sakura.3
-    - Add Litematic Version / Schema display in File Browser.
+- sync `sakura-ryoko/litematica` 1.21-0.19.54-sakura.6
+    - feat: Make it so that the entityDataSyncBackup mode is capable of saving Litematics with Server-side NBT data, similar to how Servux functions.
+      NOTE: This requires Litematica 'marking' your game session as safe to do so before hand. It does this by marking it safe after Requesting and Receiving a QueryNBT packet successfully. You can do this by going up to any simple Chest and pressing I (Info Overlay) once. This is because the operation involves potentially dozens of Packets being sent without OP status and that can be problematic, and can cause long delays in saving your Litematic without having OP. Using Servux is better overall because with the Servux packets; the data is sent in a single Large packet per a Chunk, rather than multiple packets; one for every single Block Entity or Entity within the Logical Bounding Box... But the goal is to help players who do not have access to a Fabric Server with Servux installed.

gradle/libs.versions.toml

@@ -3,10 +3,10 @@
 minecraft_version="1.21.1"
 yarn_mappings="1.21.1+build.3"
 mappings_patch="1.21+build.4"
-neoforge="21.1.68"
+neoforge="21.1.89"
 
 # Mod properties
-version="0.1.13"
+version="0.1.14"
 maven-group="org.thinkingstudio.forgematica"
 archives-name="Forgematica"
 
@@ -15,7 +15,7 @@ id-modrinth="dCKRaeBC"
 id-curseforge="912441"
 
 # Mod dependencies
-mafglib="0.1.23-mc1.21.1"
+mafglib="0.2.1-mc1.21.1"
 badpackets="neo-0.8.1"
 
 # Libraries

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

@@ -2,23 +2,30 @@
 
 import net.minecraft.client.MinecraftClient;
 
+import fi.dy.masa.malilib.config.ConfigManager;
+import fi.dy.masa.malilib.event.*;
+import fi.dy.masa.malilib.interfaces.IInitializationHandler;
+import fi.dy.masa.malilib.interfaces.IRenderer;
+import fi.dy.masa.malilib.registry.Registry;
+import fi.dy.masa.malilib.util.data.ModInfo;
 import fi.dy.masa.litematica.config.Configs;
 import fi.dy.masa.litematica.data.DataManager;
 import fi.dy.masa.litematica.data.EntitiesDataStorage;
 import fi.dy.masa.litematica.event.*;
+import fi.dy.masa.litematica.gui.GuiConfigs;
 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.*;
-import fi.dy.masa.malilib.interfaces.IInitializationHandler;
-import fi.dy.masa.malilib.interfaces.IRenderer;
 
 public class InitHandler implements IInitializationHandler
 {
     @Override
     public void registerModHandlers()
     {
         ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs());
+        Registry.CONFIG_SCREEN.registerConfigScreenFactory(
+                new ModInfo(Reference.MOD_ID, Reference.MOD_NAME, GuiConfigs::new)
+        );
+
         EntitiesDataStorage.getInstance().onGameInit();
 
         InputEventHandler.getKeybindManager().registerKeybindProvider(InputHandler.getInstance());
@@ -29,8 +36,7 @@ public void registerModHandlers()
         RenderEventHandler.getInstance().registerGameOverlayRenderer(renderer);
         RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);
 
-        ServerListener serverListener = new ServerListener();
-        ServerHandler.getInstance().registerServerHandler(serverListener);
+        ServerHandler.getInstance().registerServerHandler(new ServerListener());
 
         TickHandler.getInstance().registerClientTickHandler(new ClientTickHandler());
         TickHandler.getInstance().registerClientTickHandler(EntitiesDataStorage.getInstance());

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

@@ -5,6 +5,7 @@
 
 public class Reference
 {
+    public static final String ID = "litematica";
     public static final String MOD_ID = "forgematica";
     public static final String MOD_NAME = "Forgematica";
     public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID);

src/main/java/fi/dy/masa/litematica/compat/modmenu/ModMenuImpl.java

@@ -0,0 +1,18 @@
+package fi.dy.masa.litematica.compat.modmenu;
+
+import fi.dy.masa.litematica.gui.GuiConfigs;
+import org.thinkingstudio.mafglib.loader.gui.ModConfigScreenFactory;
+import org.thinkingstudio.mafglib.loader.gui.ModConfigScreenInitializer;
+
+public class ModMenuImpl implements ModConfigScreenInitializer
+{
+    @Override
+    public ModConfigScreenFactory getModConfigScreenFactory()
+    {
+        return (modContainer, screen) -> {
+            GuiConfigs gui = new GuiConfigs();
+            gui.setParent(screen);
+            return gui;
+        };
+    }
+}