[API] Break out field registration and field adding, fixes #45

Author: robotgryphon

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version=1.16.5
 forge_version=36.1.3
 
 mod_id=compactcrafting
-mod_version=1.0.0-beta.6
+mod_version=1.0.0-beta.7
 
 # Dependencies and Libs
 jei_version=7.7.1.110

src/api/java/dev/compactmods/crafting/api/field/IActiveWorldFields.java

@@ -15,6 +15,11 @@ public interface IActiveWorldFields {
 
     void tickFields();
 
+    /**
+     * Adds a field instance. This is typically called during world load; use this safely.
+     * @param field The field to register.
+     */
+    default void addFieldInstance(IMiniaturizationField field) {}
     IMiniaturizationField registerField(IMiniaturizationField field);
 
     void unregisterField(BlockPos center);

src/main/java/dev/compactmods/crafting/field/ActiveWorldFields.java

@@ -65,7 +65,8 @@ public void tickFields() {
         loaded.forEach(IMiniaturizationField::tick);
     }
 
-    public IMiniaturizationField registerField(IMiniaturizationField field) {
+    @Override
+    public void addFieldInstance(IMiniaturizationField field) {
         field.setLevel(level);
 
         BlockPos center = field.getCenter();
@@ -75,6 +76,12 @@ public IMiniaturizationField registerField(IMiniaturizationField field) {
         laziness.put(center, lazy);
         field.setRef(lazy);
 
+        lazy.addListener(lo -> {
+            lo.ifPresent(this::unregisterField);
+        });
+    }
+
+    public IMiniaturizationField registerField(IMiniaturizationField field) {
         final Optional<BlockPos> anyMissing = ProjectorHelper
                 .getMissingProjectors(level, field.getFieldSize(), field.getCenter())
                 .findFirst();
@@ -84,6 +91,7 @@ public IMiniaturizationField registerField(IMiniaturizationField field) {
             return field;
         }
 
+        addFieldInstance(field);
         field.getProjectorPositions().forEach(pos -> {
             BlockState stateAt = level.getBlockState(pos);
             if(!(stateAt.getBlock() instanceof FieldProjectorBlock))
@@ -92,14 +100,10 @@ public IMiniaturizationField registerField(IMiniaturizationField field) {
             if(stateAt.hasTileEntity()) {
                 TileEntity tileAt = level.getBlockEntity(pos);
                 if (tileAt instanceof FieldProjectorTile) {
-                    ((FieldProjectorTile) tileAt).setFieldRef(lazy);
+                    ((FieldProjectorTile) tileAt).setFieldRef(field.getRef());
                 }
             }
         });
-        
-        lazy.addListener(lo -> {
-            lo.ifPresent(this::unregisterField);
-        });
 
         return field;
     }

src/main/java/dev/compactmods/crafting/field/capability/CapabilityActiveWorldFields.java

@@ -55,7 +55,7 @@ public void readNBT(Capability<IActiveWorldFields> capability, IActiveWorldField
                             MiniaturizationField field = MiniaturizationField.fromSizeAndCenter(size, center);
                             field.loadServerData(f);
 
-                            instance.registerField(field);
+                            instance.addFieldInstance(field);
                         });
                     }
                 },