From 8162d1f0b10c9e86060feb8d6a3bc64a7c7df49c Mon Sep 17 00:00:00 2001 From: rathmerdominik Date: Fri, 8 Dec 2023 00:26:31 +0100 Subject: [PATCH 1/2] fix(DiscordIntegrationMod): Removed double avatarURL replace --- .../erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java index acfcd23..797afda 100644 --- a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java +++ b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java @@ -210,7 +210,6 @@ public void advancement(AdvancementEvent ev) { .replace("%advDesc%", TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString())) .replace("%advNameURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()))) .replace("%advDescURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()))) - .replace("%avatarURL%", avatarURL) .replace("%playerColor%", "" + TextColors.generateFromUUID(ev.getEntity().getUUID()).getRGB()) ); INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); From 2e1b4c96a9d7c6be10efbf903b4dbc2d1abb79b9 Mon Sep 17 00:00:00 2001 From: rathmerdominik Date: Fri, 8 Dec 2023 01:26:53 +0100 Subject: [PATCH 2/2] feat(DiscordIntegrationMod): Add seperate channel possibility for advancements --- .../dcintegration/forge/DiscordIntegrationMod.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java index 797afda..e0e35d9 100644 --- a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java +++ b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java @@ -212,7 +212,7 @@ public void advancement(AdvancementEvent ev) { .replace("%advDescURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()))) .replace("%playerColor%", "" + TextColors.generateFromUUID(ev.getEntity().getUUID()).getRGB()) ); - INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); + INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.advancementChannelID)); } else { EmbedBuilder b = Configuration.instance().embedMode.advancementMessage.toEmbed(); b = b.setAuthor(ForgeMessageUtils.formatPlayerName(ev.getEntity()), null, avatarURL) @@ -229,7 +229,7 @@ public void advancement(AdvancementEvent ev) { .replace("\\n", "\n").replace("%advNameURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()))) .replace("%advDescURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString()))) ); - INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); + INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.advancementChannelID)); } } else INSTANCE.sendMessage(Localization.instance().advancementMessage.replace("%player%", TextFormatting.stripFormatting(ForgeMessageUtils.formatPlayerName(ev.getEntity()))) @@ -244,7 +244,7 @@ public void advancement(AdvancementEvent ev) { .getDescription() .getString()).replace("%advNameURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getTitle().getString()))) .replace("%advDescURL%", URLEncoder.encode(TextFormatting.stripFormatting(ev.getAdvancement().getDisplay().getDescription().getString())))) - .replace("\\n", "\n"),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); + .replace("\\n", "\n"),INSTANCE.getChannel(Configuration.instance().advanced.advancementChannelID)); } }