From 1adc6e03c22ba26d9062b61edf6ae06a89a3f9ba Mon Sep 17 00:00:00 2001
From: Xujiayao <caiandxu@163.com>
Date: Fri, 29 Oct 2021 00:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=A8=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E5=86=85=E4=BD=BF=E7=94=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                   |  2 +-
 gradle.properties                              |  4 ++--
 .../listeners/MinecraftEventListener.java      | 18 ++++++++++++++++++
 update/version.json                            |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b0f8591..1c47a0cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.10.37'
+    id 'fabric-loom' version '0.10.43'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
diff --git a/gradle.properties b/gradle.properties
index 655d6941..34c17e6b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx4G
 # check these on https://fabricmc.net/use
 minecraft_version=1.17.1
 yarn_mappings=1.17.1+build.63
-loader_version=0.12.2
+loader_version=0.12.3
 # Mod Properties
-mod_version=1.17-1.10.4
+mod_version=1.17-1.10.5
 maven_group=top.xujiayao
 archives_base_name=MCDiscordChat
 # Dependencies
diff --git a/src/main/java/top/xujiayao/mcdiscordchat/listeners/MinecraftEventListener.java b/src/main/java/top/xujiayao/mcdiscordchat/listeners/MinecraftEventListener.java
index aafd7415..d67d8399 100644
--- a/src/main/java/top/xujiayao/mcdiscordchat/listeners/MinecraftEventListener.java
+++ b/src/main/java/top/xujiayao/mcdiscordchat/listeners/MinecraftEventListener.java
@@ -2,9 +2,11 @@
 
 import kong.unirest.Unirest;
 import kong.unirest.json.JSONObject;
+import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.utils.MarkdownSanitizer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Pair;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import top.xujiayao.mcdiscordchat.Main;
 import top.xujiayao.mcdiscordchat.events.PlayerAdvancementCallback;
@@ -15,6 +17,7 @@
 import top.xujiayao.mcdiscordchat.utils.MarkdownParser;
 import top.xujiayao.mcdiscordchat.utils.Utils;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -24,6 +27,21 @@ public class MinecraftEventListener {
 	public void init() {
 		ServerChatCallback.EVENT.register((playerEntity, rawMessage, message) -> {
 			if (!Main.stop) {
+				try {
+					if (StringUtils.countMatches(rawMessage, ":") >= 2) {
+						String[] emoteNames = StringUtils.substringsBetween(rawMessage, ":", ":");
+						for (String emoteName : emoteNames) {
+							List<Emote> emotes = Main.jda.getEmotesByName(emoteName, true);
+							if (!emotes.isEmpty()) {
+								rawMessage = StringUtils.replaceFirst(rawMessage, ":" + emoteName + ":", "<:" + emoteName + ":" + emotes.get(0).getId() + ">");
+							}
+						}
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+					Main.textChannel.sendMessage("```\n" + ExceptionUtils.getStackTrace(e) + "\n```").queue();
+				}
+
 				Pair<String, String> convertedPair = Utils.convertMentionsFromNames(rawMessage);
 
 				if (Main.config.generic.bannedMinecraft.contains(playerEntity.getEntityName())) {
diff --git a/update/version.json b/update/version.json
index 85f7d403..ae1ae06c 100644
--- a/update/version.json
+++ b/update/version.json
@@ -1 +1 @@
-{"version":"1.17-1.10.4"}
\ No newline at end of file
+{"version":"1.17-1.10.5"}
\ No newline at end of file