diff --git a/README.md b/README.md index f385438..7a6789c 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ Plugin do Minecrafta, który chroni twóją nagrywkę przed graczami próbujący ## 🚀 Instalowanie 1. Pobierz najnowszą wersję pluginu [tutaj](https://github.com/RaidVM/JoinGuard-plugin/releases/latest) 2. Wgraj ten plugin na serwer do folderu `plugins` -3. Uruchom serwer +3. Uruchom serwer \ No newline at end of file diff --git a/src/main/java/com/epicplayera10/joinguard/commands/JoinGuardCommand.java b/src/main/java/com/epicplayera10/joinguard/commands/JoinGuardCommand.java index dad653b..cd47327 100644 --- a/src/main/java/com/epicplayera10/joinguard/commands/JoinGuardCommand.java +++ b/src/main/java/com/epicplayera10/joinguard/commands/JoinGuardCommand.java @@ -27,7 +27,7 @@ public void doHelp(CommandSender sender, CommandHelp help) { } @Subcommand("reload") - @Description("Przeładuj konfigurację") + @Description("Reload the configuration") public void reload(CommandSender sender) { sender.sendMessage("Reloading configuration..."); JoinGuard.instance().reloadConfiguration(); @@ -35,38 +35,38 @@ public void reload(CommandSender sender) { } @Subcommand("whitelist add") - @Syntax("") + @Syntax("") @CommandCompletion("@not_whitelisted") - @Description("Dodaj gracza do whitelisty") + @Description("Add a player to the whitelist") public void whitelistAdd(CommandSender sender, String playerName) { - if (JoinGuard.instance().pluginConfiguration().whitelistedNicks.contains(playerName)){ - sender.sendMessage(ChatUtils.colorize("&cGracz jest już na whitelistcie")); + if (JoinGuard.instance().pluginConfiguration().whitelistedNicks.contains(playerName)) { + sender.sendMessage(ChatUtils.colorize("&cThat player is already on the whitelist")); return; } JoinGuard.instance().pluginConfiguration().whitelistedNicks.add(playerName); JoinGuard.instance().pluginConfiguration().save(); - sender.sendMessage("Dodano " + playerName + " do whitelisty"); + sender.sendMessage("Added " + playerName + " to the whitelist"); } @Subcommand("whitelist remove") - @Syntax("") + @Syntax("") @CommandCompletion("@whitelist") - @Description("Usuń gracza z whitelisty") + @Description("Remove a player from the whitelist") public void whitelistRemove(CommandSender sender, String playerName) { - if (!JoinGuard.instance().pluginConfiguration().whitelistedNicks.contains(playerName)){ - sender.sendMessage(ChatUtils.colorize("&cGracza nie ma na whitelistcie")); + if (!JoinGuard.instance().pluginConfiguration().whitelistedNicks.contains(playerName)) { + sender.sendMessage(ChatUtils.colorize("&cThat player is not on the whitelist")); return; } JoinGuard.instance().pluginConfiguration().whitelistedNicks.remove(playerName); JoinGuard.instance().pluginConfiguration().save(); - sender.sendMessage("Usunięto " + playerName + " z whitelisty"); + sender.sendMessage("Removed " + playerName + " from the whitelist"); } @Subcommand("whitelist list") - @Description("Wyświetl listę graczy na whitelistcie") + @Description("Show the list of whitelisted players") public void whitelistList(CommandSender sender) { - if (JoinGuard.instance().pluginConfiguration().whitelistedNicks.isEmpty()){ - sender.sendMessage("Na whitelistcie nie ma żadnych graczy"); + if (JoinGuard.instance().pluginConfiguration().whitelistedNicks.isEmpty()) { + sender.sendMessage("There are no players on the whitelist"); return; } StringBuilder builder = new StringBuilder(); @@ -78,43 +78,43 @@ public void whitelistList(CommandSender sender) { builder.append(nick); first = false; } - sender.sendMessage("Gracze na whitelistcie: " + builder); + sender.sendMessage("Whitelisted players: " + builder); } @Subcommand("login") - @Description("Zaloguj się przez Discorda, aby funkcja zgłoszeń działała") + @Description("Log in via Discord to enable the report feature") public void login(CommandSender sender) { CompletableFuture.runAsync(() -> { String status = JoinGuardAPI.getServerRegistrationStatus().join(); if (status.equals("ok")) { - sender.sendMessage(ChatUtils.colorize("&aJesteś już zalogowany!")); + sender.sendMessage(ChatUtils.colorize("&aYou are already logged in!")); } else if (status.equals("Invalid API key")) { String url = "https://joinguard.raidvm.com/api/register?state=" + JoinGuard.instance().pluginConfiguration().serverId; if (sender instanceof Player) { - BaseComponent component = new TextComponent(TextComponent.fromLegacyText(ChatUtils.colorize("&b&nKliknij tutaj aby się zarejestrować!"))); + BaseComponent component = new TextComponent(TextComponent.fromLegacyText(ChatUtils.colorize("&b&nClick here to register!"))); component.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)); sender.spigot().sendMessage(component); } else { - sender.sendMessage(ChatUtils.colorize("&b&nKliknij tutaj aby się zarejestrować!")); + sender.sendMessage(ChatUtils.colorize("&b&nClick here to register!")); sender.sendMessage(ChatUtils.colorize("&7" + url)); } } else { - sender.sendMessage(ChatUtils.colorize("&cWystąpił błąd podczas łączenia z serwerem!")); + sender.sendMessage(ChatUtils.colorize("&cAn error occurred while connecting to the server!")); } }); } @Subcommand("report") - @Syntax("") - @Description("Zgłoś gracza") + @Syntax("") + @Description("Report a player") public void reportPlayer(Player player, OnlinePlayer reportedPlayer) { CompletableFuture.runAsync(() -> { JsonObject report = createReportJson(reportedPlayer.getPlayer(), player).join(); String encodedReport = Base64.getEncoder().encodeToString(report.toString().getBytes()); String url = "https://joinguard.raidvm.com/login/oauth2?state=" + encodedReport; - BaseComponent component = new TextComponent(TextComponent.fromLegacyText(ChatUtils.colorize("&b&nKliknij tutaj aby wysłać zgłoszenie!"))); + BaseComponent component = new TextComponent(TextComponent.fromLegacyText(ChatUtils.colorize("&b&nClick here to send the report!"))); component.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)); player.spigot().sendMessage(component); }); @@ -122,23 +122,23 @@ public void reportPlayer(Player player, OnlinePlayer reportedPlayer) { private CompletableFuture createReportJson(Player reported, Player reporter) { return CompletableFuture.supplyAsync(() -> { - // Reporter + // Reported player JsonObject reportedJson = new JsonObject(); reportedJson.addProperty("nick", reported.getName()); reportedJson.addProperty("uuid", reported.getUniqueId().toString()); reportedJson.addProperty("ip", reported.getAddress().getHostString()); - // Reported - JsonObject reportedPlayerJson = new JsonObject(); - reportedPlayerJson.addProperty("nick", reporter.getName()); + // Reporter + JsonObject reporterJson = new JsonObject(); + reporterJson.addProperty("nick", reporter.getName()); // Server data JsonObject serverJson = new JsonObject(); serverJson.addProperty("ip", JoinGuard.getServerIp().join()); serverJson.addProperty("port", Bukkit.getPort()); - // Bind this data + // Combine the data JsonObject reportJson = new JsonObject(); reportJson.add("reported", reportedJson); - reportJson.add("reporting", reportedPlayerJson); + reportJson.add("reporting", reporterJson); reportJson.add("server", serverJson); return reportJson;