Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2026-01-06 15:41:35 +00:00
Code Issues Releases Activity

Remove use of XSound

Browse Source
This commit is contained in:
SamB440
2023-11-18 14:48:14 +00:00
parent 8bb40b3eb0
commit 35336884a7
4 changed files with 7 additions and 2123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2117
api/src/main/java/net/islandearth/rpgregions/utils/XSound.java
View File

File diff suppressed because it is too large Load Diff

6
rpgregions/src/main/java/net/islandearth/rpgregions/gui/QueryGUI.java
View File

@@ -7,8 +7,8 @@ import net.islandearth.rpgregions.RPGRegions;
import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
import net.islandearth.rpgregions.managers.registry.IRPGRegionsRegistry;
import net.islandearth.rpgregions.utils.ItemStackBuilder;
import net.islandearth.rpgregions.utils.XSound;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -31,11 +31,11 @@ public class QueryGUI extends RPGRegionsGUI {
.build();
GuiItem addRegistryGuiItem = new GuiItem(add, click -> {
new AddRegionElementGUI(plugin, player, region, registry).open();
XSound.ITEM_BOOK_PAGE_TURN.play(player, 1f, 1f);
player.playSound(player, Sound.ITEM_BOOK_PAGE_TURN, 1f, 1f);
});
GuiItem editRegistryGuiItem = new GuiItem(edit, click -> {
new EditRegionElementGUI(plugin, player, region, registry).open();
XSound.ITEM_BOOK_PAGE_TURN.play(player, 1f, 1f);
player.playSound(player, Sound.ITEM_BOOK_PAGE_TURN, 1f, 1f);
});
items.add(addRegistryGuiItem);
items.add(editRegistryGuiItem);

3
rpgregions/src/main/java/net/islandearth/rpgregions/listener/ConnectionListener.java
View File

@@ -28,7 +28,7 @@ public record ConnectionListener(RPGRegions plugin) implements Listener {
public void onJoin(PlayerJoinEvent event) {
final Player player = event.getPlayer();
if (!plugin.getManagers().getStorageManager().getCachedAccounts().synchronous().asMap().containsKey(player.getUniqueId())) {
player.kickPlayer(ChatColor.RED + "Player user data not present! Please contact an administrator.");
player.kickPlayer(ChatColor.RED + "[RPGRegions] Player user data not present! Please contact an administrator.");
return;
}
@@ -48,6 +48,7 @@ public record ConnectionListener(RPGRegions plugin) implements Listener {
"<gradient:gold:yellow>As the plugin has been newly installed, you will need to:"));
audience.sendMessage(miniMessage.deserialize("" +
"<gradient:gold:yellow> - Set the correct region implementation you wish to use in the config.yml."));
audience.sendMessage(miniMessage.deserialize("<gradient:gold:yellow> - Make sure you set the correct permissions. If you are OP or have all perms, you will bypass region requirements etc."));
audience.sendMessage(miniMessage.deserialize(
"<gradient:gold:yellow> - Setup a database if you will be dealing with high player counts." +
" <red><bold>Note: Migration is currently not possible."));

4
rpgregions/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java
View File

@@ -11,9 +11,9 @@ import net.islandearth.rpgregions.translation.Translations;
import net.islandearth.rpgregions.utils.RegenUtils;
import net.islandearth.rpgregions.utils.TimeEntry;
import net.islandearth.rpgregions.utils.TitleAnimator;
import net.islandearth.rpgregions.utils.XSound;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -137,7 +137,7 @@ public class RegionListener implements Listener {
if (region.getSound() == null) {
player.playSound(
player.getLocation(),
XSound.valueOf(plugin.getConfig().getString("settings.server.discoveries.discovered.sound.name")).parseSound(),
Sound.valueOf(plugin.getConfig().getString("settings.server.discoveries.discovered.sound.name")),
1,
plugin.getConfig().getInt("settings.server.discoveries.discovered.sound.pitch")
);