From cbae1a2619dfda7570231a3d305c1e59a16edb9d Mon Sep 17 00:00:00 2001 From: RonanCraft Date: Mon, 7 Mar 2022 14:26:52 -0500 Subject: [PATCH] project clean up + es translation update zFoxy#1717 --- .../SuperRonanCraft/BetterRTP/BetterRTP.java | 2 +- .../BetterRTP/player/commands/Commands.java | 20 +---- .../player/commands/types/CmdLocation.java | 2 +- .../player/commands/types/CmdPlayer.java | 4 +- .../BetterRTP/player/events/Click.java | 5 +- .../BetterRTP/player/events/Leave.java | 2 +- .../BetterRTP/player/events/Teleport.java | 4 +- .../BetterRTP/player/rtp/RTP.java | 3 +- .../BetterRTP/player/rtp/RTPDelay.java | 2 +- .../BetterRTP/player/rtp/RTPPlayer.java | 3 +- .../BetterRTP/player/rtp/RTPTeleport.java | 3 + .../BetterRTP/player/rtp/queue/RTPQueue.java | 2 +- .../{customEvents => events}/RTPEvent.java | 2 +- .../RTP_CancelledEvent.java | 3 +- .../RTP_CommandEvent.java | 4 +- .../RTP_FindLocationEvent.java | 4 +- .../RTP_SettingUpEvent.java | 2 +- .../RTP_TeleportEvent.java | 4 +- .../RTP_TeleportPostEvent.java | 4 +- .../RTP_TeleportPreEvent.java | 4 +- .../invs/enums/RTPInventory_Defaults.java | 5 +- .../{systems => player}/HelperPlayer.java | 4 +- .../playerdata/PlayerData.java | 2 +- .../playerdata/PlayerDataManager.java | 2 +- .../playerdata/PlayerData_Menus.java | 2 +- .../references/rtpinfo/CooldownHandler.java | 6 +- src/main/resources/lang/es.yml | 86 +++++++++---------- 27 files changed, 80 insertions(+), 106 deletions(-) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTPEvent.java (84%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_CancelledEvent.java (80%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_CommandEvent.java (77%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_FindLocationEvent.java (82%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_SettingUpEvent.java (88%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_TeleportEvent.java (83%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_TeleportPostEvent.java (84%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{customEvents => events}/RTP_TeleportPreEvent.java (70%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{systems => player}/HelperPlayer.java (75%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{systems => player}/playerdata/PlayerData.java (90%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{systems => player}/playerdata/PlayerDataManager.java (92%) rename src/main/java/me/SuperRonanCraft/BetterRTP/references/{systems => player}/playerdata/PlayerData_Menus.java (85%) diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java index bfb927d..4438d21 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java @@ -14,7 +14,7 @@ import me.SuperRonanCraft.BetterRTP.references.file.Messages; import me.SuperRonanCraft.BetterRTP.references.invs.RTPInventories; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownHandler; import me.SuperRonanCraft.BetterRTP.references.settings.Settings; -import me.SuperRonanCraft.BetterRTP.references.systems.playerdata.PlayerDataManager; +import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerDataManager; import me.SuperRonanCraft.BetterRTP.references.web.Metrics; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java index 2b4a721..2a8c28d 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java @@ -5,7 +5,7 @@ import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownHandler; import me.SuperRonanCraft.BetterRTP.player.rtp.RTPSetupInformation; import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE; -import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CommandEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_CommandEvent; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldLocations; import org.bukkit.Bukkit; @@ -49,19 +49,15 @@ public class Commands { //Command Event Bukkit.getServer().getPluginManager().callEvent(new RTP_CommandEvent(sendi, cmd)); } else - noPerm(sendi); + pl.getText().getNoPermission(sendi); return; } } - invalid(sendi, label); + pl.getText().getInvalid(sendi, label); } else rtp(sendi, label, null, null); } else - noPerm(sendi); - } - - private void invalid(CommandSender sendi, String cmd) { - pl.getText().getInvalid(sendi, cmd); + pl.getText().getNoPermission(sendi); } public List onTabComplete(CommandSender sendi, String[] args) { @@ -125,14 +121,6 @@ public class Commands { return biomes; } - public void playerNotOnline(CommandSender sendi, String player) { - pl.getText().getNotOnline(sendi, player); - } - - private void noPerm(CommandSender sendi) { - pl.getText().getNoPermission(sendi); - } - public void tp(Player player, CommandSender sendi, String world, List biomes, RTP_TYPE rtpType) { this.tp(player, sendi, world, biomes, rtpType, false, false); } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java index 4f4b0ec..2903536 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java @@ -48,7 +48,7 @@ public class CmdLocation implements RTPCommand, RTPCommandHelpable { } usage(sendi, label); } else if (p != null) - getCmd().playerNotOnline(sendi, args[1]); + BetterRTP.getInstance().getText().getNotOnline(sendi, args[1]); else usage(sendi, label); } else diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java index 5e6f63e..ada59e3 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java @@ -26,7 +26,7 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable { if (Bukkit.getPlayer(args[1]) != null && Bukkit.getPlayer(args[1]).isOnline()) getCmd().tp(Bukkit.getPlayer(args[1]), sendi, Bukkit.getPlayer(args[1]).getWorld().getName(), null, RTP_TYPE.FORCED); else if (Bukkit.getPlayer(args[1]) != null) - getCmd().playerNotOnline(sendi, args[1]); + BetterRTP.getInstance().getText().getNotOnline(sendi, args[1]); else usage(sendi, label); else if (args.length >= 3) @@ -37,7 +37,7 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable { } else BetterRTP.getInstance().getText().getNotExist(sendi, args[2]); } else if (Bukkit.getPlayer(args[1]) != null) - getCmd().playerNotOnline(sendi, args[1]); + BetterRTP.getInstance().getText().getNotOnline(sendi, args[1]); else usage(sendi, label); else diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java index fdfb6cf..a0a9b3c 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java @@ -2,9 +2,8 @@ package me.SuperRonanCraft.BetterRTP.player.events; import me.SuperRonanCraft.BetterRTP.references.invs.RTPInventories; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.player.PlayerInfo; -import me.SuperRonanCraft.BetterRTP.references.systems.HelperPlayer; -import me.SuperRonanCraft.BetterRTP.references.systems.playerdata.PlayerData; +import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; +import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java index dc4a7f6..477b1d6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java @@ -1,6 +1,6 @@ package me.SuperRonanCraft.BetterRTP.player.events; -import me.SuperRonanCraft.BetterRTP.references.systems.HelperPlayer; +import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerQuitEvent; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Teleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Teleport.java index e14a26d..9abb2ca 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Teleport.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Teleport.java @@ -1,7 +1,7 @@ package me.SuperRonanCraft.BetterRTP.player.events; -import me.SuperRonanCraft.BetterRTP.references.systems.HelperPlayer; -import me.SuperRonanCraft.BetterRTP.references.systems.playerdata.PlayerData; +import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; +import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java index 1b0b84b..28081a7 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java @@ -1,9 +1,8 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; import lombok.Getter; -import me.RonanCraft.Pueblos.resources.tools.HelperEvent; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_SettingUpEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_SettingUpEvent; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.*; import org.bukkit.Bukkit; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java index ce2e240..1e0f8a6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java @@ -1,7 +1,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CancelledEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_CancelledEvent; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java index 9129f96..9cb8445 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java @@ -1,6 +1,6 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; -import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_FindLocationEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_FindLocationEvent; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer; import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; @@ -15,7 +15,6 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.logging.Level; public class RTPPlayer { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java index b344813..d06ecd3 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java @@ -3,6 +3,9 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.customEvents.*; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_TeleportEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_TeleportPostEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_TeleportPreEvent; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WORLD_TYPE; import org.bukkit.Chunk; import org.bukkit.Location; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/queue/RTPQueue.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/queue/RTPQueue.java index 8ab9aa6..76640e6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/queue/RTPQueue.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/queue/RTPQueue.java @@ -1,7 +1,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp.queue; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_FindLocationEvent; +import me.SuperRonanCraft.BetterRTP.references.events.RTP_FindLocationEvent; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTPEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTPEvent.java similarity index 84% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTPEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTPEvent.java index 93154de..820f996 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTPEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTPEvent.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_CancelledEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_CancelledEvent.java similarity index 80% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_CancelledEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_CancelledEvent.java index 5d51685..a23e14f 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_CancelledEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_CancelledEvent.java @@ -1,7 +1,6 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import org.bukkit.entity.Player; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; public class RTP_CancelledEvent extends RTPEvent { //Called when a delayed rtp is cancelled cause player moved diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_CommandEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_CommandEvent.java similarity index 77% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_CommandEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_CommandEvent.java index 3f3ab41..441b3ec 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_CommandEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_CommandEvent.java @@ -1,9 +1,7 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand; -import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandType; import org.bukkit.command.CommandSender; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; public class RTP_CommandEvent extends RTPEvent { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_FindLocationEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_FindLocationEvent.java similarity index 82% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_FindLocationEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_FindLocationEvent.java index 61df8f6..8922fc4 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_FindLocationEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_FindLocationEvent.java @@ -1,10 +1,8 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld; import org.bukkit.Location; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; public class RTP_FindLocationEvent extends RTPEvent { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_SettingUpEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_SettingUpEvent.java similarity index 88% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_SettingUpEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_SettingUpEvent.java index 10e85fc..fbc0d4d 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_SettingUpEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_SettingUpEvent.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportEvent.java similarity index 83% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportEvent.java index 2a4f70e..a1c22ca 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportEvent.java @@ -1,10 +1,8 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WORLD_TYPE; import org.bukkit.Location; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; public class RTP_TeleportEvent extends RTPEvent { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportPostEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportPostEvent.java similarity index 84% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportPostEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportPostEvent.java index 8a05041..758dd4c 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportPostEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportPostEvent.java @@ -1,10 +1,8 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE; import org.bukkit.Location; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; public class RTP_TeleportPostEvent extends RTPEvent { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportPreEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportPreEvent.java similarity index 70% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportPreEvent.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportPreEvent.java index 29d2941..1919acd 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportPreEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/events/RTP_TeleportPreEvent.java @@ -1,8 +1,6 @@ -package me.SuperRonanCraft.BetterRTP.references.customEvents; +package me.SuperRonanCraft.BetterRTP.references.events; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; public class RTP_TeleportPreEvent extends RTPEvent { //Called upon every rtp call, does not mean player will be teleported diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java index 2a41371..d668eea 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java @@ -2,9 +2,8 @@ package me.SuperRonanCraft.BetterRTP.references.invs.enums; import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.player.PlayerInfo; -import me.SuperRonanCraft.BetterRTP.references.systems.HelperPlayer; -import me.SuperRonanCraft.BetterRTP.references.systems.playerdata.PlayerData; +import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; +import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/HelperPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/HelperPlayer.java similarity index 75% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/HelperPlayer.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/player/HelperPlayer.java index 1454aee..074bec8 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/HelperPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/HelperPlayer.java @@ -1,7 +1,7 @@ -package me.SuperRonanCraft.BetterRTP.references.systems; +package me.SuperRonanCraft.BetterRTP.references.player; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.systems.playerdata.PlayerData; +import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import org.bukkit.entity.Player; public class HelperPlayer { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerData.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerData.java similarity index 90% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerData.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerData.java index 850ddfe..3f7c880 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerData.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerData.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTP.references.systems.playerdata; +package me.SuperRonanCraft.BetterRTP.references.player.playerdata; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerDataManager.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerDataManager.java similarity index 92% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerDataManager.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerDataManager.java index 0b305cc..6d9f91d 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerDataManager.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerDataManager.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTP.references.systems.playerdata; +package me.SuperRonanCraft.BetterRTP.references.player.playerdata; import lombok.NonNull; import org.bukkit.entity.Player; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerData_Menus.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerData_Menus.java similarity index 85% rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerData_Menus.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerData_Menus.java index 1479190..6f194c7 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/systems/playerdata/PlayerData_Menus.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/player/playerdata/PlayerData_Menus.java @@ -1,4 +1,4 @@ -package me.SuperRonanCraft.BetterRTP.references.systems.playerdata; +package me.SuperRonanCraft.BetterRTP.references.player.playerdata; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java index 6d102ff..47c61b6 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java @@ -1,12 +1,11 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo; import lombok.Getter; -import me.SuperRonanCraft.BetterRTP.player.PlayerInfo; import me.SuperRonanCraft.BetterRTP.references.database.DatabaseCooldowns; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.references.systems.HelperPlayer; -import me.SuperRonanCraft.BetterRTP.references.systems.playerdata.PlayerData; +import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer; +import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData; import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; @@ -16,7 +15,6 @@ import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.UUID; diff --git a/src/main/resources/lang/es.yml b/src/main/resources/lang/es.yml index 2e3b81a..12ba5dc 100644 --- a/src/main/resources/lang/es.yml +++ b/src/main/resources/lang/es.yml @@ -1,62 +1,62 @@ -# Translation author: emgv (Discord) +# Translation author: zFoxy#1717 (Discord) Messages: Prefix: '&7[&6BetterRTP&7] ' - Success: - Paid: '&a¡Fuiste teletransportado a las coordenadas &7 x=%x% y=%y% z=%z%!' - Bypass: '&a¡Fuiste teletransportado a las coordenadas &7 x=%x% y=%y% z=%z%!' - Loading: '&a¡Lugar seguro para el TP localizado! &7Cargando chunks...' - Teleport: '&aTeletransportandote... &fpor favor, ¡espera mientras encontramos una ubicación segura!' + Success: # # ¡Placeholders! ¡%x% %y% y %z% son las coordinadas x, y, y z al que el jugador está siendo teletransportado! # + Paid: '&a¡Has sido teletransportado a&7 x=%x% y=%y% z=%z% por &c$%price%&7 en &f%attempts% &7intentos!' + Bypass: '&aHas sido teletransportado a&7 x=%x% y=%y% z=%z% en &f%attempts% &7intentos' + Loading: '&a¡Lugar seguro localizado! &7Cargando chunks...' + Teleport: '&f¡&aTeletransportandote... &fpor favor, espere mientras encontramos un lugar seguro!' Failed: - Price: '&c¡No te pudimos teletransortar porque no tienes fondos suficientes! &7¡Tienes que tener por lo menos $%price% &7para teletransportarte!' - NotSafe: '&c¡No pudimos encontrar un lugar seguro :( ! &7¡No fuiste teletransportado!' - Hunger: '&c¡No te pudimos teletransportar porque estás hambriento&c, come algo!' + Price: '&c¡No pudimos teletransportarte aleatoriamente por falta de fondos! &7¡Debes tener al menos $%price% &7para teletransportarte!' + NotSafe: '&c¡No pudimos encontrar un lugar seguro en %attempts% intentos! &7¡No fuiste teletransportado!' + Hunger: '&c¡No pudimos teletransportarte aleatoriamente porque tienes... &7demasiada hambre&c, come algo amigo!' Other: - Success: '&a%player% fue teletransportado a &7 x=%x% y=%y% z=%z%' - NotSafe: '&c¡No se pudo encontrar un lugar seguro en %attempts% intentos! &7¡%player% no fue teletransportado!' - Biome: '&c¡Parece que el bioma &7%biome%&c no existe! &7¡Trata de usar la función de autcompletado con TAB!' + Success: '&7¡&a%player% ha sido teletransportado a&7 x=%x% y=%y% z=%z% en &f%attempts% &7intentos!' + NotSafe: '&c¡No se pudo encontrar un lugar seguro en %attempts% intentos! &7¡%player% no fue teletransportado aleatoriamente!' + Biome: '&c¡Parece que el bioma&7 %biome%&c no existe! &7¡Intenta usar la lista del tab!' Reload: '&e¡Configuración recargada exitosamente!' NoPermission: - Basic: '&7¡No tienes permiso para ejecutar este comando!' - World: '&7¡No estás autorizado a hacer RTP en %world%!' - DisabledWorld: '&c¡El mundo %world% está desactivado! &7¡No se pudo hacer RTP!' - Cooldown: '&7¡Por favor, espera &c%time%s &7 antes de volver a usar tu RTP!' - Locked: '&7¡Ya usaste todos tus RTP!' - Invalid: '&cSintaxis o argumento invalido. Prueba ''/%command% help''' - NotOnline: '&c¡El jugador &7%player% &cno está en línea!' + Basic: '&c¡Lo siento! &7¡No tienes permiso para usar este comando!' + World: '&c¡Lo siento! &7¡No tienes permitido teletransportarte aleatoriamente en el mundo %world%!' + DisabledWorld: '&c¡Mundo %world% Deshabilitado! &7¡No se puede usar RTP!' + Cooldown: '&c¡Lo siento! &7¡No puedes teletransportarte aleatoriamente por otros &c%time% &7segundos!' + Locked: '&c¡Lo siento! &7¡Has usado todos tus RTPs!' + Invalid: '&cArgumento inválido. Intenta ''/%command% help''' + NotOnline: '&c¡El jugador &7%player% &cno está conectado!' Delay: '&a¡Teletransportandote en &f%time% &asegundos! ¡No te muevas!' - Moved: '&c¡Te moviste! &7El RTP fue cancelado!' - NotExist: '&c¡Parece que el mundo &7%world% &c no existe!' - Already: '&7Ya tienes una teletransportación en curso, por favor, espera.' - Sign: '&7¡El letrero con comandos ha sido creado! &7El comando es... ''&f/rtp %command%&7''' + Moved: '&c¡Te has movido! &7¡El teletransporte aleatorio fue cancelado!' + NotExist: '&c¡Parece que el mundo &7%world% &cno existe!' + Already: '&c¡Oops! &7¡Parece que ya estás teletransportandote aleatoriamente, ten un poco de paciencia!' + Sign: '&7¡Un cartel de comando ha sido creado! &7El comando es... ''&f/rtp %command%&7''' Edit: - Error: '&c¡Error! &7¡Input incorrecto!' - Set: '&b¡Éxito! &7%type% establecido a %value%' - Remove: '&c¡Removido! &7Eliminaste exitosamente el mundo %world%' + Error: '&c¡Error! &7¡Entrada proporcionada inválida!' + Set: '&b¡Exito! &7%type% establecido a %value%' + Remove: '&c¡Eliminado! &7Has eliminado el Mundo Personalizado %world%' Help: Prefix: '&e&m-----&6&l BetterRTP &8| Ayuda &e&m-----' Main: ' &7- &e/%command% &7- ¡Te teletransporta aleatoriamente!' - Biome: ' &7- &e/%command% biome &7- Te teletransporta aleatoriamente en alguno de esos biomas' - Edit: ' &7- &e/%command% edit [args...] &7- Edita algunos ajustes del plugin' - Help: ' &7- &e/%command% help &7- Muestra la lista de comandos' - Info: ' &7- &e/%command% info [world/particles/shapes/potion_effects] &7- Visualiza parámetros específicos del plugin' - Player: ' &7- &e/%command% player [world] [biome1, biome2...] &7- Teletransporta aleatoriamente a otro jugador' + Biome: ' &7- &e/%command% biome &7- Teletransporte aleatorio dentro de estos biomas' + Edit: ' &7- &e/%command% edit [args...] &7- Editar algunos ajustes del plugin' + Help: ' &7- &e/%command% help &7- Muestra la lista de ayuda' + Info: ' &7- &e/%command% info [world/particles/shapes/potion_effects] &7- Ver información específica sobre los parámetros del plugin' + Player: ' &7- &e/%command% player [mundo] [bioma1, bioma2...] &7- Teletransportar aleatoriamente a otro jugador' Reload: ' &7- &e/%command% reload &7- Recarga el plugin' - Settings: ' &7- &e/%command% settings &7- Abre una GUI para editar algunos ajustes' - Test: ' &7- &e/%command% test &7- Prueba los efectos posteriores a teletransportarse sin moverse del lugar' + Settings: ' &7- &e/%command% settings &7- Abre una GUI y edita algunos ajustes' + Test: ' &7- &e/%command% test &7- Probar los efectos del plugin después de un teletransporte sin moverse' Version: ' &7- &e/%command% version &7- Ver la versión actual' - World: ' &7- &e/%command% world [bioma1, bioma2...] &7- Teletransportarse aleatoriamente en otro mundo' -# Location: ' &7- &e/%command% location &7- Rtp using a specific location' + World: ' &7- &e/%command% world [bioma1, bioma2...] &7- Teletransportarse aleatoriamente a otro mundo' + Location: ' &7- &e/%command% location &7- Teletransportarse aleatoriamente utilizando una ubicación específica' Usage: - Player: '&cUso&7&7: /%command% player [mundo] [bioma1, bioma2]' - World: '&cUso&7&77: /%command% world [bioma1, bioma2...]' + Player: '&cUso&7: /%command% player [world] [bioma1, bioma2]' + World: '&cUso&7: /%command% world [bioma1, bioma2...]' Biome: '&cUso&7: /%command% biome ' -# Location: '&cUsage&7: /%command% location ' + Location: '&cUso&7: /%command% location ' Edit: Base: '&cUso&7: /%command% edit [args...]' - Default: '&cUso&7: /%command% edit default ' - World: '&cUso&7: /%command% edit world ' -# Worldtype: '&cUsage&7: /%command% edit world_type ' -# Override: '&cUsage&7: /%command% edit override ' -# BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks ' + Default: '&cUso&7: /%command% edit default ' + World: '&cUso&7: /%command% edit world ' + Worldtype: '&cUso&7: /%command% edit world_type ' + Override: '&cUso&7: /%command% edit override ' + BlacklistedBlocks: '&cUso&7: /%command% edit blacklistedblocks '