Merge branch '1.19.4' into 1.20.1

# Conflicts:
#	build.gradle
#	gradle.properties
#	update_checker.json

Author: ErdbeerbaerLP

build.gradle

@@ -30,7 +30,7 @@ apply plugin: 'org.spongepowered.mixin'
 
 
 //Build variables
-version = "3.0.4.1"
+version = "3.0.5"
 group = "de.erdbeerbaerlp.dcintegration"
 archivesBaseName = "dcintegration-forge"
 
@@ -94,8 +94,9 @@ configurations.all {
 //Dependencies
 dependencies {
     // =========  Common  =====================
-    embed('de.erdbeerbaerlp:dcintegration.common:3.0.4.1') {
+    embed('de.erdbeerbaerlp:dcintegration.common:3.0.5') {
         changing = true
+        transitive = false
     }
 
     // =========  Minecraft Forge =============

gradle.properties

@@ -2,6 +2,6 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-changelog=Fix death message custom embed
+changelog=Fix server stopping not working\nFix update checker\nImplement URL Encoded advancement message
 releaseType = BETA
 mcVersion = 1.20.1

src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java

@@ -60,6 +60,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.regex.Pattern;
 
@@ -208,6 +210,8 @@ public void advancement(AdvancementEvent.AdvancementEarnEvent ev) {
                                     .replace("%avatarURL%", avatarURL)
                                     .replace("%advName%", ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()))
                                     .replace("%advDesc%", ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()))
+                                    .replace("%advNameURL%", URLEncoder.encode(ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()), StandardCharsets.UTF_8))
+                                    .replace("%advDescURL%", URLEncoder.encode(ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()), StandardCharsets.UTF_8))
                                     .replace("%avatarURL%", avatarURL)
                                     .replace("%playerColor%", "" + TextColors.generateFromUUID(ev.getEntity().getUUID()).getRGB())
                             );
@@ -225,7 +229,9 @@ public void advancement(AdvancementEvent.AdvancementEarnEvent ev) {
                                                             .getDisplay()
                                                             .getDescription()
                                                             .getString()))
-                                            .replace("\\n", "\n"));
+                                            .replace("\\n", "\n").replace("%advNameURL%", URLEncoder.encode(ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()), StandardCharsets.UTF_8))
+                                            .replace("%advDescURL%", URLEncoder.encode(ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()), StandardCharsets.UTF_8))
+                                    );
                             INSTANCE.sendMessage(new DiscordMessage(b.build()));
                         }
                     } else INSTANCE.sendMessage(Localization.instance().advancementMessage.replace("%player%",
@@ -237,9 +243,11 @@ public void advancement(AdvancementEvent.AdvancementEarnEvent ev) {
                                             .getString()))
                             .replace("%advDesc%",
                                     ChatFormatting.stripFormatting(ev.getAdvancement()
-                                            .getDisplay()
-                                            .getDescription()
-                                            .getString()))
+                                                    .getDisplay()
+                                                    .getDescription()
+                                                    .getString()).replace("%advNameURL%", URLEncoder.encode(ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()), StandardCharsets.UTF_8))
+                                            .replace("%advDescURL%", URLEncoder.encode(ChatFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()), StandardCharsets.UTF_8))
+                            )
                             .replace("\\n", "\n"));
                 }
     }

update_checker.json

@@ -1,5 +1,9 @@
 [
   {
+    "version": "3.0.5",
+    "changelog": "Fix server stopping not working\nFix update checker\nImplement URL Encoded advancement message",
+    "type": "beta"
+  },{
     "version": "3.0.4.1",
     "changelog": "Fix death message custom embed",
     "type": "beta"