GH-71 Support 1.21.3 bukkit platform, better adventure support (#71)

Author: Rollczi

buildSrc/src/main/kotlin/Versions.kt

@@ -10,7 +10,7 @@ object Versions {
     const val ASSERTJ_CORE = "3.27.2"
     const val AWAITILITY = "4.2.2"
 
-    const val SPIGOT_API = "1.19.4-R0.1-SNAPSHOT"
+    const val SPIGOT_API = "1.21.4-R0.1-SNAPSHOT"
 
     const val JETBRAINS_ANNOTATIONS = "26.0.1"
 

examples/bukkit/build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
     id("java")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.gradleup.shadow") version "9.0.0-beta4"
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
-    id("xyz.jpenilla.run-paper") version "2.3.0"
+    id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
 version = "1.0.0-SNAPSHOT"
@@ -42,8 +42,8 @@ tasks.shadowJar {
     archiveFileName.set("$pluginName v${project.version}.jar")
 
     listOf(
-        "com.eternalcode.multification",
-        "net.dzikoysk.cdn",
+//        "com.eternalcode.multification",
+//        "net.dzikoysk.cdn",
         "panda.std",
         "panda.utilities",
         "net.kyori",
@@ -56,5 +56,5 @@ sourceSets.test {
 }
 
 tasks.runServer {
-    minecraftVersion("1.20.4")
+    minecraftVersion("1.21.4")
 }

examples/bukkit/src/main/java/com/eternalcode/example/bukkit/ExamplePlugin.java

@@ -1,6 +1,7 @@
 package com.eternalcode.example.bukkit;
 
 import com.eternalcode.example.bukkit.command.GiveCommand;
+import com.eternalcode.example.bukkit.command.ReloadCommand;
 import com.eternalcode.example.bukkit.command.TeleportCommand;
 import com.eternalcode.example.bukkit.command.timer.TimerCommand;
 import com.eternalcode.example.bukkit.command.timer.TimerManager;
@@ -39,6 +40,7 @@ public void onEnable() {
                 new TeleportCommand(multification),
                 new FlyCommand(multification),
                 new GiveCommand(multification),
+                new ReloadCommand(configurationManager, multification),
                 new TimerCommand(new TimerManager(this.getServer().getScheduler(), this, multification))
             )
             .build();

examples/bukkit/src/main/java/com/eternalcode/example/bukkit/command/ReloadCommand.java

@@ -0,0 +1,40 @@
+package com.eternalcode.example.bukkit.command;
+
+import com.eternalcode.example.bukkit.config.ConfigurationManager;
+import com.eternalcode.example.bukkit.multification.YourMultification;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.execute.Execute;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@Command(name = "reload-config")
+public class ReloadCommand {
+
+    private final ConfigurationManager configurationManager;
+    private final YourMultification multification;
+
+    public ReloadCommand(ConfigurationManager configurationManager, YourMultification multification) {
+        this.configurationManager = configurationManager;
+        this.multification = multification;
+    }
+
+    @Execute
+    public void execute(@Context CommandSender sender) {
+        this.configurationManager.reload();
+
+        if (sender instanceof Player player) {
+            this.multification.create()
+                .player(player.getUniqueId())
+                .notice(messagesConfig -> messagesConfig.reloadMessage)
+                .send();
+            return;
+        }
+
+        this.multification.create()
+            .console()
+            .notice(messagesConfig -> messagesConfig.reloadMessage)
+            .send();
+    }
+
+}

examples/bukkit/src/main/java/com/eternalcode/example/bukkit/config/ConfigurationManager.java

@@ -4,6 +4,8 @@
 import com.eternalcode.multification.notice.Notice;
 import com.eternalcode.multification.notice.resolver.NoticeResolverRegistry;
 import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
 import net.dzikoysk.cdn.Cdn;
 import net.dzikoysk.cdn.CdnFactory;
 import net.dzikoysk.cdn.reflect.Visibility;
@@ -12,6 +14,7 @@ public class ConfigurationManager {
 
     private final Cdn cdn;
     private final File dataFolder;
+    private final Set<ReloadableConfig> configs = new HashSet<>();
 
     public ConfigurationManager(File dataFolder, NoticeResolverRegistry resolverRegistry) {
         this.dataFolder = dataFolder;
@@ -30,7 +33,19 @@ public <T> T load(T config, String fileName) {
         this.cdn.render(config, Source.of(this.dataFolder, fileName))
             .orThrow(RuntimeException::new);
 
+        this.configs.add(new ReloadableConfig(fileName, config));
+
         return config;
     }
 
+    public void reload() {
+        for (ReloadableConfig config : configs) {
+            this.cdn.load(Source.of(this.dataFolder, config.fileName()), config.instance())
+                .orThrow(RuntimeException::new);
+        }
+    }
+
+    private record ReloadableConfig(String fileName, Object instance) {
+    }
+
 }

examples/bukkit/src/main/java/com/eternalcode/example/bukkit/config/MessagesConfig.java

@@ -37,4 +37,9 @@ public class MessagesConfig {
         .bossBar(BossBar.Color.RED, Duration.ofSeconds(1), "<red>Timer: <yellow>{time}")
         .build();
 
+    public Notice reloadMessage = Notice.builder()
+        .chat("<pride:pride>Configuration has been reloaded!")
+        .sound("ambient.basalt_deltas.additions", 1.0F, 1.0F)
+        .build();
+
 }

multification-bukkit/src/com/eternalcode/multification/bukkit/notice/resolver/sound/SoundAccessor.java

@@ -0,0 +1,45 @@
+package com.eternalcode.multification.bukkit.notice.resolver.sound;
+
+import java.lang.reflect.Method;
+import org.bukkit.Sound;
+
+public final class SoundAccessor {
+
+    private static final Method VALUE_OF_METHOD;
+    private static final Method nameMethod;
+
+    static {
+        try {
+            VALUE_OF_METHOD = Sound.class.getMethod("valueOf", String.class);
+            VALUE_OF_METHOD.setAccessible(true);
+
+            nameMethod = Sound.class.getMethod("name");
+            nameMethod.setAccessible(true);
+        }
+        catch (NoSuchMethodException noSuchMethodException) {
+            throw new RuntimeException(noSuchMethodException);
+        }
+    }
+
+    private SoundAccessor() {
+    }
+
+    public static Sound valueOf(String name) {
+        try {
+            return (Sound) VALUE_OF_METHOD.invoke(null, name);
+        }
+        catch (ReflectiveOperationException reflectiveOperationException) {
+            throw new RuntimeException(reflectiveOperationException);
+        }
+    }
+
+    public static String name(Sound sound) {
+        try {
+            return (String) nameMethod.invoke(sound);
+        }
+        catch (ReflectiveOperationException reflectiveOperationException) {
+            throw new RuntimeException(reflectiveOperationException);
+        }
+    }
+
+}

multification-bukkit/src/com/eternalcode/multification/bukkit/notice/resolver/sound/SoundBukkitResolver.java

@@ -4,6 +4,7 @@
 import com.eternalcode.multification.notice.NoticeKey;
 import com.eternalcode.multification.notice.resolver.NoticeSerdesResult;
 import com.eternalcode.multification.notice.resolver.NoticeResolver;
+import java.util.Locale;
 import java.util.Optional;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.key.Key;
@@ -40,24 +41,38 @@ public void send(Audience audience, ComponentSerializer<Component, Component, St
     public NoticeSerdesResult serialize(SoundBukkit content) {
         if (content.category() == null) {
             if (content.pitch() == SoundBukkit.PITCH_UNSET || content.volume() == SoundBukkit.VOLUME_UNSET) {
-                return new NoticeSerdesResult.Single(String.format(MUSIC, content.sound().name()));
+                return new NoticeSerdesResult.Single(String.format(MUSIC, getNameOrLegacyName(content)));
             }
 
             return new NoticeSerdesResult.Single(String.format(MUSIC_WITH_PITCH_VOLUME,
-                content.sound().name(),
+                getNameOrLegacyName(content),
                 content.pitch(),
                 content.volume()
             ));
         }
 
         return new NoticeSerdesResult.Single(String.format(MUSIC_FULL,
-            content.sound().name(),
+            getNameOrLegacyName(content),
             content.category().name(),
             content.pitch(),
             content.volume()
         ));
     }
 
+    /**
+     * From 1.21.3, the sound name is returned in "SOME.EPIC.SOUND" format.
+     * We want to return it in "some.epic.sound" format, because that's how it's stored in the sound registry.
+     * Old versions of Bukkit return the sound name in "SOME_EPIC_SOUND" enum format.
+     */
+    private static String getNameOrLegacyName(SoundBukkit content) {
+        String name = SoundAccessor.name(content.sound());
+        if (name.contains(".")) {
+            return name.toLowerCase(Locale.ROOT);
+        }
+
+        return name;
+    }
+
     @Override
     public Optional<SoundBukkit> deserialize(NoticeSerdesResult result) {
         Optional<String> firstElement = result.firstElement();
@@ -69,14 +84,14 @@ public Optional<SoundBukkit> deserialize(NoticeSerdesResult result) {
         String[] music = firstElement.get().split(" ");
 
         if (music.length == 1) {
-            return Optional.of(new SoundBukkit(org.bukkit.Sound.valueOf(music[0]), null, SoundBukkit.PITCH_UNSET, SoundBukkit.VOLUME_UNSET));
+            return Optional.of(new SoundBukkit(SoundAccessor.valueOf(music[0]), null, SoundBukkit.PITCH_UNSET, SoundBukkit.VOLUME_UNSET));
         }
 
         if (music.length != 4 && music.length != 3) {
             throw new IllegalArgumentException("Invalid sound format: " + firstElement.get());
         }
 
-        org.bukkit.Sound sound = org.bukkit.Sound.valueOf(music[0]);
+        org.bukkit.Sound sound = SoundAccessor.valueOf(music[0]);
         SoundCategory category = music.length == 3 ? null : SoundCategory.valueOf(music[1]);
         float pitch = Float.parseFloat(music[music.length - 2]);
         float volume = Float.parseFloat(music[music.length - 1]);