[BUG] Fix NeoForge/Forge issue with adventure

This commit is contained in:
2024-08-08 21:51:15 +02:00
parent 04d4ea6520
commit 029bde932d
79 changed files with 176 additions and 88 deletions

View File

@@ -29,6 +29,7 @@ shadowJar {
}
setArchiveClassifier('dev-shadow')
mergeServiceFiles()
}
/**
@@ -112,8 +113,8 @@ publisher {
setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[FABRIC/QUILT 1.21.x] CraterLib - ${project.version}")
setGameVersions("1.21", "1.21.1")
setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
setGameVersions("1.21")
setLoaders("fabric", "quilt")
setArtifact(remapJar)
setCurseEnvironment("both")

View File

@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
cancellable = true
)
private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled())
ci.cancel();