diff --git a/build.gradle b/build.gradle index 6117cd3..28416ff 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation "de.maxhenkel.voicechat:voicechat-api:${voicechat_api_version}" shadow "dev.jorel:commandapi-bukkit-shade:${command_api_version}" - compileOnly group: "com.comphenix.protocol", name: "ProtocolLib", version: "5.1.0"; + compileOnly group: "com.comphenix.protocol", name: "ProtocolLib", version: "5.3.0"; } repositories { diff --git a/gradle.properties b/gradle.properties index 686413e..55239be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,13 +5,13 @@ java_version=21 mp3spi_version=1.9.5.4 bukkit_api_version=1.21 -bukkit_version=1.21.4-R0.1-SNAPSHOT +bukkit_version=1.21.5-R0.1-SNAPSHOT mod_id=customdiscsplugin # Target an older API to make it compatible with older versions of Simple Voice Chat -voicechat_api_version=2.5.0 -command_api_version=9.7.0 +voicechat_api_version=2.3.3 +command_api_version=10.0.1 -plugin_version=4.3 +plugin_version=4.4 maven_group=me.Navoei.customdiscsplugin archives_base_name=custom-discs \ No newline at end of file diff --git a/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java b/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java index 7f96750..56e631c 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java +++ b/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java @@ -34,7 +34,7 @@ public final class CustomDiscs extends JavaPlugin { public static YamlConfiguration LANG; public static File LANG_FILE; public float musicDiscDistance; - public float musicDiscMaxDistance; + public float musicDiscMaxDistance; public float musicDiscVolume; @Override diff --git a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateSubCommand.java b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateSubCommand.java index f1febed..ca8f802 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateSubCommand.java +++ b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateSubCommand.java @@ -5,9 +5,6 @@ import dev.jorel.commandapi.arguments.ArgumentSuggestions; import dev.jorel.commandapi.arguments.StringArgument; import dev.jorel.commandapi.arguments.TextArgument; import dev.jorel.commandapi.executors.CommandArguments; -import io.papermc.paper.datacomponent.DataComponentTypes; -import io.papermc.paper.datacomponent.item.JukeboxPlayable; -import io.papermc.paper.datacomponent.item.ShownInTooltip; import me.Navoei.customdiscsplugin.CustomDiscs; import me.Navoei.customdiscsplugin.language.Lang; import net.kyori.adventure.text.Component; @@ -18,10 +15,8 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.*; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.inventory.meta.MusicInstrumentMeta; import org.bukkit.inventory.meta.components.JukeboxPlayableComponent; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; diff --git a/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java b/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java index a72ea7d..e8cfc0a 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java +++ b/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java @@ -44,6 +44,7 @@ public class JukeBox implements Listener{ if (event.getAction() != Action.RIGHT_CLICK_BLOCK || event.getClickedBlock() == null || event.getItem() == null || event.getItem().getItemMeta() == null || block == null) return; if (event.getClickedBlock().getType() != Material.JUKEBOX) return; + if (player.isSneaking()) return; if (isCustomMusicDisc(event.getItem()) && !jukeboxContainsDisc(block)) {