getMixins() {
+ return null;
+ }
+
+ @Override
+ public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+ }
+
+ @Override
+ public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+ }
+}
diff --git a/src/main/java/cn/revaria/chatplus/plugin/annotation/DisableIfModsLoaded.java b/src/main/java/cn/revaria/chatplus/plugin/annotation/DisableIfModsLoaded.java
new file mode 100644
index 0000000..d8f0999
--- /dev/null
+++ b/src/main/java/cn/revaria/chatplus/plugin/annotation/DisableIfModsLoaded.java
@@ -0,0 +1,18 @@
+package cn.revaria.chatplus.plugin.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Conditionally disables the annotated mixin when specified mods are loaded.
+ *
+ * When applied, the mixin config plugin should disable the annotated class
+ * if any mod ID in the value list is present in the runtime environment.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DisableIfModsLoaded {
+ String[] value();
+}
diff --git a/src/main/java/cn/revaria/chatplus/util/TextStyleFormatter.java b/src/main/java/cn/revaria/chatplus/util/TextStyleFormatter.java
new file mode 100644
index 0000000..f932bda
--- /dev/null
+++ b/src/main/java/cn/revaria/chatplus/util/TextStyleFormatter.java
@@ -0,0 +1,80 @@
+package cn.revaria.chatplus.util;
+
+#if MC_VER <= MC_1_20
+import net.minecraft.text.LiteralTextContent;
+#else
+import net.minecraft.text.PlainTextContent.Literal;
+#endif
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class TextStyleFormatter {
+ public static int MAIN_HAND = -1; // Must be smaller than or equal to 0
+
+ /**
+ * Processes text styling with two key functions:
+ *
+ * 1. Replaces {@code &} with {@code §}, using {@code &&} to escape literal {@code &}
+ * 2. Substitutes {@code [item]} with main-hand item hover text and {@code [item=N]} with Nth slot's hover text
+ *
+ * Recursively processes nested text components.
+ *
+ * @param sourceText Original text to process (supports nested text components)
+ * @param sourcePlayer Player used for item stack references
+ * @return Processed text with styling and item hover elements
+ */
+ public static MutableText applyStyle(Text sourceText, ServerPlayerEntity sourcePlayer) {
+ MutableText sourceMutableText = sourceText.copy();
+
+ MutableText finalText = Text.empty().setStyle(sourceMutableText.getStyle());
+
+ if (sourceText.getContent() instanceof #if MC_VER <= MC_1_20 LiteralTextContent #else Literal #endif plainTextContent) {
+ String changedMessage = plainTextContent.string()
+ .replace('&', '§')
+ .replace("§§", "&");
+ String regex = "\\[item(?:=([1-9]))?\\]";
+ String[] messages = changedMessage.split(regex, -1);
+ Deque itemDeque = new ArrayDeque<>();
+
+ Matcher matcher = Pattern.compile(regex).matcher(changedMessage);
+ while (matcher.find()) {
+ String digit = matcher.group(1);
+ if (digit == null) {
+ itemDeque.addLast(MAIN_HAND);
+ } else {
+ itemDeque.addLast(Integer.parseInt(digit));
+ }
+ }
+
+ for (String message : messages) {
+ finalText.append(Text.literal(message));
+ if (!itemDeque.isEmpty()) {
+ ItemStack itemStack;
+ if (itemDeque.getFirst() == MAIN_HAND) {
+ itemStack = sourcePlayer.getMainHandStack();
+ } else {
+ itemStack = sourcePlayer.getInventory().getStack(itemDeque.getFirst() - 1);
+ }
+ finalText.append(itemStack.toHoverableText());
+ itemDeque.removeFirst();
+ }
+ }
+ }
+
+ List sourceTexts = sourceMutableText.getSiblings();
+ for (Text text : sourceTexts) {
+ finalText.append(applyStyle(text, sourcePlayer));
+ }
+
+ return finalText;
+ }
+}
diff --git a/src/main/resources/assets/chat-plus/icon.png b/src/main/resources/assets/chat-plus/icon.png
index 128ec65..80f3e18 100644
Binary files a/src/main/resources/assets/chat-plus/icon.png and b/src/main/resources/assets/chat-plus/icon.png differ
diff --git a/src/main/resources/chat-plus.mixins.json b/src/main/resources/chat-plus.mixins.json
index c1878d2..bbb0e0e 100644
--- a/src/main/resources/chat-plus.mixins.json
+++ b/src/main/resources/chat-plus.mixins.json
@@ -1,11 +1,13 @@
{
"required": true,
"package": "cn.revaria.chatplus.mixin",
- "compatibilityLevel": "JAVA_17",
+ "plugin": "cn.revaria.chatplus.plugin.MixinConfigPlugin",
"mixins": [
- "MixinChat"
+ "ChatMixin",
+ "compat.DynmapMixin",
+ "compat.StyledChatMixin"
],
"injectors": {
"defaultRequire": 1
}
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 7779036..73c5d4e 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -3,7 +3,7 @@
"id": "chat-plus",
"version": "${version}",
"name": "Chat Plus",
- "description": "Add bukkit style with an & and [item] for Fabric Server",
+ "description": "Add Bukkit-style color codes (using \"&\") and \"[item]\" display in chat.",
"authors": [
"Rev_Aria"
],
@@ -12,7 +12,7 @@
"sources": "https://github.com/CPTProgrammer/ChatPlus/",
"issues": "https://github.com/CPTProgrammer/ChatPlus/issues"
},
- "license": "CC0-1.0",
+ "license": "GPL-3.0-or-later",
"icon": "assets/chat-plus/icon.png",
"environment": "*",
"entrypoints": {
@@ -21,19 +21,12 @@
]
},
"mixins": [
- "chat-plus.mixins.json",
- {
- "config": "chat-plus.client.mixins.json",
- "environment": "client"
- }
+ "chat-plus.mixins.json"
],
"depends": {
- "fabricloader": ">=0.16.9",
- "minecraft": "~1.21.4",
- "java": ">=17",
- "fabric-api": "*"
- },
- "suggests": {
- "another-mod": "*"
+ "fabricloader": "${fabric_loader_version_range}",
+ "minecraft": "~${minecraft_version}",
+ "java": ">=${java_version}",
+ "${fabric_api_mod_id}": ">=${fabric_api_version}"
}
-}
\ No newline at end of file
+}
