Let controllers save to the current manager so controllers can load new/modified structures immediately

Author: Swedz

src/main/java/aztech/modern_industrialization/machines/multiblocks/structure/MIStructureTemplateManager.java

@@ -78,19 +78,28 @@ private static void assertLoaded() {
 
     public static boolean exists(ResourceLocation id) {
         assertLoaded();
+        Objects.requireNonNull(id);
         return STRUCTURE_TEMPLATES.containsKey(id);
     }
 
     public static ShapeTemplate get(ResourceLocation id) {
         assertLoaded();
+        Objects.requireNonNull(id);
         ShapeTemplate template = STRUCTURE_TEMPLATES.get(id);
         if (template != null) {
             return template;
         } else {
-            throw new IllegalArgumentException("Structure shape template \"" + id.toString() + "\" does not exist.");
+            throw new IllegalArgumentException("Structure shape template \"" + id + "\" does not exist.");
         }
     }
 
+    public static void register(ResourceLocation id, ShapeTemplate template) {
+        assertLoaded();
+        Objects.requireNonNull(id);
+        Objects.requireNonNull(template);
+        STRUCTURE_TEMPLATES.put(id, template);
+    }
+
     public static StructureResult fromWorld(ResourceLocation id, Level level,
             BlockPos controllerPos, Direction controllerDirection,
             MachineCasing hatchCasing, StructureControllerBounds bounds) {
@@ -186,7 +195,13 @@ public static StructureResult fromWorld(ResourceLocation id, Level level,
         tag.put("members", membersTag);
         tag.put("blocks", blocksTag);
 
-        return new StructureResult.Success(id, tag);
+        ShapeTemplate template = deserialize(tag);
+        if (template == null) {
+            MI.LOGGER.error("Failed to deserialize structure tag immediately after it was created. Have you changed the deserialier or serializer?");
+            return new StructureResult.Unknown();
+        }
+
+        return new StructureResult.Success(id, template, tag);
     }
 
     @Nullable
@@ -292,7 +307,7 @@ private static void register(ResourceLocation id, Path path) {
         if (structureTag != null) {
             ShapeTemplate structure = deserialize(structureTag);
             if (structure != null) {
-                STRUCTURE_TEMPLATES.put(id, structure);
+                register(id, structure);
             } else {
                 MI.LOGGER.error("Failed to load structure with id \"{}\"", id);
             }

src/main/java/aztech/modern_industrialization/machines/multiblocks/structure/StructureResult.java

@@ -24,6 +24,7 @@
 package aztech.modern_industrialization.machines.multiblocks.structure;
 
 import aztech.modern_industrialization.MIText;
+import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate;
 import aztech.modern_industrialization.network.structure.StructureMisconfiguredBlocksPacket;
 import java.util.ArrayList;
 import java.util.List;
@@ -115,7 +116,7 @@ public Component text() {
         }
     }
 
-    record Success(ResourceLocation structureId, CompoundTag tag) implements StructureResult {
+    record Success(ResourceLocation structureId, ShapeTemplate template, CompoundTag tag) implements StructureResult {
         @Override
         public boolean isSuccess() {
             return true;

src/main/java/aztech/modern_industrialization/network/structure/StructureSaveControllerPacket.java

@@ -62,9 +62,12 @@ public void handle(Context ctx) {
             var result = MIStructureTemplateManager.fromWorld(id,
                     level, pos, state.getValue(StructureMultiblockControllerBlock.FACING),
                     controller.getCasing(), controller.getBounds());
-            if (result instanceof StructureResult.Success success &&
-                    !MIStructureTemplateManager.save(id, success.tag())) {
-                result = new StructureResult.Unknown();
+            if (result instanceof StructureResult.Success success) {
+                if (MIStructureTemplateManager.save(id, success.tag())) {
+                    MIStructureTemplateManager.register(id, success.template());
+                } else {
+                    result = new StructureResult.Unknown();
+                }
             }
             result.send(player);
         }