project clean up + es translation update zFoxy#1717

This commit is contained in:
RonanCraft 2022-03-07 14:26:52 -05:00
parent 90592d0894
commit cbae1a2619
27 changed files with 80 additions and 106 deletions

View File

@ -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;

View File

@ -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<String> 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<String> biomes, RTP_TYPE rtpType) {
this.tp(player, sendi, world, biomes, rtpType, false, false);
}

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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;

View File

@ -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 {

View File

@ -1,4 +1,4 @@
package me.SuperRonanCraft.BetterRTP.references.systems.playerdata;
package me.SuperRonanCraft.BetterRTP.references.player.playerdata;
import lombok.Getter;
import lombok.Setter;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package me.SuperRonanCraft.BetterRTP.references.systems.playerdata;
package me.SuperRonanCraft.BetterRTP.references.player.playerdata;
import lombok.Getter;
import lombok.Setter;

View File

@ -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;

View File

@ -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!'
Moved: '&c¡Te has movido! &7¡El teletransporte aleatorio fue cancelado!'
NotExist: '&c¡Parece que el mundo &7%world% &cno 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'''
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 <bioma1, bioma2...> &7- Te teletransporta aleatoriamente en alguno de esos biomas'
Edit: ' &7- &e/%command% edit <default/world> [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 <jugador> [world] [biome1, biome2...] &7- Teletransporta aleatoriamente a otro jugador'
Biome: ' &7- &e/%command% biome <bioma1, bioma2...> &7- Teletransporte aleatorio dentro de estos biomas'
Edit: ' &7- &e/%command% edit <default/world> [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 <jugador> [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 <mundo> [bioma1, bioma2...] &7- Teletransportarse aleatoriamente en otro mundo'
# Location: ' &7- &e/%command% location <location_name> &7- Rtp using a specific location'
World: ' &7- &e/%command% world <mundo> [bioma1, bioma2...] &7- Teletransportarse aleatoriamente a otro mundo'
Location: ' &7- &e/%command% location <nombre_de_la_ubicación> &7- Teletransportarse aleatoriamente utilizando una ubicación específica'
Usage:
Player: '&cUso&7&7: /%command% player <jugador> [mundo] [bioma1, bioma2]'
World: '&cUso&7&77: /%command% world <mundo> [bioma1, bioma2...]'
Player: '&cUso&7: /%command% player <jugador> [world] [bioma1, bioma2]'
World: '&cUso&7: /%command% world <mundo> [bioma1, bioma2...]'
Biome: '&cUso&7: /%command% biome <bioma1, bioma2...>'
# Location: '&cUsage&7: /%command% location <location_name>'
Location: '&cUso&7: /%command% location <nombre_de_la_ubicación>'
Edit:
Base: '&cUso&7: /%command% edit <default/world> [args...]'
Default: '&cUso&7: /%command% edit default <max/min/useworldborder/center> <value>'
World: '&cUso&7: /%command% edit world <mundo> <max/min/useworldborder/center> <value>'
# Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
# Override: '&cUsage&7: /%command% edit override <world> <world_to>'
# BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'
Default: '&cUso&7: /%command% edit default <max/min/useworldborder/center> <valor>'
World: '&cUso&7: /%command% edit world <mundo> <max/min/useworldborder/center> <valor>'
Worldtype: '&cUso&7: /%command% edit world_type <mundo> <NETHER/NORMAL>'
Override: '&cUso&7: /%command% edit override <mundo1> <mundo2>'
BlacklistedBlocks: '&cUso&7: /%command% edit blacklistedblocks <add/remove> <id_del_bloque>'