Merge branch 'oraxen:master' into dev/update

build.gradle.kts

@@ -35,7 +35,7 @@ val devPluginPath = project.findProperty("oraxen_dev_plugin_path")?.toString()
 val foliaPluginPath = project.findProperty("oraxen_folia_plugin_path")?.toString()
 val spigotPluginPath = project.findProperty("oraxen_spigot_plugin_path")?.toString()
 val pluginVersion: String by project
-val commandApiVersion = "9.5.1"
+val commandApiVersion = "9.5.3"
 val adventureVersion = "4.17.0"
 val platformVersion = "4.3.3"
 val googleGsonVersion = "2.10.1"
@@ -101,6 +101,7 @@ allprojects {
         compileOnly("nl.rutgerkok:blocklocker:1.10.4-SNAPSHOT")
         compileOnly("org.apache.commons:commons-lang3:$apacheLang3Version")
 
+        implementation("team.unnamed:creative-api:1.7.3") { exclude("net.kyori") }
         implementation("dev.jorel:commandapi-bukkit-shade:$commandApiVersion")
         implementation("org.bstats:bstats-bukkit:3.0.0")
         implementation("io.th0rgal:protectionlib:1.6.0")
@@ -110,7 +111,6 @@ allprojects {
         implementation("com.jeff-media:persistent-data-serializer:1.0")
         implementation("org.jetbrains:annotations:24.1.0") { isTransitive = false }
         implementation("dev.triumphteam:triumph-gui:3.1.10") { exclude("net.kyori") }
-        implementation("com.ticxo:PlayerAnimator:R1.2.8") { isChanging = true }
 
         implementation("me.gabytm.util:actions-spigot:$actionsVersion") { exclude(group = "com.google.guava") }
     }
@@ -215,8 +215,6 @@ bukkit {
         "net.kyori:adventure-platform-bukkit:$platformVersion",
         "com.google.code.gson:gson:$googleGsonVersion",
         "org.apache.commons:commons-lang3:$apacheLang3Version",
-        "team.unnamed:creative-api:1.7.3",
-        "team.unnamed:creative-serializer-minecraft:1.7.3",
         "gs.mclo:java:2.2.1",
     )
 }

core/src/main/java/io/th0rgal/oraxen/OraxenPlugin.java

@@ -1,7 +1,6 @@
 package io.th0rgal.oraxen;
 
 import com.comphenix.protocol.ProtocolLibrary;
-import com.ticxo.playeranimator.PlayerAnimatorImpl;
 import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPIBukkitConfig;
 import io.th0rgal.oraxen.api.OraxenItems;
@@ -12,7 +11,6 @@
 import io.th0rgal.oraxen.font.FontManager;
 import io.th0rgal.oraxen.font.packets.InventoryPacketListener;
 import io.th0rgal.oraxen.font.packets.TitlePacketListener;
-import io.th0rgal.oraxen.gestures.GestureManager;
 import io.th0rgal.oraxen.hud.HudManager;
 import io.th0rgal.oraxen.items.ItemUpdater;
 import io.th0rgal.oraxen.mechanics.MechanicsManager;
@@ -45,7 +43,6 @@
 public class OraxenPlugin extends JavaPlugin {
 
     private static OraxenPlugin oraxen;
-    private static GestureManager gestureManager;
     private ConfigsManager configsManager;
     private ResourcesManager resourceManager;
     private BukkitAudiences audience;
@@ -84,7 +81,6 @@ public void onLoad() {
     public void onEnable() {
         CommandAPI.onEnable();
         ProtectionLib.init(this);
-        if (!VersionUtil.atOrAbove("1.20.3")) PlayerAnimatorImpl.initialize(this);
         audience = BukkitAudiences.create(this);
         clickActionManager = new ClickActionManager(this);
         supportsDisplayEntities = VersionUtil.atOrAbove("1.19.4");
@@ -109,7 +105,6 @@ public void onEnable() {
         hudManager = new HudManager(configsManager);
         fontManager = new FontManager(configsManager);
         soundManager = new SoundManager(configsManager.getSound());
-        if (!VersionUtil.atOrAbove("1.20.3")) gestureManager = new GestureManager();
         OraxenItems.loadItems();
         fontManager.registerEvents();
         fontManager.verifyRequired(); // Verify the required glyph is there
@@ -155,10 +150,6 @@ public ResourcesManager getResourceManager() {
         return resourceManager;
     }
 
-    public GestureManager getGesturesManager() {
-        return gestureManager;
-    }
-
     public BukkitAudiences getAudience() {
         return audience;
     }

core/src/main/java/io/th0rgal/oraxen/commands/CommandsManager.java

@@ -38,7 +38,6 @@ public void loadCommands() {
                         (new BlockInfoCommand()).getBlockInfoCommand(),
                         (new HudCommand()).getHudCommand(),
                         (new LogDumpCommand().getLogDumpCommand()),
-                        (new GestureCommand().getGestureCommand()),
                         (new VersionCommand()).getVersionCommand(),
                         (new AdminCommand()).getAdminCommand())
                 .executes((sender, args) -> {

core/src/main/java/io/th0rgal/oraxen/commands/ReloadCommand.java

@@ -71,11 +71,6 @@ public static void reloadHud(@Nullable CommandSender sender) {
         hudManager.restartTask();
     }
 
-    public static void reloadGestures(@Nullable CommandSender sender) {
-        Message.RELOAD.send(sender, AdventureUtils.tagResolver("reloaded", "gestures"));
-        OraxenPlugin.get().getGesturesManager().reload();
-    }
-
     public static void reloadRecipes(@Nullable CommandSender sender) {
         Message.RELOAD.send(sender, AdventureUtils.tagResolver("reloaded", "recipes"));
         RecipesManager.reload();

core/src/main/java/io/th0rgal/oraxen/config/RemovedSettings.java

@@ -24,6 +24,7 @@ public enum RemovedSettings {
     NMS_BLOCK_CORRECTION("Plugin.experimental.nms.block_correction"),
     SPIGOT_CHAT_FORMATTING("Plugin.experimental.spigot_chat_formatting"),
     ORAXEN_INV_TYPE("oraxen_inventory.main_menu_type"),
+    GESTURES_ENABLED("Gestures.enabled")
 
     ;
 

core/src/main/java/io/th0rgal/oraxen/config/Settings.java

@@ -61,9 +61,6 @@ public enum Settings {
     CUSTOM_ARMOR_SHADER_GENERATE_CUSTOM_TEXTURES("CustomArmor.shader_settings.generate_custom_armor_textures"),
     CUSTOM_ARMOR_SHADER_GENERATE_SHADER_COMPATIBLE_ARMOR("CustomArmor.shader_settings.generate_shader_compatible_armor"),
 
-
-    GESTURES_ENABLED("Gestures.enabled"),
-
     // Custom Blocks
     BLOCK_CORRECTION("CustomBlocks.block_correction"),
     LEGACY_NOTEBLOCKS("CustomBlocks.use_legacy_noteblocks"),