From 3e59d08db159f684f92160592aac52c5f50fde7a Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 13 May 2026 21:44:16 +0900 Subject: [PATCH 01/18] Initial Fabric mod for chat-based quiz answer submission Hooks ServerMessageEvents.ALLOW_CHAT_MESSAGE to intercept chat while the music_quiz datapack is in answer-accepting state (init=5 on objective 'main'). Intercepted messages are forwarded to mq:answer/submit with the player's UUID context and the chat broadcast is suppressed so the answer stays hidden from other players. Outside that state chat passes through normally. Target: Minecraft 1.21.6+, Java 21, Fabric Loader 0.16+, Fabric API. Co-Authored-By: Claude Opus 4.7 --- .gitignore | 15 ++ LICENSE | 21 ++ README.md | 49 ++++ build.gradle | 45 ++++ gradle.properties | 16 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 9 + .../kr/tkrmagid/chatanswer/ChatAnswerMod.java | 103 +++++++ src/main/resources/fabric.mod.json | 22 ++ 12 files changed, 632 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java create mode 100644 src/main/resources/fabric.mod.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1d6216a --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +# Gradle +.gradle/ +build/ +out/ +*.iml +.idea/ + +# Loom +.fabric/ +run/ +remappedSrc/ + +# OS +.DS_Store +Thumbs.db diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1cbd2f4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 tkrmagid + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..09494f7 --- /dev/null +++ b/README.md @@ -0,0 +1,49 @@ +# chat_answer (채팅정답) + +음악퀴즈(`mq`) 데이터팩의 짝이 되는 **서버사이드** 모드. + +정답 입력을 받는 상태(`scoreboard players get init main == 5`) 동안 플레이어가 +채팅을 입력하면 메시지를 가로채서 다음을 실행한다: + +``` +execute as <플레이어 UUID> run function mq:answer/submit {text:'<채팅 내용>'} +``` + +채팅은 다른 플레이어에게 broadcast 되지 않으므로 정답이 화면에 노출되지 않는다. +`init` 점수가 5 가 아닐 때는 채팅이 평소처럼 모두에게 보인다. + +## 빌드 + +JDK 21 필요. Linux/macOS: + +``` +./gradlew build +``` + +Windows: + +``` +gradlew.bat build +``` + +산출물: `build/libs/chat_answer-.jar` + +## 설치 + +서버의 `mods/` 폴더에 jar 를 넣는다. Fabric Loader 0.16+ 필요. Fabric API 도 함께 설치. + +## 호환성 + +- 빌드 대상: Minecraft 1.21.6 (Dialog 시스템 최초 버전). +- 코드가 사용하는 API (`ServerMessageEvents.ALLOW_CHAT_MESSAGE`, `Scoreboard`, `MinecraftServer.getCommandManager`) 는 1.21.x 전반에 걸쳐 인터미디어리 매핑이 안정적이므로 동일 jar 가 그 이상 버전에서도 일반적으로 작동. +- Mojang 이 chat / scoreboard / command 시스템을 깨는 변경을 적용하면 그 시점에 재빌드 필요. + +### Forge / NeoForge 사용자 + +현재 jar 는 Fabric 전용. NeoForge 서버에서 사용하려면 [Sinytra Connector](https://modrinth.com/mod/connector) 를 함께 설치하면 그대로 작동. + +(별도 NeoForge 네이티브 variant 빌드는 향후 추가 예정.) + +## 라이센스 + +MIT diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2e114d4 --- /dev/null +++ b/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'fabric-loom' version '1.10-SNAPSHOT' + id 'java' +} + +group = project.mod_group +version = project.mod_version +archivesBaseName = project.mod_id + +java { + toolchain.languageVersion = JavaLanguageVersion.of(21) + withSourcesJar() +} + +repositories { + maven { url = 'https://maven.fabricmc.net/' } + mavenCentral() +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + inputs.property "mod_id", project.mod_id + + filesMatching("fabric.mod.json") { + expand "version": project.version, "mod_id": project.mod_id + } +} + +tasks.withType(JavaCompile).configureEach { + options.release = 21 + options.encoding = 'UTF-8' +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..d54fba3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,16 @@ +org.gradle.jvmargs=-Xmx2G +org.gradle.parallel=true + +# Minecraft / Fabric versions +# Targets MC 1.21.6 (oldest Minecraft version with the dialog system). +# Chat events are stable since 1.19 — the same jar typically works across +# the 1.21.x line; rebuild against newer mappings if a future version +# breaks binary compatibility. +minecraft_version=1.21.6 +yarn_mappings=1.21.6+build.1 +loader_version=0.16.10 +fabric_version=0.128.2+1.21.6 + +mod_id=chat_answer +mod_version=1.0.0 +mod_group=kr.tkrmagid.chatanswer diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..cea7a79 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f3b75f3 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2008f4e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { url = 'https://maven.fabricmc.net/' } + gradlePluginPortal() + mavenCentral() + } +} + +rootProject.name = 'chat_answer' diff --git a/src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java b/src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java new file mode 100644 index 0000000..c79011c --- /dev/null +++ b/src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java @@ -0,0 +1,103 @@ +package kr.tkrmagid.chatanswer; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.minecraft.scoreboard.Scoreboard; +import net.minecraft.scoreboard.ScoreboardObjective; +import net.minecraft.scoreboard.ScoreHolder; +import net.minecraft.scoreboard.ReadableScoreboardScore; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 채팅정답 (chat_answer) — 음악퀴즈 데이터팩과 짝이 되는 서버사이드 모드. + * + * 정답 입력 상태(init=5) 일 때 플레이어 채팅을 가로채서 + * function mq:answer/submit {text:'<채팅 내용>'} + * 을 해당 플레이어 컨텍스트로 실행한다. 채팅은 다른 플레이어들에게 broadcast 되지 + * 않도록 차단한다 (정답이 노출되면 안되므로). 그 외 상태에서는 채팅이 정상 진행된다. + */ +public class ChatAnswerMod implements ModInitializer { + public static final String MOD_ID = "chat_answer"; + private static final Logger LOG = LoggerFactory.getLogger(MOD_ID); + + // 음악퀴즈 데이터팩 약속 — main objective 의 init 점수가 5 면 정답 입력 받는 상태. + private static final String SCOREBOARD_OBJECTIVE = "main"; + private static final String SCOREBOARD_HOLDER = "init"; + private static final int ACCEPTING_ANSWER_STATE = 5; + + @Override + public void onInitialize() { + // 1) 가로채기 단계 — 정답 입력 상태면 false 반환해서 broadcast 차단 + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> { + if (!isAcceptingAnswer(sender.getServer())) { + return true; // 평소엔 채팅 그대로 + } + submitAnswer(sender, message.getContent().getString()); + return false; // 정답 입력 상태에서는 채팅을 죽임 + }); + LOG.info("[{}] initialized — chat-as-answer hook active", MOD_ID); + } + + /** + * mq:main 데이터팩의 scoreboard main / init 점수를 읽어서 현재 상태 판정. + * objective 가 아직 생성되지 않았으면(퀴즈 미시작) 항상 false. + */ + private static boolean isAcceptingAnswer(MinecraftServer server) { + Scoreboard scoreboard = server.getScoreboard(); + ScoreboardObjective objective = scoreboard.getNullableObjective(SCOREBOARD_OBJECTIVE); + if (objective == null) { + return false; + } + ReadableScoreboardScore score = scoreboard.getScore(ScoreHolder.fromName(SCOREBOARD_HOLDER), objective); + if (score == null) { + return false; + } + return score.getScore() == ACCEPTING_ANSWER_STATE; + } + + /** + * 채팅 내용을 데이터팩 함수 호출로 변환. NBT 단일 따옴표 문자열로 감싸고, + * 매크로 치환 단계에서 문제 일으킬 수 있는 문자들을 사전 정리한다. + */ + private static void submitAnswer(ServerPlayerEntity sender, String rawText) { + String safe = sanitize(rawText); + if (safe.isEmpty()) { + return; + } + // single-quoted NBT 안의 ' 과 \ 만 이스케이프 + String nbt = safe.replace("\\", "\\\\").replace("'", "\\'"); + String command = "execute as " + sender.getUuidAsString() + + " run function mq:answer/submit {text:'" + nbt + "'}"; + + MinecraftServer server = sender.getServer(); + // 서버 커맨드 소스 (OP level 4) + silent — 채팅창에 명령어 출력 방지 + ServerCommandSource source = server.getCommandSource().withSilent(); + try { + server.getCommandManager().executeWithPrefix(source, command); + } catch (Exception e) { + LOG.error("[{}] failed to submit answer for {}: {}", MOD_ID, sender.getName().getString(), e.toString()); + } + } + + /** + * 매크로 라인 ($data ... set value "$(text)") 가 큰따옴표로 값을 감싸기 때문에, + * 채팅 내용에 큰따옴표나 백슬래시가 있으면 그 매크로가 깨진다. + * 가장 안전한 처리는 두 문자를 제거. 일반 정답 텍스트에는 거의 등장하지 않음. + * 추가로 NBT 호환을 위해 제어문자(\u0000-\u001f, \u007f) 도 제거. + */ + private static String sanitize(String text) { + if (text == null) return ""; + StringBuilder sb = new StringBuilder(text.length()); + for (int i = 0; i < text.length(); i++) { + char c = text.charAt(i); + if (c == '"' || c == '\\') continue; + if (c < 0x20 || c == 0x7f) continue; + sb.append(c); + } + return sb.toString().strip(); + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..72593a4 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,22 @@ +{ + "schemaVersion": 1, + "id": "${mod_id}", + "version": "${version}", + "name": "채팅정답", + "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.", + "authors": [ "tkrmagid" ], + "contact": { + "homepage": "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod" + }, + "license": "MIT", + "environment": "server", + "entrypoints": { + "main": [ "kr.tkrmagid.chatanswer.ChatAnswerMod" ] + }, + "depends": { + "fabricloader": ">=0.16.0", + "minecraft": ">=1.21.6", + "java": ">=21", + "fabric-api": "*" + } +} From 2c35e77b8bd6d309964eac6b263aa6630ea2ba8d Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 13 May 2026 22:10:30 +0900 Subject: [PATCH 02/18] Restructure into multi-loader (Fabric + NeoForge) with merged jar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit common 디렉토리에 로더 비종속 ChatAnswerCore 를 두고, fabric/ 과 neoforge/ 서브프로젝트가 각자 진입점만 갖도록 분리. 두 결과물을 하나의 jar 로 묶기 위해 Fabric 측 common 클래스를 Shadow 의 relocate 로 kr.tkrmagid.chatanswer.fabric.core 패키지로 옮긴다 (Fabric 은 intermediary, NeoForge 는 Mojang 매핑이라 같은 클래스 경로에 그대로 두면 충돌). 루트의 mergedJar 태스크가 :fabric:relocatedJar 와 :neoforge:jar 를 합쳐서 build/libs/chat_answer--all.jar 생성. 산출물: 9.9KB 통합 jar 가 Fabric / NeoForge 양쪽에서 작동. --- README.md | 41 ++++--- build.gradle | 70 ++++++------ .../chatanswer/core/ChatAnswerCore.java | 86 +++++++++++++++ fabric/build.gradle | 71 ++++++++++++ .../chatanswer/fabric/ChatAnswerFabric.java | 14 +++ .../src}/main/resources/fabric.mod.json | 4 +- gradle.properties | 16 ++- neoforge/build.gradle | 41 +++++++ .../neoforge/ChatAnswerNeoForge.java | 23 ++++ .../resources/META-INF/neoforge.mods.toml | 26 +++++ settings.gradle | 2 + .../kr/tkrmagid/chatanswer/ChatAnswerMod.java | 103 ------------------ 12 files changed, 340 insertions(+), 157 deletions(-) create mode 100644 common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java create mode 100644 fabric/build.gradle create mode 100644 fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java rename {src => fabric/src}/main/resources/fabric.mod.json (85%) create mode 100644 neoforge/build.gradle create mode 100644 neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java create mode 100644 neoforge/src/main/resources/META-INF/neoforge.mods.toml delete mode 100644 src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java diff --git a/README.md b/README.md index 09494f7..80307c0 100644 --- a/README.md +++ b/README.md @@ -14,35 +14,46 @@ execute as <플레이어 UUID> run function mq:answer/submit {text:'<채팅 내 ## 빌드 -JDK 21 필요. Linux/macOS: +JDK 21 필요. ``` -./gradlew build +./gradlew buildAll ``` -Windows: +산출물: -``` -gradlew.bat build -``` - -산출물: `build/libs/chat_answer-.jar` +- `build/libs/chat_answer--all.jar` — **Fabric + NeoForge 통합 단일 jar** (권장) +- `fabric/build/libs/chat_answer-fabric-.jar` — Fabric 전용 +- `neoforge/build/libs/chat_answer-neoforge-.jar` — NeoForge 전용 ## 설치 -서버의 `mods/` 폴더에 jar 를 넣는다. Fabric Loader 0.16+ 필요. Fabric API 도 함께 설치. +서버의 `mods/` 폴더에 통합 jar (`*-all.jar`) 하나만 넣으면 된다. 로더가 Fabric 이든 +NeoForge 든 자기 쪽 진입점만 인식해서 동작한다. + +요구사항: + +- Minecraft 1.21.6+ 서버 +- Fabric: Fabric Loader 0.16+, Fabric API +- NeoForge: 21.6+ ## 호환성 -- 빌드 대상: Minecraft 1.21.6 (Dialog 시스템 최초 버전). -- 코드가 사용하는 API (`ServerMessageEvents.ALLOW_CHAT_MESSAGE`, `Scoreboard`, `MinecraftServer.getCommandManager`) 는 1.21.x 전반에 걸쳐 인터미디어리 매핑이 안정적이므로 동일 jar 가 그 이상 버전에서도 일반적으로 작동. -- Mojang 이 chat / scoreboard / command 시스템을 깨는 변경을 적용하면 그 시점에 재빌드 필요. +- 빌드 타깃: Minecraft 1.21.6 (Dialog 시스템 최초 도입 버전). +- 사용하는 API (`ServerMessageEvents.ALLOW_CHAT_MESSAGE` / `ServerChatEvent`, + `Scoreboard`, `MinecraftServer.getCommands()`) 는 1.21.x 전반에 안정적이라 + 같은 jar 가 보통 그대로 동작. +- Mojang 이 chat / scoreboard / command 시스템을 깨는 변경을 적용하면 재빌드 필요. -### Forge / NeoForge 사용자 +## 구조 -현재 jar 는 Fabric 전용. NeoForge 서버에서 사용하려면 [Sinytra Connector](https://modrinth.com/mod/connector) 를 함께 설치하면 그대로 작동. +- `common/` — 로더 비종속 핵심 로직 (Mojang 매핑 기반) +- `fabric/` — Fabric Loader 진입점 + `ServerMessageEvents` 훅 +- `neoforge/` — NeoForge 진입점 + `ServerChatEvent` 훅 -(별도 NeoForge 네이티브 variant 빌드는 향후 추가 예정.) +통합 jar 는 두 로더의 결과물을 하나로 묶되, Fabric 쪽 common 클래스는 패키지 +재배치(`kr.tkrmagid.chatanswer.core` → `kr.tkrmagid.chatanswer.fabric.core`)로 +NeoForge 쪽 같은 클래스와 충돌하지 않게 분리한다. ## 라이센스 diff --git a/build.gradle b/build.gradle index 2e114d4..28da4e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,45 +1,53 @@ plugins { - id 'fabric-loom' version '1.10-SNAPSHOT' id 'java' } -group = project.mod_group -version = project.mod_version -archivesBaseName = project.mod_id +allprojects { + apply plugin: 'java' -java { - toolchain.languageVersion = JavaLanguageVersion.of(21) - withSourcesJar() -} + group = project.mod_group + version = project.mod_version -repositories { - maven { url = 'https://maven.fabricmc.net/' } - mavenCentral() -} + java { + toolchain.languageVersion = JavaLanguageVersion.of(21) + } -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" -} + tasks.withType(JavaCompile).configureEach { + options.release = 21 + options.encoding = 'UTF-8' + } -processResources { - inputs.property "version", project.version - inputs.property "mod_id", project.mod_id - - filesMatching("fabric.mod.json") { - expand "version": project.version, "mod_id": project.mod_id + repositories { + maven { url = 'https://maven.fabricmc.net/' } + maven { url = 'https://maven.neoforged.net/releases/' } + mavenCentral() } } -tasks.withType(JavaCompile).configureEach { - options.release = 21 - options.encoding = 'UTF-8' -} +// ───── merged jar ────────────────────────────────────────────────────────── +// fabric + neoforge 각각의 remapJar 결과물을 한 jar 안에 압축해서 단일 배포물 생성. +// 같은 클래스(common 코드)는 한 번만 포함. 각 로더는 자신의 mod metadata +// (fabric.mod.json / META-INF/neoforge.mods.toml) 만 인식해서 자기 쪽 진입점만 로드. -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } +tasks.register('mergedJar', Jar) { + dependsOn ':fabric:relocatedJar', ':neoforge:jar' + archiveBaseName = project.mod_id + archiveVersion = project.mod_version + archiveClassifier = 'all' + destinationDirectory = file('build/libs') + + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + // Fabric: Shadow(relocatedJar) 가 common 패키지를 kr.tkrmagid.chatanswer.fabric.core 로 옮긴 jar + // NeoForge: common 은 그대로 kr.tkrmagid.chatanswer.core 에 위치 + // → 같은 클래스명 다른 매핑이라도 패키지 경로가 달라서 공존 가능 + from(zipTree(project(':fabric').tasks.named('relocatedJar').flatMap { it.archiveFile })) + from(zipTree(project(':neoforge').tasks.named('jar').flatMap { it.archiveFile })) { + // META-INF/MANIFEST.MF 는 Fabric 측 것을 그대로 사용 (둘 다 단순 manifest) + exclude 'META-INF/MANIFEST.MF' } } + +tasks.register('buildAll') { + dependsOn 'mergedJar' +} diff --git a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java new file mode 100644 index 0000000..0c1b4f4 --- /dev/null +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -0,0 +1,86 @@ +package kr.tkrmagid.chatanswer.core; + +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.scores.Objective; +import net.minecraft.world.scores.ReadOnlyScoreInfo; +import net.minecraft.world.scores.Scoreboard; +import net.minecraft.world.scores.ScoreHolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 채팅정답 핵심 로직 — 로더 비종속. + * + * 정답 입력 상태(scoreboard main / init = 5) 일 때 채팅을 가로채서 + * execute as run function mq:answer/submit {text:'<채팅>'} + * 을 OP 레벨로 실행한다. + * + * 각 로더 진입점(Fabric / NeoForge) 에서 chat 이벤트 받자마자 {@link #handleChat} + * 호출 → 반환값이 false 면 그 채팅은 broadcast 차단해야 함. + */ +public final class ChatAnswerCore { + public static final String MOD_ID = "chat_answer"; + public static final String DISPLAY_NAME = "채팅정답"; + private static final Logger LOG = LoggerFactory.getLogger(MOD_ID); + + private static final String SCOREBOARD_OBJECTIVE = "main"; + private static final String SCOREBOARD_HOLDER = "init"; + private static final int ACCEPTING_ANSWER_STATE = 5; + + private ChatAnswerCore() {} + + /** + * @return true = 채팅을 평소처럼 broadcast / false = 채팅 차단 (이미 정답 제출 처리됨) + */ + public static boolean handleChat(ServerPlayer sender, String rawText) { + MinecraftServer server = sender.getServer(); + if (server == null) return true; + if (!isAcceptingAnswer(server)) return true; + + submitAnswer(server, sender, rawText); + return false; + } + + private static boolean isAcceptingAnswer(MinecraftServer server) { + Scoreboard scoreboard = server.getScoreboard(); + Objective objective = scoreboard.getObjective(SCOREBOARD_OBJECTIVE); + if (objective == null) return false; + ReadOnlyScoreInfo score = scoreboard.getPlayerScoreInfo(ScoreHolder.forNameOnly(SCOREBOARD_HOLDER), objective); + if (score == null) return false; + return score.value() == ACCEPTING_ANSWER_STATE; + } + + private static void submitAnswer(MinecraftServer server, ServerPlayer sender, String rawText) { + String safe = sanitize(rawText); + if (safe.isEmpty()) return; + + String nbt = safe.replace("\\", "\\\\").replace("'", "\\'"); + String command = "execute as " + sender.getStringUUID() + + " run function mq:answer/submit {text:'" + nbt + "'}"; + + CommandSourceStack source = server.createCommandSourceStack().withSuppressedOutput(); + try { + server.getCommands().performPrefixedCommand(source, command); + } catch (Exception e) { + LOG.error("[{}] failed to submit answer for {}: {}", MOD_ID, sender.getName().getString(), e.toString()); + } + } + + /** + * 매크로 라인 ($data ... set value "$(text)") 가 큰따옴표로 값을 감싸므로 + * 큰따옴표/백슬래시는 제거. 제어문자도 NBT 호환을 위해 제거. + */ + private static String sanitize(String text) { + if (text == null) return ""; + StringBuilder sb = new StringBuilder(text.length()); + for (int i = 0; i < text.length(); i++) { + char c = text.charAt(i); + if (c == '"' || c == '\\') continue; + if (c < 0x20 || c == 0x7f) continue; + sb.append(c); + } + return sb.toString().strip(); + } +} diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..7051615 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,71 @@ +plugins { + id 'fabric-loom' version '1.10-SNAPSHOT' + id 'com.gradleup.shadow' version '8.3.5' +} + +archivesBaseName = "${project.mod_id}-fabric" + +// common/ 디렉토리의 로더 비종속 소스를 fabric 컴파일에 포함 (Mojang 매핑으로 컴파일) +sourceSets { + main { + java { + srcDirs += "${rootDir}/common/src/main/java" + } + } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings loom.officialMojangMappings() + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + +loom { + serverOnlyMinecraftJar() +} + +processResources { + inputs.property "version", project.version + inputs.property "mod_id", project.mod_id + inputs.property "mod_name", project.mod_name + + filesMatching("fabric.mod.json") { + expand( + "version": project.version, + "mod_id": project.mod_id, + "mod_name": project.mod_name + ) + } +} + +jar { + from(rootProject.file("LICENSE")) { + rename { "${it}_${project.mod_id}" } + } +} + +// ───── relocation for single-jar merge ───────────────────────────────────── +// Fabric 의 common 코드는 intermediary 매핑으로 컴파일되고, NeoForge 의 common +// 코드는 Mojang 매핑으로 컴파일된다. 둘은 바이트코드가 달라서 같은 클래스 경로에 +// 공존 불가. Shadow 의 relocate 로 Fabric 쪽 common 클래스만 별도 패키지로 옮겨서 +// merged jar 안에서 충돌하지 않게 한다. +// +// 진행 순서: loom 의 remapJar 결과 → shadowJar 가 받아서 패키지 재배치 → +// rootProject 의 mergedJar 가 이걸 사용. + +// Shadow 가 자동으로 만든 shadowJar 는 main sourceSet + 런타임 classpath 를 전부 +// 포함해서 100MB+ 가 되어버린다. 우리한테 필요한 건 "remapJar 결과물에 relocate 만 +// 적용한 작은 jar" 이므로, 별도 ShadowJar 태스크를 새로 만들어서 입력을 명시적으로 +// remapJar 의 zipTree 만 지정한다. +tasks.register('relocatedJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { + dependsOn 'remapJar' + archiveClassifier = 'relocated' + from zipTree(tasks.named('remapJar').flatMap { it.archiveFile }) + relocate 'kr.tkrmagid.chatanswer.core', 'kr.tkrmagid.chatanswer.fabric.core' + mergeServiceFiles() +} + +tasks.named('build') { + dependsOn 'relocatedJar' +} diff --git a/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java b/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java new file mode 100644 index 0000000..ae3a849 --- /dev/null +++ b/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java @@ -0,0 +1,14 @@ +package kr.tkrmagid.chatanswer.fabric; + +import kr.tkrmagid.chatanswer.core.ChatAnswerCore; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; + +public final class ChatAnswerFabric implements ModInitializer { + @Override + public void onInitialize() { + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> + ChatAnswerCore.handleChat(sender, message.signedContent()) + ); + } +} diff --git a/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json similarity index 85% rename from src/main/resources/fabric.mod.json rename to fabric/src/main/resources/fabric.mod.json index 72593a4..a23e975 100644 --- a/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "${mod_id}", "version": "${version}", - "name": "채팅정답", + "name": "${mod_name}", "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.", "authors": [ "tkrmagid" ], "contact": { @@ -11,7 +11,7 @@ "license": "MIT", "environment": "server", "entrypoints": { - "main": [ "kr.tkrmagid.chatanswer.ChatAnswerMod" ] + "main": [ "kr.tkrmagid.chatanswer.fabric.ChatAnswerFabric" ] }, "depends": { "fabricloader": ">=0.16.0", diff --git a/gradle.properties b/gradle.properties index d54fba3..f48aeaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,20 @@ -org.gradle.jvmargs=-Xmx2G +org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true -# Minecraft / Fabric versions -# Targets MC 1.21.6 (oldest Minecraft version with the dialog system). -# Chat events are stable since 1.19 — the same jar typically works across -# the 1.21.x line; rebuild against newer mappings if a future version -# breaks binary compatibility. +# ───── target Minecraft / loader versions ─────────────────────────────────── +# 1.21.6 = dialog system 최초 버전 = 음악퀴즈 데이터팩 최소 요구 버전 minecraft_version=1.21.6 + +# Fabric yarn_mappings=1.21.6+build.1 loader_version=0.16.10 fabric_version=0.128.2+1.21.6 +# NeoForge +neoforge_version=21.6.20-beta + +# ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer mod_version=1.0.0 mod_group=kr.tkrmagid.chatanswer +mod_name=채팅정답 diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 0000000..49236c8 --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'net.neoforged.moddev' version '2.0.97' +} + +archivesBaseName = "${project.mod_id}-neoforge" + +sourceSets { + main { + java { + srcDirs += "${rootDir}/common/src/main/java" + } + } +} + +neoForge { + version = project.neoforge_version +} + +processResources { + inputs.property "version", project.version + inputs.property "mod_id", project.mod_id + inputs.property "mod_name", project.mod_name + inputs.property "minecraft_version", project.minecraft_version + inputs.property "neoforge_version", project.neoforge_version + + filesMatching("META-INF/neoforge.mods.toml") { + expand( + "version": project.version, + "mod_id": project.mod_id, + "mod_name": project.mod_name, + "minecraft_version": project.minecraft_version, + "neoforge_version": project.neoforge_version + ) + } +} + +jar { + from(rootProject.file("LICENSE")) { + rename { "${it}_${project.mod_id}" } + } +} diff --git a/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java b/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java new file mode 100644 index 0000000..00a1902 --- /dev/null +++ b/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java @@ -0,0 +1,23 @@ +package kr.tkrmagid.chatanswer.neoforge; + +import kr.tkrmagid.chatanswer.core.ChatAnswerCore; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.ServerChatEvent; + +@Mod(ChatAnswerCore.MOD_ID) +public final class ChatAnswerNeoForge { + public ChatAnswerNeoForge(IEventBus modBus) { + NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerChat); + } + + @SubscribeEvent + public static void onServerChat(ServerChatEvent event) { + boolean allow = ChatAnswerCore.handleChat(event.getPlayer(), event.getRawText()); + if (!allow) { + event.setCanceled(true); + } + } +} diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..4257057 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,26 @@ +modLoader = "javafml" +loaderVersion = "[1,)" +license = "MIT" +issueTrackerURL = "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod/issues" + +[[mods]] +modId = "${mod_id}" +version = "${version}" +displayName = "${mod_name}" +authors = "tkrmagid" +description = '''음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.''' +displayURL = "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod" + +[[dependencies.${mod_id}]] +modId = "neoforge" +type = "required" +versionRange = "[${neoforge_version},)" +ordering = "NONE" +side = "SERVER" + +[[dependencies.${mod_id}]] +modId = "minecraft" +type = "required" +versionRange = "[${minecraft_version},)" +ordering = "NONE" +side = "SERVER" diff --git a/settings.gradle b/settings.gradle index 2008f4e..a1dbe30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,11 @@ pluginManagement { repositories { maven { url = 'https://maven.fabricmc.net/' } + maven { url = 'https://maven.neoforged.net/releases/' } gradlePluginPortal() mavenCentral() } } rootProject.name = 'chat_answer' +include 'fabric', 'neoforge' diff --git a/src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java b/src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java deleted file mode 100644 index c79011c..0000000 --- a/src/main/java/kr/tkrmagid/chatanswer/ChatAnswerMod.java +++ /dev/null @@ -1,103 +0,0 @@ -package kr.tkrmagid.chatanswer; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; -import net.minecraft.scoreboard.Scoreboard; -import net.minecraft.scoreboard.ScoreboardObjective; -import net.minecraft.scoreboard.ScoreHolder; -import net.minecraft.scoreboard.ReadableScoreboardScore; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 채팅정답 (chat_answer) — 음악퀴즈 데이터팩과 짝이 되는 서버사이드 모드. - * - * 정답 입력 상태(init=5) 일 때 플레이어 채팅을 가로채서 - * function mq:answer/submit {text:'<채팅 내용>'} - * 을 해당 플레이어 컨텍스트로 실행한다. 채팅은 다른 플레이어들에게 broadcast 되지 - * 않도록 차단한다 (정답이 노출되면 안되므로). 그 외 상태에서는 채팅이 정상 진행된다. - */ -public class ChatAnswerMod implements ModInitializer { - public static final String MOD_ID = "chat_answer"; - private static final Logger LOG = LoggerFactory.getLogger(MOD_ID); - - // 음악퀴즈 데이터팩 약속 — main objective 의 init 점수가 5 면 정답 입력 받는 상태. - private static final String SCOREBOARD_OBJECTIVE = "main"; - private static final String SCOREBOARD_HOLDER = "init"; - private static final int ACCEPTING_ANSWER_STATE = 5; - - @Override - public void onInitialize() { - // 1) 가로채기 단계 — 정답 입력 상태면 false 반환해서 broadcast 차단 - ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> { - if (!isAcceptingAnswer(sender.getServer())) { - return true; // 평소엔 채팅 그대로 - } - submitAnswer(sender, message.getContent().getString()); - return false; // 정답 입력 상태에서는 채팅을 죽임 - }); - LOG.info("[{}] initialized — chat-as-answer hook active", MOD_ID); - } - - /** - * mq:main 데이터팩의 scoreboard main / init 점수를 읽어서 현재 상태 판정. - * objective 가 아직 생성되지 않았으면(퀴즈 미시작) 항상 false. - */ - private static boolean isAcceptingAnswer(MinecraftServer server) { - Scoreboard scoreboard = server.getScoreboard(); - ScoreboardObjective objective = scoreboard.getNullableObjective(SCOREBOARD_OBJECTIVE); - if (objective == null) { - return false; - } - ReadableScoreboardScore score = scoreboard.getScore(ScoreHolder.fromName(SCOREBOARD_HOLDER), objective); - if (score == null) { - return false; - } - return score.getScore() == ACCEPTING_ANSWER_STATE; - } - - /** - * 채팅 내용을 데이터팩 함수 호출로 변환. NBT 단일 따옴표 문자열로 감싸고, - * 매크로 치환 단계에서 문제 일으킬 수 있는 문자들을 사전 정리한다. - */ - private static void submitAnswer(ServerPlayerEntity sender, String rawText) { - String safe = sanitize(rawText); - if (safe.isEmpty()) { - return; - } - // single-quoted NBT 안의 ' 과 \ 만 이스케이프 - String nbt = safe.replace("\\", "\\\\").replace("'", "\\'"); - String command = "execute as " + sender.getUuidAsString() - + " run function mq:answer/submit {text:'" + nbt + "'}"; - - MinecraftServer server = sender.getServer(); - // 서버 커맨드 소스 (OP level 4) + silent — 채팅창에 명령어 출력 방지 - ServerCommandSource source = server.getCommandSource().withSilent(); - try { - server.getCommandManager().executeWithPrefix(source, command); - } catch (Exception e) { - LOG.error("[{}] failed to submit answer for {}: {}", MOD_ID, sender.getName().getString(), e.toString()); - } - } - - /** - * 매크로 라인 ($data ... set value "$(text)") 가 큰따옴표로 값을 감싸기 때문에, - * 채팅 내용에 큰따옴표나 백슬래시가 있으면 그 매크로가 깨진다. - * 가장 안전한 처리는 두 문자를 제거. 일반 정답 텍스트에는 거의 등장하지 않음. - * 추가로 NBT 호환을 위해 제어문자(\u0000-\u001f, \u007f) 도 제거. - */ - private static String sanitize(String text) { - if (text == null) return ""; - StringBuilder sb = new StringBuilder(text.length()); - for (int i = 0; i < text.length(); i++) { - char c = text.charAt(i); - if (c == '"' || c == '\\') continue; - if (c < 0x20 || c == 0x7f) continue; - sb.append(c); - } - return sb.toString().strip(); - } -} From 464762589c73b4d40c01f50def1f7bf561543bc3 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 13 May 2026 22:20:00 +0900 Subject: [PATCH 03/18] Add player-join hook to signal mod presence to datapack (v1.1.0) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ChatAnswerCore.onPlayerJoin 이 storage chat_answer:status active=1b 를 set. Fabric 측은 ServerPlayConnectionEvents.JOIN, NeoForge 측은 PlayerLoggedInEvent 에서 호출. 데이터팩이 mq:load 단계에서 0b 로 clear 해 두므로, 모드가 빠진 환경에선 이 hook 이 일어나지 않아 0b 가 유지되고, 모드가 있으면 첫 로그인 직후 1b 로 갱신되어 데이터팩이 활성 상태를 분기할 수 있다. --- .../chatanswer/core/ChatAnswerCore.java | 20 +++++++++++++++++++ .../chatanswer/fabric/ChatAnswerFabric.java | 4 ++++ gradle.properties | 2 +- .../neoforge/ChatAnswerNeoForge.java | 10 ++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) 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 0c1b4f4..5f052c8 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -31,6 +31,26 @@ public final class ChatAnswerCore { private ChatAnswerCore() {} + /** + * 플레이어 로그인 직후 호출. 데이터팩이 "모드 살아있음" 신호로 쓸 수 있게 + * storage chat_answer:status 에 active=1b 를 세팅한다. 데이터팩의 mq:load 가 + * 매 /reload 와 서버 시작 시 이 값을 0b 로 clear 하므로, 모드가 없으면 이 + * 호출이 일어나지 않아 0b 로 유지되고, 모드가 있으면 첫 로그인 직후 1b 로 갱신. + */ + public static void onPlayerJoin(ServerPlayer player) { + MinecraftServer server = player.getServer(); + if (server == null) return; + CommandSourceStack source = server.createCommandSourceStack().withSuppressedOutput(); + try { + server.getCommands().performPrefixedCommand( + source, + "data modify storage chat_answer:status active set value 1b" + ); + } catch (Exception e) { + LOG.debug("[{}] failed to set active flag: {}", MOD_ID, e.toString()); + } + } + /** * @return true = 채팅을 평소처럼 broadcast / false = 채팅 차단 (이미 정답 제출 처리됨) */ diff --git a/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java b/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java index ae3a849..587f5b4 100644 --- a/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java +++ b/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java @@ -3,6 +3,7 @@ package kr.tkrmagid.chatanswer.fabric; import kr.tkrmagid.chatanswer.core.ChatAnswerCore; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; public final class ChatAnswerFabric implements ModInitializer { @Override @@ -10,5 +11,8 @@ public final class ChatAnswerFabric implements ModInitializer { ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> ChatAnswerCore.handleChat(sender, message.signedContent()) ); + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> + ChatAnswerCore.onPlayerJoin(handler.player) + ); } } diff --git a/gradle.properties b/gradle.properties index f48aeaa..eb03f1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ neoforge_version=21.6.20-beta # ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer -mod_version=1.0.0 +mod_version=1.1.0 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 diff --git a/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java b/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java index 00a1902..b5cf676 100644 --- a/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java +++ b/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java @@ -1,16 +1,19 @@ package kr.tkrmagid.chatanswer.neoforge; import kr.tkrmagid.chatanswer.core.ChatAnswerCore; +import net.minecraft.server.level.ServerPlayer; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; 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; @Mod(ChatAnswerCore.MOD_ID) public final class ChatAnswerNeoForge { public ChatAnswerNeoForge(IEventBus modBus) { NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerChat); + NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onPlayerLogin); } @SubscribeEvent @@ -20,4 +23,11 @@ public final class ChatAnswerNeoForge { event.setCanceled(true); } } + + @SubscribeEvent + public static void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + if (event.getEntity() instanceof ServerPlayer player) { + ChatAnswerCore.onPlayerJoin(player); + } + } } From fd9d17e8188bb10b18f9ad2b6ac67ef1778eaaee Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 00:46:11 +0900 Subject: [PATCH 04/18] =?UTF-8?q?v1.1.1=20=E2=80=94=20make=20mod=20load=20?= =?UTF-8?q?on=20client=20(single-player)=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fabric.mod.json 의 environment 가 "server" 라 client 설치에선 Fabric Loader 가 모드를 건너뛰어 ModMenu 에 안 나타나는 문제. "*" 로 바꿔서 client (싱글 플레이 integrated server 포함) + dedicated server 양쪽에서 로드되게 함. NeoForge 쪽도 side = "BOTH" 로 변경. 실제 로직은 변함없이 server 측 채팅 이벤트만 hook 하므로 client 단독에서는 no-op. --- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 2 +- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index a23e975..c112dfe 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ "homepage": "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod" }, "license": "MIT", - "environment": "server", + "environment": "*", "entrypoints": { "main": [ "kr.tkrmagid.chatanswer.fabric.ChatAnswerFabric" ] }, diff --git a/gradle.properties b/gradle.properties index eb03f1f..65f9eb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ neoforge_version=21.6.20-beta # ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer -mod_version=1.1.0 +mod_version=1.1.1 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 4257057..8191595 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -16,11 +16,11 @@ modId = "neoforge" type = "required" versionRange = "[${neoforge_version},)" ordering = "NONE" -side = "SERVER" +side = "BOTH" [[dependencies.${mod_id}]] modId = "minecraft" type = "required" versionRange = "[${minecraft_version},)" ordering = "NONE" -side = "SERVER" +side = "BOTH" From e4bfda783a60b0b1f6eb9ae2051ddab61301090a Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 01:55:02 +0900 Subject: [PATCH 05/18] =?UTF-8?q?v1.2.0=20=E2=80=94=20target=20MC=2026.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit User reported NoClassDefFoundError: net/minecraft/class_7471 on MC 26.1.2. Root cause: v1.1.1 was built for 1.21.6 intermediary, which uses class_NNNN obfuscated names. MC 26.x ships an unobfuscated server jar with Mojang names directly, so intermediary lookups for class_7471 (=PlayerChatMessage in 1.21.6) fail at runtime. Build retargeted to 26.1.2: - minecraft 26.1.2 / loader 0.19.2 / fabric-api 0.148.2+26.1.2 - Loom 1.16-SNAPSHOT, Shadow 9.4.1 (Java 25 bytecode support) - Gradle 9.5.1, JDK 25 toolchain - Drop officialMojangMappings(); use intermediary:0.0.0 identity (Mojang stopped publishing proguard mappings for 26.x). - Adapt code: ServerPlayer.getServer() removed in 26.1.2 → use player.level().getServer() (ServerPlayer.level() returns ServerLevel). - NeoForge dropped from this build — moddev plugin can't parse 26.1.2 yet, falls back to 1.21.5. - 1.2.0 = Fabric only; 1.21.6 users stay on 1.1.1. --- build.gradle | 31 +++---------------- .../chatanswer/core/ChatAnswerCore.java | 4 +-- fabric/build.gradle | 19 ++++++------ fabric/src/main/resources/fabric.mod.json | 6 ++-- gradle.properties | 14 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 2 +- settings.gradle | 3 +- 8 files changed, 29 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 28da4e5..154bf6b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,11 +9,11 @@ allprojects { version = project.mod_version java { - toolchain.languageVersion = JavaLanguageVersion.of(21) + toolchain.languageVersion = JavaLanguageVersion.of(25) } tasks.withType(JavaCompile).configureEach { - options.release = 21 + options.release = 25 options.encoding = 'UTF-8' } @@ -24,30 +24,7 @@ allprojects { } } -// ───── merged jar ────────────────────────────────────────────────────────── -// fabric + neoforge 각각의 remapJar 결과물을 한 jar 안에 압축해서 단일 배포물 생성. -// 같은 클래스(common 코드)는 한 번만 포함. 각 로더는 자신의 mod metadata -// (fabric.mod.json / META-INF/neoforge.mods.toml) 만 인식해서 자기 쪽 진입점만 로드. - -tasks.register('mergedJar', Jar) { - dependsOn ':fabric:relocatedJar', ':neoforge:jar' - archiveBaseName = project.mod_id - archiveVersion = project.mod_version - archiveClassifier = 'all' - destinationDirectory = file('build/libs') - - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - // Fabric: Shadow(relocatedJar) 가 common 패키지를 kr.tkrmagid.chatanswer.fabric.core 로 옮긴 jar - // NeoForge: common 은 그대로 kr.tkrmagid.chatanswer.core 에 위치 - // → 같은 클래스명 다른 매핑이라도 패키지 경로가 달라서 공존 가능 - from(zipTree(project(':fabric').tasks.named('relocatedJar').flatMap { it.archiveFile })) - from(zipTree(project(':neoforge').tasks.named('jar').flatMap { it.archiveFile })) { - // META-INF/MANIFEST.MF 는 Fabric 측 것을 그대로 사용 (둘 다 단순 manifest) - exclude 'META-INF/MANIFEST.MF' - } -} - +// MC 26.1.2 배포물은 Fabric jar 단일 빌드. buildAll = fabric remapJar 결과물. tasks.register('buildAll') { - dependsOn 'mergedJar' + dependsOn ':fabric:remapJar' } 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 5f052c8..ba0d06d 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -38,7 +38,7 @@ public final class ChatAnswerCore { * 호출이 일어나지 않아 0b 로 유지되고, 모드가 있으면 첫 로그인 직후 1b 로 갱신. */ public static void onPlayerJoin(ServerPlayer player) { - MinecraftServer server = player.getServer(); + MinecraftServer server = player.level().getServer(); if (server == null) return; CommandSourceStack source = server.createCommandSourceStack().withSuppressedOutput(); try { @@ -55,7 +55,7 @@ public final class ChatAnswerCore { * @return true = 채팅을 평소처럼 broadcast / false = 채팅 차단 (이미 정답 제출 처리됨) */ public static boolean handleChat(ServerPlayer sender, String rawText) { - MinecraftServer server = sender.getServer(); + MinecraftServer server = sender.level().getServer(); if (server == null) return true; if (!isAcceptingAnswer(server)) return true; diff --git a/fabric/build.gradle b/fabric/build.gradle index 7051615..6fe61ff 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'fabric-loom' version '1.10-SNAPSHOT' - id 'com.gradleup.shadow' version '8.3.5' + id 'fabric-loom' version '1.16-SNAPSHOT' + id 'com.gradleup.shadow' version '9.4.1' } -archivesBaseName = "${project.mod_id}-fabric" +base.archivesName = "${project.mod_id}-fabric" // common/ 디렉토리의 로더 비종속 소스를 fabric 컴파일에 포함 (Mojang 매핑으로 컴파일) sourceSets { @@ -15,14 +15,11 @@ sourceSets { } dependencies { + // MC 26.x: server jar 가 unobfuscated. intermediary 0.0.0 = identity mapping. minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" -} - -loom { - serverOnlyMinecraftJar() + mappings "net.fabricmc:intermediary:0.0.0:v2" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } processResources { @@ -30,6 +27,8 @@ processResources { inputs.property "mod_id", project.mod_id inputs.property "mod_name", project.mod_name + filteringCharset = 'UTF-8' + filesMatching("fabric.mod.json") { expand( "version": project.version, diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c112dfe..cb4596e 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "${mod_id}", "version": "${version}", - "name": "${mod_name}", + "name": "채팅정답", "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.", "authors": [ "tkrmagid" ], "contact": { @@ -14,8 +14,8 @@ "main": [ "kr.tkrmagid.chatanswer.fabric.ChatAnswerFabric" ] }, "depends": { - "fabricloader": ">=0.16.0", - "minecraft": ">=1.21.6", + "fabricloader": ">=0.19.0", + "minecraft": ">=26.1.2", "java": ">=21", "fabric-api": "*" } diff --git a/gradle.properties b/gradle.properties index 65f9eb9..4418772 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,19 +2,19 @@ org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true # ───── target Minecraft / loader versions ─────────────────────────────────── -# 1.21.6 = dialog system 최초 버전 = 음악퀴즈 데이터팩 최소 요구 버전 -minecraft_version=1.21.6 +# MC 26.1.2 = 사용자 환경. 1.21.6 과는 intermediary 매핑이 달라서 동일 jar 로 양쪽 +# 지원 불가 → 26.1.2 전용 빌드. +minecraft_version=26.1.2 # Fabric -yarn_mappings=1.21.6+build.1 -loader_version=0.16.10 -fabric_version=0.128.2+1.21.6 +loader_version=0.19.2 +fabric_version=0.148.2+26.1.2 # NeoForge -neoforge_version=21.6.20-beta +neoforge_version=26.1.2.36-beta # ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer -mod_version=1.1.1 +mod_version=1.2.0 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a79..5dd3c01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 49236c8..1e12ceb 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -2,7 +2,7 @@ plugins { id 'net.neoforged.moddev' version '2.0.97' } -archivesBaseName = "${project.mod_id}-neoforge" +base.archivesName = "${project.mod_id}-neoforge" sourceSets { main { diff --git a/settings.gradle b/settings.gradle index a1dbe30..c1b2c30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,5 @@ pluginManagement { } rootProject.name = 'chat_answer' -include 'fabric', 'neoforge' +// NeoForge moddev plugin 이 MC 26.1.2 를 파싱하지 못함(1.21.5 로 fallback) → 26.x 정식 지원 전까지 제외. +include 'fabric' From 785efe24b98f974a9369d3d987b333ff9e3fa62b Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 02:28:20 +0900 Subject: [PATCH 06/18] =?UTF-8?q?v1.2.1=20=E2=80=94=20add=20icon,=20drop?= =?UTF-8?q?=20contact=20homepage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Embed music quiz icon at assets/chat_answer/icon.png; reference from fabric.mod.json so ModMenu shows it. - Remove contact.homepage (private Gitea — owner-only). --- .../main/resources/assets/chat_answer/icon.png | Bin 0 -> 4458 bytes fabric/src/main/resources/fabric.mod.json | 4 +--- gradle.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 fabric/src/main/resources/assets/chat_answer/icon.png diff --git a/fabric/src/main/resources/assets/chat_answer/icon.png b/fabric/src/main/resources/assets/chat_answer/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..080209f8c100788385bb6102eb043fe5faaf9d53 GIT binary patch literal 4458 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 literal 0 HcmV?d00001 diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index cb4596e..435456a 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -5,10 +5,8 @@ "name": "채팅정답", "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.", "authors": [ "tkrmagid" ], - "contact": { - "homepage": "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod" - }, "license": "MIT", + "icon": "assets/chat_answer/icon.png", "environment": "*", "entrypoints": { "main": [ "kr.tkrmagid.chatanswer.fabric.ChatAnswerFabric" ] diff --git a/gradle.properties b/gradle.properties index 4418772..c98824e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ neoforge_version=26.1.2.36-beta # ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer -mod_version=1.2.0 +mod_version=1.2.1 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 From e01137ee312576c90b5d90f8a1b42023d54b9bd8 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 02:45:54 +0900 Subject: [PATCH 07/18] =?UTF-8?q?v1.3.0=20=E2=80=94=20single=20jar=20cover?= =?UTF-8?q?s=20Fabric=201.21.6=20+=20Fabric=2026.1.2=20+=20NeoForge=201.21?= =?UTF-8?q?.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 이전엔 1.21.6 (v1.1.1) 와 26.1.2 (v1.2.1) 가 분리된 jar 였음. 사용자 입장에서 버전별로 다른 파일을 받아야 했고 합친 의미가 없어서, 한 jar 가 어느 환경에든 들어갈 수 있도록 컨테이너 구조로 재작업. 구조: - outer chat_answer-1.3.0.jar ├── fabric.mod.json (entrypoint 없는 컨테이너 메타. MC dep 없음.) ├── META-INF/neoforge.mods.toml (NeoForge 1.21.6 모드 본체 메타) ├── kr/.../neoforge/ (NeoForge 1.21.6 entry + core, Mojang 매핑) ├── kr/.../core/ (NeoForge 가 쓰는 공유 core 사본) └── META-INF/jars/ (Fabric Loader 가 자동 스캔) ├── chat_answer-fabric-1216-1.3.0.jar (MC ">=1.21.6 <1.22") └── chat_answer-fabric-2612-1.3.0.jar (MC ">=26.1.2") 로더별 동작: - Fabric 1.21.6 → outer 는 no-op 컨테이너, 1216 nested 가 활성 (intermediary class_NNNN 리매핑됨) - Fabric 26.1.2 → outer 는 no-op 컨테이너, 2612 nested 가 활성 (intermediary 0.0.0 identity) - NeoForge 1.21.6 → outer 의 NeoForge entry 가 동작. Fabric 메타와 nested jars 는 NeoForge 가 무시. 핵심 트레이드오프: - 1.21.6 fabric subproject 는 modImplementation 필수 (intermediary 매핑 리맵 필요) - 26.1.2 fabric subproject 는 implementation 으로 충분 (서버 jar unobfuscated → identity 매핑) - 26.1.2 NeoForge 는 moddev plugin 이 아직 26.x 를 파싱 못 함 → 1.21.6 만 지원 - 두 nested fabric jar 는 mod id 동일 (chat_answer_fabric) — depends.minecraft 가 상호 배타라 한 환경에서 둘이 동시 candidate 가 되지 않으므로 충돌 없음. Co-Authored-By: Claude Opus 4.7 --- build.gradle | 52 ++++++++++++- .../assets/chat_answer/icon.png | Bin container-resources/fabric.mod.json | 15 ++++ fabric-1216/build.gradle | 53 +++++++++++++ .../chatanswer/fabric/ChatAnswerFabric.java | 0 .../resources/assets/chat_answer/icon.png | Bin 0 -> 4458 bytes .../src/main/resources/fabric.mod.json | 20 +++++ fabric-2612/build.gradle | 42 +++++++++++ .../chatanswer/fabric/ChatAnswerFabric.java | 18 +++++ .../resources/assets/chat_answer/icon.png | Bin 0 -> 4458 bytes .../src/main/resources/fabric.mod.json | 6 +- fabric/build.gradle | 70 ------------------ gradle.properties | 32 ++++---- neoforge-1216/build.gradle | 49 ++++++++++++ .../neoforge/ChatAnswerNeoForge.java | 0 .../resources/META-INF/neoforge.mods.toml | 5 +- neoforge-1216/src/main/resources/icon.png | Bin 0 -> 4458 bytes neoforge/build.gradle | 41 ---------- settings.gradle | 8 +- 19 files changed, 276 insertions(+), 135 deletions(-) rename {fabric/src/main/resources => container-resources}/assets/chat_answer/icon.png (100%) create mode 100644 container-resources/fabric.mod.json create mode 100644 fabric-1216/build.gradle rename {fabric => fabric-1216}/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java (100%) create mode 100644 fabric-1216/src/main/resources/assets/chat_answer/icon.png create mode 100644 fabric-1216/src/main/resources/fabric.mod.json create mode 100644 fabric-2612/build.gradle create mode 100644 fabric-2612/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java create mode 100644 fabric-2612/src/main/resources/assets/chat_answer/icon.png rename {fabric => fabric-2612}/src/main/resources/fabric.mod.json (80%) delete mode 100644 fabric/build.gradle create mode 100644 neoforge-1216/build.gradle rename {neoforge => neoforge-1216}/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java (100%) rename {neoforge => neoforge-1216}/src/main/resources/META-INF/neoforge.mods.toml (76%) create mode 100644 neoforge-1216/src/main/resources/icon.png delete mode 100644 neoforge/build.gradle diff --git a/build.gradle b/build.gradle index 154bf6b..6b08ef9 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,8 @@ allprojects { group = project.mod_group version = project.mod_version + // 기본 JDK toolchain 은 Java 25 (26.x Loom 빌드 요구). subproject 가 필요하면 + // 자체 release 21 등으로 다운그레이드. java { toolchain.languageVersion = JavaLanguageVersion.of(25) } @@ -24,7 +26,51 @@ allprojects { } } -// MC 26.1.2 배포물은 Fabric jar 단일 빌드. buildAll = fabric remapJar 결과물. -tasks.register('buildAll') { - dependsOn ':fabric:remapJar' +// ───── 단일 배포 jar 컨테이너 ──────────────────────────────────────────────── +// 한 jar 가 어떤 환경에서도 동작하도록: +// * outer = NeoForge 1.21.6 모드 본체 (NeoForge 만 fabric.mod.json 을 무시) +// + 메타로 fabric.mod.json (entrypoint 없는 컨테이너) +// * META-INF/jars/ = Fabric 용 nested jar 둘 (1.21.6 / 26.1.2) +// Fabric Loader 가 depends.minecraft 로 자동 매칭. NeoForge 는 무시. +// +// 결과: chat_answer-.jar 한 개를 Fabric 1.21.6 / Fabric 26.1.2 / NeoForge +// 1.21.6 어디에 넣어도 적절한 코드 경로가 활성화된다. + +tasks.register('containerJar', Jar) { + dependsOn ':fabric-1216:remapJar', + ':fabric-2612:remapJar', + ':neoforge-1216:jar' + + archiveBaseName = project.mod_id + archiveVersion = project.mod_version + archiveClassifier = '' + destinationDirectory = file('build/libs') + + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + // 1. NeoForge 모드 본체 (classes + META-INF/neoforge.mods.toml + icon.png) 을 통째로. + // MANIFEST.MF 는 새 jar 가 자체적으로 생성하니 제외. + from(zipTree(project(':neoforge-1216').tasks.named('jar').flatMap { it.archiveFile })) { + exclude 'META-INF/MANIFEST.MF' + } + + // 2. Fabric 컨테이너 메타데이터 (entrypoint 없이 그냥 "외피") 와 아이콘. + // fabric.mod.json 의 ${version} 만 치환. + filteringCharset = 'UTF-8' + from("${rootDir}/container-resources") { + filesMatching("fabric.mod.json") { + expand("version": project.mod_version) + } + } + + // 3. Fabric nested jars (Fabric Loader 가 META-INF/jars/ 를 스캔해서 + // depends.minecraft 매칭되는 jar 만 활성화). + into('META-INF/jars') { + from project(':fabric-1216').tasks.named('remapJar').flatMap { it.archiveFile } + from project(':fabric-2612').tasks.named('remapJar').flatMap { it.archiveFile } + } +} + +tasks.register('buildAll') { + dependsOn 'containerJar' } diff --git a/fabric/src/main/resources/assets/chat_answer/icon.png b/container-resources/assets/chat_answer/icon.png similarity index 100% rename from fabric/src/main/resources/assets/chat_answer/icon.png rename to container-resources/assets/chat_answer/icon.png diff --git a/container-resources/fabric.mod.json b/container-resources/fabric.mod.json new file mode 100644 index 0000000..0d846d5 --- /dev/null +++ b/container-resources/fabric.mod.json @@ -0,0 +1,15 @@ +{ + "schemaVersion": 1, + "id": "chat_answer", + "version": "${version}", + "name": "채팅정답", + "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다. 단일 jar 에 1.21.6 (Fabric/NeoForge) + 26.1.2 (Fabric) 빌드가 모두 들어있어 어느 환경에서도 그대로 동작합니다.", + "authors": [ "tkrmagid" ], + "license": "MIT", + "icon": "assets/chat_answer/icon.png", + "environment": "*", + "depends": { + "fabricloader": ">=0.16.0", + "java": ">=21" + } +} diff --git a/fabric-1216/build.gradle b/fabric-1216/build.gradle new file mode 100644 index 0000000..2fa4547 --- /dev/null +++ b/fabric-1216/build.gradle @@ -0,0 +1,53 @@ +plugins { + id 'fabric-loom' version '1.16-SNAPSHOT' +} + +base.archivesName = "${project.mod_id}-fabric-1216" + +// 1.21.6 은 Java 21 런타임. release 21 로 컴파일. +java { + toolchain.languageVersion = JavaLanguageVersion.of(25) +} +tasks.withType(JavaCompile).configureEach { + options.release = 21 +} + +// common/ 디렉토리의 로더 비종속 소스 포함. Mojang 매핑으로 컴파일됨. +sourceSets { + main { + java { + srcDirs += "${rootDir}/common/src/main/java" + } + } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.mc_1216}" + mappings loom.officialMojangMappings() + modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_1216}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_1216}" +} + +loom { + serverOnlyMinecraftJar() +} + +processResources { + inputs.property "version", project.version + inputs.property "mod_id", project.mod_id + + filteringCharset = 'UTF-8' + + filesMatching("fabric.mod.json") { + expand( + "version": project.version, + "mod_id": project.mod_id + ) + } +} + +jar { + from(rootProject.file("LICENSE")) { + rename { "${it}_${project.mod_id}_fabric_1216" } + } +} diff --git a/fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java b/fabric-1216/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java similarity index 100% rename from fabric/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java rename to fabric-1216/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java diff --git a/fabric-1216/src/main/resources/assets/chat_answer/icon.png b/fabric-1216/src/main/resources/assets/chat_answer/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..080209f8c100788385bb6102eb043fe5faaf9d53 GIT binary patch literal 4458 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 literal 0 HcmV?d00001 diff --git a/fabric-1216/src/main/resources/fabric.mod.json b/fabric-1216/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..330af2f --- /dev/null +++ b/fabric-1216/src/main/resources/fabric.mod.json @@ -0,0 +1,20 @@ +{ + "schemaVersion": 1, + "id": "chat_answer_fabric", + "version": "${version}", + "name": "채팅정답 (Fabric impl)", + "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다. (MC 1.21.6 변형)", + "authors": [ "tkrmagid" ], + "license": "MIT", + "icon": "assets/chat_answer/icon.png", + "environment": "*", + "entrypoints": { + "main": [ "kr.tkrmagid.chatanswer.fabric.ChatAnswerFabric" ] + }, + "depends": { + "fabricloader": ">=0.16.0", + "minecraft": ">=1.21.6 <1.22", + "java": ">=21", + "fabric-api": "*" + } +} diff --git a/fabric-2612/build.gradle b/fabric-2612/build.gradle new file mode 100644 index 0000000..ed8e3a6 --- /dev/null +++ b/fabric-2612/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'fabric-loom' version '1.16-SNAPSHOT' +} + +base.archivesName = "${project.mod_id}-fabric-2612" + +// common/ 디렉토리의 로더 비종속 소스 포함. +sourceSets { + main { + java { + srcDirs += "${rootDir}/common/src/main/java" + } + } +} + +dependencies { + // MC 26.x: server jar 가 unobfuscated. intermediary 0.0.0 = identity mapping. + minecraft "com.mojang:minecraft:${project.mc_2612}" + mappings "net.fabricmc:intermediary:0.0.0:v2" + implementation "net.fabricmc:fabric-loader:${project.fabric_loader_2612}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_2612}" +} + +processResources { + inputs.property "version", project.version + inputs.property "mod_id", project.mod_id + + filteringCharset = 'UTF-8' + + filesMatching("fabric.mod.json") { + expand( + "version": project.version, + "mod_id": project.mod_id + ) + } +} + +jar { + from(rootProject.file("LICENSE")) { + rename { "${it}_${project.mod_id}_fabric_2612" } + } +} 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 new file mode 100644 index 0000000..587f5b4 --- /dev/null +++ b/fabric-2612/src/main/java/kr/tkrmagid/chatanswer/fabric/ChatAnswerFabric.java @@ -0,0 +1,18 @@ +package kr.tkrmagid.chatanswer.fabric; + +import kr.tkrmagid.chatanswer.core.ChatAnswerCore; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; + +public final class ChatAnswerFabric implements ModInitializer { + @Override + public void onInitialize() { + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> + ChatAnswerCore.handleChat(sender, message.signedContent()) + ); + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> + ChatAnswerCore.onPlayerJoin(handler.player) + ); + } +} diff --git a/fabric-2612/src/main/resources/assets/chat_answer/icon.png b/fabric-2612/src/main/resources/assets/chat_answer/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..080209f8c100788385bb6102eb043fe5faaf9d53 GIT binary patch literal 4458 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 literal 0 HcmV?d00001 diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric-2612/src/main/resources/fabric.mod.json similarity index 80% rename from fabric/src/main/resources/fabric.mod.json rename to fabric-2612/src/main/resources/fabric.mod.json index 435456a..bde180c 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric-2612/src/main/resources/fabric.mod.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, - "id": "${mod_id}", + "id": "chat_answer_fabric", "version": "${version}", - "name": "채팅정답", - "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.", + "name": "채팅정답 (Fabric impl)", + "description": "음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다. (MC 26.1.2 변형)", "authors": [ "tkrmagid" ], "license": "MIT", "icon": "assets/chat_answer/icon.png", diff --git a/fabric/build.gradle b/fabric/build.gradle deleted file mode 100644 index 6fe61ff..0000000 --- a/fabric/build.gradle +++ /dev/null @@ -1,70 +0,0 @@ -plugins { - id 'fabric-loom' version '1.16-SNAPSHOT' - id 'com.gradleup.shadow' version '9.4.1' -} - -base.archivesName = "${project.mod_id}-fabric" - -// common/ 디렉토리의 로더 비종속 소스를 fabric 컴파일에 포함 (Mojang 매핑으로 컴파일) -sourceSets { - main { - java { - srcDirs += "${rootDir}/common/src/main/java" - } - } -} - -dependencies { - // MC 26.x: server jar 가 unobfuscated. intermediary 0.0.0 = identity mapping. - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:intermediary:0.0.0:v2" - implementation "net.fabricmc:fabric-loader:${project.loader_version}" - implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" -} - -processResources { - inputs.property "version", project.version - inputs.property "mod_id", project.mod_id - inputs.property "mod_name", project.mod_name - - filteringCharset = 'UTF-8' - - filesMatching("fabric.mod.json") { - expand( - "version": project.version, - "mod_id": project.mod_id, - "mod_name": project.mod_name - ) - } -} - -jar { - from(rootProject.file("LICENSE")) { - rename { "${it}_${project.mod_id}" } - } -} - -// ───── relocation for single-jar merge ───────────────────────────────────── -// Fabric 의 common 코드는 intermediary 매핑으로 컴파일되고, NeoForge 의 common -// 코드는 Mojang 매핑으로 컴파일된다. 둘은 바이트코드가 달라서 같은 클래스 경로에 -// 공존 불가. Shadow 의 relocate 로 Fabric 쪽 common 클래스만 별도 패키지로 옮겨서 -// merged jar 안에서 충돌하지 않게 한다. -// -// 진행 순서: loom 의 remapJar 결과 → shadowJar 가 받아서 패키지 재배치 → -// rootProject 의 mergedJar 가 이걸 사용. - -// Shadow 가 자동으로 만든 shadowJar 는 main sourceSet + 런타임 classpath 를 전부 -// 포함해서 100MB+ 가 되어버린다. 우리한테 필요한 건 "remapJar 결과물에 relocate 만 -// 적용한 작은 jar" 이므로, 별도 ShadowJar 태스크를 새로 만들어서 입력을 명시적으로 -// remapJar 의 zipTree 만 지정한다. -tasks.register('relocatedJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - dependsOn 'remapJar' - archiveClassifier = 'relocated' - from zipTree(tasks.named('remapJar').flatMap { it.archiveFile }) - relocate 'kr.tkrmagid.chatanswer.core', 'kr.tkrmagid.chatanswer.fabric.core' - mergeServiceFiles() -} - -tasks.named('build') { - dependsOn 'relocatedJar' -} diff --git a/gradle.properties b/gradle.properties index c98824e..d4567d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,26 @@ org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true -# ───── target Minecraft / loader versions ─────────────────────────────────── -# MC 26.1.2 = 사용자 환경. 1.21.6 과는 intermediary 매핑이 달라서 동일 jar 로 양쪽 -# 지원 불가 → 26.1.2 전용 빌드. -minecraft_version=26.1.2 - -# Fabric -loader_version=0.19.2 -fabric_version=0.148.2+26.1.2 - -# NeoForge -neoforge_version=26.1.2.36-beta - # ───── mod metadata ───────────────────────────────────────────────────────── mod_id=chat_answer -mod_version=1.2.1 +mod_version=1.3.0 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 + +# ───── per-target MC / loader versions ────────────────────────────────────── +# 한 jar 로 1.21.6 (Fabric/NeoForge) + 26.1.2 (Fabric) 전부 커버하기 위해 +# 각 타겟마다 별도 subproject 가 자기 버전으로 빌드되고, 결과물을 outer +# container jar 가 묶는다 (Fabric 은 META-INF/jars/ JiJ, NeoForge 는 outer 본체). + +# Fabric MC 1.21.6 +mc_1216=1.21.6 +fabric_api_1216=0.128.2+1.21.6 +fabric_loader_1216=0.16.10 + +# Fabric MC 26.1.2 (26.x 서버 jar 는 unobfuscated. intermediary 0.0.0 = identity) +mc_2612=26.1.2 +fabric_api_2612=0.148.2+26.1.2 +fabric_loader_2612=0.19.2 + +# NeoForge MC 1.21.6 (26.x 는 NeoForge moddev plugin 이 아직 인식 못 함) +neoforge_1216=21.6.20-beta diff --git a/neoforge-1216/build.gradle b/neoforge-1216/build.gradle new file mode 100644 index 0000000..1d6efdb --- /dev/null +++ b/neoforge-1216/build.gradle @@ -0,0 +1,49 @@ +plugins { + id 'net.neoforged.moddev' version '2.0.97' +} + +base.archivesName = "${project.mod_id}-neoforge-1216" + +// NeoForge 1.21.6 은 Java 21. release 21 로 컴파일. +java { + toolchain.languageVersion = JavaLanguageVersion.of(25) +} +tasks.withType(JavaCompile).configureEach { + options.release = 21 +} + +sourceSets { + main { + java { + srcDirs += "${rootDir}/common/src/main/java" + } + } +} + +neoForge { + version = project.neoforge_1216 +} + +processResources { + inputs.property "version", project.version + inputs.property "mod_id", project.mod_id + inputs.property "minecraft_version", project.mc_1216 + inputs.property "neoforge_version", project.neoforge_1216 + + filteringCharset = 'UTF-8' + + filesMatching("META-INF/neoforge.mods.toml") { + expand( + "version": project.version, + "mod_id": project.mod_id, + "minecraft_version": project.mc_1216, + "neoforge_version": project.neoforge_1216 + ) + } +} + +jar { + from(rootProject.file("LICENSE")) { + rename { "${it}_${project.mod_id}_neoforge_1216" } + } +} diff --git a/neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java b/neoforge-1216/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java similarity index 100% rename from neoforge/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java rename to neoforge-1216/src/main/java/kr/tkrmagid/chatanswer/neoforge/ChatAnswerNeoForge.java diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge-1216/src/main/resources/META-INF/neoforge.mods.toml similarity index 76% rename from neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to neoforge-1216/src/main/resources/META-INF/neoforge.mods.toml index 8191595..5d7db34 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge-1216/src/main/resources/META-INF/neoforge.mods.toml @@ -1,15 +1,14 @@ modLoader = "javafml" loaderVersion = "[1,)" license = "MIT" -issueTrackerURL = "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod/issues" [[mods]] modId = "${mod_id}" version = "${version}" -displayName = "${mod_name}" +displayName = "채팅정답" authors = "tkrmagid" description = '''음악퀴즈(mq) 데이터팩이 정답 입력을 받는 상태(init=5)에서 채팅을 가로채 mq:answer/submit 함수로 전달합니다.''' -displayURL = "https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod" +logoFile = "icon.png" [[dependencies.${mod_id}]] modId = "neoforge" diff --git a/neoforge-1216/src/main/resources/icon.png b/neoforge-1216/src/main/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..080209f8c100788385bb6102eb043fe5faaf9d53 GIT binary patch literal 4458 zcmV-w5tZ(VP) zZIl$%na6+kR`ts;fZ)q&j7N|*S#^yFA`F5+Jf0;w%s|}ZMnhtbg0HOEvu97fh>0(| z8qa>))f_iQ!Dx)hCK6?4#M#}mt_X@?Kv36FGQ)rvjX+Rf-n;AWhpO(W?x}vS>aH5= z-{+p5uBvK-xs>~B*cRHYR|cmh#LCB4jAA?f~wotu(rEmZ&^@xelx zucGvpB7nT)Z{PpS(vrIr!ZXaBwz4zNE=3U$h`DF4EVO?N`ETt1MM%1jF>l&;oWzh< z1Y%x(0c4TC&4KtP=aYq~F-qjdQ3RsNSpZq&zivCh{E&2CqX<`HL?Gr*`%dn*Eb?FL zeLB~PPzl;c^us#V;w!br#7f%0fr+s@^ zf>Rb+#Bc3=dTGwS4A)XH_O-?4LY(%8ui(7W*wXv-Qm6egR}rICVA1p&!r342vS|7Z z8Taqx1!Qi8&Am@81y~%CKW@rmO9Y#HpUMpd=t2mbkZ*g4U?Z1TUF5mc8`3{Mk;ALX z3IQ+g`}tCUE6({|=>Er9x#FDfbz*Ux9ReKYy3@80;|F$r9q$H)^p9`Y`OOLe_5&&{ z|Gn?Yj(WShus9bdem(I3p$G9d?EE;Ufz_sfVG8MQ*!gia1a$VS@5Xwsx4R2VjYGgD zi~KZR>RI1?)r=bx6*N^he7&`)vr0{sb_un)iZALr3jXkLADdV-a3EGw*Re>D5_17lYk{cp-)kYofi_v#z_jiiwru0SX_G56f(1wr6{QF5o=dahZ-*r`yWm zHStbJi@_}+JDilGs09?odS`w=gZQW0d2?H&ORf&3L1dChe)$QDAELm;} z;gyYVR8+sM`w1sc+Xc{WdDoW2sP5XDh|k3mt54+$ zq17VSX4{O1ZB497K>2*xk9Rcn^)-OgQ$ey&KYP5`V(tWH!?--+LGaVdC_&u6_8(w=H_1#1I0`EmVb&^3wG z&9!v-K_uUfMP-JBYV4baeVZru0&0cJ15SP#iYK2)sCGhNCK&@wfz55Wf@i_4t z$Ol3edN}j9lrR&$I{)RZ^GZ5@wXpLWxJSYkw$636y)7HJXMHYZ>|1l{xY;LD1lx-r zSOx5344emWt8Zx|yU|`+5Y-6b&NUr8{F7$a`cw!x9-#06e!>D5X4+O4iO<(|Za?o_ zQ|P|gSS)OvJI2eni9iaVTJozU{@Kn$WgJ}|;c48trh`W;FW{vJvIP);G;l#nmE^Z= z_uZKC!5*I%w$5W~oBJa0n=CShJ?x zwegpD9l+mdV5NOAXTE>NQ4VtZ?e;kA?MVrwOJ<`_N~P-G*0$aCzSI)8uW1|O1>78i zecQNO18fU;%+Cim$7FBIw^=|_%cT|7^F!a=K<+T+x6Wl-+YXo7wuJz{E&|_Z+fkD` zep>{laqAszo{b@A5jYlpnL}^b6hE&7kKmVndj+?~XK%;#N5Z^%ZEt&%?QL%s-0$W2 z>w(-pG_}liWeoOhz6}BS%J#M$nNrL1)&n=+vC)$;1SSL&!**MU2uh!;g&X6{4go@t zE|~*t+rpA+{@}OWj@rj2)iS zwh*<&dW(2x4_zHU_WEH6@FAXjba_Dzs^!OCKNNt^@MMn5cS0xtpW)7{znpj9!!LeR zQX4-n;PP|ft^j;`Gbl(XWUucxpH;B#zjYkssYh3oMXH;>;ud-U3zsaLQ{;$)dG}Of zufK0Ti%XW3S0@Ys9-x{ryGcl`&ljeF8B{*z>g`ot{V)ym0AFAa;Qk4Mh{VvfUG2XQvj8tpFAq>__n+HFC;$szU;%_#fQi~?0T(a3q-N*J z*GA|8EY!mTR8lVt0Un{&0;pv6zt#SG4+Icq0VZml1yoYSC0@cTzyY=N05g}(uE}{y zX(tqb1;4N4cen2h1>jedW3P+qJo|Io3e!Lf)r`5+x|Nc@r+ufZoY>nM*G~nT{}@l{#<3<2>a+NZ&i%4Rq6oyKT*_Wwfy(&RD{d~K9XIX8#DH^B# z209H?nRjJ=kOrv~AQXl&i8Yi$rOe|5nBTis);D8pFJ&lm+#-E!={6|WUhj15;%m*N zg#$0R7#C@v0t5=B%$aK_10!j0#<@cr+^ccY=_Aa)dVpwy!SSPlS&N3*@Mt4@cSl*W zVu07$8&N5V6dFR zY4Q!FK&CKKiuo%(XYM!pIc@P&_IDg&TJt2>HvrQn!u~!uBhDR*436zO!sJU&<;v?0 zvAHeA*0u%)k44ahh7=M_Xh@{#7li33i`k-l8_rk~t*x!eY2$p_->r@zA+13i=s)1CN;qEpQ8fq*z4VnUHp|L0Bw+Yc_S7A2Kl!ZSM&f5hnQn1HCX| zdY<|MQiJB7u`@u%!5GTyP4)JpMFp2E?4kFA)9L%{6cCD-h!yOWf9>UrK>SLWV-BlK z@?|7R)3QD|*pC*;>3M1hlE*;C03(kH6et5uy%HME&TLJ$b=k@jeEXpfX_$P3!Qo+s zlEZ}!8j#}DU)||fFl+tGn5DpU{0f0$$@QPpa8V=loEUQyY6OmKhN%n8S#AtEv?f3$ z%@RKg1`e3ptm_HtKp)V@S1;6gf45|$|Kx&w^P{~A!QS6MWC7;N-^%-eV@D($?88VY zq?V_z1HFI&@iWcYZVczNra)*AJ;k=&gpdLR%)KGS$sPOn&kc37TPlPUa8iWs9XjpLp3mflN&NBE9-<D#utrijL1+b<-;#}!7>TLA#5qr*&|k|bp$>3QWHb3I_Cr1iH;)r&xfHGoew zEs>~{4oStPN2f6P)WckGZ47mwul!I@2E+u7sZ&ST|Jomzs82v?qkj0`S7I%wmf`{V~2I5kVqkG_9NA9+RusKnq&d)wkMECbfG|MC>3GTW0SbJ z_XHQV#Ne}G)QI6qSWt%PRm4DwEiXjS(9nfMv&5K=|8CnW7hdw=X$ZJu&yTyY-rZ_5 zy%x}s=x9V`g#B+e@~eNE!sf>fnAYgpnm{z_i0KpQ-ZI3W_C<(Fjfl|DtWYF{m7023 zaJjAA_B{KSF}GXfr*Zq9A9uUauKALg=l3E)CnjPvXmQ?uwSnG^{cw8REY&~&Cq?-8 z8~b_Yp*V3FB_^XpgpMY3>$ySc+K39-&@J0J@#}gBxOLBiPX9W)3*fdr4|W0k^rE|( zt2hM$GYi*{2mwOs2m=m(Fp>2?i1DQh`k2=;$gJfNn5e@a2h7{NDTT4CjH*w);$kqO`zNMJlOryi|$Ie(YDT5GRswdYsh30ramQ4Wp(I_~G$zOx zQ7uADMu>_C5vg15UzYs1csaOv_XAFzGmWnFAGcUu6yRqw*H+|7Yj!i}@tJEAt9L)p z_4v%S39n{LIvnUiVqmV$btTPOWWg!Hb(3qr4%hgAS2pwH$=u)#nj{D>TJZ>X%wQb^H^Ptvo84pltA3O~K#ZKr2 zGHU_>QfVk5(S#(T3{pZPrF4?YAf*hHZeS=y@{nS(t}u?m*k(O=FXlAX&AdBt)9!!nwtsfZj`nr}b}6`oYXo4CD9o9RMpS4- zg-%RHh|36Z8KogpVl>DoaTz5p(=lHsDl~MoQ8D0s&YxS>&%8T<_3lP{PW%Syd4O_| z9)rqyl0%tyaxE|6R3rDRV1BTLmmxVYkAzhUk@HCv8JZtQ?t1nVv`50+M9{|e)Wtt+ z_SORwIUvONLnweRIC2Ewum%VvFs_j|4gBTBKk5Wn`PThQ>z&et#oe;~ULyRJqSDEW7em(1+PJrun-4}*|aZ;|^b>C7fZgcmg z1t9Dj)A&{>g20z=S>!WzpRfcl_Vt@t_jZm}3SU8frSY3t_jWq%m$`~am)}|0gn*9P0zrFY#a*&k~{EgKJz;iaw5W>GG!kNhW@Z79>o!ZC}!8JSY z$uziO_I;rUe2gMo334}Va25dMh~S&HhST_6C w4TVAo21=wAbXndtfBV6q82p8@h)m=E0rf5RPKMnZFaQ7m07*qoM6N<$f}i4)xBvhE literal 0 HcmV?d00001 diff --git a/neoforge/build.gradle b/neoforge/build.gradle deleted file mode 100644 index 1e12ceb..0000000 --- a/neoforge/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -plugins { - id 'net.neoforged.moddev' version '2.0.97' -} - -base.archivesName = "${project.mod_id}-neoforge" - -sourceSets { - main { - java { - srcDirs += "${rootDir}/common/src/main/java" - } - } -} - -neoForge { - version = project.neoforge_version -} - -processResources { - inputs.property "version", project.version - inputs.property "mod_id", project.mod_id - inputs.property "mod_name", project.mod_name - inputs.property "minecraft_version", project.minecraft_version - inputs.property "neoforge_version", project.neoforge_version - - filesMatching("META-INF/neoforge.mods.toml") { - expand( - "version": project.version, - "mod_id": project.mod_id, - "mod_name": project.mod_name, - "minecraft_version": project.minecraft_version, - "neoforge_version": project.neoforge_version - ) - } -} - -jar { - from(rootProject.file("LICENSE")) { - rename { "${it}_${project.mod_id}" } - } -} diff --git a/settings.gradle b/settings.gradle index c1b2c30..119f93f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,5 +8,9 @@ pluginManagement { } rootProject.name = 'chat_answer' -// NeoForge moddev plugin 이 MC 26.1.2 를 파싱하지 못함(1.21.5 로 fallback) → 26.x 정식 지원 전까지 제외. -include 'fabric' + +// 세 개의 target-specific subproject. 각각 자기 MC/로더 버전으로 컴파일/리맵. +// rootProject 의 containerJar 가 셋의 산출물을 하나로 묶어 단일 jar 배포물 생성. +include 'fabric-1216' +include 'fabric-2612' +include 'neoforge-1216' From 939505c86119464caa45a44bb5d68b3cbd569375 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 02:50:25 +0900 Subject: [PATCH 08/18] =?UTF-8?q?v1.3.1=20=E2=80=94=20fix:=20declare=20nes?= =?UTF-8?q?ted=20fabric=20jars=20in=20outer=20fabric.mod.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v1.3.0 의 nested fabric jar 가 실제로 로드되지 않던 버그 수정. Fabric Loader 는 META-INF/jars/ 디렉토리를 자동 스캔하지 않고, 부모 jar 의 fabric.mod.json 에 "jars" 배열로 명시된 파일만 처리한다. v1.3.0 에선 jars 배열이 비어 있어서 outer chat_answer 컨테이너만 로드되고 (entrypoint 없으니 no-op), 실제 채팅 hook 을 담은 nested fabric jar 는 그대로 무시됐다. 수정: - container-resources/fabric.mod.json: "jars" 배열에 두 nested 경로 명시 - root build.gradle: containerJar 의 nested jar 파일명을 버전 suffix 없는 고정 이름 (chat_answer-fabric-1216.jar / -2612.jar) 으로 변경. outer fabric.mod.json 의 jars 항목과 일치해야 Fabric Loader 가 찾는다. 증상: 음악퀴즈 데이터팩 맵 접속 시 "모드 활성화" 메시지 안 뜸 (ServerPlayConnectionEvents.JOIN 이 실행 안 되어 storage chat_answer:status active 가 0b 로 유지). 원인: 위와 같이 nested jar 가 로드 안 됨. Co-Authored-By: Claude Opus 4.7 --- build.gradle | 14 ++++++++++---- container-resources/fabric.mod.json | 4 ++++ gradle.properties | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 6b08ef9..01b3739 100644 --- a/build.gradle +++ b/build.gradle @@ -63,11 +63,17 @@ tasks.register('containerJar', Jar) { } } - // 3. Fabric nested jars (Fabric Loader 가 META-INF/jars/ 를 스캔해서 - // depends.minecraft 매칭되는 jar 만 활성화). + // 3. Fabric nested jars. Fabric Loader 는 META-INF/jars/ 를 자동 스캔하지 + // 않고 outer fabric.mod.json 의 "jars" 배열에 명시된 파일만 처리하므로, + // container-resources/fabric.mod.json 의 jars 항목과 일치하는 고정 파일명 + // (버전 suffix 제거) 으로 넣는다. into('META-INF/jars') { - from project(':fabric-1216').tasks.named('remapJar').flatMap { it.archiveFile } - from project(':fabric-2612').tasks.named('remapJar').flatMap { it.archiveFile } + from(project(':fabric-1216').tasks.named('remapJar').flatMap { it.archiveFile }) { + rename '.+\\.jar', 'chat_answer-fabric-1216.jar' + } + from(project(':fabric-2612').tasks.named('remapJar').flatMap { it.archiveFile }) { + rename '.+\\.jar', 'chat_answer-fabric-2612.jar' + } } } diff --git a/container-resources/fabric.mod.json b/container-resources/fabric.mod.json index 0d846d5..aee24d5 100644 --- a/container-resources/fabric.mod.json +++ b/container-resources/fabric.mod.json @@ -8,6 +8,10 @@ "license": "MIT", "icon": "assets/chat_answer/icon.png", "environment": "*", + "jars": [ + { "file": "META-INF/jars/chat_answer-fabric-1216.jar" }, + { "file": "META-INF/jars/chat_answer-fabric-2612.jar" } + ], "depends": { "fabricloader": ">=0.16.0", "java": ">=21" diff --git a/gradle.properties b/gradle.properties index d4567d0..884cef9 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.0 +mod_version=1.3.1 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 From d1c650497307c8f8ae09d2fc9bd2dc6070019208 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 03:02:00 +0900 Subject: [PATCH 09/18] =?UTF-8?q?v1.3.2=20=E2=80=94=20verbose=20logging=20?= =?UTF-8?q?to=20diagnose=20missing=20active=3D1b=20write?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 증상: chat_answer:status active 가 0b 그대로 → 데이터팩 login 메시지 안 뜸. mq:load 는 정상 작동(0b 초기화 됨)인데 모드의 onPlayerJoin 이 1b 로 안 씀. 추가 로그: - ChatAnswerFabric.onInitialize: 진입/완료, event register 예외시 ERROR - ChatAnswerCore.onPlayerJoin: 진입 (player 이름 포함), 성공 시 INFO, 실패 catch 를 LOG.debug → LOG.warn 으로 승격해 latest.log 에 보이게. 이 로그를 보고 다음 중 어디서 깨지는지 좁힐 수 있음: - "Fabric entrypoint onInitialize starting" 안 보임 → nested jar 미로드 - "onInitialize starting" 보이고 "registered" 안 보임 → fabric-api ABI mismatch - "onPlayerJoin fired" 안 보임 → JOIN 이벤트 미발화 - "active=1b set" 안 보이고 "failed" 만 보임 → command 실행 실패 Co-Authored-By: Claude Opus 4.7 --- .../chatanswer/core/ChatAnswerCore.java | 10 ++++++-- .../chatanswer/fabric/ChatAnswerFabric.java | 23 ++++++++++++++----- .../chatanswer/fabric/ChatAnswerFabric.java | 23 ++++++++++++++----- gradle.properties | 2 +- 4 files changed, 43 insertions(+), 15 deletions(-) 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 ba0d06d..611be67 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -38,16 +38,22 @@ public final class ChatAnswerCore { * 호출이 일어나지 않아 0b 로 유지되고, 모드가 있으면 첫 로그인 직후 1b 로 갱신. */ public static void onPlayerJoin(ServerPlayer player) { + String name = player.getName().getString(); + LOG.info("[{}] onPlayerJoin fired for {}", MOD_ID, name); MinecraftServer server = player.level().getServer(); - if (server == null) return; + if (server == null) { + LOG.warn("[{}] onPlayerJoin: server is null, skipping active-flag set for {}", MOD_ID, name); + return; + } CommandSourceStack source = server.createCommandSourceStack().withSuppressedOutput(); try { server.getCommands().performPrefixedCommand( source, "data modify storage chat_answer:status active set value 1b" ); + LOG.info("[{}] active=1b set after {} joined", MOD_ID, name); } catch (Exception e) { - LOG.debug("[{}] failed to set active flag: {}", MOD_ID, e.toString()); + LOG.warn("[{}] failed to set active flag for {}: {}", MOD_ID, name, e.toString(), e); } } 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 587f5b4..ea8de97 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 @@ -4,15 +4,26 @@ import kr.tkrmagid.chatanswer.core.ChatAnswerCore; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class ChatAnswerFabric implements ModInitializer { + private static final Logger LOG = LoggerFactory.getLogger(ChatAnswerCore.MOD_ID); + @Override public void onInitialize() { - ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> - ChatAnswerCore.handleChat(sender, message.signedContent()) - ); - ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> - ChatAnswerCore.onPlayerJoin(handler.player) - ); + LOG.info("[{}] Fabric entrypoint onInitialize starting", ChatAnswerCore.MOD_ID); + try { + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> + ChatAnswerCore.handleChat(sender, message.signedContent()) + ); + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> + ChatAnswerCore.onPlayerJoin(handler.player) + ); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + JOIN", 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 587f5b4..ea8de97 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 @@ -4,15 +4,26 @@ import kr.tkrmagid.chatanswer.core.ChatAnswerCore; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class ChatAnswerFabric implements ModInitializer { + private static final Logger LOG = LoggerFactory.getLogger(ChatAnswerCore.MOD_ID); + @Override public void onInitialize() { - ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> - ChatAnswerCore.handleChat(sender, message.signedContent()) - ); - ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> - ChatAnswerCore.onPlayerJoin(handler.player) - ); + LOG.info("[{}] Fabric entrypoint onInitialize starting", ChatAnswerCore.MOD_ID); + try { + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> + ChatAnswerCore.handleChat(sender, message.signedContent()) + ); + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> + ChatAnswerCore.onPlayerJoin(handler.player) + ); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + JOIN", 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 884cef9..e92d083 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.1 +mod_version=1.3.2 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 From a67ec47f89fba6af2e0bcb58be12a1ae0d233eb3 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 03:15:04 +0900 Subject: [PATCH 10/18] =?UTF-8?q?v1.3.3=20=E2=80=94=20replace=20storage=20?= =?UTF-8?q?flag=20with=20direct=20function=20call=20(race-free)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 이전 v1.3.2: onPlayerJoin 에서 storage chat_answer:status active=1b 를 set. 하지만 통합 서버 (integrated singleplayer) 에서 데이터팩의 mq:load 가 player join 이후에 도는 케이스가 있어 모드가 써놓은 1b 를 데이터팩이 0b 로 덮어쓰는 race 가 있었고, repeat/players 의 첫 tick 체크 시점에 이미 0b 라서 알림 메세지가 안 떴음. v1.3.3: storage flag 자체를 폐기. onPlayerJoin 에서 execute as at @s run function mq:players/mod_active_notice 를 호출. 데이터팩이 메세지 텍스트를 정의하고, 모드는 "지금 들어온 이 플레이어에게 보여라" 만 트리거한다. 데이터팩 자체가 없으면 함수가 없어 suppressed source 의 command 실패로 silent → 안전. 데이터팩(music_quiz) 도 동일 커밋으로 함수 추가 및 flag 제거됨. --- .../chatanswer/core/ChatAnswerCore.java | 27 +++++++++++-------- gradle.properties | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) 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 611be67..c314c37 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -32,28 +32,33 @@ public final class ChatAnswerCore { private ChatAnswerCore() {} /** - * 플레이어 로그인 직후 호출. 데이터팩이 "모드 살아있음" 신호로 쓸 수 있게 - * storage chat_answer:status 에 active=1b 를 세팅한다. 데이터팩의 mq:load 가 - * 매 /reload 와 서버 시작 시 이 값을 0b 로 clear 하므로, 모드가 없으면 이 - * 호출이 일어나지 않아 0b 로 유지되고, 모드가 있으면 첫 로그인 직후 1b 로 갱신. + * 플레이어 로그인 직후 호출. 음악퀴즈 데이터팩의 + * mq:players/mod_active_notice + * 함수를 해당 플레이어 컨텍스트로 직접 호출한다. 데이터팩이 메세지를 정의하고, + * 모드는 "지금 막 들어온 이 플레이어에게 보여라" 만 트리거한다. + * + * 이전엔 storage chat_answer:status active=1b 플래그를 썼는데, 통합 서버에서 + * mq:load 의 0b 초기화가 player join 이후에 도는 케이스 때문에 race 가 발생했다. + * 함수를 모드가 직접 호출하면 race 가 사라지고, 데이터팩이 없을 땐 함수가 + * 존재하지 않아 커맨드가 (suppressed source 라 채팅엔 안 뜨고 log warn 으로) + * 무시된다. */ public static void onPlayerJoin(ServerPlayer player) { String name = player.getName().getString(); LOG.info("[{}] onPlayerJoin fired for {}", MOD_ID, name); MinecraftServer server = player.level().getServer(); if (server == null) { - LOG.warn("[{}] onPlayerJoin: server is null, skipping active-flag set for {}", MOD_ID, name); + LOG.warn("[{}] onPlayerJoin: server is null, skipping notice for {}", MOD_ID, name); return; } CommandSourceStack source = server.createCommandSourceStack().withSuppressedOutput(); + String command = "execute as " + player.getStringUUID() + + " at @s run function mq:players/mod_active_notice"; try { - server.getCommands().performPrefixedCommand( - source, - "data modify storage chat_answer:status active set value 1b" - ); - LOG.info("[{}] active=1b set after {} joined", MOD_ID, name); + server.getCommands().performPrefixedCommand(source, command); + LOG.info("[{}] mod_active_notice invoked for {}", MOD_ID, name); } catch (Exception e) { - LOG.warn("[{}] failed to set active flag for {}: {}", MOD_ID, name, e.toString(), e); + LOG.warn("[{}] failed to invoke mod_active_notice for {}: {}", MOD_ID, name, e.toString(), e); } } diff --git a/gradle.properties b/gradle.properties index e92d083..985d773 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.2 +mod_version=1.3.3 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 From 8f989ee135ea97c9db99dd443f92b0db11604fa5 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 14 May 2026 03:26:27 +0900 Subject: [PATCH 11/18] =?UTF-8?q?v1.3.4=20=E2=80=94=20defer=20mod=5Factive?= =?UTF-8?q?=5Fnotice=20by=2020=20ticks=20to=20fix=20chat-not-delivered=20r?= =?UTF-8?q?ace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v1.3.3 에서 PlayerJoinEvent 시점에 즉시 `execute as ... run function` 으로 데이터팩 함수를 호출했는데, JOIN 이벤트 시점은 플레이어가 PlayerList 에 막 들어간 직후라 클라이언트가 시스템 chat 패킷을 받을 준비가 안 됐고 tellraw 가 사라지는 race 가 있었음. 사용자 로그에서 확인: 모드의 `mod_active_notice invoked` 가 03:22:42 에 찍혔으나 클라이언트엔 메세지 안 도착, 1초 뒤 (03:22:43) mq:load 가 보낸 같은 시스템의 tellraw 는 정상 도착, 9초 뒤 수동 /function 호출도 정상. 수정: JOIN 시 즉시 호출하지 않고 UUID → 남은 틱 수 맵에 적재, server tick 마다 카운트 다운, 20 ticks (1초) 후 player 자체를 source 로 한 CommandSourceStack 으로 `function mq:players/mod_active_notice` 호출. 엔트리포인트 변경: - fabric-1216/2612: ServerTickEvents.END_SERVER_TICK 추가 등록 - neoforge-1216: ServerTickEvent.Post 리스너 추가 --- .../chatanswer/core/ChatAnswerCore.java | 63 +++++++++++++------ .../chatanswer/fabric/ChatAnswerFabric.java | 4 +- .../chatanswer/fabric/ChatAnswerFabric.java | 4 +- gradle.properties | 2 +- .../neoforge/ChatAnswerNeoForge.java | 7 +++ 5 files changed, 57 insertions(+), 23 deletions(-) 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 c314c37..e26f89d 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -1,5 +1,9 @@ package kr.tkrmagid.chatanswer.core; +import java.util.Iterator; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -29,36 +33,55 @@ public final class ChatAnswerCore { private static final String SCOREBOARD_HOLDER = "init"; private static final int ACCEPTING_ANSWER_STATE = 5; + /** JOIN 이벤트 시점엔 클라이언트가 chat HUD 를 받을 준비가 안 됐을 수 있어 + * tellraw 패킷이 사라지는 경우가 있다. 그래서 N 틱 늦춰서 호출한다. */ + private static final int NOTICE_DELAY_TICKS = 20; + private static final Map PENDING_NOTICES = new ConcurrentHashMap<>(); + private ChatAnswerCore() {} /** - * 플레이어 로그인 직후 호출. 음악퀴즈 데이터팩의 + * 플레이어 로그인 시점에 호출. 음악퀴즈 데이터팩의 * mq:players/mod_active_notice - * 함수를 해당 플레이어 컨텍스트로 직접 호출한다. 데이터팩이 메세지를 정의하고, - * 모드는 "지금 막 들어온 이 플레이어에게 보여라" 만 트리거한다. - * - * 이전엔 storage chat_answer:status active=1b 플래그를 썼는데, 통합 서버에서 - * mq:load 의 0b 초기화가 player join 이후에 도는 케이스 때문에 race 가 발생했다. - * 함수를 모드가 직접 호출하면 race 가 사라지고, 데이터팩이 없을 땐 함수가 - * 존재하지 않아 커맨드가 (suppressed source 라 채팅엔 안 뜨고 log warn 으로) - * 무시된다. + * 함수를 해당 플레이어 컨텍스트로 호출한다. 단, JOIN 이벤트가 너무 일러서 + * 즉시 호출 시 tellraw 가 클라이언트에 도달하지 못하는 race 가 있어 + * {@link #NOTICE_DELAY_TICKS} 만큼 늦춘다 ({@link #onServerTick} 가 처리). */ public static void onPlayerJoin(ServerPlayer player) { String name = player.getName().getString(); - LOG.info("[{}] onPlayerJoin fired for {}", MOD_ID, name); - MinecraftServer server = player.level().getServer(); - if (server == null) { - LOG.warn("[{}] onPlayerJoin: server is null, skipping notice for {}", MOD_ID, name); - return; + LOG.info("[{}] onPlayerJoin fired for {}, scheduling notice in {} ticks", + MOD_ID, name, NOTICE_DELAY_TICKS); + PENDING_NOTICES.put(player.getUUID(), NOTICE_DELAY_TICKS); + } + + /** 각 로더 entrypoint 가 매 server tick 마다 호출해야 한다. */ + public static void onServerTick(MinecraftServer server) { + if (PENDING_NOTICES.isEmpty()) return; + Iterator> it = PENDING_NOTICES.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry e = it.next(); + int remaining = e.getValue() - 1; + if (remaining > 0) { + e.setValue(remaining); + continue; + } + UUID uuid = e.getKey(); + it.remove(); + ServerPlayer player = server.getPlayerList().getPlayer(uuid); + if (player == null) continue; + deliverNotice(server, player); } - CommandSourceStack source = server.createCommandSourceStack().withSuppressedOutput(); - String command = "execute as " + player.getStringUUID() - + " at @s run function mq:players/mod_active_notice"; + } + + private static void deliverNotice(MinecraftServer server, ServerPlayer player) { + String name = player.getName().getString(); + // 플레이어 자체를 source 로 써서 함수 안의 @s 가 그대로 player. + CommandSourceStack source = player.createCommandSourceStack().withSuppressedOutput(); try { - server.getCommands().performPrefixedCommand(source, command); - LOG.info("[{}] mod_active_notice invoked for {}", MOD_ID, name); + server.getCommands().performPrefixedCommand(source, "function mq:players/mod_active_notice"); + LOG.info("[{}] mod_active_notice delivered for {}", MOD_ID, name); } catch (Exception e) { - LOG.warn("[{}] failed to invoke mod_active_notice for {}: {}", MOD_ID, name, e.toString(), e); + LOG.warn("[{}] failed to deliver mod_active_notice for {}: {}", MOD_ID, name, e.toString(), e); } } 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 ea8de97..fcb2165 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.ServerTickEvents; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import org.slf4j.Logger; @@ -20,7 +21,8 @@ public final class ChatAnswerFabric implements ModInitializer { ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> ChatAnswerCore.onPlayerJoin(handler.player) ); - LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + JOIN", ChatAnswerCore.MOD_ID); + ServerTickEvents.END_SERVER_TICK.register(ChatAnswerCore::onServerTick); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + 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 ea8de97..fcb2165 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.ServerTickEvents; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import org.slf4j.Logger; @@ -20,7 +21,8 @@ public final class ChatAnswerFabric implements ModInitializer { ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> ChatAnswerCore.onPlayerJoin(handler.player) ); - LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + JOIN", ChatAnswerCore.MOD_ID); + ServerTickEvents.END_SERVER_TICK.register(ChatAnswerCore::onServerTick); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + 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 985d773..08494b9 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.3 +mod_version=1.3.4 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 b5cf676..326ef6a 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.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::onPlayerLogin); + NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerTick); } @SubscribeEvent @@ -30,4 +32,9 @@ public final class ChatAnswerNeoForge { ChatAnswerCore.onPlayerJoin(player); } } + + @SubscribeEvent + public static void onServerTick(ServerTickEvent.Post event) { + ChatAnswerCore.onServerTick(event.getServer()); + } } From 8057fa1112392603418450e244a8dab78ac131b1 Mon Sep 17 00:00:00 2001 From: claude Date: Sat, 16 May 2026 22:12:26 +0900 Subject: [PATCH 12/18] =?UTF-8?q?add=20mq=5Fchat=5Fmod=20presence=20tick?= =?UTF-8?q?=20=E2=80=94=20datapack=EA=B0=80=20=EB=AA=A8=EB=93=9C=20?= =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=97=AC=EB=B6=80=20=EA=B2=80=EC=A6=9D?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EB=A7=A4?= =?UTF-8?q?=20server=20tick=20=EB=A7=88=EB=8B=A4=20=EC=98=A8=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=20=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=EC=9D=98=20mq?= =?UTF-8?q?=5Fchat=5Fmod=20=EC=A0=90=EC=88=98=EB=A5=BC=201=20=EB=A1=9C=20s?= =?UTF-8?q?et.=20objective=20=EB=AF=B8=EC=A1=B4=EC=9E=AC=20=EC=8B=9C=20?= =?UTF-8?q?=EC=A1=B0=EC=9A=A9=ED=9E=88=20skip.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../chatanswer/core/ChatAnswerCore.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) 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 e26f89d..d1db143 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -33,6 +33,13 @@ public final class ChatAnswerCore { private static final String SCOREBOARD_HOLDER = "init"; private static final int ACCEPTING_ANSWER_STATE = 5; + /** 음악퀴즈 데이터팩이 선언한 "모드 존재 확인" 점수 이름. + * 매 server tick 마다 온라인 플레이어 전원의 점수를 1 로 set. + * 데이터팩의 mq:commands/start 가드가 이 점수를 검사 — 0/미설정 인 + * 플레이어가 있으면 시작 차단. 점수 값이 변경되지 않으면 클라이언트로 + * packet 이 전송되지 않으므로 매 tick set 해도 트래픽 비용은 없음. */ + private static final String MOD_PRESENCE_OBJECTIVE = "mq_chat_mod"; + /** JOIN 이벤트 시점엔 클라이언트가 chat HUD 를 받을 준비가 안 됐을 수 있어 * tellraw 패킷이 사라지는 경우가 있다. 그래서 N 틱 늦춰서 호출한다. */ private static final int NOTICE_DELAY_TICKS = 20; @@ -56,6 +63,7 @@ public final class ChatAnswerCore { /** 각 로더 entrypoint 가 매 server tick 마다 호출해야 한다. */ public static void onServerTick(MinecraftServer server) { + markModPresence(server); if (PENDING_NOTICES.isEmpty()) return; Iterator> it = PENDING_NOTICES.entrySet().iterator(); while (it.hasNext()) { @@ -73,6 +81,22 @@ public final class ChatAnswerCore { } } + /** + * 데이터팩의 mq_chat_mod 점수를 온라인 플레이어 전원에게 1 로 set. + * 데이터팩이 아직 load 되지 않아 objective 가 없으면 조용히 skip. + * 점수 값이 이미 1 이면 Minecraft 가 packet 전송을 생략하므로 + * 매 tick 호출해도 클라이언트 트래픽은 늘지 않는다. + */ + private static void markModPresence(MinecraftServer server) { + Scoreboard scoreboard = server.getScoreboard(); + Objective objective = scoreboard.getObjective(MOD_PRESENCE_OBJECTIVE); + if (objective == null) return; + for (ServerPlayer p : server.getPlayerList().getPlayers()) { + // ServerPlayer 자체가 ScoreHolder — 이름 기반 점수에 정확히 매칭됨. + scoreboard.getOrCreatePlayerScore(p, objective).set(1); + } + } + private static void deliverNotice(MinecraftServer server, ServerPlayer player) { String name = player.getName().getString(); // 플레이어 자체를 source 로 써서 함수 안의 @s 가 그대로 player. From 41fcc829536cc3445948a32983581ea821099788 Mon Sep 17 00:00:00 2001 From: claude Date: Sat, 16 May 2026 22:22:43 +0900 Subject: [PATCH 13/18] =?UTF-8?q?fix=20mq=5Fchat=5Fmod=20presence:=20serve?= =?UTF-8?q?r-only=20mod=20=EC=9D=B4=EB=AF=80=EB=A1=9C=20fake=20player=20#s?= =?UTF-8?q?erver=20=EC=A0=90=EC=88=98=EB=A7=8C=20set=20=E2=80=94=20per-pla?= =?UTF-8?q?yer=20iterate=20=EC=A0=9C=EA=B1=B0.=20=ED=81=B4=EB=9D=BC=20?= =?UTF-8?q?=EB=AF=B8=EC=84=A4=EC=B9=98=20=EA=B2=80=EC=A6=9D=EC=9D=80=20?= =?UTF-8?q?=EC=9D=98=EB=AF=B8=20=EC=97=86=EC=9C=BC=EB=8B=88(=EC=B1=84?= =?UTF-8?q?=ED=8C=85=20=EA=B0=80=EB=A1=9C=EC=B1=84=EA=B8=B0=EB=8A=94=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=B8=A1=20=EB=8F=99=EC=9E=91)=20#server?= =?UTF-8?q?=20=ED=95=9C=20=EA=B3=B3=EB=A7=8C=20=EA=B0=B1=EC=8B=A0=ED=95=B4?= =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=ED=8C=A9=EC=9D=98=20server=20pre?= =?UTF-8?q?sence=20=EA=B0=80=EB=93=9C=EC=97=90=20=EC=A0=95=ED=99=95?= =?UTF-8?q?=ED=9E=88=20=EB=A7=A4=EC=B9=AD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../chatanswer/core/ChatAnswerCore.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 d1db143..4289e35 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -34,11 +34,13 @@ public final class ChatAnswerCore { private static final int ACCEPTING_ANSWER_STATE = 5; /** 음악퀴즈 데이터팩이 선언한 "모드 존재 확인" 점수 이름. - * 매 server tick 마다 온라인 플레이어 전원의 점수를 1 로 set. - * 데이터팩의 mq:commands/start 가드가 이 점수를 검사 — 0/미설정 인 - * 플레이어가 있으면 시작 차단. 점수 값이 변경되지 않으면 클라이언트로 - * packet 이 전송되지 않으므로 매 tick set 해도 트래픽 비용은 없음. */ + * 본 모드는 서버 측에서 채팅을 가로채는 server-only 모드 — 클라이언트는 + * 설치할 필요가 없고 server 한 곳에 있으면 모든 플레이어에게 적용된다. + * 따라서 per-player 검증은 무의미하고, fake player {@link #PRESENCE_HOLDER} + * 점수만 매 server tick 마다 1 로 set 한다. 데이터팩의 start 가드는 + * `score matches 1` 로 검사. */ private static final String MOD_PRESENCE_OBJECTIVE = "mq_chat_mod"; + private static final String PRESENCE_HOLDER = "#server"; /** JOIN 이벤트 시점엔 클라이언트가 chat HUD 를 받을 준비가 안 됐을 수 있어 * tellraw 패킷이 사라지는 경우가 있다. 그래서 N 틱 늦춰서 호출한다. */ @@ -82,19 +84,16 @@ public final class ChatAnswerCore { } /** - * 데이터팩의 mq_chat_mod 점수를 온라인 플레이어 전원에게 1 로 set. + * 데이터팩의 mq_chat_mod 점수(fake player #server 키) 를 1 로 set. * 데이터팩이 아직 load 되지 않아 objective 가 없으면 조용히 skip. * 점수 값이 이미 1 이면 Minecraft 가 packet 전송을 생략하므로 - * 매 tick 호출해도 클라이언트 트래픽은 늘지 않는다. + * 매 tick 호출해도 트래픽은 늘지 않는다. */ private static void markModPresence(MinecraftServer server) { Scoreboard scoreboard = server.getScoreboard(); Objective objective = scoreboard.getObjective(MOD_PRESENCE_OBJECTIVE); if (objective == null) return; - for (ServerPlayer p : server.getPlayerList().getPlayers()) { - // ServerPlayer 자체가 ScoreHolder — 이름 기반 점수에 정확히 매칭됨. - scoreboard.getOrCreatePlayerScore(p, objective).set(1); - } + scoreboard.getOrCreatePlayerScore(ScoreHolder.forNameOnly(PRESENCE_HOLDER), objective).set(1); } private static void deliverNotice(MinecraftServer server, ServerPlayer player) { From 5aaa3c2ace22b7cde2bf7aed623c5dd7e4da5023 Mon Sep 17 00:00:00 2001 From: "Claude (owner)" Date: Sun, 17 May 2026 00:15:19 +0900 Subject: [PATCH 14/18] bump version to 1.3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v1.3.5 — datapack 측 server-presence 검증 가드를 위한 fake player tick. 전 버전 v1.3.4 이후 변경: - 8057fa1 add mq_chat_mod presence tick: ChatAnswerCore.markModPresence 가 매 server tick 마다 점수 객체 mq_chat_mod 에 fake player #server 점수를 1 로 set. objective 미존재(=데이터팩이 안 깔린 환경) 시 조용히 skip. - 41fcc82 fix mq_chat_mod presence: server-only mod 이므로 per-player iterate 를 제거하고 #server 한 곳만 갱신. mc_datapack v1.0.13+ 의 start.mcfunction presence 가드와 정확히 매칭. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 08494b9..b498a74 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.4 +mod_version=1.3.5 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 From 48d73daaf7859279437fb340eb671501173987bf Mon Sep 17 00:00:00 2001 From: "Claude (owner)" Date: Tue, 19 May 2026 00:14:13 +0900 Subject: [PATCH 15/18] =?UTF-8?q?v1.3.6=20=E2=80=94=20presence=20pulse=20?= =?UTF-8?q?=EB=8B=A4=EC=A4=91=20hook=20=EC=9C=BC=EB=A1=9C=20false=20negati?= =?UTF-8?q?ve=20=ED=9A=8C=ED=94=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 음악퀴즈 데이터팩의 `#server mq_chat_mod` 가드가 일부 호스트에서 false negative 로 시작 차단되던 문제. 기존엔 매 server tick 한 곳에서만 markModPresence 를 호출했는데, banner/mohist 같은 fabric-bukkit 하이브리드 호스트에서 ServerTickEvents.END_SERVER_TICK 이 안 들어와 점수가 영영 1 로 안 올라갔음. 이번 변경: presence pulse 호출 지점을 셋으로 확장 — 어느 한 이벤트만 firing 돼도 가드가 통과. - ServerLifecycleEvents.SERVER_STARTED (fabric) / ServerStartedEvent (neoforge) — 서버 부팅 완료 직후 한 번 - onPlayerJoin — 플레이어 로그인 시점 (server tick 가 죽어도 발화) - ServerTickEvents.END_SERVER_TICK — 정상 호스트에서의 steady-state ChatAnswerCore 에 onServerStarted public method 추가, onPlayerJoin 에서도 player.level().getServer() 로 server 받아 markModPresence 호출. 세 로더 entrypoint (fabric-1216, fabric-2612, neoforge-1216) 모두에서 SERVER_STARTED 등록. Co-Authored-By: Claude Opus 4.7 --- .../chatanswer/core/ChatAnswerCore.java | 21 +++++++++++++++++-- .../chatanswer/fabric/ChatAnswerFabric.java | 4 +++- .../chatanswer/fabric/ChatAnswerFabric.java | 4 +++- gradle.properties | 2 +- .../neoforge/ChatAnswerNeoForge.java | 7 +++++++ 5 files changed, 33 insertions(+), 5 deletions(-) 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) { From 8540d693a03e0fb16987aa1af5db906805de36e6 Mon Sep 17 00:00:00 2001 From: "Claude (owner)" Date: Tue, 19 May 2026 00:22:06 +0900 Subject: [PATCH 16/18] =?UTF-8?q?v1.3.7=20=E2=80=94=20END=5FDATA=5FPACK=5F?= =?UTF-8?q?RELOAD=20=ED=9B=85=20=EC=B6=94=EA=B0=80=EB=A1=9C=20/reload=20?= =?UTF-8?q?=EC=A7=81=ED=9B=84=20false=20negative=20=ED=9A=8C=ED=94=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v1.3.6 에서 SERVER_STARTED + JOIN + ServerTick 셋에 presence pulse 를 달았지만 한 케이스가 남아 있었음: 데이터팩의 load.mcfunction 이 /reload 때마다 mq_chat_mod objective 를 remove/add 하고 #server 점수를 0 으로 재설정. 그런데 tick 이벤트가 죽은 호스트 + 이미 접속 중인 플레이어 조합이면 SERVER_STARTED 도 JOIN 도 발화 안 되어 reload 후 영영 다시 1 로 안 올라감 → 같은 false negative 가 reload 단위로 재발. 이번 변경: - Fabric (1216, 2612): ServerLifecycleEvents.END_DATA_PACK_RELOAD 등록. success=true 일 때만 markModPresence (실패한 reload 는 가드 통과시키면 안 됨). - NeoForge (1216): OnDatapackSyncEvent 등록. /reload 끝나면 player=null 로 한 번 broadcast 되므로 reload 직후 presence 가 다시 찍힘. - ChatAnswerCore.onDataPackReload 추가 (markModPresence + 진단 log). v1.3.6 jar 는 retire — 사용자 환경이 /reload 기반 워크플로라 reload 케이스 fix 가 필수. Co-Authored-By: Claude Opus 4.7 --- .../kr/tkrmagid/chatanswer/core/ChatAnswerCore.java | 9 +++++++++ .../tkrmagid/chatanswer/fabric/ChatAnswerFabric.java | 5 ++++- .../tkrmagid/chatanswer/fabric/ChatAnswerFabric.java | 5 ++++- gradle.properties | 2 +- .../chatanswer/neoforge/ChatAnswerNeoForge.java | 10 ++++++++++ 5 files changed, 28 insertions(+), 3 deletions(-) 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 bb2d7e7..44cf38b 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -80,6 +80,15 @@ public final class ChatAnswerCore { markModPresence(server); } + /** /reload 직후 호출. load.mcfunction 이 mq_chat_mod objective 를 remove/add + * 하고 `#server` 점수를 0 으로 재설정하므로, reload 끝난 직후 즉시 + * 다시 1 로 찍어야 함. tick 이벤트가 죽은 호스트 + 이미 접속 중인 + * 플레이어 조합에서 SERVER_STARTED/JOIN 둘 다 발화 안 되는 케이스 커버. */ + public static void onDataPackReload(MinecraftServer server) { + LOG.info("[{}] onDataPackReload fired, re-marking presence", MOD_ID); + markModPresence(server); + } + /** 각 로더 entrypoint 가 매 server tick 마다 호출해야 한다. */ public static void onServerTick(MinecraftServer server) { markModPresence(server); 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 0894964..e0f07d7 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 @@ -20,11 +20,14 @@ public final class ChatAnswerFabric implements ModInitializer { ChatAnswerCore.handleChat(sender, message.signedContent()) ); ServerLifecycleEvents.SERVER_STARTED.register(ChatAnswerCore::onServerStarted); + ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, success) -> { + if (success) ChatAnswerCore.onDataPackReload(server); + }); 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 + SERVER_STARTED + JOIN + TICK", ChatAnswerCore.MOD_ID); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + SERVER_STARTED + END_DATA_PACK_RELOAD + 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 0894964..e0f07d7 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 @@ -20,11 +20,14 @@ public final class ChatAnswerFabric implements ModInitializer { ChatAnswerCore.handleChat(sender, message.signedContent()) ); ServerLifecycleEvents.SERVER_STARTED.register(ChatAnswerCore::onServerStarted); + ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, success) -> { + if (success) ChatAnswerCore.onDataPackReload(server); + }); 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 + SERVER_STARTED + JOIN + TICK", ChatAnswerCore.MOD_ID); + LOG.info("[{}] Fabric entrypoint registered: ALLOW_CHAT_MESSAGE + SERVER_STARTED + END_DATA_PACK_RELOAD + 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 3583b52..24bb969 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.6 +mod_version=1.3.7 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 91666f8..4530ca9 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 @@ -6,6 +6,7 @@ import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.OnDatapackSyncEvent; import net.neoforged.neoforge.event.ServerChatEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.server.ServerStartedEvent; @@ -16,6 +17,7 @@ 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::onDatapackSync); NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onPlayerLogin); NeoForge.EVENT_BUS.addListener(ChatAnswerNeoForge::onServerTick); } @@ -33,6 +35,14 @@ public final class ChatAnswerNeoForge { ChatAnswerCore.onServerStarted(event.getServer()); } + /** OnDatapackSyncEvent: /reload 끝나면 player=null 로 한 번 broadcast, + * 로그인 때마다 해당 player 로 한 번 더 fire. 어느 쪽이든 reload 직후 + * presence 가 다시 찍히는 것이 목적이라 둘 다 OK. */ + @SubscribeEvent + public static void onDatapackSync(OnDatapackSyncEvent event) { + ChatAnswerCore.onDataPackReload(event.getPlayerList().getServer()); + } + @SubscribeEvent public static void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { if (event.getEntity() instanceof ServerPlayer player) { From fa5b1148b494960116720dfe31b65436cd6cfaad Mon Sep 17 00:00:00 2001 From: "Claude (owner)" Date: Wed, 20 May 2026 10:27:48 +0900 Subject: [PATCH 17/18] =?UTF-8?q?v1.3.8=20=E2=80=94=20=EC=A0=95=EB=8B=B5?= =?UTF-8?q?=20=EB=8B=A8=EA=B3=84=20=EC=B1=84=ED=8C=85=20broadcast=20?= =?UTF-8?q?=EC=B0=A8=EB=8B=A8=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 사용자 요청: 정답 입력 단계에서도 친 채팅이 다른 플레이어한테 보이게. 정답 보호는 데이터팩이 아니라 룸 운영자의 신뢰 기반 운영으로 처리한다는 방침. 다른 단계는 원래도 차단하지 않았으니 변경 없음. - ChatAnswerCore.handleChat 가 항상 true 반환. 정답 단계(state 5) 일 때만 부가적으로 mq:answer/submit 호출하고 broadcast 는 그대로 허용. - Fabric ALLOW_CHAT_MESSAGE / NeoForge ServerChatEvent 핸들러는 그대로 반환값을 전달 — 항상 true 라 cancel 안 됨. - README.md: 차단 동작 설명을 v1.3.8 부터 broadcast 허용으로 정정. 호환: 데이터팩 mq:answer/submit 함수는 동일하게 호출되므로 음악퀴즈 v1.0.26 + chat_answer v1.3.8 조합으로 그대로 동작. 정답 보이는 게 싫으면 v1.3.7 으로 다운그레이드. Co-Authored-By: Claude Opus 4.7 --- README.md | 5 +++-- .../chatanswer/core/ChatAnswerCore.java | 21 ++++++++++++------- gradle.properties | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 80307c0..4a0bd95 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ execute as <플레이어 UUID> run function mq:answer/submit {text:'<채팅 내용>'} ``` -채팅은 다른 플레이어에게 broadcast 되지 않으므로 정답이 화면에 노출되지 않는다. -`init` 점수가 5 가 아닐 때는 채팅이 평소처럼 모두에게 보인다. +v1.3.8 부터는 정답 단계여도 채팅이 평소대로 broadcast 된다 (다른 플레이어 +화면에 그대로 노출됨). 정답 보호는 데이터팩이 아니라 룸 운영자의 신뢰 기반 +운영으로 처리한다. v1.3.7 까지는 정답 단계에서 채팅 broadcast 가 차단됐었다. ## 빌드 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 44cf38b..2bc6179 100644 --- a/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java +++ b/common/src/main/java/kr/tkrmagid/chatanswer/core/ChatAnswerCore.java @@ -21,8 +21,11 @@ import org.slf4j.LoggerFactory; * execute as run function mq:answer/submit {text:'<채팅>'} * 을 OP 레벨로 실행한다. * - * 각 로더 진입점(Fabric / NeoForge) 에서 chat 이벤트 받자마자 {@link #handleChat} - * 호출 → 반환값이 false 면 그 채팅은 broadcast 차단해야 함. + * v1.3.8 부터 채팅은 어떤 단계에서도 broadcast 차단하지 않는다 — 정답 입력 + * 단계에서도 친 채팅이 평소처럼 채팅창에 보인다. (사용자 요청: 정답 화면 + * 노출을 데이터팩이 관리하지 않고 룸 운영자가 신뢰 기반으로 처리.) + * 따라서 {@link #handleChat} 는 항상 true 를 반환하며, 정답 단계일 때만 + * 부가적으로 정답 제출 함수를 호출한다. */ public final class ChatAnswerCore { public static final String MOD_ID = "chat_answer"; @@ -135,15 +138,19 @@ public final class ChatAnswerCore { } /** - * @return true = 채팅을 평소처럼 broadcast / false = 채팅 차단 (이미 정답 제출 처리됨) + * 항상 true 반환 — 어떤 단계에서도 채팅을 차단하지 않는다. + * 정답 단계(state 5) 일 때만 부가적으로 정답 제출 함수를 호출한다. + * + * @return 항상 true (broadcast 허용). 로더 진입점은 반환값을 그대로 이벤트 + * allow/cancel 결정에 전달하면 된다. */ public static boolean handleChat(ServerPlayer sender, String rawText) { MinecraftServer server = sender.level().getServer(); if (server == null) return true; - if (!isAcceptingAnswer(server)) return true; - - submitAnswer(server, sender, rawText); - return false; + if (isAcceptingAnswer(server)) { + submitAnswer(server, sender, rawText); + } + return true; } private static boolean isAcceptingAnswer(MinecraftServer server) { diff --git a/gradle.properties b/gradle.properties index 24bb969..9b6f400 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.7 +mod_version=1.3.8 mod_group=kr.tkrmagid.chatanswer mod_name=채팅정답 From b79eff26b7a9f42ea9861b2259838010df64163c Mon Sep 17 00:00:00 2001 From: "Claude (owner)" Date: Wed, 20 May 2026 10:45:12 +0900 Subject: [PATCH 18/18] =?UTF-8?q?add=20HANDOVER.md=20=E2=80=94=20mod=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=9D=B4=20=EB=B3=84=EB=8F=84=20=EC=B1=84?= =?UTF-8?q?=ED=8C=85=EC=9C=BC=EB=A1=9C=20=EB=B6=84=EB=A6=AC=EB=90=98?= =?UTF-8?q?=EB=A9=B4=EC=84=9C=20=EC=BD=9C=EB=93=9C=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=ED=8A=B8=EC=9A=A9=20=EC=9D=B8=EA=B3=84=20=EB=AC=B8=EC=84=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 내용: - 한 줄 요약, 리포/인증, 최신 버전 - 폴더 구조, 빌드 명령 - 핵심 동작 3 개 (handleChat, mod_active_notice, presence pulse) 동작 + 왜 그렇게 짰는지 - mc_datapack 측 통합 인터페이스 (함수/점수 표) - v1.1.0 ~ v1.3.8 버전 히스토리 요점 - 릴리스 절차 (gradle.properties 버전 → buildAll → tag/push → Gitea API) - 작업 환경 (클론 위치, JDK, git author override 패턴) 이 mod 채팅은 데이터팩 mc_datapack 채팅과 분리되므로, 호환 깰 가능성 있는 변경 시 데이터팩 쪽 채팅과 조율 필요. Co-Authored-By: Claude Opus 4.7 --- HANDOVER.md | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 HANDOVER.md diff --git a/HANDOVER.md b/HANDOVER.md new file mode 100644 index 0000000..f4796e0 --- /dev/null +++ b/HANDOVER.md @@ -0,0 +1,205 @@ +# mc_chat_answer_mod 인수인계 (Handover) + +이 문서는 본 모드 작업이 별도 채팅(Discord 룸)으로 분리되면서 새 채팅이 +콜드 스타트로 인계받을 수 있도록 그동안의 컨텍스트를 정리한 것입니다. +모드를 계속 유지보수할 때 이 파일을 먼저 읽으면 됩니다. + +## 한 줄 요약 + +음악퀴즈 데이터팩(`mc_datapack` / 데이터팩 namespace `mq`) 의 짝이 되는 +멀티로더(Fabric + NeoForge) **서버사이드** Minecraft 모드. 두 가지 일을 +한다: + +1. **정답 채팅 가로채기** — `init main == 5` (정답 입력 단계) 일 때 플레이어 + 채팅을 정답 제출로 OP 권한으로 처리. +2. **데이터팩 presence pulse** — `mq_chat_mod` objective 의 `#server` 점수를 + 1 로 set 해서 데이터팩이 "이 모드 설치돼 있는가" 를 검사할 수 있게 함. +3. (부가) **모드 활성화 안내** — 로그인 1 초 뒤 `mq:players/mod_active_notice` + 호출. + +## 리포 / 접근 + +- URL: https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod +- 기본 브랜치: `main` +- 라이센스: MIT +- 인증: Gitea PAT — 글로벌 메모리 `/home/claude/.config/ejclaw/secrets.json` + 의 `credentials["git.tkrmagid.kr"].token`. HTTPS URL 에 임베드하거나 + `Authorization: token ` 헤더로 사용. +- git author (커밋 시): `-c user.name="Claude (owner)" -c user.email="claude@tkrmagid.kr"`. + 글로벌 git config 안 건드림. + +## 최신 버전 + +**v1.3.8** (2026-05-20). 릴리스: https://git.tkrmagid.kr/tkrmagid/mc_chat_answer_mod/releases/tag/v1.3.8 + +## 폴더 구조 + +- `common/` — 로더 비종속 핵심 로직 (Mojang 매핑 기준). + - `kr/tkrmagid/chatanswer/core/ChatAnswerCore.java` — 거의 모든 로직이 여기. +- `fabric-1216/` — Fabric Loader MC 1.21.6 진입점. +- `fabric-2612/` — Fabric Loader MC 26.1.2 진입점. +- `neoforge-1216/` — NeoForge MC 1.21.6 진입점. (26.x 는 NeoForge moddev + plugin 이 아직 인식 못 함.) +- `containerJar` 태스크가 위 세 로더의 결과물을 **단일 jar** 로 묶음 + (Fabric 은 META-INF/jars/ JiJ, NeoForge 는 outer 본체). 최종 산출: + `build/libs/chat_answer-.jar`. + +## 빌드 + +JDK 21 필요. + +``` +./gradlew buildAll +``` + +산출물: `build/libs/chat_answer-.jar` (서버 mods/ 에 이거 하나만 +넣으면 됨 — Fabric 이든 NeoForge 든 자기 진입점만 인식). + +## 핵심 동작 상세 + +### A. handleChat (정답 채팅 처리) + +`ChatAnswerCore.handleChat(ServerPlayer, String)`: + +- 정답 단계(`init main == 5`) 가 아니면 그대로 통과 (true 반환). +- 정답 단계면 `sanitize` 후 OP 권한으로 다음 실행: + ``` + execute as run function mq:answer/submit {text:'<채팅>'} + ``` +- **v1.3.7 까지**: 정답 단계에서 false 반환 → Fabric `ALLOW_CHAT_MESSAGE` + / NeoForge `ServerChatEvent.setCanceled(true)` 가 broadcast 차단. +- **v1.3.8 부터**: 항상 true 반환 → broadcast 차단 안 함. 정답 채팅도 + 다른 플레이어에게 평소대로 보임. 정답 보호는 룸 운영자 신뢰 기반. + +`sanitize` 는 큰따옴표/백슬래시/제어문자 제거 (매크로 NBT 호환). + +### B. mod_active_notice (입장 안내) + +`onPlayerJoin(ServerPlayer)` 가 UUID → 20 ticks 맵에 적재. 매 server tick +마다 카운트다운, 0 되면 player 본인을 source 로 한 CommandSourceStack 으로 +`function mq:players/mod_active_notice` 호출. + +**왜 지연하는가**: JOIN 이벤트는 플레이어가 PlayerList 에 막 들어간 직후라 +클라이언트가 system chat 패킷 받을 준비가 안 됐을 수 있음. 즉시 tellraw 를 +보내면 사라지는 race 가 v1.3.3 이하에서 재현됐음. 20 ticks (1 초) 지연으로 +해결. + +### C. presence pulse + +`markModPresence(MinecraftServer)`: +```java +scoreboard.getOrCreatePlayerScore( + ScoreHolder.forNameOnly("#server"), + scoreboard.getObjective("mq_chat_mod") +).set(1); +``` + +- objective 가 없으면 (= 데이터팩 미설치) 조용히 skip. +- 점수가 이미 1 이면 MC 가 packet 전송 생략 → 매 tick 호출해도 트래픽 + 안 늘어남. +- **호출 지점 4 개** (어느 하나만 firing 돼도 가드 통과): + - `ServerLifecycleEvents.SERVER_STARTED` / `ServerStartedEvent` — 부팅 직후 + - `onPlayerJoin` — 로그인 시 + - `ServerTickEvents.END_SERVER_TICK` / `ServerTickEvent.Post` — steady-state + - `ServerLifecycleEvents.END_DATA_PACK_RELOAD` (success=true 시) / + `OnDatapackSyncEvent` — /reload 직후 + +**왜 중복**: banner/mohist 같은 fabric-bukkit 하이브리드 호스트에서 +`END_SERVER_TICK` 이 안 들어오는 케이스, `/reload` 가 objective 를 +remove/add 해서 `#server` 점수를 0 으로 reset 하는 케이스 등이 보고됨. +하나만 의존하면 false negative 가 남음. + +## 데이터팩 (mc_datapack / mq) 측 통합 + +| 모드 → 데이터팩 | 모드가 호출하는 함수 / 쓰는 점수 | +|---|---| +| `mq:players/mod_active_notice` | 로그인 1 초 뒤 호출 | +| `mq:answer/submit {text:'...'}` | 정답 단계 채팅 시 호출 | +| `scoreboard mq_chat_mod` `#server` ← 1 | presence pulse | + +| 데이터팩 → 모드 | 데이터팩이 읽는 점수 | +|---|---| +| `scoreboard main` `init` | 5 면 정답 단계 | +| `scoreboard mq_chat_mod` `#server` | 1 이면 모드 설치됨 (가드 통과) | + +데이터팩의 `load.mcfunction` 이 `scoreboard objectives add mq_chat_mod dummy` +로 objective 를 생성하고 `#server` 를 0 으로 materialize. 모드는 그 objective +가 있어야 pulse 가 동작. 데이터팩의 `commands/start.mcfunction` 에서 +`execute if score #server mq_chat_mod matches 1` 로 검증, 미설치 시 +사유와 함께 차단. + +데이터팩 최신: v1.0.26. README 에 `mc_chat_answer_mod` 최소 권장 버전 +**v1.3.7+** 명시 (v1.3.8 은 상위 호환이라 README 갱신 불필요). + +## 버전 히스토리 (요점만) + +- **v1.1.0** — PlayerJoin 훅 추가, 데이터팩에 모드 설치 신호. +- **v1.1.1** — 싱글플레이어 (client side) 에서도 로드. +- **v1.2.0** — MC 26.1.2 타깃. +- **v1.2.1** — icon 추가. +- **v1.3.0** — 단일 jar 가 Fabric 1.21.6 + Fabric 26.1.2 + NeoForge 1.21.6 커버. +- **v1.3.1** — 중첩 fabric jar 를 outer fabric.mod.json 에 선언. +- **v1.3.2** — 진단 로깅. +- **v1.3.3** — storage flag 대신 직접 function 호출 (race 해소). +- **v1.3.4** — `mod_active_notice` 20 tick 지연 (chat-not-delivered race 해소). + **이 버전 미만이면 입장 안내 채팅이 가끔 사라짐.** +- **v1.3.5** — `#server mq_chat_mod` tick pulse 추가 (가드 도입). +- **v1.3.6** — fabric-bukkit 하이브리드에서 END_SERVER_TICK 안 들어오는 + false negative → SERVER_STARTED + JOIN 에도 pulse. +- **v1.3.7** — /reload 가 objective remove/add 로 점수 reset 하는데 + 죽은 호스트 + 이미 접속 중 조합에서 SERVER_STARTED/JOIN/Tick 모두 + 안 발화 → END_DATA_PACK_RELOAD / OnDatapackSyncEvent 추가. +- **v1.3.8** — 정답 단계 broadcast 차단 해제 (사용자 요청). + +## 알려진 이슈 + +v1.3.8 시점 기준 없음. 리뷰어 검증 통과 항목: + +- `handleChat` 가 항상 true 반환 (jar 바이트코드 기준). +- 정답 단계에서는 `mq:answer/submit` 호출 후 broadcast 유지. +- 다른 채팅 cancel 경로 repo 전체에 없음. +- `./gradlew buildAll` 성공. + +## 릴리스 절차 + +1. 코드 수정 + 테스트. +2. `gradle.properties` 의 `mod_version` 올림. +3. `./gradlew buildAll` 으로 jar 빌드 → `build/libs/chat_answer-.jar`. +4. 커밋 (위의 git author override 사용) + annotated tag `v` + push. +5. Gitea 릴리스 생성: + ``` + POST https://git.tkrmagid.kr/api/v1/repos/tkrmagid/mc_chat_answer_mod/releases + Authorization: token + Content-Type: application/json + {"tag_name":"v","name":"...","body":"..."} + ``` + 응답의 `id` 받아서 자산 업로드: + ``` + POST .../releases//assets?name=chat_answer-.jar + -F "attachment=@build/libs/chat_answer-.jar" + ``` +6. 사용자에게 mods 폴더 jar 교체 안내. + +호환성 깰 가능성이 있는 변경 (예: `mq:answer/submit` 호출 인자 변경, +`mq_chat_mod` objective 이름 변경 등) 은 반드시 mc_datapack 쪽 채팅과 +조율해야 함. + +## 작업 환경 메모 + +- 로컬 클론 경로 (참고): `/tmp/mc_chat_answer_mod`. owner Claude workspace + (`/home/claude/EJClaw/data/workspaces/mc_datapack/owner/`) 밖이므로 + owner 브랜치 protocol 적용 대상 아님. mod repo 는 `main` 직접 push. +- 빌드 도구: Gradle wrapper (`./gradlew`), JDK 21. +- Loom 1.16.2, NeoForge moddev plugin 사용. + +## 짝 데이터팩 (mc_datapack) + +- URL: https://git.tkrmagid.kr/tkrmagid/mc_datapack +- 별도 채팅(현 mc_datapack 채팅) 에서 유지보수. +- 본 모드 작업이 데이터팩 호환을 깨면 그쪽 채팅에 알려야 함. +- 데이터팩 namespace `mq`, 메인 디렉토리 `music_quiz/data/mq/function/`. + +--- + +이 문서는 mod repo 의 `HANDOVER.md` 로 커밋돼 있습니다. 새 채팅에서 +`git clone` 후 이 파일부터 읽으면 됩니다.