Improvements to Saving and Loading

Fixed incorrect Loading for Edge Cases.
Fixed Activation Method not properly saving the Activity State.
Added State for attempted Activation to ensure that Events do not activate again when it already was attempted in the valid Time Frame.
Event Registering and Time Management now automatically clean themselves up.

Author: Atilist

src/test/java/net/modificationstation/sltest/celestial/CelestialListener.java

@@ -8,7 +8,6 @@
 import net.modificationstation.stationapi.api.event.celestial.CelestialRegisterEvent;
 
 public class CelestialListener {
-    private boolean alreadyRegistered = false;
 
     public static CelestialEvent flyingDimando;
     public static CelestialEvent fallingDimando;
@@ -18,8 +17,6 @@ public class CelestialListener {
 
     @EventListener
     public void registerCelestialEvents(CelestialRegisterEvent event) {
-        if (alreadyRegistered) return;
-        alreadyRegistered = true;
         SLTest.LOGGER.info("Register celestial events for testing");
         flyingDimando = new FlyingDimando(4, "flying_dimando", event.world);
         fallingDimando = new DebugCelestialEvent(2, "falling_dimando", event.world);

station-world-events-v0/src/main/java/net/modificationstation/stationapi/api/celestial/CelestialEvent.java

@@ -47,19 +47,34 @@ public CelestialEvent setExtraDays(int extraDays) {
     }
 
     public boolean activateEvent(long worldTime, Random random) {
+        CelestialEventActivityState activityState = (CelestialEventActivityState) this.world.getOrCreateState(CelestialEventActivityState.class, this.name);
+        if (initializationNeeded) {
+            activityState = initializeEvent(activityState);
+        }
         if (active) {
+            activityState.active = true;
+            activityState.attemptedActivation = true;
+            activityState.markDirty();
             return true;
         }
         for (CelestialEvent otherEvent : incompatibleEvents) {
             if (otherEvent == null) continue;
             if (otherEvent.isActive()) {
                 active = false;
+                activityState.active = false;
+                activityState.attemptedActivation = true;
+                activityState.markDirty();
                 return false;
             }
         }
         long days = worldTime / dayLength + dayOffset;
-        active = days % frequency == 0 && random.nextFloat() <= chance;
+        if (!activityState.attemptedActivation) {
+            active = days % frequency == 0 && random.nextFloat() <= chance;
+        }
         if (active) {
+            activityState.active = true;
+            activityState.attemptedActivation = true;
+            activityState.markDirty();
             onActivation();
         }
         return active;
@@ -76,14 +91,17 @@ public void updateEvent(long worldTime) {
         if (initializationNeeded) {
             activityState = initializeEvent(activityState);
         }
-        if (!active) return;
+        if (!active && !activityState.active) return;
         worldTime -= startingDaytime;
         worldTime += endingDaytime;
         long days = worldTime / dayLength + dayOffset;
         active = days % frequency <= extraDays;
         activityState.active = active;
+        if (!active) {
+            onDeactivation();
+            activityState.attemptedActivation = false;
+        }
         activityState.markDirty();
-        if (!active) onDeactivation();
     }
 
     private CelestialEventActivityState initializeEvent(CelestialEventActivityState activityState) {
@@ -129,4 +147,10 @@ public void addIncompatibleEvent(CelestialEvent otherEvent) {
         incompatibleEvents.add(otherEvent);
         otherEvent.addIncompatibleEvent(this);
     }
+
+    public void markForInitialization() {
+        CelestialEventActivityState activityState = (CelestialEventActivityState) this.world.getOrCreateState(CelestialEventActivityState.class, this.name);
+        initializeEvent(activityState);
+        initializationNeeded = false;
+    }
 }

station-world-events-v0/src/main/java/net/modificationstation/stationapi/api/celestial/CelestialEventActivityState.java

@@ -5,6 +5,7 @@
 
 public class CelestialEventActivityState extends PersistentState {
     public boolean active;
+    public boolean attemptedActivation;
 
     public CelestialEventActivityState(String id) {
         super(id);
@@ -13,10 +14,12 @@ public CelestialEventActivityState(String id) {
     @Override
     public void readNbt(NbtCompound nbt) {
         this.active = nbt.getBoolean("active");
+        this.attemptedActivation = nbt.getBoolean("attemptedActivation");
     }
 
     @Override
     public void writeNbt(NbtCompound nbt) {
         nbt.putBoolean("active", active);
+        nbt.putBoolean("attemptedActivation", attemptedActivation);
     }
 }

station-world-events-v0/src/main/java/net/modificationstation/stationapi/api/celestial/CelestialTimeManager.java

@@ -93,4 +93,19 @@ public static void updateEvents(long time) {
             celestialEvent.updateEvent(time);
         }
     }
+
+    public static void clearLists() {
+        MORNING_START.clear();
+        NOON_START.clear();
+        EVENING_START.clear();
+        MIDNIGHT_START.clear();
+        ALL_EVENTS.clear();
+    }
+
+    public static void initializeEvents() {
+        for (CelestialEvent celestialEvent : ALL_EVENTS) {
+            if (celestialEvent == null) continue;
+            celestialEvent.markForInitialization();
+        }
+    }
 }

station-world-events-v0/src/main/java/net/modificationstation/stationapi/mixin/world/WorldMixin.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.world.World;
 import net.modificationstation.stationapi.api.StationAPI;
+import net.modificationstation.stationapi.api.celestial.CelestialTimeManager;
 import net.modificationstation.stationapi.api.event.celestial.CelestialRegisterEvent;
 import net.modificationstation.stationapi.api.event.world.WorldEvent;
 import org.spongepowered.asm.mixin.Mixin;
@@ -20,10 +21,10 @@ class WorldMixin {
             at = @At("RETURN")
     )
     private void stationapi_onCor1(CallbackInfo ci) {
+        CelestialTimeManager.clearLists();
         StationAPI.EVENT_BUS.post(WorldEvent.Init.builder().world(World.class.cast(this)).build());
-        StationAPI.EVENT_BUS.post(
-                CelestialRegisterEvent.builder().world(World.class.cast(this)).build()
-        );
+        StationAPI.EVENT_BUS.post(CelestialRegisterEvent.builder().world(World.class.cast(this)).build());
+        CelestialTimeManager.initializeEvents();
     }
 
 	@Inject(