diff --git a/.gitignore b/.gitignore index bba7b53..66ddc4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ /target/ /.idea/ + +# Eclipse IDE +.classpath +.project +.settings/ diff --git a/pom.xml b/pom.xml index 7b03a66..92a5972 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.nik ResourceWorld - 2.0.8 + 2.0.9 jar ResourceWorld diff --git a/src/main/java/me/nik/resourceworld/commands/CommandManager.java b/src/main/java/me/nik/resourceworld/commands/CommandManager.java index c97bbc0..fbf1d63 100644 --- a/src/main/java/me/nik/resourceworld/commands/CommandManager.java +++ b/src/main/java/me/nik/resourceworld/commands/CommandManager.java @@ -1,123 +1,123 @@ package me.nik.resourceworld.commands; -import me.nik.resourceworld.ResourceWorld; -import me.nik.resourceworld.commands.subcommands.Menu; -import me.nik.resourceworld.commands.subcommands.Reload; -import me.nik.resourceworld.commands.subcommands.Reset; -import me.nik.resourceworld.commands.subcommands.Teleport; -import me.nik.resourceworld.managers.MsgType; +import java.util.ArrayList; +import java.util.List; + import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.TabExecutor; -import java.util.ArrayList; -import java.util.List; +import me.nik.resourceworld.ResourceWorld; +import me.nik.resourceworld.commands.subcommands.Menu; +import me.nik.resourceworld.commands.subcommands.Reload; +import me.nik.resourceworld.commands.subcommands.Reset; +import me.nik.resourceworld.commands.subcommands.Teleport; +import me.nik.resourceworld.commands.subcommands.TpPlayer; +import me.nik.resourceworld.managers.MsgType; public class CommandManager implements TabExecutor { - private static final String INFO_MESSAGE = MsgType.PREFIX.getMessage() - + ChatColor.GRAY + "You're running " + ChatColor.WHITE - + ResourceWorld.getInstance().getDescription().getName() + ChatColor.GRAY + " version " - + ChatColor.GREEN + "v" + ResourceWorld.getInstance().getDescription().getVersion() - + ChatColor.GRAY + " by" + ChatColor.WHITE + " Nik"; - private final List subcommands = new ArrayList<>(); + private static final String INFO_MESSAGE = MsgType.PREFIX.getMessage() + ChatColor.GRAY + "You're running " + + ChatColor.WHITE + ResourceWorld.getInstance().getDescription().getName() + ChatColor.GRAY + " version " + + ChatColor.GREEN + "v" + ResourceWorld.getInstance().getDescription().getVersion() + ChatColor.GRAY + " by" + + ChatColor.WHITE + " Nik"; + private final static List subcommands = new ArrayList<>(); - public CommandManager(ResourceWorld plugin) { - subcommands.add(new Teleport()); - subcommands.add(new Reload(plugin)); - subcommands.add(new Menu(plugin)); - subcommands.add(new Reset(plugin)); - } + public CommandManager(ResourceWorld plugin) { + subcommands.add(new Teleport()); + subcommands.add(new Reload(plugin)); + subcommands.add(new Menu(plugin)); + subcommands.add(new Reset(plugin)); + subcommands.add(new TpPlayer()); + } - public List getSubcommands() { - return subcommands; - } + public List getSubcommands() { + return subcommands; + } - @Override - public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { - if (args.length == 1) { - ArrayList subcommandsArgs = new ArrayList<>(); - for (int i = 0; i < getSubcommands().size(); i++) { - subcommandsArgs.add(getSubcommands().get(i).getName()); - } - return subcommandsArgs; - } else if (args.length == 2) { - for (int i = 0; i < getSubcommands().size(); i++) { - if (args[0].equalsIgnoreCase(getSubcommands().get(i).getName())) { - return getSubcommands().get(i).getSubcommandArguments(sender, args); - } - } - } - return null; - } + @Override + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { + if (args.length == 1) { + ArrayList subcommandsArgs = new ArrayList<>(); + for (int i = 0; i < getSubcommands().size(); i++) { + subcommandsArgs.add(getSubcommands().get(i).getName()); + } + return subcommandsArgs; + } else if (args.length == 2) { + for (int i = 0; i < getSubcommands().size(); i++) { + if (args[0].equalsIgnoreCase(getSubcommands().get(i).getName())) { + return getSubcommands().get(i).getSubcommandArguments(sender, args); + } + } + } + return null; + } - private void helpMessage(CommandSender sender) { - sender.sendMessage(""); - sender.sendMessage(MsgType.PREFIX.getMessage() + ChatColor.GRAY + "Available Commands"); - sender.sendMessage(""); - this.subcommands.stream().filter(subCommand -> sender.hasPermission(subCommand.getPermission())) - .forEach(subCommand -> sender.sendMessage(ChatColor.GREEN - + subCommand.getSyntax() - + ChatColor.DARK_GRAY + " - " - + ChatColor.GRAY + subCommand.getDescription())); - sender.sendMessage(""); - } + public static void helpMessage(CommandSender sender) { + sender.sendMessage(""); + sender.sendMessage(MsgType.PREFIX.getMessage() + ChatColor.GRAY + "Available Commands"); + sender.sendMessage(""); + subcommands.stream().filter(subCommand -> sender.hasPermission(subCommand.getPermission())) + .forEach(subCommand -> sender.sendMessage(ChatColor.GREEN + subCommand.getSyntax() + ChatColor.DARK_GRAY + + " - " + ChatColor.GRAY + subCommand.getDescription())); + sender.sendMessage(""); + } - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (args.length > 0) { + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (args.length > 0) { - for (int i = 0; i < getSubcommands().size(); i++) { + for (int i = 0; i < getSubcommands().size(); i++) { - final SubCommand subCommand = getSubcommands().get(i); + final SubCommand subCommand = getSubcommands().get(i); - if (args[0].equalsIgnoreCase(subCommand.getName())) { + if (args[0].equalsIgnoreCase(subCommand.getName())) { - if (!subCommand.canConsoleExecute() && sender instanceof ConsoleCommandSender) { + if (!subCommand.canConsoleExecute() && sender instanceof ConsoleCommandSender) { - sender.sendMessage(MsgType.CONSOLE_MESSAGE.getMessage()); + sender.sendMessage(MsgType.CONSOLE_MESSAGE.getMessage()); - return true; - } + return true; + } - if (!sender.hasPermission(subCommand.getPermission())) { + if (!sender.hasPermission(subCommand.getPermission())) { - sender.sendMessage(MsgType.NO_PERMISSION.getMessage()); + sender.sendMessage(MsgType.NO_PERMISSION.getMessage()); - return true; - } + return true; + } - if (args.length < subCommand.maxArguments()) { + if (args.length < subCommand.maxArguments()) { - helpMessage(sender); + helpMessage(sender); - return true; - } + return true; + } - subCommand.perform(sender, args); + subCommand.perform(sender, args); - return true; - } + return true; + } - if (args[0].equalsIgnoreCase("help")) { + if (args[0].equalsIgnoreCase("help")) { - helpMessage(sender); + helpMessage(sender); - return true; - } - } + return true; + } + } - } else { + } else { - sender.sendMessage(INFO_MESSAGE); + sender.sendMessage(INFO_MESSAGE); - return true; - } + return true; + } - helpMessage(sender); + helpMessage(sender); - return true; - } + return true; + } } \ No newline at end of file diff --git a/src/main/java/me/nik/resourceworld/commands/subcommands/Teleport.java b/src/main/java/me/nik/resourceworld/commands/subcommands/Teleport.java index 42192f9..e90fe38 100644 --- a/src/main/java/me/nik/resourceworld/commands/subcommands/Teleport.java +++ b/src/main/java/me/nik/resourceworld/commands/subcommands/Teleport.java @@ -21,187 +21,194 @@ public class Teleport extends SubCommand { - private final Economy economy; - /* - Clear outdated cache automatically. - */ - private final ExpiringMap cooldown = new ExpiringMap<>(600000); - private final LocationFinder locationFinder = new LocationFinder(); + private final Economy economy; + /* + * Clear outdated cache automatically. + */ + private final ExpiringMap cooldown = new ExpiringMap<>(600000); + private final LocationFinder locationFinder = new LocationFinder(); - public Teleport() { + public Teleport() { - //Load Vault if found - if (Bukkit.getPluginManager().getPlugin("Vault") != null) { + // Load Vault if found + if (Bukkit.getPluginManager().getPlugin("Vault") != null) { - RegisteredServiceProvider rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class); + RegisteredServiceProvider rsp = Bukkit.getServer().getServicesManager() + .getRegistration(Economy.class); - if (rsp != null) { - this.economy = rsp.getProvider(); - return; - } - } + if (rsp != null) { + this.economy = rsp.getProvider(); + return; + } + } - this.economy = null; - } + this.economy = null; + } - @Override - public String getName() { - return "tp"; - } + @Override + public String getName() { + return "tp"; + } - @Override - public String getDescription() { - return "Randomly Teleport To The Resource World!"; - } + @Override + public String getDescription() { + return "Randomly Teleport To The Resource World!"; + } - @Override - public String getSyntax() { - return "/resource tp "; - } + @Override + public String getSyntax() { + return "/resource tp "; + } - @Override - public String getPermission() { - return Permissions.TELEPORT.getPermission(); - } + @Override + public String getPermission() { + return Permissions.TELEPORT.getPermission(); + } - @Override - protected int maxArguments() { - return 1; - } + @Override + protected int maxArguments() { + return 1; + } - @Override - public boolean canConsoleExecute() { - return false; - } + @Override + public boolean canConsoleExecute() { + return false; + } - @Override - public void perform(CommandSender sender, String[] args) { + @Override + public void perform(CommandSender sender, String[] args) { - Player player = (Player) sender; + Player player = (Player) sender; - UUID uuid = player.getUniqueId(); + UUID uuid = player.getUniqueId(); - long currentTime = System.currentTimeMillis(); + long currentTime = System.currentTimeMillis(); - if (this.cooldown.containsKey(uuid)) { + if (this.cooldown.containsKey(uuid)) { - long secondsleft = ((this.cooldown.get(uuid) / 1000L) + Config.Setting.TELEPORT_COOLDOWN.getLong()) - (currentTime / 1000L); + long secondsleft = ((this.cooldown.get(uuid) / 1000L) + Config.Setting.TELEPORT_COOLDOWN.getLong()) + - (currentTime / 1000L); - if (secondsleft <= 0L) { + if (secondsleft <= 0L) { - this.cooldown.remove(uuid); + this.cooldown.remove(uuid); - } else { + } else { - player.sendMessage(MsgType.COOLDOWN_MESSAGE.getMessage().replaceAll("%seconds%", String.valueOf(secondsleft))); + player.sendMessage( + MsgType.COOLDOWN_MESSAGE.getMessage().replaceAll("%seconds%", String.valueOf(secondsleft))); - return; - } - } + return; + } + } - World world = null; + World world = null; - switch (args.length) { + switch (args.length) { - case 1: { + case 1: { - world = Bukkit.getWorld(Config.Setting.WORLD_NAME.getString()); + world = Bukkit.getWorld(Config.Setting.WORLD_NAME.getString()); - break; - } + break; + } - case 2: { + case 2: { - switch (args[1].toLowerCase()) { + switch (args[1].toLowerCase()) { - case "nether": + case "nether": - if (!player.hasPermission(Permissions.TELEPORT_NETHER.getPermission())) { + if (!player.hasPermission(Permissions.TELEPORT_NETHER.getPermission())) { - player.sendMessage(MsgType.NO_PERMISSION.getMessage()); + player.sendMessage(MsgType.NO_PERMISSION.getMessage()); - return; - } + return; + } - world = Bukkit.getWorld(Config.Setting.NETHER_NAME.getString()); + world = Bukkit.getWorld(Config.Setting.NETHER_NAME.getString()); - break; + break; - case "end": + case "end": - if (!player.hasPermission(Permissions.TELEPORT_END.getPermission())) { + if (!player.hasPermission(Permissions.TELEPORT_END.getPermission())) { - player.sendMessage(MsgType.NO_PERMISSION.getMessage()); + player.sendMessage(MsgType.NO_PERMISSION.getMessage()); - return; - } + return; + } - world = Bukkit.getWorld(Config.Setting.END_NAME.getString()); + world = Bukkit.getWorld(Config.Setting.END_NAME.getString()); - break; - } - } - } + break; + } + } + } - if (world == null) return; + if (world == null) + return; - boolean notBypassing = !player.hasPermission(Permissions.ADMIN.getPermission()); + boolean notBypassing = !player.hasPermission(Permissions.ADMIN.getPermission()); - //Handle vault - if (this.economy != null && Config.Setting.TELEPORT_PRICE.getDouble() > 0D && notBypassing) { + // Handle vault + if (this.economy != null && Config.Setting.TELEPORT_PRICE.getDouble() > 0D && notBypassing) { - EconomyResponse res = this.economy.withdrawPlayer(player, Config.Setting.TELEPORT_PRICE.getDouble()); + EconomyResponse res = this.economy.withdrawPlayer(player, Config.Setting.TELEPORT_PRICE.getDouble()); - if (res.transactionSuccess()) { + if (res.transactionSuccess()) { - player.sendMessage(MsgType.TELEPORT_PAID.getMessage().replace("%price%", this.economy.format(res.amount))); + player.sendMessage( + MsgType.TELEPORT_PAID.getMessage().replace("%price%", this.economy.format(res.amount))); - } else { + } else { - player.sendMessage(MsgType.TELEPORT_ERROR.getMessage()); + player.sendMessage(MsgType.TELEPORT_ERROR.getMessage()); - return; - } - } + return; + } + } - //Add to cooldown - if (notBypassing && Config.Setting.TELEPORT_COOLDOWN.getLong() > 0L) { + // Add to cooldown + if (notBypassing && Config.Setting.TELEPORT_COOLDOWN.getLong() > 0L) { - this.cooldown.put(player.getUniqueId(), System.currentTimeMillis()); - } + this.cooldown.put(player.getUniqueId(), System.currentTimeMillis()); + } - //Finally teleport - if (Config.Setting.TELEPORT_DELAY.getLong() <= 0L) { + // Finally teleport + if (Config.Setting.TELEPORT_DELAY.getLong() <= 0L) { - this.locationFinder.teleportSafely(player, world); + this.locationFinder.teleportSafely(player, world); - } else { + } else { - player.sendMessage(MsgType.TELEPORT_DELAY.getMessage().replaceAll("%seconds%", String.valueOf(Config.Setting.TELEPORT_DELAY.getLong()))); + player.sendMessage(MsgType.TELEPORT_DELAY.getMessage().replaceAll("%seconds%", + String.valueOf(Config.Setting.TELEPORT_DELAY.getLong()))); - World finalWorld = world; - TaskUtils.taskLater(() -> this.locationFinder.teleportSafely(player, finalWorld), Config.Setting.TELEPORT_DELAY.getLong() * 20L); - } - } + World finalWorld = world; + TaskUtils.taskLater(() -> this.locationFinder.teleportSafely(player, finalWorld), + Config.Setting.TELEPORT_DELAY.getLong() * 20L); + } + } - @Override - public List getSubcommandArguments(CommandSender sender, String[] args) { + @Override + public List getSubcommandArguments(CommandSender sender, String[] args) { - if (args.length == 2) { + if (args.length == 2) { - List worlds = new ArrayList<>(); + List worlds = new ArrayList<>(); - if (Bukkit.getWorld(Config.Setting.NETHER_NAME.getString()) != null) { - worlds.add("nether"); - } + if (Bukkit.getWorld(Config.Setting.NETHER_NAME.getString()) != null) { + worlds.add("nether"); + } - if (Bukkit.getWorld(Config.Setting.END_NAME.getString()) != null) { - worlds.add("end"); - } + if (Bukkit.getWorld(Config.Setting.END_NAME.getString()) != null) { + worlds.add("end"); + } - return worlds; - } + return worlds; + } - return null; - } + return null; + } } \ No newline at end of file diff --git a/src/main/java/me/nik/resourceworld/commands/subcommands/TpPlayer.java b/src/main/java/me/nik/resourceworld/commands/subcommands/TpPlayer.java new file mode 100644 index 0000000..321e6a2 --- /dev/null +++ b/src/main/java/me/nik/resourceworld/commands/subcommands/TpPlayer.java @@ -0,0 +1,83 @@ +package me.nik.resourceworld.commands.subcommands; + +import java.util.List; + +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import me.nik.resourceworld.commands.CommandManager; +import me.nik.resourceworld.commands.SubCommand; +import me.nik.resourceworld.files.Config; +import me.nik.resourceworld.managers.MsgType; +import me.nik.resourceworld.managers.Permissions; +import me.nik.resourceworld.utils.ChatUtils; +import me.nik.resourceworld.utils.LocationFinder; + +public class TpPlayer extends SubCommand { + + private final LocationFinder locationFinder = new LocationFinder(); + + @Override + protected String getName() { + return "tpplayer"; + } + + @Override + protected String getDescription() { + return "Randomly Teleport targeted player to the Resource World!"; + } + + @Override + protected String getSyntax() { + return "/resource tpplayer "; + } + + @Override + protected String getPermission() { + return Permissions.ADMIN.getPermission(); + } + + @Override + protected int maxArguments() { + return 2; + } + + @Override + protected boolean canConsoleExecute() { + return true; + } + + @Override + protected void perform(CommandSender sender, String[] args) { + + if (args.length == 2) { + if (Bukkit.getPlayerExact(args[1]) != null) { + Player targetPlayer = Bukkit.getPlayerExact(args[1]); + String worldName = Config.Setting.WORLD_NAME.getString(); + World world = Bukkit.getWorld(worldName); + + sendColoredText(sender, MsgType.TELEPORTING_OTHER.getMessage().replaceAll("%player%", args[1])); + sendColoredText(sender, MsgType.TELEPORTED_BY_ADMIN.getMessage()); + this.locationFinder.teleportSafely(Bukkit.getPlayerExact(args[1]), world); + + } else { + sendColoredText(sender, MsgType.PLAYER_DONT_EXIST.getMessage().replaceAll("%player%", args[1])); + } + } else { + CommandManager.helpMessage(sender); + } + } + + @Override + protected List getSubcommandArguments(CommandSender sender, String[] args) { + + return null; + } + + private void sendColoredText(CommandSender sender, String message) { + sender.sendMessage(ChatUtils.format(message)); + } + +} diff --git a/src/main/java/me/nik/resourceworld/files/Lang.java b/src/main/java/me/nik/resourceworld/files/Lang.java index 75b0280..d6019ec 100644 --- a/src/main/java/me/nik/resourceworld/files/Lang.java +++ b/src/main/java/me/nik/resourceworld/files/Lang.java @@ -8,59 +8,83 @@ import java.io.IOException; public class Lang { - private File file; - private FileConfiguration lang; + private File file; + private FileConfiguration lang; - public void setup(JavaPlugin plugin) { - file = new File(plugin.getDataFolder(), "lang.yml"); - if (!file.exists()) { - try { - file.createNewFile(); - } catch (IOException ignored) { - } - } - lang = YamlConfiguration.loadConfiguration(file); - } + public void setup(JavaPlugin plugin) { + file = new File(plugin.getDataFolder(), "lang.yml"); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException ignored) { + } + } + lang = YamlConfiguration.loadConfiguration(file); + } - public FileConfiguration get() { - return lang; - } + public FileConfiguration get() { + return lang; + } - public void save() { - try { - lang.save(file); - } catch (IOException ignored) { - } - } + public void save() { + try { + lang.save(file); + } catch (IOException ignored) { + } + } - public void reload() { - lang = YamlConfiguration.loadConfiguration(file); - } + public void reload() { + lang = YamlConfiguration.loadConfiguration(file); + } - public void addDefaults() { - get().options().header("+----------------------------------------------------------------------------------------------+" + "\n" + "| |" + "\n" + "| Resource World |" + "\n" + "| |" + "\n" + "| Discord: https://discord.gg/m7j2Y9H |" + "\n" + "| |" + "\n" + "| Author: Nik |" + "\n" + "| |" + "\n" + "+----------------------------------------------------------------------------------------------+" + "\n"); - get().addDefault("prefix", "&a&l[&2Resource World&a&l]&f&l: "); - get().addDefault("update_found", "&aThere is an Update available, Your version &f%current%&a new version &f%new%"); - get().addDefault("disabled_command", "&cSorry, You can't use that Command in this World!"); - get().addDefault("resetting_the_world", "&fCleaning up the Resource World, This may cause Lag!"); - get().addDefault("resetting_the_nether", "&fCleaning up the Nether World, This may cause Lag!"); - get().addDefault("resetting_the_end", "&fCleaning up the End World, This may cause Lag!"); - get().addDefault("world_has_been_reset", "&fThe Resource World has been Reset!"); - get().addDefault("nether_has_been_reset", "&fThe Nether World has been Reset!"); - get().addDefault("end_has_been_reset", "&fThe End World has been Reset!"); - get().addDefault("console_message", "&f&lThis command cannot be executed through the Console :("); - get().addDefault("no_perm", "&cYou do not have permission to execute this command!"); - get().addDefault("cooldown_message", "&cYou can teleport to the Resource World again in %seconds% seconds."); - get().addDefault("cooldown_spawn", "&cYou can teleport to spawn again in %seconds% seconds."); - get().addDefault("reloaded", "&fYou have successfully reloaded the plugin!"); - get().addDefault("teleport_delay", "&aTeleporting to the Resource World in %seconds% seconds."); - get().addDefault("gui_name", "&2&lResource World Menu"); - get().addDefault("worlds_gui_name", "&2&lReset A Resource World"); - get().addDefault("teleported_message", "&fYou have been Teleported back to spawn!"); - get().addDefault("not_exist", "&cThe Resource World is currently under Maintenance, Please try again later!"); - get().addDefault("teleport_paid", "&a%price% &fHave been taken from your balance."); - get().addDefault("teleport_error", "&cYou do not have enough money to Teleport to the Resource World."); - get().addDefault("teleported_players", "&aTeleported all the players back to spawn!"); - get().addDefault("update_not_found", "&f&lYou're running the Latest Version &c&l<3"); - } + public void addDefaults() { + get().options().header( + "+----------------------------------------------------------------------------------------------+" + + "\n" + + "| |" + + "\n" + + "| Resource World |" + + "\n" + + "| |" + + "\n" + + "| Discord: https://discord.gg/m7j2Y9H |" + + "\n" + + "| |" + + "\n" + + "| Author: Nik |" + + "\n" + + "| |" + + "\n" + + "+----------------------------------------------------------------------------------------------+" + + "\n"); + get().addDefault("prefix", "&a&l[&2Resource World&a&l]&f&l: "); + get().addDefault("update_found", + "&aThere is an Update available, Your version &f%current%&a new version &f%new%"); + get().addDefault("disabled_command", "&cSorry, You can't use that Command in this World!"); + get().addDefault("resetting_the_world", "&fCleaning up the Resource World, This may cause Lag!"); + get().addDefault("resetting_the_nether", "&fCleaning up the Nether World, This may cause Lag!"); + get().addDefault("resetting_the_end", "&fCleaning up the End World, This may cause Lag!"); + get().addDefault("world_has_been_reset", "&fThe Resource World has been Reset!"); + get().addDefault("nether_has_been_reset", "&fThe Nether World has been Reset!"); + get().addDefault("end_has_been_reset", "&fThe End World has been Reset!"); + get().addDefault("console_message", "&f&lThis command cannot be executed through the Console :("); + get().addDefault("no_perm", "&cYou do not have permission to execute this command!"); + get().addDefault("cooldown_message", "&cYou can teleport to the Resource World again in %seconds% seconds."); + get().addDefault("cooldown_spawn", "&cYou can teleport to spawn again in %seconds% seconds."); + get().addDefault("reloaded", "&fYou have successfully reloaded the plugin!"); + get().addDefault("teleport_delay", "&aTeleporting to the Resource World in %seconds% seconds."); + get().addDefault("gui_name", "&2&lResource World Menu"); + get().addDefault("worlds_gui_name", "&2&lReset A Resource World"); + get().addDefault("teleported_message", "&fYou have been Teleported back to spawn!"); + get().addDefault("not_exist", "&cThe Resource World is currently under Maintenance, Please try again later!"); + get().addDefault("teleport_paid", "&a%price% &fHave been taken from your balance."); + get().addDefault("teleport_error", "&cYou do not have enough money to Teleport to the Resource World."); + get().addDefault("teleported_players", "&aTeleported all the players back to spawn!"); + get().addDefault("update_not_found", "&f&lYou're running the Latest Version &c&l<3"); + get().addDefault("player_dont_exist", "The player %player% is not online or doesn't exist."); + get().addDefault("teleporting_other", "&aTeleporting %player% in the Resource World."); + get().addDefault("teleported_by_admin", "&aYou are teleported in the Resource World by an admin."); + get().addDefault("finding_location", "&eFinding a safe location before teleporting you to the Resource World..."); + + } } \ No newline at end of file diff --git a/src/main/java/me/nik/resourceworld/managers/MsgType.java b/src/main/java/me/nik/resourceworld/managers/MsgType.java index 9c60f20..8c2aee9 100644 --- a/src/main/java/me/nik/resourceworld/managers/MsgType.java +++ b/src/main/java/me/nik/resourceworld/managers/MsgType.java @@ -25,7 +25,11 @@ public enum MsgType { TELEPORT_PAID(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("teleport_paid"))), TELEPORT_ERROR(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("teleport_error"))), TELEPORTED_PLAYERS(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("teleported_players"))), - UPDATE_NOT_FOUND(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("update_not_found"))); + UPDATE_NOT_FOUND(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("update_not_found"))), + PLAYER_DONT_EXIST(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("player_dont_exist"))), + TELEPORTING_OTHER(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("teleporting_other"))), + TELEPORTED_BY_ADMIN(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("teleported_by_admin"))), + FINDING_LOCATION(PREFIX.getMessage() + ChatUtils.format(ResourceWorld.getInstance().getLang().getString("finding_location"))); private final String message; diff --git a/src/main/java/me/nik/resourceworld/utils/LocationFinder.java b/src/main/java/me/nik/resourceworld/utils/LocationFinder.java index 155d26d..4b5e229 100644 --- a/src/main/java/me/nik/resourceworld/utils/LocationFinder.java +++ b/src/main/java/me/nik/resourceworld/utils/LocationFinder.java @@ -2,12 +2,15 @@ import io.papermc.lib.PaperLib; import me.nik.resourceworld.files.Config; +import me.nik.resourceworld.managers.MsgType; + import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -20,6 +23,8 @@ public class LocationFinder { private static final Random random = new Random(); public void teleportSafely(Player player, World world) { + + sendColoredText(player, MsgType.FINDING_LOCATION.getMessage()); final World.Environment environment = world.getEnvironment(); @@ -147,4 +152,8 @@ private int randomInt(int value) { return random.nextInt((value - min) + 1) + min; } + + private void sendColoredText(CommandSender sender, String message) { + sender.sendMessage(ChatUtils.format(message)); + } } \ No newline at end of file diff --git a/version.txt b/version.txt index e8f41f0..ed35d09 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.8 \ No newline at end of file +2.0.9 \ No newline at end of file