don't cache chunks and entities unless we're capturing

Avanatiker · Feb 5, 2024 · 04f888b · 04f888b
1 parent b02574a
commit 04f888b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/common/src/main/kotlin/org/waste/of/time/Events.kt b/common/src/main/kotlin/org/waste/of/time/Events.kt
@@ -34,10 +34,12 @@ import java.awt.Color
 
 object Events {
     fun onChunkLoad(chunk: WorldChunk) {
+        if (!CaptureManager.capturing) return
         RegionBasedChunk(chunk).cache()
     }
 
     fun onChunkUnload(chunk: WorldChunk) {
+        if (!CaptureManager.capturing) return
         val regionBasedChunk = HotCache.chunks[chunk.pos] ?: RegionBasedChunk(chunk)
         regionBasedChunk.apply {
             cacheBlockEntities()
@@ -47,6 +49,7 @@ object Events {
     }
 
     fun onEntityLoad(entity: Entity) {
+        if (!CaptureManager.capturing) return
         if (entity is PlayerEntity) {
             PlayerStoreable(entity).cache()
         } else {
@@ -55,6 +58,7 @@ object Events {
     }
 
     fun onEntityUnload(entity: Entity) {
+        if (!CaptureManager.capturing) return
         if (entity !is PlayerEntity) return
         PlayerStoreable(entity).apply {
             emit()

diff --git a/common/src/main/kotlin/org/waste/of/time/storage/StorageFlow.kt b/common/src/main/kotlin/org/waste/of/time/storage/StorageFlow.kt
@@ -5,13 +5,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
+import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.util.path.SymlinkValidationException
 import org.waste.of.time.WorldTools.LOG
 import org.waste.of.time.WorldTools.mc
 import org.waste.of.time.manager.MessageManager
-import org.waste.of.time.manager.MessageManager.sendInfo
 import org.waste.of.time.manager.StatisticManager
+import org.waste.of.time.storage.cache.EntityCacheable
 import org.waste.of.time.storage.serializable.EndFlow
+import org.waste.of.time.storage.serializable.PlayerStoreable
+import org.waste.of.time.storage.serializable.RegionBasedChunk
 import java.io.IOException
 import java.util.concurrent.CancellationException
 import kotlin.time.Duration
@@ -38,6 +41,7 @@ object StorageFlow {
 
         try {
             LOG.info("Started caching")
+            syncCacheFromWorldState()
             mc.levelStorage.createSession(levelName).use { openSession ->
                 sharedFlow.collect { storeable ->
                     if (!storeable.shouldStore()) {
@@ -71,5 +75,19 @@ object StorageFlow {
         LOG.info("Finished caching")
     }
 
+    private fun syncCacheFromWorldState() {
+        val diameter = mc.world?.chunkManager?.chunks?.diameter ?: 0
+        for (i in 0..<(diameter * diameter)) {
+            mc.world?.chunkManager?.chunks?.getChunk(i)?.let { chunk ->
+                RegionBasedChunk(chunk).cache()
+            }
+        }
+
+        mc.world?.entities?.forEach {
+            if (it is PlayerEntity) PlayerStoreable(it).cache()
+            else EntityCacheable(it).cache()
+        }
+    }
+
     class StopCollectingException : Exception()
 }
diff --git a/common/src/main/resources/worldtools.accesswidener b/common/src/main/resources/worldtools.accesswidener
@@ -2,3 +2,6 @@ accessWidener   v2      named
 
 accessible class net/minecraft/client/world/ClientChunkManager$ClientChunkMap
 accessible method net/minecraft/client/world/ClientChunkManager$ClientChunkMap isInRadius (II)Z
+accessible field net/minecraft/client/world/ClientChunkManager chunks Lnet/minecraft/client/world/ClientChunkManager$ClientChunkMap;
+accessible method net/minecraft/client/world/ClientChunkManager$ClientChunkMap getChunk (I)Lnet/minecraft/world/chunk/WorldChunk;
+accessible field net/minecraft/client/world/ClientChunkManager$ClientChunkMap diameter I