Fix plugin entrypoint

senseiwells · Jul 24, 2024 · 69b827f · 69b827f
1 parent 19f97ec
commit 69b827f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -156,6 +156,9 @@ tasks {
     publishing {
         publications {
             create<MavenPublication>("mavenJava") {
+                groupId = "com.github.senseiwells"
+                artifactId = "ServerReplay"
+                version = getGitHash()
                 from(project.components.getByName("java"))
             }
         }

diff --git a/src/main/kotlin/me/senseiwells/replay/api/ServerReplayPluginManager.kt b/src/main/kotlin/me/senseiwells/replay/api/ServerReplayPluginManager.kt
@@ -2,6 +2,8 @@ package me.senseiwells.replay.api
 
 import me.senseiwells.replay.ServerReplay
 import me.senseiwells.replay.api.ServerReplayPluginManager.registerPlugin
+import me.senseiwells.replay.chunk.ChunkRecorder
+import me.senseiwells.replay.player.PlayerRecorder
 import net.fabricmc.loader.api.FabricLoader
 
 /**
@@ -42,6 +44,18 @@ object ServerReplayPluginManager {
         this.plugins.add(plugin)
     }
 
+    internal fun startReplay(recorder: PlayerRecorder) {
+        for (plugin in this.plugins) {
+            plugin.onPlayerReplayStart(recorder)
+        }
+    }
+
+    internal fun startReplay(recorder: ChunkRecorder) {
+        for (plugin in this.plugins) {
+            plugin.onChunkReplayStart(recorder)
+        }
+    }
+
     internal fun loadPlugins() {
         val containers = FabricLoader.getInstance().getEntrypointContainers("server_replay", ServerReplayPlugin::class.java)
         for (container in containers) {

diff --git a/src/main/kotlin/me/senseiwells/replay/chunk/ChunkRecorder.kt b/src/main/kotlin/me/senseiwells/replay/chunk/ChunkRecorder.kt
@@ -5,6 +5,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive
 import me.senseiwells.replay.ServerReplay
+import me.senseiwells.replay.api.ServerReplayPluginManager
 import me.senseiwells.replay.mixin.chunk.WitherBossAccessor
 import me.senseiwells.replay.mixin.rejoin.ChunkMapAccessor
 import me.senseiwells.replay.player.PlayerRecorder
@@ -98,6 +99,7 @@ class ChunkRecorder internal constructor(
         RejoinedReplayPlayer.rejoin(this.dummy, this)
         this.spawnPlayer()
         this.sendChunksAndEntities()
+        ServerReplayPluginManager.startReplay(this)
 
         val chunks = this.level.chunkSource.chunkMap as ChunkMapAccessor
         for (pos in this.chunks) {

diff --git a/src/main/kotlin/me/senseiwells/replay/player/PlayerRecorder.kt b/src/main/kotlin/me/senseiwells/replay/player/PlayerRecorder.kt
@@ -1,6 +1,7 @@
 package me.senseiwells.replay.player
 
 import com.mojang.authlib.GameProfile
+import me.senseiwells.replay.api.ServerReplayPluginManager
 import me.senseiwells.replay.recorder.ChunkSender
 import me.senseiwells.replay.recorder.ReplayRecorder
 import me.senseiwells.replay.rejoin.RejoinedReplayPlayer
@@ -81,6 +82,7 @@ class PlayerRecorder internal constructor(
         val player = this.player ?: return false
         RejoinedReplayPlayer.rejoin(player, this)
         this.sendChunksAndEntities()
+        ServerReplayPluginManager.startReplay(this)
         return true
     }
 

diff --git a/src/main/kotlin/me/senseiwells/replay/rejoin/RejoinedReplayPlayer.kt b/src/main/kotlin/me/senseiwells/replay/rejoin/RejoinedReplayPlayer.kt
@@ -1,9 +1,6 @@
 package me.senseiwells.replay.rejoin
 
-import me.senseiwells.replay.api.ServerReplayPluginManager
-import me.senseiwells.replay.chunk.ChunkRecorder
 import me.senseiwells.replay.ducks.`ServerReplay$PackTracker`
-import me.senseiwells.replay.player.PlayerRecorder
 import me.senseiwells.replay.recorder.ReplayRecorder
 import me.senseiwells.replay.viewer.ReplayViewerUtils
 import net.minecraft.nbt.CompoundTag
@@ -53,13 +50,6 @@ class RejoinedReplayPlayer private constructor(
             place(rejoined, RejoinGamePacketListener(rejoined, connection, cookies), player) {
                 recorder.shouldHidePlayerFromTabList(it)
             }
-
-            for (plugin in ServerReplayPluginManager.plugins) {
-                when (recorder) {
-                    is PlayerRecorder -> plugin.onPlayerReplayStart(recorder)
-                    is ChunkRecorder -> plugin.onChunkReplayStart(recorder)
-                }
-            }
         }
 
         fun place(