Always print message when sub-levels unload

Author: Ocelot5836

common/src/main/java/dev/ryanhcode/sable/sublevel/storage/holding/SubLevelHoldingChunkMap.java

@@ -332,8 +332,8 @@ private GlobalSavedSubLevelPointer moveAndSaveSubLevel(final @Nullable ServerSub
                 final MinecraftServer server = this.level.getServer();
                 if (server instanceof final SableToastableServer toastable) {
                     toastable.sable$reportSubLevelSaveFailure(data);
-                    return null;
                 }
+                return null;
             }
 
             if (VERBOSE) {
@@ -407,7 +407,7 @@ private GlobalSavedSubLevelPointer moveAndSaveSubLevel(final @Nullable ServerSub
      * @param create   whether to create a new holding chunk if it doesn't exist
      */
     @Contract("_, true -> !null")
-    private SubLevelHoldingChunk getOrLoadHoldingChunk(final ChunkPos chunkPos, final boolean create) {
+    private @Nullable SubLevelHoldingChunk getOrLoadHoldingChunk(final ChunkPos chunkPos, final boolean create) {
         final long longKey = chunkPos.toLong();
         final SubLevelHoldingChunk holdingChunk = this.loadedHoldingChunks.get(longKey);
 
@@ -522,9 +522,14 @@ private void processUnloads() {
     }
 
     public void moveToUnloaded(final ServerSubLevel subLevel, final ChunkPos pos) {
+        // When sub-levels unload there is no logs indicating that it unloaded. This then leads to people
+        // making issues on the tracker, so always print this message saying the sub-level was unloaded
         if (VERBOSE) {
             Sable.LOGGER.info("Sub-level {} with pointer {} detected unloaded chunk, moving to {}", subLevel, subLevel.getLastSerializationPointer(), pos);
+        } else {
+            Sable.LOGGER.info("Sub-level {} with pointer {} detected unloaded chunk, unloading", subLevel.getUniqueId(), subLevel.getLastSerializationPointer());
         }
+
         final Collection<ServerSubLevel> chain = SubLevelHelper.getLoadingDependencyChain(subLevel);
         final List<UUID> uuids = chain.stream().map(SubLevel::getUniqueId).toList();
 

common/src/main/java/dev/ryanhcode/sable/sublevel/tracking_points/SubLevelTrackingPointSavedData.java

@@ -1,8 +1,6 @@
 package dev.ryanhcode.sable.sublevel.tracking_points;
 
 import dev.ryanhcode.sable.Sable;
-import dev.ryanhcode.sable.api.SubLevelHelper;
-import dev.ryanhcode.sable.api.entity.EntitySubLevelUtil;
 import dev.ryanhcode.sable.api.sublevel.ServerSubLevelContainer;
 import dev.ryanhcode.sable.api.sublevel.SubLevelContainer;
 import dev.ryanhcode.sable.api.sublevel.SubLevelObserver;
@@ -26,6 +24,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3d;
 import org.joml.Vector3dc;
@@ -43,17 +42,13 @@ private SubLevelTrackingPointSavedData(final ServerLevel level) {
     }
 
     public static SubLevelTrackingPointSavedData getOrLoad(final ServerLevel level) {
-        final SubLevelTrackingPointSavedData data = level.getDataStorage().computeIfAbsent(
+        return level.getDataStorage().computeIfAbsent(
                 new Factory<>(
-                        () -> {
-                            return new SubLevelTrackingPointSavedData(level);
-                        },
+                        () -> new SubLevelTrackingPointSavedData(level),
                         (tag, provider) -> SubLevelTrackingPointSavedData.load(level, tag),
                         null
                 ),
                 SubLevelTrackingPointSavedData.FILE_ID);
-
-        return data;
     }
 
     private static SubLevelTrackingPointSavedData load(final ServerLevel level, final CompoundTag tag) {
@@ -91,7 +86,7 @@ private static SubLevelTrackingPointSavedData load(final ServerLevel level, fina
     }
 
     @Override
-    public CompoundTag save(final CompoundTag compoundTag, final HolderLookup.Provider provider) {
+    public @NotNull CompoundTag save(final @NotNull CompoundTag compoundTag, final HolderLookup.@NotNull Provider provider) {
         final SubLevelContainer container = SubLevelContainer.getContainer(this.level);
         assert container != null : "Sub-level container is null";
 
@@ -259,7 +254,6 @@ public void removeTrackingPoint(final UUID key) {
 
     @Nullable
     public TrackingPoint getTrackingPoint(final UUID uuid) {
-        final TrackingPoint point = this.trackingPoints.get(uuid);
-        return point;
+        return this.trackingPoints.get(uuid);
     }
 }