diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 18c82c7..bf82fbb 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,16 +1,16 @@ name: Java CI -on: [push] +on: [ push ] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Build with Maven - run: mvn -B package --file pom.xml \ No newline at end of file + - uses: actions/checkout@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build with Maven + run: mvn -B package --file pom.xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 48532d3..199a6af 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.destroystokyo.paper paper-api - 1.16.3-R0.1-SNAPSHOT + 1.16.4-R0.1-SNAPSHOT provided @@ -35,7 +35,7 @@ org.projectlombok lombok - 1.18.12 + 1.18.16 compile diff --git a/src/main/java/me/totalfreedom/plex/Plex.java b/src/main/java/me/totalfreedom/plex/Plex.java index ada3b87..52fe507 100644 --- a/src/main/java/me/totalfreedom/plex/Plex.java +++ b/src/main/java/me/totalfreedom/plex/Plex.java @@ -18,8 +18,6 @@ import me.totalfreedom.plex.util.PlexUtils; import me.totalfreedom.plex.world.CustomWorld; import org.bukkit.plugin.java.JavaPlugin; -import java.io.File; - @Getter @Setter public class Plex extends JavaPlugin @@ -118,7 +116,9 @@ public class Plex extends JavaPlugin { PlexLog.log("Generating any worlds if needed..."); for (String key : config.getConfigurationSection("worlds").getKeys(false)) + { CustomWorld.generateConfigFlatWorld(key); + } PlexLog.log("Finished with world generation!"); } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/admin/Admin.java b/src/main/java/me/totalfreedom/plex/admin/Admin.java index 4c2b9eb..2dd0817 100644 --- a/src/main/java/me/totalfreedom/plex/admin/Admin.java +++ b/src/main/java/me/totalfreedom/plex/admin/Admin.java @@ -1,12 +1,11 @@ package me.totalfreedom.plex.admin; +import java.util.UUID; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import me.totalfreedom.plex.rank.enums.Rank; -import java.util.UUID; - @Getter @Setter public class Admin @@ -26,6 +25,4 @@ public class Admin } - - } diff --git a/src/main/java/me/totalfreedom/plex/admin/AdminList.java b/src/main/java/me/totalfreedom/plex/admin/AdminList.java index ac6b503..528adc2 100644 --- a/src/main/java/me/totalfreedom/plex/admin/AdminList.java +++ b/src/main/java/me/totalfreedom/plex/admin/AdminList.java @@ -4,13 +4,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import dev.morphia.Datastore; import dev.morphia.query.Query; -import dev.morphia.query.experimental.filters.Filters; import dev.morphia.query.internal.MorphiaCursor; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.storage.StorageType; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -18,6 +12,10 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; import java.util.UUID; +import me.totalfreedom.plex.Plex; +import me.totalfreedom.plex.player.PlexPlayer; +import me.totalfreedom.plex.rank.enums.Rank; +import me.totalfreedom.plex.storage.StorageType; public class AdminList { @@ -51,7 +49,9 @@ public class AdminList admins.add(player.getName()); } } - } else { + } + else + { try (Connection con = Plex.get().getSqlConnection().getCon()) { PreparedStatement statement = con.prepareStatement("SELECT * FROM `players` WHERE rank IN(?, ?, ?)"); @@ -65,7 +65,9 @@ public class AdminList admins.add(set.getString("name")); } - } catch (SQLException throwables) { + } + catch (SQLException throwables) + { throwables.printStackTrace(); } } diff --git a/src/main/java/me/totalfreedom/plex/cache/DataUtils.java b/src/main/java/me/totalfreedom/plex/cache/DataUtils.java index ec26f38..142c36d 100644 --- a/src/main/java/me/totalfreedom/plex/cache/DataUtils.java +++ b/src/main/java/me/totalfreedom/plex/cache/DataUtils.java @@ -1,11 +1,10 @@ package me.totalfreedom.plex.cache; +import java.util.UUID; import me.totalfreedom.plex.Plex; import me.totalfreedom.plex.player.PlexPlayer; import me.totalfreedom.plex.storage.StorageType; -import java.util.UUID; - public class DataUtils { @@ -14,7 +13,9 @@ public class DataUtils if (Plex.get().getStorageType() == StorageType.MONGO) { return Plex.get().getMongoPlayerData().exists(uuid); - } else { + } + else + { return Plex.get().getSqlPlayerData().exists(uuid); } } @@ -29,7 +30,9 @@ public class DataUtils if (Plex.get().getStorageType() == StorageType.MONGO) { return Plex.get().getMongoPlayerData().getByUUID(uuid); - } else { + } + else + { return Plex.get().getSqlPlayerData().getByUUID(uuid); } } @@ -39,7 +42,9 @@ public class DataUtils if (Plex.get().getStorageType() == StorageType.MONGO) { Plex.get().getMongoPlayerData().update(plexPlayer); - } else { + } + else + { Plex.get().getSqlPlayerData().update(plexPlayer); } } diff --git a/src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java b/src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java index e4499c5..1349d1b 100644 --- a/src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java +++ b/src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java @@ -5,11 +5,10 @@ import dev.morphia.query.Query; import dev.morphia.query.Update; import dev.morphia.query.experimental.filters.Filters; import dev.morphia.query.experimental.updates.UpdateOperators; +import java.util.UUID; import me.totalfreedom.plex.Plex; import me.totalfreedom.plex.player.PlexPlayer; -import java.util.UUID; - public class MongoPlayerData { private final Datastore datastore; diff --git a/src/main/java/me/totalfreedom/plex/cache/PlayerCache.java b/src/main/java/me/totalfreedom/plex/cache/PlayerCache.java index f7f50ac..be3bda9 100644 --- a/src/main/java/me/totalfreedom/plex/cache/PlayerCache.java +++ b/src/main/java/me/totalfreedom/plex/cache/PlayerCache.java @@ -1,11 +1,10 @@ package me.totalfreedom.plex.cache; import com.google.common.collect.Maps; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.player.PunishedPlayer; - import java.util.Map; import java.util.UUID; +import me.totalfreedom.plex.player.PlexPlayer; +import me.totalfreedom.plex.player.PunishedPlayer; public class PlayerCache { diff --git a/src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java b/src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java index a2feb84..e282f8d 100644 --- a/src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java +++ b/src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java @@ -2,15 +2,14 @@ package me.totalfreedom.plex.cache; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.player.PlexPlayer; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import java.util.UUID; +import me.totalfreedom.plex.Plex; +import me.totalfreedom.plex.player.PlexPlayer; public class SQLPlayerData { diff --git a/src/main/java/me/totalfreedom/plex/command/IPlexCommand.java b/src/main/java/me/totalfreedom/plex/command/IPlexCommand.java index 8f1395a..5f37245 100644 --- a/src/main/java/me/totalfreedom/plex/command/IPlexCommand.java +++ b/src/main/java/me/totalfreedom/plex/command/IPlexCommand.java @@ -1,13 +1,13 @@ package me.totalfreedom.plex.command; -import me.totalfreedom.plex.command.source.CommandSource; - import java.util.List; +import me.totalfreedom.plex.command.source.CommandSource; public interface IPlexCommand { void execute(CommandSource sender, String[] args); + List onTabComplete(CommandSource sender, String[] args); } diff --git a/src/main/java/me/totalfreedom/plex/command/PlexCommand.java b/src/main/java/me/totalfreedom/plex/command/PlexCommand.java index 7c3dcc7..41fd009 100644 --- a/src/main/java/me/totalfreedom/plex/command/PlexCommand.java +++ b/src/main/java/me/totalfreedom/plex/command/PlexCommand.java @@ -1,6 +1,9 @@ package me.totalfreedom.plex.command; import com.google.common.collect.ImmutableList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import me.totalfreedom.plex.Plex; import me.totalfreedom.plex.cache.PlayerCache; import me.totalfreedom.plex.command.annotation.CommandParameters; @@ -16,13 +19,12 @@ import me.totalfreedom.plex.util.PlexLog; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.World; -import org.bukkit.command.*; +import org.bukkit.command.Command; +import org.bukkit.command.CommandMap; +import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; - -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - import static me.totalfreedom.plex.util.PlexUtils.tl; public abstract class PlexCommand extends Command implements TabExecutor, IPlexCommand @@ -67,9 +69,14 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - if (!matches(label)) return false; + if (!matches(label)) + { + return false; + } if (this.sender == null) + { this.sender = new CommandSource(sender); + } PlexLog.log(this.sender.getSender().getName()); if (commandSource == RequiredCommandSource.CONSOLE && sender instanceof Player) { @@ -83,7 +90,7 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC sender.sendMessage(tl("noPermissionConsole")); return true; } - Player player = (Player) sender; + Player player = (Player)sender; PlexPlayer plexPlayer = PlayerCache.getPlexPlayerMap().get(player.getUniqueId()); if (!plexPlayer.getRankFromString().isAtLeast(getLevel())) { @@ -109,20 +116,29 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC @Override public List tabComplete(CommandSender sender, String alias, String[] args) { - if (!matches(alias)) return ImmutableList.of(); + if (!matches(alias)) + { + return ImmutableList.of(); + } if (this.sender == null) + { this.sender = new CommandSource(sender); + } if (sender instanceof Player) { - Player player = (Player) sender; + Player player = (Player)sender; PlexPlayer plexPlayer = PlayerCache.getPlexPlayerMap().get(player.getUniqueId()); if (plexPlayer.getRankFromString().isAtLeast(getLevel())) { return onTabComplete(this.sender, args); - } else { + } + else + { return ImmutableList.of(); } - } else { + } + else + { return onTabComplete(this.sender, args); } } @@ -144,7 +160,8 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC return true; } } - } else if (params.aliases().split(",").length < 1) + } + else if (params.aliases().split(",").length < 1) { return getName().equalsIgnoreCase(label); } @@ -169,7 +186,9 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC protected void send(String s) { if (sender == null) + { return; + } send(s, sender); } @@ -177,7 +196,9 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC { Player player = Bukkit.getPlayer(name); if (player == null) + { throw new PlayerNotFoundException(); + } return player; } @@ -186,7 +207,9 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC Player player = getNonNullPlayer(name); PlexPlayer plexPlayer = PlayerCache.getPlexPlayer(player.getUniqueId()); if (plexPlayer == null) + { throw new PlayerNotFoundException(); + } return plexPlayer; } @@ -194,7 +217,9 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC { PlexPlayer plexPlayer = PlayerCache.getPlexPlayer(uuid); if (plexPlayer == null) + { throw new PlayerNotFoundException(); + } return plexPlayer; } @@ -202,7 +227,9 @@ public abstract class PlexCommand extends Command implements TabExecutor, IPlexC { World world = Bukkit.getWorld(name); if (world == null) + { throw new CommandFailException(tl("worldNotFound")); + } return world; } diff --git a/src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java b/src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java index f3c47d9..724c61e 100644 --- a/src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java +++ b/src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java @@ -7,6 +7,8 @@ import java.lang.annotation.RetentionPolicy; public @interface CommandParameters { String description() default ""; + String usage() default "/"; + String aliases() default ""; } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java b/src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java index 5ba2a5c..b625b03 100644 --- a/src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java +++ b/src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java @@ -1,14 +1,14 @@ package me.totalfreedom.plex.command.annotation; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import me.totalfreedom.plex.command.source.RequiredCommandSource; +import me.totalfreedom.plex.rank.enums.Rank; @Retention(RetentionPolicy.RUNTIME) public @interface CommandPermissions { Rank level() default Rank.IMPOSTOR; + RequiredCommandSource source() default RequiredCommandSource.ANY; } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java b/src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java index bb6c6e3..8fc14ab 100644 --- a/src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java +++ b/src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java @@ -1,3 +1,5 @@ package me.totalfreedom.plex.command.exception; -public class CommandArgumentException extends RuntimeException {} // lolololol \ No newline at end of file +public class CommandArgumentException extends RuntimeException +{ +} // lolololol \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java index 25fb77a..ff4fcb8 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java @@ -1,6 +1,9 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import me.totalfreedom.plex.cache.DataUtils; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; @@ -16,15 +19,12 @@ import me.totalfreedom.plex.util.PlexUtils; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - @CommandPermissions(level = Rank.SENIOR_ADMIN, source = RequiredCommandSource.CONSOLE) @CommandParameters(usage = "/ [player] [rank]", aliases = "adminconfig,adminmanage", description = "Manages all admins") public class AdminCMD extends PlexCommand { - public AdminCMD() { + public AdminCMD() + { super("admin"); } @@ -133,11 +133,13 @@ public class AdminCMD extends PlexCommand } @Override - public List onTabComplete(CommandSource sender, String[] args) { + public List onTabComplete(CommandSource sender, String[] args) + { if (args.length == 1) { return Arrays.asList("add", "remove", "setrank", "list"); - } else if (args.length == 2 && !args[0].equalsIgnoreCase("list")) + } + else if (args.length == 2 && !args[0].equalsIgnoreCase("list")) { return PlexUtils.getPlayerNameList(); } diff --git a/src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java index 8761880..3cbcd87 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java @@ -1,6 +1,11 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import me.totalfreedom.plex.cache.PlayerCache; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; @@ -12,12 +17,16 @@ import me.totalfreedom.plex.command.source.RequiredCommandSource; import me.totalfreedom.plex.util.PlexUtils; import me.totalfreedom.plex.world.BlockMapChunkGenerator; import me.totalfreedom.plex.world.CustomWorld; -import org.bukkit.*; -import org.bukkit.entity.*; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.entity.Enderman; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.entity.Strider; import org.bukkit.scheduler.BukkitRunnable; - -import java.util.*; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandParameters(description = "Subliminal message.") @@ -36,9 +45,13 @@ public class FionnCMD extends PlexCommand public void execute(CommandSource sender, String[] args) { if (!sender.getPlayer().getUniqueId().equals(UUID.fromString("9aa3eda6-c271-440a-a578-a952ee9aee2f"))) + { throw new CommandFailException(tl("noPermission")); + } if (args.length != 0) + { throw new CommandArgumentException(); + } String name = "fionn"; LinkedHashMap map = new LinkedHashMap<>(); map.put(Material.CRIMSON_NYLIUM, 1); @@ -47,11 +60,11 @@ public class FionnCMD extends PlexCommand ENABLED = true; fionnWorld.setTime(0); fionnWorld.getBlockAt(0, 5, 0).setType(Material.BARRIER); - Strider fionn = (Strider) fionnWorld.spawnEntity(new Location(fionnWorld, 12, 6, 6, -180, -3), EntityType.STRIDER); + Strider fionn = (Strider)fionnWorld.spawnEntity(new Location(fionnWorld, 12, 6, 6, -180, -3), EntityType.STRIDER); fionn.setCustomNameVisible(true); fionn.setCustomName(ChatColor.GREEN + "fionn"); fionn.setAI(false); - Enderman elmon = (Enderman) fionnWorld.spawnEntity(new Location(fionnWorld, 12, 6, 0, 0, 18), EntityType.ENDERMAN); + Enderman elmon = (Enderman)fionnWorld.spawnEntity(new Location(fionnWorld, 12, 6, 0, 0, 18), EntityType.ENDERMAN); elmon.setCustomNameVisible(true); elmon.setCustomName(ChatColor.RED + "elmon"); elmon.setInvulnerable(true); @@ -108,7 +121,9 @@ public class FionnCMD extends PlexCommand p.setInvisible(false); Location location = LOCATION_CACHE.get(p); if (location != null) + { p.teleport(location); + } PlayerCache.getPunishedPlayer(p.getUniqueId()).setFrozen(false); } LOCATION_CACHE.clear(); diff --git a/src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java index e39c744..0df2ac5 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java @@ -1,6 +1,7 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.List; import me.totalfreedom.plex.cache.PlayerCache; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; @@ -11,9 +12,6 @@ import me.totalfreedom.plex.player.PunishedPlayer; import me.totalfreedom.plex.rank.enums.Rank; import me.totalfreedom.plex.util.PlexUtils; import org.bukkit.entity.Player; - -import java.util.List; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandParameters(description = "Freeze/unfreeze a player on the server", usage = "/ ") @@ -29,7 +27,9 @@ public class FreezeCMD extends PlexCommand public void execute(CommandSource sender, String[] args) { if (args.length != 1) + { throw new CommandArgumentException(); + } Player player = getNonNullPlayer(args[0]); PunishedPlayer punishedPlayer = PlayerCache.getPunishedPlayer(player.getUniqueId()); punishedPlayer.setFrozen(!punishedPlayer.isFrozen()); diff --git a/src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java index 1d59f40..3f33348 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java @@ -1,6 +1,10 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Comparator; +import java.util.List; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; import me.totalfreedom.plex.command.annotation.CommandPermissions; @@ -11,12 +15,6 @@ import me.totalfreedom.plex.util.PlexUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; - -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Comparator; -import java.util.List; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandParameters(description = "Get the name history of a player", usage = "/ ", aliases = "nh") @@ -34,14 +32,16 @@ public class NameHistoryCMD extends PlexCommand public void execute(CommandSource sender, String[] args) { if (args.length != 1) + { throw new CommandArgumentException(); + } String username = args[0]; JSONArray array; try { - JSONObject profile = (JSONObject) PlexUtils.simpleGET("https://api.mojang.com/users/profiles/minecraft/" + username); - String uuid = (String) profile.get("id"); - array = (JSONArray) PlexUtils.simpleGET("https://api.mojang.com/user/profiles/" + uuid + "/names"); + JSONObject profile = (JSONObject)PlexUtils.simpleGET("https://api.mojang.com/users/profiles/minecraft/" + username); + String uuid = (String)profile.get("id"); + array = (JSONArray)PlexUtils.simpleGET("https://api.mojang.com/user/profiles/" + uuid + "/names"); } catch (ParseException | IOException ex) { @@ -56,14 +56,18 @@ public class NameHistoryCMD extends PlexCommand .append("\n"); for (Object o : array) { - JSONObject object = (JSONObject) o; + JSONObject object = (JSONObject)o; Object changedToAt = object.get("changedToAt"); if (changedToAt == null) + { changedToAt = "O"; + } else + { changedToAt = DATE_FORMAT.format(changedToAt); + } result.append(tl("nameHistoryBody", object.get("name"), changedToAt)) - .append("\n"); + .append("\n"); } send(result.toString()); } diff --git a/src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java index a746597..bd45232 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java @@ -1,6 +1,7 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.List; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; import me.totalfreedom.plex.command.annotation.CommandPermissions; @@ -9,9 +10,6 @@ import me.totalfreedom.plex.rank.enums.Rank; import me.totalfreedom.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; - -import java.util.List; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandParameters(description = "Op everyone on the server", aliases = "opa") @@ -27,12 +25,15 @@ public class OpAllCMD extends PlexCommand public void execute(CommandSource sender, String[] args) { for (Player player : Bukkit.getOnlinePlayers()) + { player.setOp(true); + } PlexUtils.broadcast(tl("oppedAllPlayers", sender.getName())); } @Override - public List onTabComplete(CommandSource sender, String[] args) { + public List onTabComplete(CommandSource sender, String[] args) + { return ImmutableList.of(); } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java index 623709b..26471ed 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java @@ -1,6 +1,7 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.List; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; import me.totalfreedom.plex.command.annotation.CommandPermissions; @@ -9,9 +10,6 @@ import me.totalfreedom.plex.command.source.CommandSource; import me.totalfreedom.plex.rank.enums.Rank; import me.totalfreedom.plex.util.PlexUtils; import org.bukkit.entity.Player; - -import java.util.List; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandParameters(description = "Op a player on the server", usage = "/ ") @@ -27,7 +25,9 @@ public class OpCMD extends PlexCommand public void execute(CommandSource sender, String[] args) { if (args.length != 1) + { throw new CommandArgumentException(); + } Player player = getNonNullPlayer(args[0]); player.setOp(true); PlexUtils.broadcast(tl("oppedPlayer", sender.getName(), player.getName())); diff --git a/src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java index 9c81d94..7c6c7b8 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java @@ -1,5 +1,7 @@ package me.totalfreedom.plex.command.impl; +import java.util.Arrays; +import java.util.List; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; import me.totalfreedom.plex.command.annotation.CommandPermissions; @@ -7,14 +9,12 @@ import me.totalfreedom.plex.command.source.CommandSource; import me.totalfreedom.plex.command.source.RequiredCommandSource; import me.totalfreedom.plex.rank.enums.Rank; -import java.util.Arrays; -import java.util.List; - @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) @CommandParameters(aliases = "plexhelp", description = "Help with plex") public class PlexCMD extends PlexCommand { - public PlexCMD() { + public PlexCMD() + { super("plex"); } @@ -25,7 +25,8 @@ public class PlexCMD extends PlexCommand } @Override - public List onTabComplete(CommandSource sender, String[] args) { + public List onTabComplete(CommandSource sender, String[] args) + { return Arrays.asList("Telesphoreo", "super", "Taahh"); } } diff --git a/src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java index d2d8c32..d111db2 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java @@ -1,23 +1,22 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.Arrays; +import java.util.List; +import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; import me.totalfreedom.plex.command.annotation.CommandPermissions; -import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.source.CommandSource; import me.totalfreedom.plex.command.source.RequiredCommandSource; import me.totalfreedom.plex.rank.enums.Rank; - -import java.util.Arrays; -import java.util.List; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) @CommandParameters(aliases = "tst,tast", description = "HELLO") public class TestCMD extends PlexCommand { - public TestCMD() { + public TestCMD() + { super("test"); } @@ -28,7 +27,8 @@ public class TestCMD extends PlexCommand } @Override - public List onTabComplete(CommandSource sender, String[] args) { + public List onTabComplete(CommandSource sender, String[] args) + { if (args.length == 1) { return Arrays.asList("WHATTHEFAWK", "LUL"); diff --git a/src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java b/src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java index 2ae2782..186adce 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java +++ b/src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java @@ -1,6 +1,8 @@ package me.totalfreedom.plex.command.impl; import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.List; import me.totalfreedom.plex.command.PlexCommand; import me.totalfreedom.plex.command.annotation.CommandParameters; import me.totalfreedom.plex.command.annotation.CommandPermissions; @@ -11,17 +13,14 @@ import me.totalfreedom.plex.rank.enums.Rank; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; - -import java.util.ArrayList; -import java.util.List; - import static me.totalfreedom.plex.util.PlexUtils.tl; @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.IN_GAME) @CommandParameters(description = "Teleport to a world.", usage = "/ ") public class WorldCMD extends PlexCommand { - public WorldCMD() { + public WorldCMD() + { super("world"); } @@ -29,7 +28,9 @@ public class WorldCMD extends PlexCommand public void execute(CommandSource sender, String[] args) { if (args.length != 1) + { throw new CommandArgumentException(); + } World world = getNonNullWorld(args[0]); sender.getPlayer().teleport(new Location(world, 0, world.getHighestBlockYAt(0, 0) + 1, 0, 0, 0)); send(tl("playerWorldTeleport", world.getName())); @@ -40,9 +41,13 @@ public class WorldCMD extends PlexCommand { List worlds = new ArrayList<>(); for (World world : Bukkit.getWorlds()) + { worlds.add(world.getName()); + } if (args.length == 1) + { return worlds; + } return ImmutableList.of(); } diff --git a/src/main/java/me/totalfreedom/plex/command/source/CommandSource.java b/src/main/java/me/totalfreedom/plex/command/source/CommandSource.java index f0f7bc6..dfab73b 100644 --- a/src/main/java/me/totalfreedom/plex/command/source/CommandSource.java +++ b/src/main/java/me/totalfreedom/plex/command/source/CommandSource.java @@ -18,7 +18,7 @@ public class CommandSource { this.sender = sender; this.player = sender instanceof Player ? Bukkit.getPlayer(sender.getName()) : null; - this.plexPlayer = sender instanceof Player ? PlayerCache.getPlexPlayerMap().get(((Player) sender).getUniqueId()) : null; + this.plexPlayer = sender instanceof Player ? PlayerCache.getPlexPlayerMap().get(((Player)sender).getUniqueId()) : null; } public void send(String s) diff --git a/src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java b/src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java index cdca741..9782308 100644 --- a/src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java +++ b/src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java @@ -21,7 +21,8 @@ public class AdminAddEvent extends Event return handlers; } - public PlexPlayer getPlexPlayer() { + public PlexPlayer getPlexPlayer() + { return plexPlayer; } } diff --git a/src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java b/src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java index e78bc2f..9451640 100644 --- a/src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java +++ b/src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java @@ -21,7 +21,8 @@ public class AdminRemoveEvent extends Event return handlers; } - public PlexPlayer getPlexPlayer() { + public PlexPlayer getPlexPlayer() + { return plexPlayer; } } diff --git a/src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java b/src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java index 7099f49..245ec9d 100644 --- a/src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java +++ b/src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java @@ -24,11 +24,13 @@ public class AdminSetRankEvent extends Event return handlers; } - public PlexPlayer getPlexPlayer() { + public PlexPlayer getPlexPlayer() + { return plexPlayer; } - public Rank getRank() { + public Rank getRank() + { return rank; } } diff --git a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java b/src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java index 6ae8e6d..706af71 100644 --- a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java +++ b/src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java @@ -1,5 +1,6 @@ package me.totalfreedom.plex.event; +import java.util.UUID; import lombok.Getter; import lombok.Setter; import me.totalfreedom.plex.player.PunishedPlayer; @@ -7,8 +8,6 @@ import org.bukkit.Bukkit; import org.bukkit.event.Cancellable; import org.bukkit.event.player.PlayerEvent; -import java.util.UUID; - @Getter public abstract class PunishedPlayerEvent extends PlayerEvent implements Cancellable { diff --git a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java b/src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java index 80fea66..063f308 100644 --- a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java +++ b/src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java @@ -4,6 +4,7 @@ import lombok.Getter; import me.totalfreedom.plex.player.PunishedPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; + @Getter public class PunishedPlayerFreezeEvent extends PunishedPlayerEvent implements Cancellable { diff --git a/src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java b/src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java index 9de1218..cd434f0 100644 --- a/src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java +++ b/src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java @@ -1,11 +1,18 @@ package me.totalfreedom.plex.handlers; import com.google.common.collect.Lists; -import me.totalfreedom.plex.command.PlexCommand; -import me.totalfreedom.plex.command.impl.*; -import me.totalfreedom.plex.util.PlexLog; - import java.util.List; +import me.totalfreedom.plex.command.PlexCommand; +import me.totalfreedom.plex.command.impl.AdminCMD; +import me.totalfreedom.plex.command.impl.FionnCMD; +import me.totalfreedom.plex.command.impl.FreezeCMD; +import me.totalfreedom.plex.command.impl.NameHistoryCMD; +import me.totalfreedom.plex.command.impl.OpAllCMD; +import me.totalfreedom.plex.command.impl.OpCMD; +import me.totalfreedom.plex.command.impl.PlexCMD; +import me.totalfreedom.plex.command.impl.TestCMD; +import me.totalfreedom.plex.command.impl.WorldCMD; +import me.totalfreedom.plex.util.PlexLog; public class CommandHandler { diff --git a/src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java b/src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java index 005dd84..ae117f9 100644 --- a/src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java +++ b/src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java @@ -1,11 +1,13 @@ package me.totalfreedom.plex.handlers; import com.google.common.collect.Lists; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.listener.impl.*; -import me.totalfreedom.plex.util.PlexLog; - import java.util.List; +import me.totalfreedom.plex.listener.PlexListener; +import me.totalfreedom.plex.listener.impl.ChatListener; +import me.totalfreedom.plex.listener.impl.FreezeListener; +import me.totalfreedom.plex.listener.impl.PlayerListener; +import me.totalfreedom.plex.listener.impl.WorldListener; +import me.totalfreedom.plex.util.PlexLog; public class ListenerHandler { diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java b/src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java index 20d908a..cf6c94f 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java +++ b/src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java @@ -6,7 +6,6 @@ import me.totalfreedom.plex.listener.PlexListener; import me.totalfreedom.plex.player.PlexPlayer; import net.md_5.bungee.api.ChatColor; import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; public class ChatListener extends PlexListener @@ -19,7 +18,8 @@ public class ChatListener extends PlexListener if (!plexPlayer.getPrefix().isEmpty()) { event.setFormat(String.format("%s %s §7» %s", plexPlayer.getPrefix(), ChatColor.RESET + plexPlayer.getName(), event.getMessage())); - } else if (Plex.get().getRankManager().isAdmin(plexPlayer)) + } + else if (Plex.get().getRankManager().isAdmin(plexPlayer)) { event.setFormat(String.format("%s %s §7» %s", plexPlayer.getRankFromString().getPrefix(), ChatColor.RESET + plexPlayer.getName(), event.getMessage())); } diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java b/src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java index e085f4a..92b1a09 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java +++ b/src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java @@ -13,6 +13,8 @@ public class FreezeListener extends PlexListener { PunishedPlayer player = PlayerCache.getPunishedPlayer(e.getPlayer().getUniqueId()); if (player.isFrozen()) + { e.setCancelled(true); + } } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java b/src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java index 693ad95..0c59379 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java +++ b/src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java @@ -2,8 +2,6 @@ package me.totalfreedom.plex.listener.impl; import java.util.Arrays; import java.util.UUID; - -import me.totalfreedom.plex.Plex; import me.totalfreedom.plex.admin.Admin; import me.totalfreedom.plex.cache.MongoPlayerData; import me.totalfreedom.plex.cache.PlayerCache; @@ -18,7 +16,6 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -28,7 +25,7 @@ public class PlayerListener extends PlexListener private final SQLPlayerData sqlPlayerData = plugin.getSqlPlayerData() != null ? plugin.getSqlPlayerData() : null; // setting up a player's data - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerSetup(PlayerJoinEvent event) { Player player = event.getPlayer(); @@ -84,7 +81,9 @@ public class PlayerListener extends PlexListener if (!plexPlayer.getLoginMSG().isEmpty()) { event.setJoinMessage(ChatColor.AQUA + player.getName() + " is " + plexPlayer.getLoginMSG()); - } else { + } + else + { event.setJoinMessage(ChatColor.AQUA + player.getName() + " is " + plexPlayer.getRankFromString().getLoginMSG()); } @@ -112,7 +111,9 @@ public class PlayerListener extends PlexListener } if (FionnCMD.ENABLED) + { PlayerCache.getPunishedPlayer(event.getPlayer().getUniqueId()).setFrozen(false); + } PlayerCache.getPlexPlayerMap().remove(event.getPlayer().getUniqueId()); //remove them from cache PlayerCache.getPunishedPlayerMap().remove(event.getPlayer().getUniqueId()); @@ -130,7 +131,9 @@ public class PlayerListener extends PlexListener player.setInvisible(false); Location location = FionnCMD.LOCATION_CACHE.get(player); if (location != null) + { player.teleport(location); + } } } } diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java b/src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java index bcd1a54..85d31c3 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java +++ b/src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntitySpawnEvent; - import static me.totalfreedom.plex.util.PlexUtils.tl; public class WorldListener extends PlexListener @@ -26,7 +25,9 @@ public class WorldListener extends PlexListener case "adminworld": { if (plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN)) + { return; + } e.setCancelled(true); player.sendMessage(tl("noAdminWorldBlockPlace")); break; @@ -38,9 +39,13 @@ public class WorldListener extends PlexListener public void onEntitySpawn(EntitySpawnEvent e) { if (!e.getLocation().getWorld().getName().equals("fionn")) + { return; + } if (e.getEntityType() != EntityType.SLIME) + { return; + } e.setCancelled(true); } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/player/PlexPlayer.java b/src/main/java/me/totalfreedom/plex/player/PlexPlayer.java index 0f23062..3dd3a8b 100644 --- a/src/main/java/me/totalfreedom/plex/player/PlexPlayer.java +++ b/src/main/java/me/totalfreedom/plex/player/PlexPlayer.java @@ -39,7 +39,9 @@ public class PlexPlayer private List ips; - public PlexPlayer() {} + public PlexPlayer() + { + } public PlexPlayer(UUID playerUUID) { @@ -67,10 +69,14 @@ public class PlexPlayer if (player.isOp()) { return Rank.OP; - } else { + } + else + { return Rank.NONOP; } - } else { + } + else + { return Rank.valueOf(rank.toUpperCase()); } } diff --git a/src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java b/src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java index 9da83cb..2f93ca1 100644 --- a/src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java +++ b/src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java @@ -29,6 +29,8 @@ public class PunishedPlayer PunishedPlayerFreezeEvent e = new PunishedPlayerFreezeEvent(this, this.frozen); Bukkit.getServer().getPluginManager().callEvent(e); if (!e.isCancelled()) + { this.frozen = frozen; + } } } diff --git a/src/main/java/me/totalfreedom/plex/rank/RankManager.java b/src/main/java/me/totalfreedom/plex/rank/RankManager.java index fca8fcd..5525207 100644 --- a/src/main/java/me/totalfreedom/plex/rank/RankManager.java +++ b/src/main/java/me/totalfreedom/plex/rank/RankManager.java @@ -1,19 +1,18 @@ package me.totalfreedom.plex.rank; import com.google.common.collect.Maps; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexLog; -import org.json.JSONObject; -import org.json.JSONTokener; - import java.io.File; import java.io.FileInputStream; import java.io.FileWriter; import java.io.IOException; import java.util.Map; import java.util.stream.Collectors; +import me.totalfreedom.plex.Plex; +import me.totalfreedom.plex.player.PlexPlayer; +import me.totalfreedom.plex.rank.enums.Rank; +import me.totalfreedom.plex.util.PlexLog; +import org.json.JSONObject; +import org.json.JSONTokener; public class RankManager { @@ -79,7 +78,10 @@ public class RankManager JSONObject rankObj = object.getJSONObject("ranks"); for (Rank rank : Rank.values()) { - if (rankObj.isNull(rank.name().toUpperCase())) continue; + if (rankObj.isNull(rank.name().toUpperCase())) + { + continue; + } rank.setLoginMessage(rankObj.getJSONObject(rank.name().toUpperCase()).getString("loginMSG")); rank.setPrefix(rankObj.getJSONObject(rank.name().toUpperCase()).getString("prefix")); //should i even be doing this rank.setPermissions(rankObj.getJSONObject(rank.name().toUpperCase()).getJSONArray("permissions").toList().stream().map(Object::toString).collect(Collectors.toList())); diff --git a/src/main/java/me/totalfreedom/plex/rank/enums/Rank.java b/src/main/java/me/totalfreedom/plex/rank/enums/Rank.java index 7620ecb..3e6ca9b 100644 --- a/src/main/java/me/totalfreedom/plex/rank/enums/Rank.java +++ b/src/main/java/me/totalfreedom/plex/rank/enums/Rank.java @@ -1,9 +1,8 @@ package me.totalfreedom.plex.rank.enums; import com.google.common.collect.Lists; -import org.bukkit.ChatColor; - import java.util.List; +import org.bukkit.ChatColor; public enum Rank { @@ -15,7 +14,7 @@ public enum Rank EXECUTIVE(4, ChatColor.RED + "an " + ChatColor.RED + "Executive", ChatColor.RED + "[Exec]"); private String loginMessage; - private String prefix; + private String prefix; private int level; private List permissions; @@ -37,7 +36,8 @@ public enum Rank return ChatColor.translateAlternateColorCodes('&', loginMessage); } - public int getLevel() { + public int getLevel() + { return level; } @@ -46,7 +46,8 @@ public enum Rank this.loginMessage = msg; } - public void setPrefix(String prefix) { + public void setPrefix(String prefix) + { this.prefix = prefix; } @@ -55,11 +56,13 @@ public enum Rank return getLevel() >= rank.getLevel(); } - public List getPermissions() { + public List getPermissions() + { return permissions; } - public void setPermissions(List permissions) { + public void setPermissions(List permissions) + { this.permissions = permissions; } } diff --git a/src/main/java/me/totalfreedom/plex/storage/StorageType.java b/src/main/java/me/totalfreedom/plex/storage/StorageType.java index 2072670..b694b26 100644 --- a/src/main/java/me/totalfreedom/plex/storage/StorageType.java +++ b/src/main/java/me/totalfreedom/plex/storage/StorageType.java @@ -2,6 +2,5 @@ package me.totalfreedom.plex.storage; public enum StorageType { - MONGO, SQL, SQLITE; - + MONGO, SQL, SQLITE } diff --git a/src/main/java/me/totalfreedom/plex/util/PlexUtils.java b/src/main/java/me/totalfreedom/plex/util/PlexUtils.java index 5cf14a1..81c20f9 100644 --- a/src/main/java/me/totalfreedom/plex/util/PlexUtils.java +++ b/src/main/java/me/totalfreedom/plex/util/PlexUtils.java @@ -10,11 +10,14 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; - import me.totalfreedom.plex.Plex; import me.totalfreedom.plex.config.Config; import me.totalfreedom.plex.storage.StorageType; -import org.bukkit.*; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.PluginCommandYamlParser; import org.bukkit.entity.Player; @@ -81,12 +84,18 @@ public class PlexUtils { Plex plugin = Plex.get(); if (s.equals("baseColor") || s.equals("errorColor") || s.equals("broadcastColor")) + { return getChatColorFromConfig(plugin.messages, ChatColor.WHITE, s).toString(); + } String f = plugin.messages.getString(s); if (f == null) + { return ChatColor.RED + "No message"; + } for (Object object : objects) + { f = f.replaceFirst("", String.valueOf(object)); + } ChatColor base = getChatColorFromConfig(plugin.messages, ChatColor.GRAY, "baseColor"); ChatColor broadcast = getChatColorFromConfig(plugin.messages, ChatColor.AQUA, "broadcastColor"); ChatColor error = getChatColorFromConfig(plugin.messages, ChatColor.RED, "errorColor"); @@ -101,24 +110,32 @@ public class PlexUtils { ChatColor color; if (config.getString(path) == null) + { color = def; + } else if (ChatColor.getByChar(config.getString(path)) == null) + { color = def; + } else + { color = ChatColor.getByChar(config.getString(path)); + } return color; } public static void setBlocks(Location c1, Location c2, Material material) { if (!c1.getWorld().getName().equals(c1.getWorld().getName())) + { return; + } int sy = Math.min(c1.getBlockY(), c2.getBlockY()), - ey = Math.max(c1.getBlockY(), c2.getBlockY()), - sx = Math.min(c1.getBlockX(), c2.getBlockX()), - ex = Math.max(c1.getBlockX(), c2.getBlockX()), - sz = Math.min(c1.getBlockZ(), c2.getBlockZ()), - ez = Math.max(c1.getBlockZ(), c2.getBlockZ()); + ey = Math.max(c1.getBlockY(), c2.getBlockY()), + sx = Math.min(c1.getBlockX(), c2.getBlockX()), + ex = Math.max(c1.getBlockX(), c2.getBlockX()), + sz = Math.min(c1.getBlockZ(), c2.getBlockZ()), + ez = Math.max(c1.getBlockZ(), c2.getBlockZ()); World world = c1.getWorld(); for (int y = sy; y <= ey; y++) { @@ -136,7 +153,9 @@ public class PlexUtils { List names = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) + { names.add(player.getName()); + } return names; } @@ -148,13 +167,15 @@ public class PlexUtils public static Object simpleGET(String url) throws IOException, ParseException { URL u = new URL(url); - HttpURLConnection connection = (HttpURLConnection) u.openConnection(); + HttpURLConnection connection = (HttpURLConnection)u.openConnection(); connection.setRequestMethod("GET"); BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); String line; StringBuilder content = new StringBuilder(); while ((line = in.readLine()) != null) + { content.append(line); + } in.close(); connection.disconnect(); return new JSONParser().parse(content.toString()); @@ -163,13 +184,16 @@ public class PlexUtils public static UUID getFromName(String name) { JSONObject profile; - try { - profile = (JSONObject) PlexUtils.simpleGET("https://api.ashcon.app/mojang/v2/user/" + name); - } catch (IOException | ParseException e) { + try + { + profile = (JSONObject)PlexUtils.simpleGET("https://api.ashcon.app/mojang/v2/user/" + name); + } + catch (IOException | ParseException e) + { e.printStackTrace(); return null; } - String uuidString = (String) profile.get("uuid"); + String uuidString = (String)profile.get("uuid"); return UUID.fromString(uuidString); } } diff --git a/src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java b/src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java index b6f2792..8c3fff5 100644 --- a/src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java +++ b/src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java @@ -1,11 +1,10 @@ package me.totalfreedom.plex.world; -import me.totalfreedom.plex.Plex; -import org.bukkit.Material; -import org.bukkit.generator.BlockPopulator; - import java.util.LinkedHashMap; import java.util.Map; +import me.totalfreedom.plex.Plex; +import org.bukkit.Material; +import org.bukkit.generator.BlockPopulator; public class BlockMapChunkGenerator extends FlatChunkGenerator { @@ -24,11 +23,15 @@ public class BlockMapChunkGenerator extends FlatChunkGenerator { int height = -1; for (int i : blockMap.values()) + { height += i; + } for (Map.Entry entry : blockMap.entrySet()) { for (int i = 0; i < entry.getValue(); i++, height--) + { chunk.setBlock(x, height, z, entry.getKey()); + } } } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java b/src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java index 8bf841b..48ce3fd 100644 --- a/src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java +++ b/src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java @@ -1,11 +1,10 @@ package me.totalfreedom.plex.world; +import java.util.LinkedHashMap; import me.totalfreedom.plex.Plex; import org.bukkit.Material; import org.bukkit.generator.BlockPopulator; -import java.util.LinkedHashMap; - public class ConfigurationChunkGenerator extends BlockMapChunkGenerator { private static Plex plugin = Plex.get(); @@ -21,7 +20,10 @@ public class ConfigurationChunkGenerator extends BlockMapChunkGenerator for (String key : plugin.config.getConfigurationSection("worlds." + worldName + ".parameters").getKeys(false)) { Material material = Material.getMaterial(key.toUpperCase()); - if (material == null) continue; + if (material == null) + { + continue; + } int count = plugin.config.getInt("worlds." + worldName + ".parameters." + key); blockMap.put(material, count); } diff --git a/src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java b/src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java index f6303a8..cbefb30 100644 --- a/src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java +++ b/src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java @@ -1,11 +1,10 @@ package me.totalfreedom.plex.world; -import org.bukkit.World; -import org.bukkit.generator.BlockPopulator; -import org.bukkit.generator.ChunkGenerator; - import java.util.Arrays; import java.util.List; +import org.bukkit.World; +import org.bukkit.generator.BlockPopulator; +import org.bukkit.generator.ChunkGenerator; public abstract class CustomChunkGenerator extends ChunkGenerator { diff --git a/src/main/java/me/totalfreedom/plex/world/CustomWorld.java b/src/main/java/me/totalfreedom/plex/world/CustomWorld.java index 732560e..cb74b78 100644 --- a/src/main/java/me/totalfreedom/plex/world/CustomWorld.java +++ b/src/main/java/me/totalfreedom/plex/world/CustomWorld.java @@ -1,5 +1,7 @@ package me.totalfreedom.plex.world; +import java.io.File; +import java.util.Objects; import me.totalfreedom.plex.Plex; import org.bukkit.Material; import org.bukkit.World; @@ -9,9 +11,6 @@ import org.bukkit.block.BlockState; import org.bukkit.block.Sign; import org.bukkit.generator.ChunkGenerator; -import java.io.File; -import java.util.Objects; - public class CustomWorld extends WorldCreator { private static Plex plugin = Plex.get(); @@ -39,7 +38,9 @@ public class CustomWorld extends WorldCreator public static World generateConfigFlatWorld(String name) { if (!plugin.config.contains("worlds." + name)) + { return null; + } CustomWorld customWorld = new CustomWorld(name, new ConfigurationChunkGenerator(name)) { @Override @@ -54,7 +55,7 @@ public class CustomWorld extends WorldCreator BlockState state = block.getState(); if (state instanceof Sign) { - Sign sign = (Sign) state; + Sign sign = (Sign)state; sign.setLine(1, Objects.requireNonNull(plugin.config.getString("worlds." + name + ".name"))); sign.setLine(2, "- 0, 0 -"); sign.update(); diff --git a/src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java b/src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java index 406a2bb..6d5b9f7 100644 --- a/src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java +++ b/src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java @@ -1,8 +1,8 @@ package me.totalfreedom.plex.world; +import java.util.Random; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; -import java.util.Random; public abstract class FlatChunkGenerator extends CustomChunkGenerator { diff --git a/src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java b/src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java index cddf15e..2c04d9b 100644 --- a/src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java +++ b/src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java @@ -1,11 +1,10 @@ package me.totalfreedom.plex.world; +import java.util.Random; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; import org.bukkit.util.noise.PerlinNoiseGenerator; -import java.util.Random; - public abstract class NoiseChunkGenerator extends CustomChunkGenerator { private final NoiseOptions options; @@ -25,7 +24,7 @@ public abstract class NoiseChunkGenerator extends CustomChunkGenerator { for (int zz = 0; zz < 16; zz++) { - height = (int) generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); + height = (int)generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); createLoopChunkData(xx, height, zz, chunk); } } diff --git a/src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java b/src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java index 030f11a..a2843b3 100644 --- a/src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java +++ b/src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java @@ -1,16 +1,15 @@ package me.totalfreedom.plex.world; +import java.util.Random; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; import org.bukkit.util.noise.PerlinOctaveGenerator; -import java.util.Random; - public abstract class OctaveChunkGenerator extends CustomChunkGenerator { private OctaveOptions options; - public OctaveChunkGenerator(int height, OctaveOptions options, BlockPopulator... populators) + public OctaveChunkGenerator(int height, OctaveOptions options, BlockPopulator... populators) { super(height, populators); this.options = options; @@ -25,7 +24,7 @@ public abstract class OctaveChunkGenerator extends CustomChunkGenerator { for (int zz = 0; zz < 16; zz++) { - height = (int) generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); + height = (int)generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); createLoopChunkData(xx, height, zz, chunk); } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 1987e76..1a530b7 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -35,7 +35,7 @@ worlds: stone: 16 bedrock: 1 masterbuilderworld: - name: "MB World" + name: "MasterBuilder World" parameters: grass_block: 1 dirt: 32