From f45cbc4c5be284474d2f810ebbbdb56204a9397d Mon Sep 17 00:00:00 2001 From: Marlon <72864666+DinoMarlir@users.noreply.github.com> Date: Fri, 21 Jun 2024 15:44:08 +0200 Subject: [PATCH 1/2] started chat text decoration --- build.gradle.kts | 1 + .../mods/smp/mixins/MixinPlayerChatMessage.java | 17 +++++++++++++++++ .../mods/smp/mixinkt/MixinPlayerChatMessage.kt | 11 +++++++++++ .../live/einfachgustaf/mods/smp/utils/Global.kt | 5 +++++ src/main/resources/smp.mixins.json | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/java/live/einfachgustaf/mods/smp/mixins/MixinPlayerChatMessage.java create mode 100644 src/main/kotlin/live/einfachgustaf/mods/smp/mixinkt/MixinPlayerChatMessage.kt create mode 100644 src/main/kotlin/live/einfachgustaf/mods/smp/utils/Global.kt diff --git a/build.gradle.kts b/build.gradle.kts index 9c0a1c9..f8c7235 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,6 +25,7 @@ dependencies { modImplementation("net.silkmc:silk-commands:$silkVersion") include(implementation("me.obsilabor", "alert", "1.0.8")) + include(implementation("net.kyori:adventure-platform-fabric:5.13.0")!!) } tasks { diff --git a/src/main/java/live/einfachgustaf/mods/smp/mixins/MixinPlayerChatMessage.java b/src/main/java/live/einfachgustaf/mods/smp/mixins/MixinPlayerChatMessage.java new file mode 100644 index 0000000..db8233d --- /dev/null +++ b/src/main/java/live/einfachgustaf/mods/smp/mixins/MixinPlayerChatMessage.java @@ -0,0 +1,17 @@ +package live.einfachgustaf.mods.smp.mixins; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.PlayerChatMessage; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PlayerChatMessage.class) +public class MixinPlayerChatMessage { + + @Inject(at = @At("RETURN"), method = "decoratedContent", cancellable = true) + private void injectDecoratedContent(CallbackInfoReturnable cir) { + live.einfachgustaf.mods.smp.mixinkt.MixinPlayerChatMessage.INSTANCE.injectDecoratedContent(cir); + } +} diff --git a/src/main/kotlin/live/einfachgustaf/mods/smp/mixinkt/MixinPlayerChatMessage.kt b/src/main/kotlin/live/einfachgustaf/mods/smp/mixinkt/MixinPlayerChatMessage.kt new file mode 100644 index 0000000..df11f66 --- /dev/null +++ b/src/main/kotlin/live/einfachgustaf/mods/smp/mixinkt/MixinPlayerChatMessage.kt @@ -0,0 +1,11 @@ +package live.einfachgustaf.mods.smp.mixinkt + +import net.minecraft.network.chat.Component +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable + +object MixinPlayerChatMessage { + + fun injectDecoratedContent(cir: CallbackInfoReturnable) { + // TODO: MiniMessage Translation + } +} \ No newline at end of file diff --git a/src/main/kotlin/live/einfachgustaf/mods/smp/utils/Global.kt b/src/main/kotlin/live/einfachgustaf/mods/smp/utils/Global.kt new file mode 100644 index 0000000..36f5c74 --- /dev/null +++ b/src/main/kotlin/live/einfachgustaf/mods/smp/utils/Global.kt @@ -0,0 +1,5 @@ +package live.einfachgustaf.mods.smp.utils + +import net.kyori.adventure.text.minimessage.MiniMessage + +val miniMessage = MiniMessage.miniMessage() \ No newline at end of file diff --git a/src/main/resources/smp.mixins.json b/src/main/resources/smp.mixins.json index 3f8d058..e49505d 100644 --- a/src/main/resources/smp.mixins.json +++ b/src/main/resources/smp.mixins.json @@ -6,6 +6,6 @@ "defaultRequire": 0 }, "mixins": [ - + "MixinPlayerChatMessage" ] } \ No newline at end of file From a3f389c0f9959756f8a56c4768fedaebd7e79512 Mon Sep 17 00:00:00 2001 From: Marlon <72864666+DinoMarlir@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:22:36 +0200 Subject: [PATCH 2/2] added minimessage --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index f8c7235..22d9440 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { include(implementation("me.obsilabor", "alert", "1.0.8")) include(implementation("net.kyori:adventure-platform-fabric:5.13.0")!!) + include(implementation("net.kyori:adventure-text-minimessage:4.17.0")!!) } tasks {