diff --git a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java index 4289e35..bb2d7e7 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -37,8 +37,14 @@ public final class ChatAnswerCore { * 본 모드는 서버 측에서 채팅을 가로채는 server-only 모드 — 클라이언트는 * 설치할 필요가 없고 server 한 곳에 있으면 모든 플레이어에게 적용된다. * 따라서 per-player 검증은 무의미하고, fake player {@link #PRESENCE_HOLDER} - * 점수만 매 server tick 마다 1 로 set 한다. 데이터팩의 start 가드는 - * `score matches 1` 로 검사. */ + * 점수만 1 로 set 한다. 데이터팩의 start 가드는 + * `score matches 1` 로 검사. + * + * presence pulse 는 여러 이벤트에서 중복 호출한다 — banner/mohist 같은 + * fabric-bukkit 하이브리드 호스트에서 일부 Fabric 이벤트(특히 + * ServerTickEvents.END_SERVER_TICK) 가 안 들어오는 케이스가 보고됨. + * SERVER_STARTED / PlayerJoin / TickEnd 셋 중 하나라도 firing 되면 + * 데이터팩 가드가 통과하도록 모든 진입점에서 markModPresence 호출. */ private static final String MOD_PRESENCE_OBJECTIVE = "mq_chat_mod"; private static final String PRESENCE_HOLDER = "#server"; @@ -61,6 +67,17 @@ public final class ChatAnswerCore { LOG.info("[{}] onPlayerJoin fired for {}, scheduling notice in {} ticks", MOD_ID, name, NOTICE_DELAY_TICKS); PENDING_NOTICES.put(player.getUUID(), NOTICE_DELAY_TICKS); + // tick 이벤트가 안 들어오는 호스트 대비 — join 시점에도 presence 한 번 찍는다. + MinecraftServer server = player.level().getServer(); + if (server != null) markModPresence(server); + } + + /** 각 로더 entrypoint 가 서버 부팅 완료 시점에 호출. tick 이벤트가 + * 발화되지 않는 환경(banner/mohist) 에서 최소 한 번은 presence 가 찍히도록. + * 데이터팩 load 가 SERVER_STARTED 보다 먼저 끝나므로 objective 도 이미 존재. */ + public static void onServerStarted(MinecraftServer server) { + LOG.info("[{}] onServerStarted fired, marking presence", MOD_ID); + markModPresence(server); } /** 각 로더 entrypoint 가 매 server tick 마다 호출해야 한다. */ diff --git a/fabric-1216/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java b/fabric-1216/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java index fcb2165..0894964 100644 --- a/fabric-1216/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java +++ b/fabric-1216/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java @@ -2,6 +2,7 @@ package kr.tkrmagid.chatanswer.fabric; import kr.tkrmagid.chatanswer.core.ChatAnswerCore; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; @@ -18,11 +19,12 @@ public final class ChatAnswerFabric implements ModInitializer { ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> ChatAnswerCore.handleChat(sender, message.signedContent()) ); + ServerLifecycleEvents.SERVER_STARTED.register(ChatAnswerCore::onServerStarted); ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> ChatAnswerCore.onPlayerJoin(handler.player) ); ServerTickEvents.END_SERVER_TICK.register(ChatAnswerCore::onServerTick); - LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + JOIN + TICK", ChatAnswerCore.MOD_ID); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + SERVER_STARTED + JOIN + TICK", ChatAnswerCore.MOD_ID); } catch (Throwable t) { LOG.error("[{}] Fabric entrypoint event registration failed", ChatAnswerCore.MOD_ID, t); throw t; diff --git a/fabric-2612/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java b/fabric-2612/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java index fcb2165..0894964 100644 --- a/fabric-2612/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java +++ b/fabric-2612/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java @@ -2,6 +2,7 @@ package kr.tkrmagid.chatanswer.fabric; import kr.tkrmagid.chatanswer.core.ChatAnswerCore; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; @@ -18,11 +19,12 @@ public final class ChatAnswerFabric implements ModInitializer { ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> ChatAnswerCore.handleChat(sender, message.signedContent()) ); + ServerLifecycleEvents.SERVER_STARTED.register(ChatAnswerCore::onServerStarted); ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> ChatAnswerCore.onPlayerJoin(handler.player) ); ServerTickEvents.END_SERVER_TICK.register(ChatAnswerCore::onServerTick); - LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + JOIN + TICK", ChatAnswerCore.MOD_ID); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + SERVER_STARTED + JOIN + TICK", ChatAnswerCore.MOD_ID); } catch (Throwable t) { LOG.error("[{}] Fabric entrypoint event registration failed", ChatAnswerCore.MOD_ID, t); throw t; diff --git a/gradle.properties b/gradle.properties index b498a74..3583b52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.parallel=true # ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer -mod_version=1.3.5 +mod_version=1.3.6 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 diff --git a/neoforge-1216/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java b/neoforge-1216/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java index 326ef6a..91666f8 100644 --- a/neoforge-1216/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java +++ b/neoforge-1216/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java @@ -8,12 +8,14 @@ import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.ServerChatEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.event.server.ServerStartedEvent; import net.neoforged.neoforge.event.tick.ServerTickEvent; @Mod(ChatAnswerCore.MOD_ID) public final class ChatAnswerNeoForge { public ChatAnswerNeoForge(IEventBus modBus) { NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerChat); + NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerStarted); NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onPlayerLogin); NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerTick); } @@ -26,6 +28,11 @@ public final class ChatAnswerNeoForge { } } + @SubscribeEvent + public static void onServerStarted(ServerStartedEvent event) { + ChatAnswerCore.onServerStarted(event.getServer()); + } + @SubscribeEvent public static void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { if (event.getEntity() instanceof ServerPlayer player) {