Merge branch 'master' into development

The CompatibleSound class will be removed from the Core and this ensures compatibility with
new versions of the Core and newer Minecraft versions

README.md

@@ -1,21 +1,22 @@
 <!--suppress HtmlDeprecatedAttribute -->
 <div align="center">
-<img src="https://craftaro.com/images/products/509/icons/5EJsLZfmeHcwy9rIY0dAgnzqR4rL4iCKAEyjgjIk.png" width="128px">
+<img src="docs/Logo.png" width="128px">
 
 # EpicVouchers
-Create vouchers that players can claim for rewards with seemingly infinite possibilities. Customize your server’s vouchers through an intuitive in-game editor
+**Create vouchers that players can claim for rewards with seemingly infinite possibilities**
+**Customize your server&#39;s vouchers through an intuitive in-game editor**
 
 
 [![Discord][Discord shield]][Discord invite]
 [![Patreon][Patreon shield]][Patreon page]
 <br>
-[![Latest version][Latest version shield]][Marketplace page]
+[![Latest version][Latest version shield]][Plugin page]
 [![bStats Servers][bStats shield]][bStats page]
 </div>
 
 
 ## Download (Marketplace)
-You can visit [our marketplace][Marketplace page] to download EpicVouchers as well as take a
+You can visit [our marketplace][Plugin page] to download EpicVouchers as well as take a
 look at many other fantastic plugins which are sure to catch your eye.
 
 ## Documentation
@@ -33,13 +34,13 @@ For suggestions about features you think should be added to the plugin to increa
 create a thread over on [our Discord server][Discord invite].
 
 
-[Marketplace page]: https://craftaro.com/marketplace/product/25
+[Plugin page]: https://songoda.com/product/12
 [Plugin wiki]: https://wiki.craftaro.com/index.php/Epic_Vouchers
 [Patreon page]: https://www.patreon.com/join/songoda
-[Discord invite]: https://discord.gg/craftaro
+[Discord invite]: https://discord.gg/7TXM8xr2Ng
 [bStats page]: https://bstats.org/plugin/bukkit/EpicVouchers/4209
 
 [Patreon shield]: https://img.shields.io/badge/-Support_us_on_Patreon-F96854.svg?logo=patreon&style=flat&logoColor=white
-[Discord shield]: https://img.shields.io/discord/293212540723396608?color=5865F2&label=Discord&logo=discord&logoColor=5865F2
+[Discord shield]: https://img.shields.io/discord/1214289374506917889?color=5865F2&label=Discord&logo=discord&logoColor=5865F2
 [bStats shield]: https://img.shields.io/bstats/servers/4209?label=Servers
 [Latest version shield]: https://img.shields.io/badge/dynamic/xml?style=flat&color=blue&logo=github&logoColor=white&label=Latest&url=https%3A%2F%2Fraw.githubusercontent.com%2Fcraftaro%2FEpicVouchers%2Fmaster%2Fpom.xml&query=%2F*%5Blocal-name()%3D'project'%5D%2F*%5Blocal-name()%3D'version'%5D

src/main/java/com/craftaro/epicvouchers/voucher/VoucherExecutor.java

@@ -1,10 +1,10 @@
 package com.craftaro.epicvouchers.voucher;
 
-import com.craftaro.core.compatibility.CompatibleSound;
 import com.craftaro.core.compatibility.ServerVersion;
 import com.craftaro.epicvouchers.EpicVouchers;
 import com.craftaro.epicvouchers.events.VoucherRedeemEvent;
 import com.craftaro.epicvouchers.listeners.PlayerCommandListener;
+import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Effect;
@@ -15,6 +15,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
+import java.util.Optional;
 import java.util.logging.Level;
 
 public class VoucherExecutor {
@@ -142,11 +143,8 @@ public class VoucherExecutor {
                 }
 
                 if (voucher.getSound() != null && !voucher.getSound().isEmpty()) {
-                    try {
-                        CompatibleSound sound = CompatibleSound.valueOf(voucher.getSound());
-                        sound.play(player, Integer.MAX_VALUE, voucher.getSoundPitch());
-                    } catch (IllegalArgumentException ignored) {
-                    }
+                    Optional<XSound> sound = XSound.matchXSound(voucher.getSound());
+                    sound.ifPresent(xSound -> xSound.play(player, 1.0f, voucher.getSoundPitch()));
                 }
 
                 String particle = voucher.getParticle();