From 8bcfca02926b6317707aa8adbfa903068a405601 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 24 Jun 2023 20:38:29 +0200 Subject: [PATCH] Migrate usage of CompatibleSound to XSound in the CraftaroCore-Snapshot --- .../main/java/com/craftaro/epicanchors/AnchorManagerImpl.java | 4 ++-- .../main/java/com/craftaro/epicanchors/guis/AnchorGui.java | 4 ++-- .../com/craftaro/epicanchors/listener/AnchorListener.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java index 4fbdd64..7c19a56 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java @@ -3,9 +3,9 @@ package com.craftaro.epicanchors; import com.craftaro.core.SongodaPlugin; import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleParticleHandler; -import com.craftaro.core.compatibility.CompatibleSound; import com.craftaro.core.hooks.HologramManager; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; @@ -287,7 +287,7 @@ public class AnchorManagerImpl implements AnchorManager { } // Particles & Sound - anchor.getWorld().playSound(anchorLoc, CompatibleSound.ENTITY_GENERIC_EXPLODE.getSound(), 10, 10); + XSound.ENTITY_GENERIC_EXPLODE.play(anchorLoc, 10, 10); CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.getParticle(Settings.PARTICLE_DESTROY.getString()), anchor.getLocation().add(.5, .5, .5), 100, .5, .5, .5); diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java index 4d79980..dfaf051 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java @@ -1,11 +1,11 @@ package com.craftaro.epicanchors.guis; import com.craftaro.core.compatibility.CompatibleParticleHandler; -import com.craftaro.core.compatibility.CompatibleSound; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; import com.craftaro.epicanchors.EpicAnchors; @@ -84,7 +84,7 @@ public class AnchorGui extends Gui { if (success) { anchor.addTicksLeft(20 * 60 * 30); // 30 minutes - p.playSound(p.getLocation(), CompatibleSound.ENTITY_PLAYER_LEVELUP.getSound(), 0.6F, 15); + XSound.ENTITY_PLAYER_LEVELUP.play(p, .6f, 15); CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.getParticle(Settings.PARTICLE_UPGRADE.getString()), anchor.getLocation().add(.5, .5, .5), 100, .5, .5, .5); } else { diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java index e530ce5..58a2ce6 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java @@ -2,7 +2,7 @@ package com.craftaro.epicanchors.listener; import com.craftaro.core.compatibility.CompatibleHand; import com.craftaro.core.compatibility.CompatibleParticleHandler; -import com.craftaro.core.compatibility.CompatibleSound; +import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.epicanchors.AnchorManagerImpl; import com.craftaro.epicanchors.EpicAnchors; import com.craftaro.epicanchors.api.Anchor; @@ -110,7 +110,7 @@ public class AnchorListener implements Listener { CompatibleHand.MAIN_HAND.takeItem(p, 1); } - p.playSound(p.getLocation(), CompatibleSound.ENTITY_PLAYER_LEVELUP.getSound(), .6F, 15); + XSound.ENTITY_PLAYER_LEVELUP.play(p, .6f, 15); CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.getParticle(Settings.PARTICLE_UPGRADE.getString()), anchor.getLocation().add(.5, .5, .5), 100, .5, .5, .5); }