From 4103496c644afc786734ca88ea01d1c05c49fca6 Mon Sep 17 00:00:00 2001 From: DaniFoldi Date: Mon, 8 Nov 2021 22:42:38 +0000 Subject: [PATCH] Overdue protocolize 2.0 update --- README.md | 8 --- build.gradle | 20 +++--- .../bungeegui/command/PluginCommand.java | 2 +- .../com/danifoldi/bungeegui/gui/GuiItem.java | 40 ++++++++--- .../com/danifoldi/bungeegui/gui/GuiSound.java | 2 +- .../bungeegui/main/BungeeGuiListener.java | 65 ++---------------- .../danifoldi/bungeegui/main/GuiHandler.java | 68 +++++++++++++++---- .../bungeegui/main/PlaceholderHandler.java | 57 ---------------- .../danifoldi/bungeegui/util/SlotUtil.java | 2 +- .../danifoldi/bungeegui/util/SoundUtil.java | 28 ++++---- src/main/resources/config.yml | 30 ++++---- 11 files changed, 131 insertions(+), 191 deletions(-) diff --git a/README.md b/README.md index 2aa0829..1332306 100644 --- a/README.md +++ b/README.md @@ -149,14 +149,6 @@ All messages support the placeholders in the table below. The API can be used to |`%vanished%`|Whether the player is vanished or not| |`%servername%`|The name of the server the player is connected to| |`%servermotd%`|The MOTD of the server the player is connected to| -|`%traffic_downstream_input%`|Traffic received from downstream| -|`%traffic_downstream_output%`|Traffic sent downstream| -|`%traffic_upstream_input%`|Traffic received upstream| -|`%traffic_upstream_output%`|Traffic sent upstream| -|`%traffic_downstream_input_last_minute%`|Traffic received from downstream in the last minute| -|`%traffic_downstream_output_last_minute%`|Traffic sent downstream in the last minute| -|`%traffic_upstream_input_last_minute%`|Traffic received upstream in the last minute| -|`%traffic_upstream_output_last_minute%`|Traffic sent upstream in the last minute| |`%luckperms_friendlyname%`|The friendly name of the player as set in LP _(LP required)_| |`%luckperms_prefix%`|The prefix of the player _(LP required)_| |`%luckperms_suffix%`|The suffix of the player _(LP required)_| diff --git a/build.gradle b/build.gradle index bd7c011..5f1eecc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,24 @@ plugins { id 'java' - id 'com.github.johnrengelman.shadow' version '7.0.0' + id 'com.github.johnrengelman.shadow' version '7.1.0' } group 'com.danifoldi' -version '1.2.7' -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +version '2.0.0' +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 repositories { mavenCentral() - maven { url 'https://jitpack.io/' } + google() maven { url 'https://papermc.io/repo/repository/maven-public/' } + maven { url 'https://jitpack.io/' } maven { url 'https://mvn.exceptionflug.de/repository/exceptionflug-public/' } } dependencies { compileOnly 'io.github.waterfallmc:waterfall-api:1.17-R0.1-SNAPSHOT' - compileOnly 'de.exceptionflug:protocolize-api:1.7.0-SNAPSHOT' - compileOnly 'de.exceptionflug:protocolize-items:1.7.0-SNAPSHOT' - compileOnly 'de.exceptionflug:protocolize-inventory:1.7.0-SNAPSHOT' - compileOnly 'de.exceptionflug:protocolize-world:1.7.0-SNAPSHOT' + compileOnly 'dev.simplix:protocolize-api:2.0.0' compileOnly 'net.luckperms:api:5.3' compileOnly 'com.github.LeonMangler:PremiumVanishAPI:2.6.3' @@ -31,8 +29,8 @@ dependencies { compileOnly 'org.jetbrains:annotations:21.0.1' implementation 'javax.inject:javax.inject:1' - implementation 'com.google.dagger:dagger:2.37' - annotationProcessor 'com.google.dagger:dagger-compiler:2.37' + implementation 'com.google.dagger:dagger:2.40' + annotationProcessor 'com.google.dagger:dagger-compiler:2.40' } processResources { diff --git a/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java b/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java index 8c06308..f6d8ea5 100644 --- a/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java +++ b/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java @@ -5,7 +5,7 @@ import com.danifoldi.bungeegui.util.Pair; import com.danifoldi.bungeegui.util.SoundUtil; import com.danifoldi.bungeegui.util.StringUtil; -import de.exceptionflug.protocolize.world.SoundCategory; +import dev.simplix.protocolize.api.SoundCategory; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; diff --git a/src/main/java/com/danifoldi/bungeegui/gui/GuiItem.java b/src/main/java/com/danifoldi/bungeegui/gui/GuiItem.java index bd29403..9ee5d3f 100644 --- a/src/main/java/com/danifoldi/bungeegui/gui/GuiItem.java +++ b/src/main/java/com/danifoldi/bungeegui/gui/GuiItem.java @@ -3,8 +3,8 @@ import com.danifoldi.bungeegui.util.Message; import com.danifoldi.bungeegui.util.Pair; import com.danifoldi.bungeegui.util.StringUtil; -import de.exceptionflug.protocolize.items.ItemStack; -import de.exceptionflug.protocolize.items.ItemType; +import dev.simplix.protocolize.api.item.ItemStack; +import dev.simplix.protocolize.data.ItemType; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.querz.nbt.tag.ByteTag; import net.querz.nbt.tag.CompoundTag; @@ -83,20 +83,42 @@ public boolean isEnchanted() { public @NotNull ItemStack toItemStack(ProxiedPlayer placeholderTarget, String player, String target) { final @NotNull ItemStack item = new ItemStack(this.getType()); - item.setAmount((byte)this.getAmount()); - item.setDisplayName(Message.toComponent(placeholderTarget, this.getName(), Pair.of("player", player), Pair.of("target", target))); - item.setLoreComponents(this.getLore().stream().map(l -> Message.toComponent(placeholderTarget, l, Pair.of("player", player), Pair.of("target", target))).collect(Collectors.toList())); + item + .amount((byte)this.getAmount()) + .displayName(Message.toComponent(placeholderTarget, this.getName(), Pair.of("player", player), Pair.of("target", target))) + .lore(this.getLore().stream().map(l -> Message.toComponent(placeholderTarget, l, Pair.of("player", player), Pair.of("target", target))).collect(Collectors.toList()), false); - if (item.isPlayerSkull()) { + if (item.itemType().equals(ItemType.PLAYER_HEAD)) { final Pair data = StringUtil.get(this.getData()); if (data.getFirst().equalsIgnoreCase("owner")) { - item.setSkullOwner(Message.replace(data.getSecond(), Pair.of("player", player), Pair.of("target", target))); + final @NotNull CompoundTag tag = item.nbtData(); + tag.put("SkullOwner", new StringTag(Message.replace(data.getSecond(), Pair.of("player", player), Pair.of("target", target)))); + item.nbtData(tag); } else if (data.getFirst().equalsIgnoreCase("texture")) { - item.setSkullTexture(Message.replace(data.getSecond(), Pair.of("player", player), Pair.of("target", target))); + final @NotNull CompoundTag tag = item.nbtData(); + @Nullable CompoundTag skullOwnerTag = tag.getCompoundTag("SkullOwner"); + @Nullable CompoundTag propertiesTag = tag.getCompoundTag("Properties"); + final @NotNull ListTag<@NotNull CompoundTag> texturesTag = new ListTag<>(CompoundTag.class); + final @NotNull CompoundTag textureTag = new CompoundTag(); + + if (skullOwnerTag == null) { + skullOwnerTag = new CompoundTag(); + } + if (propertiesTag == null) { + propertiesTag = new CompoundTag(); + } + + texturesTag.add(textureTag); + propertiesTag.put("textures", texturesTag); + skullOwnerTag.put("Properties", propertiesTag); + skullOwnerTag.put("Name", new StringTag(Message.replace(data.getSecond(), Pair.of("player", player), Pair.of("target", target)))); + + tag.put("SkullOwner", skullOwnerTag); + item.nbtData(tag); } } - final @NotNull CompoundTag tag = (CompoundTag)item.getNBTTag(); + final @NotNull CompoundTag tag = item.nbtData(); if (this.isEnchanted()) { final @NotNull ListTag enchantments = new ListTag<>(CompoundTag.class); diff --git a/src/main/java/com/danifoldi/bungeegui/gui/GuiSound.java b/src/main/java/com/danifoldi/bungeegui/gui/GuiSound.java index 75acaf7..88dbb76 100644 --- a/src/main/java/com/danifoldi/bungeegui/gui/GuiSound.java +++ b/src/main/java/com/danifoldi/bungeegui/gui/GuiSound.java @@ -1,7 +1,7 @@ package com.danifoldi.bungeegui.gui; import com.danifoldi.bungeegui.util.SoundUtil; -import de.exceptionflug.protocolize.world.SoundCategory; +import dev.simplix.protocolize.api.SoundCategory; import net.md_5.bungee.api.connection.ProxiedPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiListener.java b/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiListener.java index 6d6921d..0a68071 100644 --- a/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiListener.java +++ b/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiListener.java @@ -2,14 +2,10 @@ import com.danifoldi.bungeegui.gui.GuiGrid; import com.danifoldi.bungeegui.util.SoundUtil; -import de.exceptionflug.protocolize.inventory.Inventory; -import de.exceptionflug.protocolize.inventory.InventoryModule; -import de.exceptionflug.protocolize.inventory.InventoryType; -import de.exceptionflug.protocolize.inventory.event.InventoryClickEvent; -import de.exceptionflug.protocolize.inventory.event.InventoryCloseEvent; -import de.exceptionflug.protocolize.items.InventoryManager; -import de.exceptionflug.protocolize.items.PlayerInventory; -import de.exceptionflug.protocolize.items.event.PlayerInteractEvent; +import dev.simplix.protocolize.api.inventory.Inventory; +import dev.simplix.protocolize.api.inventory.InventoryClick; +import dev.simplix.protocolize.api.inventory.InventoryClose; +import dev.simplix.protocolize.data.inventory.InventoryType; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PlayerDisconnectEvent; import net.md_5.bungee.api.event.ServerSwitchEvent; @@ -38,63 +34,14 @@ public void onServerSwitch(final @NotNull ServerSwitchEvent event) { guiHandler.actions(event.getPlayer()); } - @EventHandler - @SuppressWarnings("unused") - public void onItemClick(final @NotNull PlayerInteractEvent event) { + /*public void onItemClick(final @NotNull PlayerInteractEvent event) { if (guiHandler.getOpenGui(event.getPlayer().getUniqueId()) != null) { return; } PlayerInventory inventory = InventoryManager.getInventory(event.getPlayer().getUniqueId()); guiHandler.interact(event.getPlayer(), inventory.getHeldItem()); - } - - @EventHandler - @SuppressWarnings("unused") - public void onInventoryClick(final @NotNull InventoryClickEvent event) { - final @NotNull ProxiedPlayer player = event.getPlayer(); - - final @Nullable GuiGrid openGui = guiHandler.getOpenGui(event.getPlayer().getUniqueId()); - if (openGui == null) { - return; - } - - final @NotNull Inventory inventory = event.getInventory(); - final int slot = event.getSlot(); - - if (inventory.getType().equals(InventoryType.PLAYER)) { - return; - } - if (slot == -999) { - return; - } - - if (inventory.getItem(slot) == null) { - return; - } - - if (openGui.getItems().get(slot).getClickSound() != null) { - if (SoundUtil.isValidSound(openGui.getItems().get(slot).getClickSound().getSoundName())) { - logger.warning("Sound " + openGui.getItems().get(slot).getClickSound().getSoundName() + " is probably invalid"); - } - openGui.getItems().get(slot).getClickSound().playFor(player); - } - - if (openGui.getItems().get(slot).getCommands().isEmpty()) { - return; - } - - final @NotNull String target = guiHandler.getGuiTarget(player.getUniqueId()); - - guiHandler.runCommand(player,openGui, slot, target); - guiHandler.close(player, true); - } - - @EventHandler - @SuppressWarnings("unused") - public void onInventoryClose(final @NotNull InventoryCloseEvent event) { - guiHandler.close(event.getPlayer(), false); - } + }*/ @EventHandler @SuppressWarnings("unused") diff --git a/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java b/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java index f454b17..3650df1 100644 --- a/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java +++ b/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java @@ -13,13 +13,11 @@ import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.EnumGetMethod; import dagger.Module; -import de.exceptionflug.protocolize.inventory.Inventory; -import de.exceptionflug.protocolize.inventory.InventoryModule; -import de.exceptionflug.protocolize.items.InventoryManager; -import de.exceptionflug.protocolize.items.ItemStack; -import de.exceptionflug.protocolize.items.ItemType; -import de.exceptionflug.protocolize.items.PlayerInventory; -import de.exceptionflug.protocolize.world.SoundCategory; +import dev.simplix.protocolize.api.Protocolize; +import dev.simplix.protocolize.api.SoundCategory; +import dev.simplix.protocolize.api.inventory.Inventory; +import dev.simplix.protocolize.data.ItemType; +import dev.simplix.protocolize.data.inventory.InventoryType; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.PluginManager; @@ -207,18 +205,18 @@ void removeGui(final @NotNull String name) { } void actions(final @NotNull ProxiedPlayer player) { - PlayerInventory inventory = InventoryManager.getInventory(player.getUniqueId()); + /*PlayerInventory inventory = InventoryManager.getInventory(player.getUniqueId()); guiActions .stream() .filter(a -> a.getServer().equalsIgnoreCase(player.getServer().getInfo().getName())) .forEach(a -> inventory.setItem(a.getSlot(), a.getGuiItem().toItemStack(player, player.getName(), ""))); - inventory.update(); + inventory.update();*/ } void interact(final @NotNull ProxiedPlayer player, final int slot) { - Optional action = guiActions + /*Optional action = guiActions .stream() .filter(a -> a.getServer().equalsIgnoreCase(player.getServer().getInfo().getName())) .filter(a -> a.getSlot() == slot) @@ -229,7 +227,7 @@ void interact(final @NotNull ProxiedPlayer player, final int slot) { guiAction.getGuiItem().getClickSound().playFor(player); } open(guiAction.getGui(), player, null); - }); + });*/ } void open(final @NotNull String name, final @NotNull ProxiedPlayer player, final @Nullable String target) { @@ -237,7 +235,7 @@ void open(final @NotNull String name, final @NotNull ProxiedPlayer player, final final ProxiedPlayer placeholderTarget = menus.get(name).isRequireOnlineTarget() && menus.get(name).isPlaceholdersTarget() && ProxyServer.getInstance().getPlayer(target) != null ? ProxyServer.getInstance().getPlayer(target) : player; final GuiGrid gui = menus.get(name); - final Inventory inventory = new Inventory(SlotUtil.getInventoryType(gui.getGuiSize()), Message.toComponent(placeholderTarget, gui.getTitle(), Pair.of("player", player.getName()), Pair.of("target", target))); + final Inventory inventory = new Inventory(SlotUtil.getInventoryType(gui.getGuiSize())).title(Message.toComponent(placeholderTarget, gui.getTitle(), Pair.of("player", player.getName()), Pair.of("target", target))); if (gui.getOpenSound() != null) { if (SoundUtil.isValidSound(gui.getOpenSound().getSoundName())) { @@ -256,10 +254,50 @@ void open(final @NotNull String name, final @NotNull ProxiedPlayer player, final continue; } - inventory.setItem(guiItem.getKey(), guiItem.getValue().toItemStack(placeholderTarget, player.getName(), target)); + inventory.item(guiItem.getKey(), guiItem.getValue().toItemStack(placeholderTarget, player.getName(), target)); } - InventoryModule.sendInventory(player, inventory); + inventory.onClick(event -> { + //final @NotNull ProxiedPlayer player = event.player().handle(); + + final @Nullable GuiGrid openGui = getOpenGui(player.getUniqueId()); + if (openGui == null) { + return; + } + + //final @NotNull Inventory inventory = event.inventory(); + final int slot = event.slot(); + + if (inventory.type().equals(InventoryType.PLAYER)) { + return; + } + if (slot == -999) { + return; + } + + if (inventory.item(slot) == null) { + return; + } + + if (openGui.getItems().get(slot).getClickSound() != null) { + if (SoundUtil.isValidSound(openGui.getItems().get(slot).getClickSound().getSoundName())) { + logger.warning("Sound " + openGui.getItems().get(slot).getClickSound().getSoundName() + " is probably invalid"); + } + openGui.getItems().get(slot).getClickSound().playFor(player); + } + + if (openGui.getItems().get(slot).getCommands().isEmpty()) { + return; + } + + //final @NotNull String target = guiHandler.getGuiTarget(player.getUniqueId()); + + runCommand(player,openGui, slot, target); + close(player, true); + }); + inventory.onClose(event -> close(event.player().handle(), false)); + + Protocolize.playerProvider().player(player.getUniqueId()).openInventory(inventory); openGuis.put(player.getUniqueId(), Pair.of(name, target)); } @@ -319,7 +357,7 @@ void close(final @NotNull ProxiedPlayer player, final boolean didClick) { logger.info("Removing gui from cache for " + player.getName()); openGuis.remove(player.getUniqueId()); - InventoryModule.closeAllInventories(player); + Protocolize.playerProvider().player(player.getUniqueId()).closeInventory(); } @Nullable GuiGrid getOpenGui(final @NotNull UUID uuid) { diff --git a/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java b/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java index 80f3074..fb2745e 100644 --- a/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java +++ b/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java @@ -3,7 +3,6 @@ import com.danifoldi.bungeegui.util.NumberUtil; import com.danifoldi.bungeegui.util.Pair; import com.danifoldi.bungeegui.util.VersionUtil; -import de.exceptionflug.protocolize.api.protocol.ProtocolAPI; import de.myzelyam.api.vanish.BungeeVanishAPI; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.user.User; @@ -202,62 +201,6 @@ void registerBuiltins() { return player.getServer().getInfo().getMotd(); }); - registerBuiltin("traffic_downstream_input", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getDownstreamInput()); - }); - - registerBuiltin("traffic_downstream_output", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getDownstreamOutput()); - }); - - registerBuiltin("traffic_upstream_input", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getUpstreamInput()); - }); - - registerBuiltin("traffic_upstream_output", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getUpstreamOutput()); - }); - - registerBuiltin("traffic_downstream_input_last_minute", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getDownstreamInputLastMinute()); - }); - - registerBuiltin("traffic_downstream_output_last_minute", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getDownstreamOutputLastMinute()); - }); - - registerBuiltin("traffic_upstream_input_last_minute", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getUpstreamInputLastMinute()); - }); - - registerBuiltin("traffic_upstream_output_last_minute", player -> { - if (player == null) { - return "0"; - } - return String.valueOf(ProtocolAPI.getTrafficManager().getTrafficData(player.getName()).getUpstreamOutputLastMinute()); - }); - registerBuiltin("luckperms_friendlyname", player -> { if (player == null) { return ""; diff --git a/src/main/java/com/danifoldi/bungeegui/util/SlotUtil.java b/src/main/java/com/danifoldi/bungeegui/util/SlotUtil.java index 94dab82..4a877e4 100644 --- a/src/main/java/com/danifoldi/bungeegui/util/SlotUtil.java +++ b/src/main/java/com/danifoldi/bungeegui/util/SlotUtil.java @@ -1,6 +1,6 @@ package com.danifoldi.bungeegui.util; -import de.exceptionflug.protocolize.inventory.InventoryType; +import dev.simplix.protocolize.data.inventory.InventoryType; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java b/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java index 380b1d2..a775232 100644 --- a/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java +++ b/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java @@ -1,10 +1,10 @@ package com.danifoldi.bungeegui.util; -import de.exceptionflug.protocolize.world.Location; -import de.exceptionflug.protocolize.world.Sound; -import de.exceptionflug.protocolize.world.SoundCategory; -import de.exceptionflug.protocolize.world.WorldModule; -import de.exceptionflug.protocolize.world.packet.NamedSoundEffect; +import dev.simplix.protocolize.api.Location; +import dev.simplix.protocolize.api.Protocolize; +import dev.simplix.protocolize.api.SoundCategory; +import dev.simplix.protocolize.data.Sound; +import dev.simplix.protocolize.data.packets.NamedSoundEffect; import net.md_5.bungee.api.connection.ProxiedPlayer; import org.jetbrains.annotations.NotNull; @@ -17,16 +17,16 @@ public static void playSound(final @NotNull ProxiedPlayer player, final float volume, final float pitch) { final @NotNull NamedSoundEffect soundEffect = new NamedSoundEffect(); - soundEffect.setCategory(category); - soundEffect.setPitch(pitch); - soundEffect.setVolume(volume); + soundEffect.category(category); + soundEffect.pitch(pitch); + soundEffect.volume(volume); final @NotNull Pair name = StringUtil.get(soundName); - soundEffect.setSound(name.getFirst().equalsIgnoreCase("custom") ? name.getSecond() : correct(name.getSecond())); - final @NotNull Location location = WorldModule.getLocation(player.getUniqueId()); - soundEffect.setX(location.getX()); - soundEffect.setY(location.getY()); - soundEffect.setZ(location.getZ()); - player.unsafe().sendPacket(soundEffect); + soundEffect.sound(name.getFirst().equalsIgnoreCase("custom") ? name.getSecond() : correct(name.getSecond())); + final @NotNull Location location = Protocolize.playerProvider().player(player.getUniqueId()).location(); + soundEffect.x(location.x()); + soundEffect.y(location.y()); + soundEffect.z(location.z()); + Protocolize.playerProvider().player(player.getUniqueId()).sendPacket(soundEffect); } public static boolean isValidSound(final @NotNull String soundName) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fc316f5..d7c69d6 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -150,71 +150,71 @@ guis: '10': type: zombie_head clickSound: - sound: entity_zombie_ambient + sound: entity.zombie.ambient '12': type: creeper_head clickSound: - sound: entity_creeper_primed + sound: entity.creeper.primed '14': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTcxNTI4NzZiYzNhOTZkZDJhMjI5OTI0NWVkYjNiZWVmNjQ3YzhhNTZhYzg4NTNhNjg3YzNlN2I1ZDhiYiJ9fX0= clickSound: - sound: entity_puffer_fish_blow_up + sound: entity.puffer_fish.blow_up '16': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmNhNDQ1NzQ5MjUxYmRkODk4ZmI4M2Y2Njc4NDRlMzhhMWRmZjc5YTE1MjlmNzlhNDI0NDdhMDU5OTMxMGVhNCJ9fX0= clickSound: - sound: entity_skeleton_ambient + sound: entity.skeleton.ambient '20': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzEzNWY1ODM4ZTUxNTg1ZTE1OTQyZThmMmYxY2MzNmRhOTYzMDcwZGRkNWJhMzVhZjk1ZWQzN2ViNmMzIn19fQ== clickSound: - sound: entity_parrot_ambient + sound: entity.parrot.ambient '22': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzQwMDk3MjcxYmI2ODBmZTk4MWU4NTllOGJhOTNmZWEyOGI4MTNiMTA0MmJkMjc3ZWEzMzI5YmVjNDkzZWVmMyJ9fX0= clickSound: - sound: entity_cat_ambient + sound: entity.cat.ambient '24': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmU4OWQ3NDQ3NWIyZmMxYTJiMjE1Y2ZjY2ZkODY1NTkyYjg1ODQzYjkyNjBlZjY3MzA0YzJkYmNjNGJiMCJ9fX0= clickSound: - sound: entity_wolf_howl + sound: entity.wolf.howl volume: 0.2 '28': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjA3MmQ4Y2I4Mzk1YzJiYzg0NTQ3ZTZhYzliOGVkZWVkNzhjODY1OGMwZWQxYjg4M2M2MjljM2E3ZTkwIn19fQ== clickSound: - sound: entity_polar_bear_warning + sound: entity.polar_bear.warning '30': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODk1YWVlYzZiODQyYWRhODY2OWY4NDZkNjViYzQ5NzYyNTk3ODI0YWI5NDRmMjJmNDViZjNiYmI5NDFhYmU2YyJ9fX0= clickSound: - sound: entity_slime_jump + sound: entity.slime.jump '32': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2YzN2Q1MjRjM2VlZDE3MWNlMTQ5ODg3ZWExZGVlNGVkMzk5OTA0NzI3ZDUyMTg2NTY4OGVjZTNiYWM3NWUifX19 clickSound: - sound: entity_chicken_ambient + sound: entity.chicken.ambient '34': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGJkYTFkZjgwYmZhMzE0ODUzMzhkOTYzMzgzZDhkZTI2ZjA1ZjI5MzRmODc1Njk2ODYyNDU0ZTdjNzBmNDVmNiJ9fX0= clickSound: - sound: entity_cow_ambient + sound: entity.cow.ambient '38': type: dragon_head clickSound: - sound: entity_ender_dragon_ambient + sound: entity.ender_dragon.ambient '40': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjVjNGQyNGFmZmRkNDgxMDI2MjAzNjE1MjdkMjE1NmUxOGMyMjNiYWU1MTg5YWM0Mzk4MTU2NDNmM2NmZjlkIn19fQ== clickSound: - sound: block_shulker_box_open + sound: block.shulker_box.open '42': type: player_head data: texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGYwMDg1ODkyNmNkOGNkZjNmMWNmNzFlMjEwY2RlNWRhZjg3MDgzMjA1NDdiZDZkZjU3OTU4NTljNjhkOWIzZiJ9fX0= clickSound: - sound: entity_panda_worried_ambient + sound: entity.panda.worried_ambient configVersion: 3 -debugLevel: all \ No newline at end of file +debugLevel: all