Use new AdvancementDisplay available in Spigot for Minecraft 1.19 to get Advancement details (fixes #9)

Author: Programie

pom.xml

@@ -23,7 +23,7 @@
     </scm>
 
     <properties>
-        <bukkit-api-version>1.12.2</bukkit-api-version>
+        <bukkit-api-version>1.19</bukkit-api-version>
     </properties>
 
     <repositories>

src/main/java/com/selfcoders/matterbukkit/EventListener.java

@@ -3,32 +3,26 @@
 import com.selfcoders.matterbukkit.matterbridgeapi.API;
 import com.selfcoders.matterbukkit.matterbridgeapi.Message;
 import org.bukkit.ChatColor;
+import org.bukkit.advancement.AdvancementDisplay;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.*;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Arrays;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 class EventListener implements Listener {
     private final MatterBukkit plugin;
     private final API matterBridgeApi;
     private final String avatarUrl;
-    private final YamlConfiguration advancements;
 
     EventListener(MatterBukkit plugin, API matterBridgeApi, String avatarUrl) {
         this.plugin = plugin;
         this.matterBridgeApi = matterBridgeApi;
         this.avatarUrl = avatarUrl;
-
-        advancements = YamlConfiguration.loadConfiguration(new InputStreamReader(plugin.getResource("advancements.yml")));
     }
 
     @EventHandler
@@ -87,40 +81,20 @@ public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) {
             return;
         }
 
-        if (event.getAdvancement() == null || event.getAdvancement().getKey().getKey().contains("recipe/") || event.getPlayer() == null) {
-            return;
-        }
-
-        // Taken from DiscordSRV: https://github.com/DiscordSRV/DiscordSRV/blob/v1.26.2/src/main/java/github/scarsz/discordsrv/listeners/PlayerAdvancementDoneListener.java#L108-L117
-        try {
-            Object craftAdvancement = ((Object) event.getAdvancement()).getClass().getMethod("getHandle").invoke(event.getAdvancement());
-            Object advancementDisplay = craftAdvancement.getClass().getMethod("c").invoke(craftAdvancement);
-            boolean display = (boolean) advancementDisplay.getClass().getMethod("i").invoke(advancementDisplay);
+        AdvancementDisplay advancementDisplay = event.getAdvancement().getDisplay();
 
-            if (!display) {
-                return;
-            }
-        } catch (NullPointerException exception) {
+        if (advancementDisplay == null) {
             return;
-        } catch (Exception exception) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to check whether advancement should be displayed", exception);
         }
 
-        String internalAdvancementName = event.getAdvancement().getKey().getKey();
-
-        String advancementName = advancements.getString(internalAdvancementName);
-
-        if (advancementName == null) {
-            // Fallback if not defined in advancements.yml: turn "story/shitty_advancement_name" into "Shitty Advancement Name", taken from DiscordSRV
-            advancementName = Arrays.stream(internalAdvancementName.substring(internalAdvancementName.lastIndexOf("/") + 1).toLowerCase().split("_"))
-                    .map(s -> s.substring(0, 1).toUpperCase() + s.substring(1))
-                    .collect(Collectors.joining(" "));
+        if (!advancementDisplay.shouldAnnounceChat()) {
+            return;
         }
 
         String text = config.getString("outgoing.advancement.format");
 
         text = text.replaceAll("%playername%", event.getPlayer().getName())
-                .replaceAll("%advancement%", advancementName);
+                .replaceAll("%advancement%", advancementDisplay.getTitle());
 
         try {
             matterBridgeApi.sendMessage(text);

src/main/resources/advancements.yml

@@ -44,7 +44,7 @@ outgoing:
     enable: true
 
     # Format for advancement messages sent to MatterBridge
-    # Placeholders: %playername% (name of the player), %advancement% (name of the advancement as defined in advancements.yml)
+    # Placeholders: %playername% (name of the player), %advancement% (title of the advancement)
     format: "%playername% has made the advancement [%advancement%]"
 
   level-up: