Update DiscordToMinecraftListener.java

Two fixes (FS-421)

SECURITY.md

@@ -11,23 +11,20 @@ These versions are currently actively supported by our team, and you should expe
 
 | Version             | Supported          | Support End:                   |
 | ------------------- | ------------------ | ------------------------------ |
-| 2021.09             | :white_check_mark: | No Earlier than December 2021    |
+| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
 
 ### Legacy Supported
 These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
 
 | Version             | Supported          | Support End: |
 | ------------------- | ------------------ | ------------ |
-| 2021.06             | :white_check_mark: | October 2021 |
+| 2021.04             | :white_check_mark: | July 2021    |
-
 
 ### No Longer Supported
 These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
-| 2021.05             | :white_check_mark: | September 2021      |
-| 2021.04             | :white_check_mark: | July 2021           |
 | 2021.02             | :x:                | 6 June 2021         |
 | 2020.11             | :x:                | 3 May 2021          |
 | 6.0.x (Pre-Release) | :x:                | December 2020       |

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.09-RC01</version>
+    <version>2021.06</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -429,8 +429,8 @@
                                     <include>org.reflections:reflections</include>
                                     <include>org.javassist:javassist</include>
                                     <include>io.papermc:paperlib</include>
-                                    <include>com.github.speedxx:Mojangson</include>
                                     <include>org.bstats:bstats-bukkit</include>
+                                    <include>org.bstats:bstats-base</include>
                                     <include>org.jetbrains:annotations</include>
                                 </includes>
                             </artifactSet>

src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java

@@ -34,7 +34,19 @@ public class DiscordToMinecraftListener extends ListenerAdapter
                 {
                     message.append(" ").append(tag);
                 }
-                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
+                
+                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":");
+                
+                Message repliedTo = msg.getReferencedMessage();
+                
+                if (repliedTo != null)
+                {
+                    message.append(ChatColor.DARK_GRAY + ChatColor.ITALIC +"[" + ChatColor.GRAY + "Replying to " + ChatColor.BOLD + repliedTo.getAuthor().getName() + ChatColor.RESET + ChatColor.DARK_GRAY+  "]" + ChatColor.RESET);
+                } else
+                {
+                    message.append(ChatColor.RESET + " ");
+                }
+                
                 ComponentBuilder builder = new ComponentBuilder(message.toString());
                 if (!msg.getContentDisplay().isEmpty())
                 {