diff --git a/README.md b/README.md index 8f4191f..ff57cce 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Plex -The long awaited rewrite of TotalFreedomMod begins here... +A new freedom plugin. diff --git a/pom.xml b/pom.xml index 97e635c..3b07ec1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.totalfreedom + dev.plex Plex 1.0 jar @@ -41,7 +41,7 @@ org.json json - 20200518 + 20201115 compile @@ -56,19 +56,19 @@ dev.morphia.morphia morphia-core - 2.0.2 + 2.1.3 compile redis.clients jedis - 3.3.0 + 3.4.1 compile org.mariadb.jdbc mariadb-java-client - 2.6.2 + 2.7.1 compile diff --git a/src/main/java/me/totalfreedom/plex/Plex.java b/src/main/java/dev/plex/Plex.java similarity index 78% rename from src/main/java/me/totalfreedom/plex/Plex.java rename to src/main/java/dev/plex/Plex.java index 7c488b9..90debb6 100644 --- a/src/main/java/me/totalfreedom/plex/Plex.java +++ b/src/main/java/dev/plex/Plex.java @@ -1,24 +1,24 @@ -package me.totalfreedom.plex; +package dev.plex; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.plex.admin.AdminList; -import me.totalfreedom.plex.banning.BanManager; -import me.totalfreedom.plex.cache.MongoPlayerData; -import me.totalfreedom.plex.cache.SQLPlayerData; -import me.totalfreedom.plex.config.Config; -import me.totalfreedom.plex.handlers.CommandHandler; -import me.totalfreedom.plex.handlers.ListenerHandler; -import me.totalfreedom.plex.punishment.PunishmentManager; -import me.totalfreedom.plex.rank.RankManager; -import me.totalfreedom.plex.services.ServiceManager; -import me.totalfreedom.plex.storage.MongoConnection; -import me.totalfreedom.plex.storage.RedisConnection; -import me.totalfreedom.plex.storage.SQLConnection; -import me.totalfreedom.plex.storage.StorageType; -import me.totalfreedom.plex.util.PlexLog; -import me.totalfreedom.plex.util.PlexUtils; -import me.totalfreedom.plex.world.CustomWorld; +import dev.plex.admin.AdminList; +import dev.plex.banning.BanManager; +import dev.plex.cache.MongoPlayerData; +import dev.plex.cache.SQLPlayerData; +import dev.plex.config.Config; +import dev.plex.handlers.CommandHandler; +import dev.plex.handlers.ListenerHandler; +import dev.plex.punishment.PunishmentManager; +import dev.plex.rank.RankManager; +import dev.plex.services.ServiceManager; +import dev.plex.storage.MongoConnection; +import dev.plex.storage.RedisConnection; +import dev.plex.storage.SQLConnection; +import dev.plex.storage.StorageType; +import dev.plex.util.PlexLog; +import dev.plex.util.PlexUtils; +import dev.plex.world.CustomWorld; import org.bukkit.plugin.java.JavaPlugin; @Getter @@ -87,7 +87,7 @@ public class Plex extends JavaPlugin e.printStackTrace(); } - if (storageType == StorageType.MONGO) + if (storageType == StorageType.MONGODB) { mongoPlayerData = new MongoPlayerData(); } diff --git a/src/main/java/me/totalfreedom/plex/PlexBase.java b/src/main/java/dev/plex/PlexBase.java similarity index 71% rename from src/main/java/me/totalfreedom/plex/PlexBase.java rename to src/main/java/dev/plex/PlexBase.java index 12d7df5..ed0c474 100644 --- a/src/main/java/me/totalfreedom/plex/PlexBase.java +++ b/src/main/java/dev/plex/PlexBase.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex; +package dev.plex; public class PlexBase { diff --git a/src/main/java/me/totalfreedom/plex/admin/Admin.java b/src/main/java/dev/plex/admin/Admin.java similarity index 82% rename from src/main/java/me/totalfreedom/plex/admin/Admin.java rename to src/main/java/dev/plex/admin/Admin.java index 2dd0817..1a9b549 100644 --- a/src/main/java/me/totalfreedom/plex/admin/Admin.java +++ b/src/main/java/dev/plex/admin/Admin.java @@ -1,10 +1,10 @@ -package me.totalfreedom.plex.admin; +package dev.plex.admin; import java.util.UUID; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.rank.enums.Rank; @Getter @Setter diff --git a/src/main/java/me/totalfreedom/plex/admin/AdminList.java b/src/main/java/dev/plex/admin/AdminList.java similarity index 79% rename from src/main/java/me/totalfreedom/plex/admin/AdminList.java rename to src/main/java/dev/plex/admin/AdminList.java index 528adc2..a0bea0e 100644 --- a/src/main/java/me/totalfreedom/plex/admin/AdminList.java +++ b/src/main/java/dev/plex/admin/AdminList.java @@ -1,10 +1,12 @@ -package me.totalfreedom.plex.admin; +package dev.plex.admin; 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.internal.MorphiaCursor; +import dev.plex.Plex; +import dev.plex.player.PlexPlayer; +import dev.plex.storage.StorageType; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -12,10 +14,7 @@ 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; +import dev.plex.rank.enums.Rank; public class AdminList { @@ -36,14 +35,12 @@ public class AdminList public List getAllAdmins() { List admins = Lists.newArrayList(); - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { Datastore store = Plex.get().getMongoConnection().getDatastore(); Query query = store.find(PlexPlayer.class); - MorphiaCursor cursor = query.iterator(); - while (cursor.hasNext()) + for (PlexPlayer player : query) { - PlexPlayer player = cursor.next(); if (player.getRankFromString().isAtLeast(Rank.ADMIN)) { admins.add(player.getName()); diff --git a/src/main/java/me/totalfreedom/plex/banning/Ban.java b/src/main/java/dev/plex/banning/Ban.java similarity index 94% rename from src/main/java/me/totalfreedom/plex/banning/Ban.java rename to src/main/java/dev/plex/banning/Ban.java index 79aa882..4684e1a 100644 --- a/src/main/java/me/totalfreedom/plex/banning/Ban.java +++ b/src/main/java/dev/plex/banning/Ban.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.banning; +package dev.plex.banning; import dev.morphia.annotations.Entity; import dev.morphia.annotations.Id; @@ -17,6 +17,9 @@ import java.util.UUID; @Entity(value = "bans", useDiscriminator = false) public class Ban { + public Ban() + { + } @Setter(AccessLevel.NONE) @Id @@ -24,7 +27,7 @@ public class Ban @Setter(AccessLevel.NONE) @Indexed(options = @IndexOptions(unique = true)) - private final UUID uuid; + private UUID uuid; @Indexed // have the banner be indexed in the future to get bans issued by a person private UUID banner; @@ -33,6 +36,7 @@ public class Ban private String reason; private Date endDate; private boolean active; + public Ban(UUID uuid, UUID banner, String ip, String reason, Date endDate) { this.uuid = uuid; @@ -54,6 +58,4 @@ public class Ban this.endDate = endDate; this.active = true; } - - } diff --git a/src/main/java/me/totalfreedom/plex/banning/BanManager.java b/src/main/java/dev/plex/banning/BanManager.java similarity index 92% rename from src/main/java/me/totalfreedom/plex/banning/BanManager.java rename to src/main/java/dev/plex/banning/BanManager.java index ce96c33..32a8797 100644 --- a/src/main/java/me/totalfreedom/plex/banning/BanManager.java +++ b/src/main/java/dev/plex/banning/BanManager.java @@ -1,13 +1,12 @@ -package me.totalfreedom.plex.banning; +package dev.plex.banning; import com.google.common.collect.Lists; import dev.morphia.query.Query; import dev.morphia.query.experimental.filters.Filters; import dev.morphia.query.experimental.updates.UpdateOperators; import dev.morphia.query.internal.MorphiaCursor; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.storage.StorageType; -import me.totalfreedom.plex.util.PlexLog; +import dev.plex.Plex; +import dev.plex.storage.StorageType; import java.sql.Connection; import java.sql.PreparedStatement; @@ -24,7 +23,7 @@ public class BanManager public void executeBan(Ban ban) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { Plex.get().getMongoConnection().getDatastore().save(ban); } else { @@ -49,7 +48,7 @@ public class BanManager public boolean isBanned(UUID uuid) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { return Plex.get().getMongoConnection().getDatastore().find(Ban.class) .filter(Filters.eq("uuid", uuid.toString())).filter(Filters.eq("active", true)).first() != null; @@ -73,7 +72,7 @@ public class BanManager public void unban(UUID uuid) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { Query query = Plex.get().getMongoConnection().getDatastore().find(Ban.class).filter(Filters.eq("uuid", uuid.toString())).filter(Filters.eq("active", true)); if (query.first() != null) @@ -95,7 +94,7 @@ public class BanManager public void unban(String id) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { Query query = Plex.get().getMongoConnection().getDatastore().find(Ban.class).filter(Filters.eq("_id", id)).filter(Filters.eq("active", true)); if (query.first() != null) @@ -118,7 +117,7 @@ public class BanManager public List getActiveBans() { List bans = Lists.newArrayList(); - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { MorphiaCursor cursor = Plex.get().getMongoConnection().getDatastore().find(Ban.class).filter(Filters.eq("active", true)).iterator(); while (cursor.hasNext()) diff --git a/src/main/java/me/totalfreedom/plex/cache/DataUtils.java b/src/main/java/dev/plex/cache/DataUtils.java similarity index 77% rename from src/main/java/me/totalfreedom/plex/cache/DataUtils.java rename to src/main/java/dev/plex/cache/DataUtils.java index 03592c3..29d17de 100644 --- a/src/main/java/me/totalfreedom/plex/cache/DataUtils.java +++ b/src/main/java/dev/plex/cache/DataUtils.java @@ -1,9 +1,9 @@ -package me.totalfreedom.plex.cache; +package dev.plex.cache; +import dev.plex.Plex; +import dev.plex.player.PlexPlayer; +import dev.plex.storage.StorageType; import java.util.UUID; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.storage.StorageType; import org.bukkit.Bukkit; public class DataUtils @@ -12,7 +12,7 @@ public class DataUtils public static boolean hasPlayedBefore(UUID uuid) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { return Plex.get().getMongoPlayerData().exists(uuid); } @@ -29,7 +29,7 @@ public class DataUtils return PlayerCache.getPlexPlayerMap().get(uuid); } - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { return Plex.get().getMongoPlayerData().getByUUID(uuid); } @@ -46,7 +46,7 @@ public class DataUtils public static void update(PlexPlayer plexPlayer) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { Plex.get().getMongoPlayerData().update(plexPlayer); } @@ -58,7 +58,7 @@ public class DataUtils public static void insert(PlexPlayer plexPlayer) { - if (Plex.get().getStorageType() == StorageType.MONGO) + if (Plex.get().getStorageType() == StorageType.MONGODB) { Plex.get().getMongoPlayerData().save(plexPlayer); } else { diff --git a/src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java b/src/main/java/dev/plex/cache/MongoPlayerData.java similarity index 94% rename from src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java rename to src/main/java/dev/plex/cache/MongoPlayerData.java index ed29e78..e03343d 100644 --- a/src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java +++ b/src/main/java/dev/plex/cache/MongoPlayerData.java @@ -1,13 +1,13 @@ -package me.totalfreedom.plex.cache; +package dev.plex.cache; import dev.morphia.Datastore; 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 dev.plex.Plex; +import dev.plex.player.PlexPlayer; import java.util.UUID; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.player.PlexPlayer; public class MongoPlayerData { diff --git a/src/main/java/me/totalfreedom/plex/cache/PlayerCache.java b/src/main/java/dev/plex/cache/PlayerCache.java similarity index 84% rename from src/main/java/me/totalfreedom/plex/cache/PlayerCache.java rename to src/main/java/dev/plex/cache/PlayerCache.java index be3bda9..6b39fa3 100644 --- a/src/main/java/me/totalfreedom/plex/cache/PlayerCache.java +++ b/src/main/java/dev/plex/cache/PlayerCache.java @@ -1,10 +1,10 @@ -package me.totalfreedom.plex.cache; +package dev.plex.cache; import com.google.common.collect.Maps; +import dev.plex.player.PlexPlayer; +import dev.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/dev/plex/cache/SQLPlayerData.java similarity index 97% rename from src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java rename to src/main/java/dev/plex/cache/SQLPlayerData.java index 0477bf3..3925d46 100644 --- a/src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java +++ b/src/main/java/dev/plex/cache/SQLPlayerData.java @@ -1,15 +1,15 @@ -package me.totalfreedom.plex.cache; +package dev.plex.cache; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; +import dev.plex.Plex; +import dev.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/dev/plex/command/IPlexCommand.java similarity index 57% rename from src/main/java/me/totalfreedom/plex/command/IPlexCommand.java rename to src/main/java/dev/plex/command/IPlexCommand.java index 70b75f8..e5ff3d1 100644 --- a/src/main/java/me/totalfreedom/plex/command/IPlexCommand.java +++ b/src/main/java/dev/plex/command/IPlexCommand.java @@ -1,8 +1,7 @@ -package me.totalfreedom.plex.command; +package dev.plex.command; +import dev.plex.command.source.CommandSource; import java.util.List; -import me.totalfreedom.plex.command.source.CommandSource; -import org.bukkit.command.CommandSender; public interface IPlexCommand { diff --git a/src/main/java/me/totalfreedom/plex/command/PlexCommand.java b/src/main/java/dev/plex/command/PlexCommand.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/command/PlexCommand.java rename to src/main/java/dev/plex/command/PlexCommand.java index 873bed0..5e3900d 100644 --- a/src/main/java/me/totalfreedom/plex/command/PlexCommand.java +++ b/src/main/java/dev/plex/command/PlexCommand.java @@ -1,23 +1,22 @@ -package me.totalfreedom.plex.command; +package dev.plex.command; import com.google.common.collect.ImmutableList; +import dev.plex.Plex; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandArgumentException; +import dev.plex.command.exception.CommandFailException; +import dev.plex.command.exception.PlayerNotFoundException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; import java.util.Arrays; import java.util.List; import java.util.UUID; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.cache.DataUtils; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.command.annotation.CommandParameters; -import me.totalfreedom.plex.command.annotation.CommandPermissions; -import me.totalfreedom.plex.command.exception.CommandArgumentException; -import me.totalfreedom.plex.command.exception.CommandFailException; -import me.totalfreedom.plex.command.exception.PlayerNotFoundException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexLog; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.cache.DataUtils; +import dev.plex.cache.PlayerCache; +import dev.plex.player.PlexPlayer; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.World; diff --git a/src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java b/src/main/java/dev/plex/command/annotation/CommandParameters.java similarity index 84% rename from src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java rename to src/main/java/dev/plex/command/annotation/CommandParameters.java index 724c61e..3e57b77 100644 --- a/src/main/java/me/totalfreedom/plex/command/annotation/CommandParameters.java +++ b/src/main/java/dev/plex/command/annotation/CommandParameters.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.command.annotation; +package dev.plex.command.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java b/src/main/java/dev/plex/command/annotation/CommandPermissions.java similarity index 63% rename from src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java rename to src/main/java/dev/plex/command/annotation/CommandPermissions.java index b625b03..bc517e1 100644 --- a/src/main/java/me/totalfreedom/plex/command/annotation/CommandPermissions.java +++ b/src/main/java/dev/plex/command/annotation/CommandPermissions.java @@ -1,9 +1,9 @@ -package me.totalfreedom.plex.command.annotation; +package dev.plex.command.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.command.source.RequiredCommandSource; +import dev.plex.rank.enums.Rank; @Retention(RetentionPolicy.RUNTIME) public @interface CommandPermissions diff --git a/src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java b/src/main/java/dev/plex/command/exception/CommandArgumentException.java similarity index 62% rename from src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java rename to src/main/java/dev/plex/command/exception/CommandArgumentException.java index 8fc14ab..b4911ee 100644 --- a/src/main/java/me/totalfreedom/plex/command/exception/CommandArgumentException.java +++ b/src/main/java/dev/plex/command/exception/CommandArgumentException.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.command.exception; +package dev.plex.command.exception; public class CommandArgumentException extends RuntimeException { diff --git a/src/main/java/me/totalfreedom/plex/command/exception/CommandFailException.java b/src/main/java/dev/plex/command/exception/CommandFailException.java similarity index 79% rename from src/main/java/me/totalfreedom/plex/command/exception/CommandFailException.java rename to src/main/java/dev/plex/command/exception/CommandFailException.java index 1c9c667..5c3c65c 100644 --- a/src/main/java/me/totalfreedom/plex/command/exception/CommandFailException.java +++ b/src/main/java/dev/plex/command/exception/CommandFailException.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.command.exception; +package dev.plex.command.exception; public class CommandFailException extends RuntimeException // this is literally just a runtime exception lol { diff --git a/src/main/java/me/totalfreedom/plex/command/exception/ConsoleMustDefinePlayerException.java b/src/main/java/dev/plex/command/exception/ConsoleMustDefinePlayerException.java similarity index 63% rename from src/main/java/me/totalfreedom/plex/command/exception/ConsoleMustDefinePlayerException.java rename to src/main/java/dev/plex/command/exception/ConsoleMustDefinePlayerException.java index eda08ed..00ffc15 100644 --- a/src/main/java/me/totalfreedom/plex/command/exception/ConsoleMustDefinePlayerException.java +++ b/src/main/java/dev/plex/command/exception/ConsoleMustDefinePlayerException.java @@ -1,6 +1,6 @@ -package me.totalfreedom.plex.command.exception; +package dev.plex.command.exception; -import static me.totalfreedom.plex.util.PlexUtils.tl; +import static dev.plex.util.PlexUtils.tl; public class ConsoleMustDefinePlayerException extends RuntimeException { diff --git a/src/main/java/me/totalfreedom/plex/command/exception/PlayerNotFoundException.java b/src/main/java/dev/plex/command/exception/PlayerNotFoundException.java similarity index 60% rename from src/main/java/me/totalfreedom/plex/command/exception/PlayerNotFoundException.java rename to src/main/java/dev/plex/command/exception/PlayerNotFoundException.java index 04a2415..17e8a6c 100644 --- a/src/main/java/me/totalfreedom/plex/command/exception/PlayerNotFoundException.java +++ b/src/main/java/dev/plex/command/exception/PlayerNotFoundException.java @@ -1,6 +1,6 @@ -package me.totalfreedom.plex.command.exception; +package dev.plex.command.exception; -import static me.totalfreedom.plex.util.PlexUtils.tl; +import static dev.plex.util.PlexUtils.tl; public class PlayerNotFoundException extends RuntimeException { diff --git a/src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java b/src/main/java/dev/plex/command/impl/AdminCMD.java similarity index 87% rename from src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java rename to src/main/java/dev/plex/command/impl/AdminCMD.java index b4deee1..ddd95f9 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/AdminCMD.java +++ b/src/main/java/dev/plex/command/impl/AdminCMD.java @@ -1,22 +1,22 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.PlayerNotFoundException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; 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; -import me.totalfreedom.plex.command.annotation.CommandPermissions; -import me.totalfreedom.plex.command.exception.PlayerNotFoundException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.event.AdminAddEvent; -import me.totalfreedom.plex.event.AdminRemoveEvent; -import me.totalfreedom.plex.event.AdminSetRankEvent; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.cache.DataUtils; +import dev.plex.command.PlexCommand; +import dev.plex.event.AdminAddEvent; +import dev.plex.event.AdminRemoveEvent; +import dev.plex.event.AdminSetRankEvent; +import dev.plex.player.PlexPlayer; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/AdventureCMD.java b/src/main/java/dev/plex/command/impl/AdventureCMD.java similarity index 77% rename from src/main/java/me/totalfreedom/plex/command/impl/AdventureCMD.java rename to src/main/java/dev/plex/command/impl/AdventureCMD.java index 46568a7..cef8436 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/AdventureCMD.java +++ b/src/main/java/dev/plex/command/impl/AdventureCMD.java @@ -1,17 +1,16 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; -import java.util.Collections; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandFailException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; import java.util.List; import com.google.common.collect.ImmutableList; -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.exception.CommandFailException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/BanCMD.java b/src/main/java/dev/plex/command/impl/BanCMD.java similarity index 74% rename from src/main/java/me/totalfreedom/plex/command/impl/BanCMD.java rename to src/main/java/dev/plex/command/impl/BanCMD.java index f9ce667..49698ae 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/BanCMD.java +++ b/src/main/java/dev/plex/command/impl/BanCMD.java @@ -1,24 +1,21 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.banning.Ban; -import me.totalfreedom.plex.cache.DataUtils; -import me.totalfreedom.plex.cache.PlayerCache; -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.exception.PlayerNotFoundException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.punishment.Punishment; -import me.totalfreedom.plex.punishment.PunishmentType; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.PlayerNotFoundException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; +import dev.plex.punishment.Punishment; +import dev.plex.punishment.PunishmentType; +import dev.plex.cache.DataUtils; +import dev.plex.cache.PlayerCache; +import dev.plex.command.PlexCommand; +import dev.plex.player.PlexPlayer; +import dev.plex.player.PunishedPlayer; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; import java.time.Instant; import java.util.Date; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/CreativeCMD.java b/src/main/java/dev/plex/command/impl/CreativeCMD.java similarity index 77% rename from src/main/java/me/totalfreedom/plex/command/impl/CreativeCMD.java rename to src/main/java/dev/plex/command/impl/CreativeCMD.java index 875b0ab..22fbbe9 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/CreativeCMD.java +++ b/src/main/java/dev/plex/command/impl/CreativeCMD.java @@ -1,17 +1,16 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; -import java.util.Collections; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandFailException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; import java.util.List; import com.google.common.collect.ImmutableList; -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.exception.CommandFailException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java b/src/main/java/dev/plex/command/impl/FionnCMD.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java rename to src/main/java/dev/plex/command/impl/FionnCMD.java index ff2ac7b..d5e3671 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java +++ b/src/main/java/dev/plex/command/impl/FionnCMD.java @@ -1,22 +1,22 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandArgumentException; +import dev.plex.command.exception.CommandFailException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; 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; -import me.totalfreedom.plex.command.annotation.CommandPermissions; -import me.totalfreedom.plex.command.exception.CommandArgumentException; -import me.totalfreedom.plex.command.exception.CommandFailException; -import me.totalfreedom.plex.command.source.CommandSource; -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 dev.plex.cache.PlayerCache; +import dev.plex.command.PlexCommand; +import dev.plex.util.PlexUtils; +import dev.plex.world.BlockMapChunkGenerator; +import dev.plex.world.CustomWorld; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java b/src/main/java/dev/plex/command/impl/FreezeCMD.java similarity index 70% rename from src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java rename to src/main/java/dev/plex/command/impl/FreezeCMD.java index 0a75932..8dc12f9 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/FreezeCMD.java +++ b/src/main/java/dev/plex/command/impl/FreezeCMD.java @@ -1,23 +1,23 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandArgumentException; +import dev.plex.command.source.CommandSource; +import dev.plex.punishment.Punishment; +import dev.plex.punishment.PunishmentType; import java.time.Instant; import java.util.Date; import java.util.List; import java.util.UUID; -import me.totalfreedom.plex.cache.PlayerCache; -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.exception.CommandArgumentException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.punishment.Punishment; -import me.totalfreedom.plex.punishment.PunishmentType; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.cache.PlayerCache; +import dev.plex.command.PlexCommand; +import dev.plex.player.PunishedPlayer; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.entity.Player; @CommandParameters(description = "Freeze a player on the server", usage = "/ ") diff --git a/src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java b/src/main/java/dev/plex/command/impl/NameHistoryCMD.java similarity index 83% rename from src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java rename to src/main/java/dev/plex/command/impl/NameHistoryCMD.java index 1c24c3b..9f4f861 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/NameHistoryCMD.java +++ b/src/main/java/dev/plex/command/impl/NameHistoryCMD.java @@ -1,17 +1,17 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandArgumentException; +import dev.plex.command.source.CommandSource; 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; -import me.totalfreedom.plex.command.exception.CommandArgumentException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java b/src/main/java/dev/plex/command/impl/OpAllCMD.java similarity index 67% rename from src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java rename to src/main/java/dev/plex/command/impl/OpAllCMD.java index 24653f9..7a4b94c 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java +++ b/src/main/java/dev/plex/command/impl/OpAllCMD.java @@ -1,13 +1,13 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.source.CommandSource; 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.source.CommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java b/src/main/java/dev/plex/command/impl/OpCMD.java similarity index 66% rename from src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java rename to src/main/java/dev/plex/command/impl/OpCMD.java index 68482ee..13a50ba 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java +++ b/src/main/java/dev/plex/command/impl/OpCMD.java @@ -1,14 +1,14 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandArgumentException; +import dev.plex.command.source.CommandSource; 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.exception.CommandArgumentException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.entity.Player; @CommandParameters(description = "Op a player on the server", usage = "/ ") diff --git a/src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java b/src/main/java/dev/plex/command/impl/PlexCMD.java similarity index 59% rename from src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java rename to src/main/java/dev/plex/command/impl/PlexCMD.java index a62aaf9..da7a3b5 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java +++ b/src/main/java/dev/plex/command/impl/PlexCMD.java @@ -1,13 +1,13 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; 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.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) @CommandParameters(aliases = "plexhelp", description = "Help with plex") diff --git a/src/main/java/me/totalfreedom/plex/command/impl/PunishmentsCMD.java b/src/main/java/dev/plex/command/impl/PunishmentsCMD.java similarity index 62% rename from src/main/java/me/totalfreedom/plex/command/impl/PunishmentsCMD.java rename to src/main/java/dev/plex/command/impl/PunishmentsCMD.java index d5368c8..da98765 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/PunishmentsCMD.java +++ b/src/main/java/dev/plex/command/impl/PunishmentsCMD.java @@ -1,14 +1,14 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; -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.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.menu.PunishmentMenu; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; +import dev.plex.command.PlexCommand; +import dev.plex.menu.PunishmentMenu; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/SpectatorCMD.java b/src/main/java/dev/plex/command/impl/SpectatorCMD.java similarity index 76% rename from src/main/java/me/totalfreedom/plex/command/impl/SpectatorCMD.java rename to src/main/java/dev/plex/command/impl/SpectatorCMD.java index c38b5b4..26396d0 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/SpectatorCMD.java +++ b/src/main/java/dev/plex/command/impl/SpectatorCMD.java @@ -1,17 +1,16 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; -import java.util.Collections; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandFailException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; import java.util.List; import com.google.common.collect.ImmutableList; -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.exception.CommandFailException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/SurvivalCMD.java b/src/main/java/dev/plex/command/impl/SurvivalCMD.java similarity index 77% rename from src/main/java/me/totalfreedom/plex/command/impl/SurvivalCMD.java rename to src/main/java/dev/plex/command/impl/SurvivalCMD.java index 7baed4b..792a782 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/SurvivalCMD.java +++ b/src/main/java/dev/plex/command/impl/SurvivalCMD.java @@ -1,17 +1,16 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; -import java.util.Collections; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandFailException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; import java.util.List; import com.google.common.collect.ImmutableList; -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.exception.CommandFailException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java b/src/main/java/dev/plex/command/impl/TestCMD.java similarity index 64% rename from src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java rename to src/main/java/dev/plex/command/impl/TestCMD.java index 4f3e391..e7be2dd 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java +++ b/src/main/java/dev/plex/command/impl/TestCMD.java @@ -1,14 +1,14 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; 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.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) @CommandParameters(aliases = "tst,tast", description = "HELLO") diff --git a/src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java b/src/main/java/dev/plex/command/impl/WorldCMD.java similarity index 72% rename from src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java rename to src/main/java/dev/plex/command/impl/WorldCMD.java index 2dc2d00..431c064 100644 --- a/src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java +++ b/src/main/java/dev/plex/command/impl/WorldCMD.java @@ -1,15 +1,15 @@ -package me.totalfreedom.plex.command.impl; +package dev.plex.command.impl; import com.google.common.collect.ImmutableList; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.exception.CommandArgumentException; +import dev.plex.command.source.CommandSource; +import dev.plex.command.source.RequiredCommandSource; 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; -import me.totalfreedom.plex.command.exception.CommandArgumentException; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.command.source.RequiredCommandSource; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.command.PlexCommand; +import dev.plex.rank.enums.Rank; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/me/totalfreedom/plex/command/source/CommandSource.java b/src/main/java/dev/plex/command/source/CommandSource.java similarity index 88% rename from src/main/java/me/totalfreedom/plex/command/source/CommandSource.java rename to src/main/java/dev/plex/command/source/CommandSource.java index e8eed87..48d727c 100644 --- a/src/main/java/me/totalfreedom/plex/command/source/CommandSource.java +++ b/src/main/java/dev/plex/command/source/CommandSource.java @@ -1,8 +1,8 @@ -package me.totalfreedom.plex.command.source; +package dev.plex.command.source; import lombok.Getter; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.player.PlexPlayer; +import dev.plex.cache.PlayerCache; +import dev.plex.player.PlexPlayer; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/command/source/RequiredCommandSource.java b/src/main/java/dev/plex/command/source/RequiredCommandSource.java similarity index 61% rename from src/main/java/me/totalfreedom/plex/command/source/RequiredCommandSource.java rename to src/main/java/dev/plex/command/source/RequiredCommandSource.java index 569fce9..2f8ee08 100644 --- a/src/main/java/me/totalfreedom/plex/command/source/RequiredCommandSource.java +++ b/src/main/java/dev/plex/command/source/RequiredCommandSource.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.command.source; +package dev.plex.command.source; public enum RequiredCommandSource { diff --git a/src/main/java/me/totalfreedom/plex/config/Config.java b/src/main/java/dev/plex/config/Config.java similarity index 92% rename from src/main/java/me/totalfreedom/plex/config/Config.java rename to src/main/java/dev/plex/config/Config.java index ad3ada5..9f940d4 100644 --- a/src/main/java/me/totalfreedom/plex/config/Config.java +++ b/src/main/java/dev/plex/config/Config.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.config; +package dev.plex.config; +import dev.plex.Plex; import java.io.File; -import me.totalfreedom.plex.Plex; import org.bukkit.configuration.file.YamlConfiguration; public class Config extends YamlConfiguration diff --git a/src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java b/src/main/java/dev/plex/event/AdminAddEvent.java similarity index 83% rename from src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java rename to src/main/java/dev/plex/event/AdminAddEvent.java index 8c2309b..919df7e 100644 --- a/src/main/java/me/totalfreedom/plex/event/AdminAddEvent.java +++ b/src/main/java/dev/plex/event/AdminAddEvent.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.event; +package dev.plex.event; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.player.PlexPlayer; +import dev.plex.command.source.CommandSource; +import dev.plex.player.PlexPlayer; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java b/src/main/java/dev/plex/event/AdminRemoveEvent.java similarity index 83% rename from src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java rename to src/main/java/dev/plex/event/AdminRemoveEvent.java index 45058ae..84a2d2c 100644 --- a/src/main/java/me/totalfreedom/plex/event/AdminRemoveEvent.java +++ b/src/main/java/dev/plex/event/AdminRemoveEvent.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.event; +package dev.plex.event; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.player.PlexPlayer; +import dev.plex.command.source.CommandSource; +import dev.plex.player.PlexPlayer; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java b/src/main/java/dev/plex/event/AdminSetRankEvent.java similarity index 82% rename from src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java rename to src/main/java/dev/plex/event/AdminSetRankEvent.java index a1ea779..de8c2db 100644 --- a/src/main/java/me/totalfreedom/plex/event/AdminSetRankEvent.java +++ b/src/main/java/dev/plex/event/AdminSetRankEvent.java @@ -1,8 +1,8 @@ -package me.totalfreedom.plex.event; +package dev.plex.event; -import me.totalfreedom.plex.command.source.CommandSource; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.command.source.CommandSource; +import dev.plex.player.PlexPlayer; +import dev.plex.rank.enums.Rank; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java b/src/main/java/dev/plex/event/PunishedPlayerEvent.java similarity index 86% rename from src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java rename to src/main/java/dev/plex/event/PunishedPlayerEvent.java index 706af71..89a277b 100644 --- a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerEvent.java +++ b/src/main/java/dev/plex/event/PunishedPlayerEvent.java @@ -1,9 +1,9 @@ -package me.totalfreedom.plex.event; +package dev.plex.event; +import dev.plex.player.PunishedPlayer; import java.util.UUID; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.plex.player.PunishedPlayer; import org.bukkit.Bukkit; import org.bukkit.event.Cancellable; import org.bukkit.event.player.PlayerEvent; diff --git a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java b/src/main/java/dev/plex/event/PunishedPlayerFreezeEvent.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java rename to src/main/java/dev/plex/event/PunishedPlayerFreezeEvent.java index 063f308..e5b9aee 100644 --- a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerFreezeEvent.java +++ b/src/main/java/dev/plex/event/PunishedPlayerFreezeEvent.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.event; +package dev.plex.event; +import dev.plex.player.PunishedPlayer; import lombok.Getter; -import me.totalfreedom.plex.player.PunishedPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerMuteEvent.java b/src/main/java/dev/plex/event/PunishedPlayerMuteEvent.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/event/PunishedPlayerMuteEvent.java rename to src/main/java/dev/plex/event/PunishedPlayerMuteEvent.java index dadeb80..3aef67a 100644 --- a/src/main/java/me/totalfreedom/plex/event/PunishedPlayerMuteEvent.java +++ b/src/main/java/dev/plex/event/PunishedPlayerMuteEvent.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.event; +package dev.plex.event; +import dev.plex.player.PunishedPlayer; import lombok.Getter; -import me.totalfreedom.plex.player.PunishedPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java b/src/main/java/dev/plex/handlers/CommandHandler.java similarity index 55% rename from src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java rename to src/main/java/dev/plex/handlers/CommandHandler.java index 663cba2..fee5e3a 100644 --- a/src/main/java/me/totalfreedom/plex/handlers/CommandHandler.java +++ b/src/main/java/dev/plex/handlers/CommandHandler.java @@ -1,10 +1,24 @@ -package me.totalfreedom.plex.handlers; +package dev.plex.handlers; import com.google.common.collect.Lists; +import dev.plex.command.impl.AdminCMD; +import dev.plex.command.impl.AdventureCMD; +import dev.plex.command.impl.BanCMD; +import dev.plex.command.impl.CreativeCMD; +import dev.plex.command.impl.FionnCMD; +import dev.plex.command.impl.FreezeCMD; +import dev.plex.command.impl.NameHistoryCMD; +import dev.plex.command.impl.OpAllCMD; +import dev.plex.command.impl.OpCMD; +import dev.plex.command.impl.PlexCMD; +import dev.plex.command.impl.PunishmentsCMD; +import dev.plex.command.impl.SpectatorCMD; +import dev.plex.command.impl.SurvivalCMD; +import dev.plex.command.impl.TestCMD; +import dev.plex.command.impl.WorldCMD; import java.util.List; -import me.totalfreedom.plex.command.PlexCommand; -import me.totalfreedom.plex.command.impl.*; -import me.totalfreedom.plex.util.PlexLog; +import dev.plex.command.PlexCommand; +import dev.plex.util.PlexLog; public class CommandHandler { diff --git a/src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java b/src/main/java/dev/plex/handlers/ListenerHandler.java similarity index 53% rename from src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java rename to src/main/java/dev/plex/handlers/ListenerHandler.java index db74cc2..4c9cb4a 100644 --- a/src/main/java/me/totalfreedom/plex/handlers/ListenerHandler.java +++ b/src/main/java/dev/plex/handlers/ListenerHandler.java @@ -1,15 +1,20 @@ -package me.totalfreedom.plex.handlers; +package dev.plex.handlers; import com.google.common.collect.Lists; +import dev.plex.listener.impl.AdminListener; +import dev.plex.listener.impl.ChatListener; +import dev.plex.listener.impl.FreezeListener; +import dev.plex.listener.impl.LoginListener; +import dev.plex.listener.impl.PlayerListener; +import dev.plex.listener.impl.ServerListener; +import dev.plex.listener.impl.WorldListener; import java.util.List; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.listener.impl.*; -import me.totalfreedom.plex.util.PlexLog; +import dev.plex.listener.PlexListener; +import dev.plex.util.PlexLog; public class ListenerHandler { - private List listeners = Lists.newArrayList(); - + List listeners = Lists.newArrayList(); public ListenerHandler() { listeners.add(new ServerListener()); diff --git a/src/main/java/me/totalfreedom/plex/listener/PlexListener.java b/src/main/java/dev/plex/listener/PlexListener.java similarity index 74% rename from src/main/java/me/totalfreedom/plex/listener/PlexListener.java rename to src/main/java/dev/plex/listener/PlexListener.java index cddb826..4bb32b4 100644 --- a/src/main/java/me/totalfreedom/plex/listener/PlexListener.java +++ b/src/main/java/dev/plex/listener/PlexListener.java @@ -1,6 +1,6 @@ -package me.totalfreedom.plex.listener; +package dev.plex.listener; -import me.totalfreedom.plex.PlexBase; +import dev.plex.PlexBase; import org.bukkit.event.Listener; public abstract class PlexListener extends PlexBase implements Listener diff --git a/src/main/java/dev/plex/listener/impl/AdminListener.java b/src/main/java/dev/plex/listener/impl/AdminListener.java new file mode 100644 index 0000000..9ac8fed --- /dev/null +++ b/src/main/java/dev/plex/listener/impl/AdminListener.java @@ -0,0 +1,42 @@ +package dev.plex.listener.impl; + +import dev.plex.event.AdminAddEvent; +import dev.plex.event.AdminRemoveEvent; +import dev.plex.event.AdminSetRankEvent; +import dev.plex.listener.PlexListener; +import dev.plex.player.PlexPlayer; +import dev.plex.rank.enums.Rank; +import static dev.plex.util.PlexUtils.tl; +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; + +public class AdminListener extends PlexListener +{ + @EventHandler + public void onAdminAdd(AdminAddEvent event) + { + String userSender = event.getSender().getName(); + PlexPlayer target = event.getPlexPlayer(); + + Bukkit.broadcastMessage(tl("newAdminAdded", userSender, target.getName())); + } + + @EventHandler + public void onAdminRemove(AdminRemoveEvent event) + { + String userSender = event.getSender().getName(); + PlexPlayer target = event.getPlexPlayer(); + + Bukkit.broadcastMessage(tl("adminRemoved", userSender, target.getName())); + } + + @EventHandler + public void onAdminSetRank(AdminSetRankEvent event) + { + String userSender = event.getSender().getName(); + PlexPlayer target = event.getPlexPlayer(); + Rank newRank = event.getRank(); + + Bukkit.broadcastMessage(tl("adminSetRank", userSender, target.getName(), newRank.name().toUpperCase())); + } +} diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java b/src/main/java/dev/plex/listener/impl/ChatListener.java similarity index 78% rename from src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java rename to src/main/java/dev/plex/listener/impl/ChatListener.java index cf6c94f..3f7c58e 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/ChatListener.java +++ b/src/main/java/dev/plex/listener/impl/ChatListener.java @@ -1,9 +1,9 @@ -package me.totalfreedom.plex.listener.impl; +package dev.plex.listener.impl; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.player.PlexPlayer; +import dev.plex.Plex; +import dev.plex.cache.PlayerCache; +import dev.plex.listener.PlexListener; +import dev.plex.player.PlexPlayer; import net.md_5.bungee.api.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerChatEvent; diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java b/src/main/java/dev/plex/listener/impl/FreezeListener.java similarity index 50% rename from src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java rename to src/main/java/dev/plex/listener/impl/FreezeListener.java index 8916e1e..656e07d 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/FreezeListener.java +++ b/src/main/java/dev/plex/listener/impl/FreezeListener.java @@ -1,17 +1,11 @@ -package me.totalfreedom.plex.listener.impl; +package dev.plex.listener.impl; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.event.PunishedPlayerFreezeEvent; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.util.PlexUtils; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; +import dev.plex.cache.PlayerCache; +import dev.plex.listener.PlexListener; +import dev.plex.player.PunishedPlayer; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerMoveEvent; -import java.util.UUID; - public class FreezeListener extends PlexListener { @EventHandler diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/LoginListener.java b/src/main/java/dev/plex/listener/impl/LoginListener.java similarity index 75% rename from src/main/java/me/totalfreedom/plex/listener/impl/LoginListener.java rename to src/main/java/dev/plex/listener/impl/LoginListener.java index 2f430ed..9ac83a7 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/LoginListener.java +++ b/src/main/java/dev/plex/listener/impl/LoginListener.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.listener.impl; +package dev.plex.listener.impl; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.util.PlexLog; +import dev.plex.listener.PlexListener; +import dev.plex.util.PlexLog; import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; @@ -16,7 +16,7 @@ public class LoginListener extends PlexListener PlexLog.log(String.valueOf(plugin.getBanManager().isBanned(event.getUniqueId()))); if (plugin.getBanManager().isBanned(event.getUniqueId())) { - event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_BANNED, "§cYou're currently banned from this server.\n§cPlease appeal at §6https://forum.totalfreedom.me/"); + event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_BANNED, "§cYou're currently banned from this server.\n§cPlease appeal at §6https://forums.telesphoreo.me"); } } diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java b/src/main/java/dev/plex/listener/impl/PlayerListener.java similarity index 90% rename from src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java rename to src/main/java/dev/plex/listener/impl/PlayerListener.java index 07338d3..2ce9811 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/PlayerListener.java +++ b/src/main/java/dev/plex/listener/impl/PlayerListener.java @@ -1,21 +1,17 @@ -package me.totalfreedom.plex.listener.impl; +package dev.plex.listener.impl; -import java.time.Instant; import java.util.Arrays; -import java.util.Date; import java.util.UUID; -import me.totalfreedom.plex.admin.Admin; -import me.totalfreedom.plex.cache.DataUtils; -import me.totalfreedom.plex.cache.MongoPlayerData; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.cache.SQLPlayerData; -import me.totalfreedom.plex.command.impl.FionnCMD; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.punishment.Punishment; -import me.totalfreedom.plex.punishment.PunishmentType; -import me.totalfreedom.plex.util.PlexLog; +import dev.plex.admin.Admin; +import dev.plex.cache.DataUtils; +import dev.plex.cache.MongoPlayerData; +import dev.plex.cache.PlayerCache; +import dev.plex.cache.SQLPlayerData; +import dev.plex.command.impl.FionnCMD; +import dev.plex.listener.PlexListener; +import dev.plex.player.PlexPlayer; +import dev.plex.player.PunishedPlayer; +import dev.plex.util.PlexLog; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/ServerListener.java b/src/main/java/dev/plex/listener/impl/ServerListener.java similarity index 87% rename from src/main/java/me/totalfreedom/plex/listener/impl/ServerListener.java rename to src/main/java/dev/plex/listener/impl/ServerListener.java index 56346c9..d5a3c4e 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/ServerListener.java +++ b/src/main/java/dev/plex/listener/impl/ServerListener.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.listener.impl; +package dev.plex.listener.impl; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.listener.PlexListener; +import dev.plex.util.PlexUtils; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.server.ServerListPingEvent; diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java b/src/main/java/dev/plex/listener/impl/WorldListener.java similarity index 81% rename from src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java rename to src/main/java/dev/plex/listener/impl/WorldListener.java index 85d31c3..4ace4aa 100644 --- a/src/main/java/me/totalfreedom/plex/listener/impl/WorldListener.java +++ b/src/main/java/dev/plex/listener/impl/WorldListener.java @@ -1,16 +1,16 @@ -package me.totalfreedom.plex.listener.impl; +package dev.plex.listener.impl; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.cache.PlayerCache; +import dev.plex.listener.PlexListener; +import dev.plex.player.PlexPlayer; +import dev.plex.rank.enums.Rank; import org.bukkit.World; import org.bukkit.entity.EntityType; 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; +import static dev.plex.util.PlexUtils.tl; public class WorldListener extends PlexListener { diff --git a/src/main/java/me/totalfreedom/plex/menu/PunishedPlayerMenu.java b/src/main/java/dev/plex/menu/PunishedPlayerMenu.java similarity index 94% rename from src/main/java/me/totalfreedom/plex/menu/PunishedPlayerMenu.java rename to src/main/java/dev/plex/menu/PunishedPlayerMenu.java index 8263053..40c96e0 100644 --- a/src/main/java/me/totalfreedom/plex/menu/PunishedPlayerMenu.java +++ b/src/main/java/dev/plex/menu/PunishedPlayerMenu.java @@ -1,10 +1,10 @@ -package me.totalfreedom.plex.menu; +package dev.plex.menu; import com.google.common.collect.Lists; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.punishment.Punishment; -import me.totalfreedom.plex.util.menu.AbstractMenu; +import dev.plex.cache.PlayerCache; +import dev.plex.player.PunishedPlayer; +import dev.plex.punishment.Punishment; +import dev.plex.util.menu.AbstractMenu; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -22,10 +22,9 @@ import java.util.List; public class PunishedPlayerMenu extends AbstractMenu { + private final PunishedPlayer punishedPlayer; - private PunishedPlayer punishedPlayer; - - private List inventories = Lists.newArrayList(); + private final List inventories = Lists.newArrayList(); public PunishedPlayerMenu(PunishedPlayer player) { super("§c§lPunishments"); diff --git a/src/main/java/me/totalfreedom/plex/menu/PunishmentMenu.java b/src/main/java/dev/plex/menu/PunishmentMenu.java similarity index 96% rename from src/main/java/me/totalfreedom/plex/menu/PunishmentMenu.java rename to src/main/java/dev/plex/menu/PunishmentMenu.java index 4bda9b0..b4be0b3 100644 --- a/src/main/java/me/totalfreedom/plex/menu/PunishmentMenu.java +++ b/src/main/java/dev/plex/menu/PunishmentMenu.java @@ -1,9 +1,9 @@ -package me.totalfreedom.plex.menu; +package dev.plex.menu; import com.google.common.collect.Lists; -import me.totalfreedom.plex.cache.PlayerCache; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.util.menu.AbstractMenu; +import dev.plex.cache.PlayerCache; +import dev.plex.player.PunishedPlayer; +import dev.plex.util.menu.AbstractMenu; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/me/totalfreedom/plex/player/PlexPlayer.java b/src/main/java/dev/plex/player/PlexPlayer.java similarity index 95% rename from src/main/java/me/totalfreedom/plex/player/PlexPlayer.java rename to src/main/java/dev/plex/player/PlexPlayer.java index 59b85a3..adf519f 100644 --- a/src/main/java/me/totalfreedom/plex/player/PlexPlayer.java +++ b/src/main/java/dev/plex/player/PlexPlayer.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.player; +package dev.plex.player; import dev.morphia.annotations.Entity; import dev.morphia.annotations.Id; @@ -10,7 +10,7 @@ import java.util.UUID; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.plex.rank.enums.Rank; +import dev.plex.rank.enums.Rank; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java b/src/main/java/dev/plex/player/PunishedPlayer.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java rename to src/main/java/dev/plex/player/PunishedPlayer.java index 1af9389..3d5a604 100644 --- a/src/main/java/me/totalfreedom/plex/player/PunishedPlayer.java +++ b/src/main/java/dev/plex/player/PunishedPlayer.java @@ -1,5 +1,7 @@ -package me.totalfreedom.plex.player; +package dev.plex.player; +import dev.plex.Plex; +import dev.plex.punishment.Punishment; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -12,12 +14,8 @@ import com.google.common.collect.Lists; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.cache.DataUtils; -import me.totalfreedom.plex.event.PunishedPlayerFreezeEvent; -import me.totalfreedom.plex.event.PunishedPlayerMuteEvent; -import me.totalfreedom.plex.punishment.Punishment; -import me.totalfreedom.plex.util.PlexLog; +import dev.plex.event.PunishedPlayerFreezeEvent; +import dev.plex.event.PunishedPlayerMuteEvent; import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.json.JSONObject; diff --git a/src/main/java/me/totalfreedom/plex/punishment/Punishment.java b/src/main/java/dev/plex/punishment/Punishment.java similarity index 96% rename from src/main/java/me/totalfreedom/plex/punishment/Punishment.java rename to src/main/java/dev/plex/punishment/Punishment.java index e35b201..b67894b 100644 --- a/src/main/java/me/totalfreedom/plex/punishment/Punishment.java +++ b/src/main/java/dev/plex/punishment/Punishment.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.punishment; +package dev.plex.punishment; import com.google.common.collect.Lists; import com.google.gson.Gson; diff --git a/src/main/java/me/totalfreedom/plex/punishment/PunishmentManager.java b/src/main/java/dev/plex/punishment/PunishmentManager.java similarity index 91% rename from src/main/java/me/totalfreedom/plex/punishment/PunishmentManager.java rename to src/main/java/dev/plex/punishment/PunishmentManager.java index e3568fe..00feeb8 100644 --- a/src/main/java/me/totalfreedom/plex/punishment/PunishmentManager.java +++ b/src/main/java/dev/plex/punishment/PunishmentManager.java @@ -1,16 +1,12 @@ -package me.totalfreedom.plex.punishment; +package dev.plex.punishment; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.banning.Ban; -import me.totalfreedom.plex.cache.DataUtils; -import me.totalfreedom.plex.event.PunishedPlayerFreezeEvent; -import me.totalfreedom.plex.player.PunishedPlayer; -import me.totalfreedom.plex.util.PlexLog; -import me.totalfreedom.plex.util.PlexUtils; +import dev.plex.Plex; +import dev.plex.banning.Ban; +import dev.plex.player.PunishedPlayer; +import dev.plex.util.PlexUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.time.DateUtils; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; import org.json.JSONObject; diff --git a/src/main/java/me/totalfreedom/plex/punishment/PunishmentType.java b/src/main/java/dev/plex/punishment/PunishmentType.java similarity index 57% rename from src/main/java/me/totalfreedom/plex/punishment/PunishmentType.java rename to src/main/java/dev/plex/punishment/PunishmentType.java index aa200ad..64f21d8 100644 --- a/src/main/java/me/totalfreedom/plex/punishment/PunishmentType.java +++ b/src/main/java/dev/plex/punishment/PunishmentType.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.punishment; +package dev.plex.punishment; public enum PunishmentType { diff --git a/src/main/java/me/totalfreedom/plex/rank/DefaultRankObj.java b/src/main/java/dev/plex/rank/DefaultRankObj.java similarity index 85% rename from src/main/java/me/totalfreedom/plex/rank/DefaultRankObj.java rename to src/main/java/dev/plex/rank/DefaultRankObj.java index b370a46..2bddcce 100644 --- a/src/main/java/me/totalfreedom/plex/rank/DefaultRankObj.java +++ b/src/main/java/dev/plex/rank/DefaultRankObj.java @@ -1,9 +1,9 @@ -package me.totalfreedom.plex.rank; +package dev.plex.rank; import com.google.common.collect.Lists; +import dev.plex.rank.enums.Rank; import java.util.List; import lombok.Getter; -import me.totalfreedom.plex.rank.enums.Rank; @Getter public class DefaultRankObj diff --git a/src/main/java/me/totalfreedom/plex/rank/RankManager.java b/src/main/java/dev/plex/rank/RankManager.java similarity index 93% rename from src/main/java/me/totalfreedom/plex/rank/RankManager.java rename to src/main/java/dev/plex/rank/RankManager.java index 5525207..19c4f60 100644 --- a/src/main/java/me/totalfreedom/plex/rank/RankManager.java +++ b/src/main/java/dev/plex/rank/RankManager.java @@ -1,16 +1,16 @@ -package me.totalfreedom.plex.rank; +package dev.plex.rank; import com.google.common.collect.Maps; +import dev.plex.Plex; +import dev.plex.player.PlexPlayer; +import dev.plex.util.PlexLog; 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 dev.plex.rank.enums.Rank; import org.json.JSONObject; import org.json.JSONTokener; diff --git a/src/main/java/me/totalfreedom/plex/rank/enums/Rank.java b/src/main/java/dev/plex/rank/enums/Rank.java similarity index 97% rename from src/main/java/me/totalfreedom/plex/rank/enums/Rank.java rename to src/main/java/dev/plex/rank/enums/Rank.java index 61d7766..88b805c 100644 --- a/src/main/java/me/totalfreedom/plex/rank/enums/Rank.java +++ b/src/main/java/dev/plex/rank/enums/Rank.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.rank.enums; +package dev.plex.rank.enums; import com.google.common.collect.Lists; import java.util.List; diff --git a/src/main/java/me/totalfreedom/plex/rank/enums/Title.java b/src/main/java/dev/plex/rank/enums/Title.java similarity index 93% rename from src/main/java/me/totalfreedom/plex/rank/enums/Title.java rename to src/main/java/dev/plex/rank/enums/Title.java index 9787cb1..62a1fb2 100644 --- a/src/main/java/me/totalfreedom/plex/rank/enums/Title.java +++ b/src/main/java/dev/plex/rank/enums/Title.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.rank.enums; +package dev.plex.rank.enums; import org.bukkit.ChatColor; diff --git a/src/main/java/me/totalfreedom/plex/services/AbstractService.java b/src/main/java/dev/plex/services/AbstractService.java similarity index 87% rename from src/main/java/me/totalfreedom/plex/services/AbstractService.java rename to src/main/java/dev/plex/services/AbstractService.java index 12d99e8..4a3add7 100644 --- a/src/main/java/me/totalfreedom/plex/services/AbstractService.java +++ b/src/main/java/dev/plex/services/AbstractService.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.services; +package dev.plex.services; public abstract class AbstractService implements IService { diff --git a/src/main/java/me/totalfreedom/plex/services/IService.java b/src/main/java/dev/plex/services/IService.java similarity index 66% rename from src/main/java/me/totalfreedom/plex/services/IService.java rename to src/main/java/dev/plex/services/IService.java index 37d68ba..dfbe5ff 100644 --- a/src/main/java/me/totalfreedom/plex/services/IService.java +++ b/src/main/java/dev/plex/services/IService.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.services; +package dev.plex.services; public interface IService { diff --git a/src/main/java/me/totalfreedom/plex/services/ServiceManager.java b/src/main/java/dev/plex/services/ServiceManager.java similarity index 87% rename from src/main/java/me/totalfreedom/plex/services/ServiceManager.java rename to src/main/java/dev/plex/services/ServiceManager.java index 285f0ae..e9eff9b 100644 --- a/src/main/java/me/totalfreedom/plex/services/ServiceManager.java +++ b/src/main/java/dev/plex/services/ServiceManager.java @@ -1,8 +1,8 @@ -package me.totalfreedom.plex.services; +package dev.plex.services; import com.google.common.collect.Lists; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.services.impl.BanService; +import dev.plex.Plex; +import dev.plex.services.impl.BanService; import org.bukkit.Bukkit; import java.util.List; diff --git a/src/main/java/me/totalfreedom/plex/services/impl/BanService.java b/src/main/java/dev/plex/services/impl/BanService.java similarity index 78% rename from src/main/java/me/totalfreedom/plex/services/impl/BanService.java rename to src/main/java/dev/plex/services/impl/BanService.java index c5d17ef..e3dbf6c 100644 --- a/src/main/java/me/totalfreedom/plex/services/impl/BanService.java +++ b/src/main/java/dev/plex/services/impl/BanService.java @@ -1,8 +1,8 @@ -package me.totalfreedom.plex.services.impl; +package dev.plex.services.impl; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.banning.Ban; -import me.totalfreedom.plex.services.AbstractService; +import dev.plex.Plex; +import dev.plex.services.AbstractService; +import dev.plex.banning.Ban; import org.bukkit.Bukkit; import java.util.Date; diff --git a/src/main/java/me/totalfreedom/plex/storage/MongoConnection.java b/src/main/java/dev/plex/storage/MongoConnection.java similarity index 85% rename from src/main/java/me/totalfreedom/plex/storage/MongoConnection.java rename to src/main/java/dev/plex/storage/MongoConnection.java index 4ecedd9..f3a4b46 100644 --- a/src/main/java/me/totalfreedom/plex/storage/MongoConnection.java +++ b/src/main/java/dev/plex/storage/MongoConnection.java @@ -1,13 +1,13 @@ -package me.totalfreedom.plex.storage; +package dev.plex.storage; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import dev.morphia.Datastore; import dev.morphia.Morphia; import dev.morphia.mapping.MapperOptions; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.banning.Ban; -import me.totalfreedom.plex.player.PlexPlayer; +import dev.plex.Plex; +import dev.plex.banning.Ban; +import dev.plex.player.PlexPlayer; public class MongoConnection { @@ -33,7 +33,7 @@ public class MongoConnection datastore.getMapper().map(PlexPlayer.class); datastore.getMapper().map(Ban.class); datastore.ensureIndexes(); - plugin.setStorageType(StorageType.MONGO); + plugin.setStorageType(StorageType.MONGODB); return datastore; } } diff --git a/src/main/java/me/totalfreedom/plex/storage/RedisConnection.java b/src/main/java/dev/plex/storage/RedisConnection.java similarity index 92% rename from src/main/java/me/totalfreedom/plex/storage/RedisConnection.java rename to src/main/java/dev/plex/storage/RedisConnection.java index 8b0f449..6639106 100644 --- a/src/main/java/me/totalfreedom/plex/storage/RedisConnection.java +++ b/src/main/java/dev/plex/storage/RedisConnection.java @@ -1,6 +1,6 @@ -package me.totalfreedom.plex.storage; +package dev.plex.storage; -import me.totalfreedom.plex.Plex; +import dev.plex.Plex; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; diff --git a/src/main/java/me/totalfreedom/plex/storage/SQLConnection.java b/src/main/java/dev/plex/storage/SQLConnection.java similarity index 94% rename from src/main/java/me/totalfreedom/plex/storage/SQLConnection.java rename to src/main/java/dev/plex/storage/SQLConnection.java index 32fa7f1..766c85b 100644 --- a/src/main/java/me/totalfreedom/plex/storage/SQLConnection.java +++ b/src/main/java/dev/plex/storage/SQLConnection.java @@ -1,11 +1,11 @@ -package me.totalfreedom.plex.storage; +package dev.plex.storage; +import dev.plex.Plex; +import dev.plex.PlexBase; import java.io.File; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; -import me.totalfreedom.plex.Plex; -import me.totalfreedom.plex.PlexBase; public class SQLConnection extends PlexBase { @@ -29,7 +29,7 @@ public class SQLConnection extends PlexBase { Class.forName("org.mariadb.jdbc.Driver"); connection = DriverManager.getConnection("jdbc:mariadb://" + host + ":" + port + "/" + database, username, password); - Plex.get().setStorageType(StorageType.SQL); + Plex.get().setStorageType(StorageType.MARIADB); } } catch (SQLException | ClassNotFoundException throwables) diff --git a/src/main/java/dev/plex/storage/StorageType.java b/src/main/java/dev/plex/storage/StorageType.java new file mode 100644 index 0000000..61e0287 --- /dev/null +++ b/src/main/java/dev/plex/storage/StorageType.java @@ -0,0 +1,6 @@ +package dev.plex.storage; + +public enum StorageType +{ + MONGODB, MARIADB, SQLITE +} diff --git a/src/main/java/me/totalfreedom/plex/util/PlexLog.java b/src/main/java/dev/plex/util/PlexLog.java similarity index 92% rename from src/main/java/me/totalfreedom/plex/util/PlexLog.java rename to src/main/java/dev/plex/util/PlexLog.java index 8d506b8..81867be 100644 --- a/src/main/java/me/totalfreedom/plex/util/PlexLog.java +++ b/src/main/java/dev/plex/util/PlexLog.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.util; +package dev.plex.util; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/me/totalfreedom/plex/util/PlexUtils.java b/src/main/java/dev/plex/util/PlexUtils.java similarity index 97% rename from src/main/java/me/totalfreedom/plex/util/PlexUtils.java rename to src/main/java/dev/plex/util/PlexUtils.java index ed885ea..e26b3c9 100644 --- a/src/main/java/me/totalfreedom/plex/util/PlexUtils.java +++ b/src/main/java/dev/plex/util/PlexUtils.java @@ -1,5 +1,8 @@ -package me.totalfreedom.plex.util; +package dev.plex.util; +import dev.plex.Plex; +import dev.plex.config.Config; +import dev.plex.storage.StorageType; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -9,9 +12,6 @@ import java.sql.SQLException; import java.util.*; import java.util.concurrent.ThreadLocalRandom; 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.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -51,7 +51,7 @@ public class PlexUtils { if (Plex.get().getSqlConnection().getCon() != null) { - if (Plex.get().getStorageType() == StorageType.SQL) + if (Plex.get().getStorageType() == StorageType.MARIADB) { PlexLog.log("Successfully enabled MySQL!"); } diff --git a/src/main/java/me/totalfreedom/plex/util/menu/AbstractMenu.java b/src/main/java/dev/plex/util/menu/AbstractMenu.java similarity index 82% rename from src/main/java/me/totalfreedom/plex/util/menu/AbstractMenu.java rename to src/main/java/dev/plex/util/menu/AbstractMenu.java index 789cafe..9352b58 100644 --- a/src/main/java/me/totalfreedom/plex/util/menu/AbstractMenu.java +++ b/src/main/java/dev/plex/util/menu/AbstractMenu.java @@ -1,6 +1,6 @@ -package me.totalfreedom.plex.util.menu; +package dev.plex.util.menu; -import me.totalfreedom.plex.Plex; +import dev.plex.Plex; import org.bukkit.event.Listener; public abstract class AbstractMenu implements Listener diff --git a/src/main/java/me/totalfreedom/plex/util/menu/IMenu.java b/src/main/java/dev/plex/util/menu/IMenu.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/util/menu/IMenu.java rename to src/main/java/dev/plex/util/menu/IMenu.java index 098f531..b356536 100644 --- a/src/main/java/me/totalfreedom/plex/util/menu/IMenu.java +++ b/src/main/java/dev/plex/util/menu/IMenu.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.util.menu; +package dev.plex.util.menu; import org.bukkit.entity.Player; diff --git a/src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java b/src/main/java/dev/plex/world/BlockMapChunkGenerator.java similarity index 96% rename from src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java rename to src/main/java/dev/plex/world/BlockMapChunkGenerator.java index 7f5f624..8c3f498 100644 --- a/src/main/java/me/totalfreedom/plex/world/BlockMapChunkGenerator.java +++ b/src/main/java/dev/plex/world/BlockMapChunkGenerator.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java b/src/main/java/dev/plex/world/ConfigurationChunkGenerator.java similarity index 93% rename from src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java rename to src/main/java/dev/plex/world/ConfigurationChunkGenerator.java index badfaad..a701916 100644 --- a/src/main/java/me/totalfreedom/plex/world/ConfigurationChunkGenerator.java +++ b/src/main/java/dev/plex/world/ConfigurationChunkGenerator.java @@ -1,7 +1,7 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; +import dev.plex.Plex; import java.util.LinkedHashMap; -import me.totalfreedom.plex.Plex; import org.bukkit.Material; import org.bukkit.generator.BlockPopulator; diff --git a/src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java b/src/main/java/dev/plex/world/CustomChunkGenerator.java similarity index 94% rename from src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java rename to src/main/java/dev/plex/world/CustomChunkGenerator.java index cbefb30..1d5d496 100644 --- a/src/main/java/me/totalfreedom/plex/world/CustomChunkGenerator.java +++ b/src/main/java/dev/plex/world/CustomChunkGenerator.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/me/totalfreedom/plex/world/CustomWorld.java b/src/main/java/dev/plex/world/CustomWorld.java similarity index 96% rename from src/main/java/me/totalfreedom/plex/world/CustomWorld.java rename to src/main/java/dev/plex/world/CustomWorld.java index 881a95a..f637311 100644 --- a/src/main/java/me/totalfreedom/plex/world/CustomWorld.java +++ b/src/main/java/dev/plex/world/CustomWorld.java @@ -1,8 +1,8 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; +import dev.plex.Plex; import java.io.File; import java.util.Objects; -import me.totalfreedom.plex.Plex; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java b/src/main/java/dev/plex/world/FlatChunkGenerator.java similarity index 95% rename from src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java rename to src/main/java/dev/plex/world/FlatChunkGenerator.java index 6d5b9f7..68ad9f2 100644 --- a/src/main/java/me/totalfreedom/plex/world/FlatChunkGenerator.java +++ b/src/main/java/dev/plex/world/FlatChunkGenerator.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import java.util.Random; import org.bukkit.World; diff --git a/src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java b/src/main/java/dev/plex/world/NoiseChunkGenerator.java similarity index 96% rename from src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java rename to src/main/java/dev/plex/world/NoiseChunkGenerator.java index 2c04d9b..8b38451 100644 --- a/src/main/java/me/totalfreedom/plex/world/NoiseChunkGenerator.java +++ b/src/main/java/dev/plex/world/NoiseChunkGenerator.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import java.util.Random; import org.bukkit.World; diff --git a/src/main/java/me/totalfreedom/plex/world/NoiseOptions.java b/src/main/java/dev/plex/world/NoiseOptions.java similarity index 92% rename from src/main/java/me/totalfreedom/plex/world/NoiseOptions.java rename to src/main/java/dev/plex/world/NoiseOptions.java index 7ea0b94..d0eafa7 100644 --- a/src/main/java/me/totalfreedom/plex/world/NoiseOptions.java +++ b/src/main/java/dev/plex/world/NoiseOptions.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import lombok.Getter; diff --git a/src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java b/src/main/java/dev/plex/world/OctaveChunkGenerator.java similarity index 97% rename from src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java rename to src/main/java/dev/plex/world/OctaveChunkGenerator.java index 1fe3db2..1eed47c 100644 --- a/src/main/java/me/totalfreedom/plex/world/OctaveChunkGenerator.java +++ b/src/main/java/dev/plex/world/OctaveChunkGenerator.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import java.util.Random; import org.bukkit.World; diff --git a/src/main/java/me/totalfreedom/plex/world/OctaveOptions.java b/src/main/java/dev/plex/world/OctaveOptions.java similarity index 89% rename from src/main/java/me/totalfreedom/plex/world/OctaveOptions.java rename to src/main/java/dev/plex/world/OctaveOptions.java index aac5c52..da339e3 100644 --- a/src/main/java/me/totalfreedom/plex/world/OctaveOptions.java +++ b/src/main/java/dev/plex/world/OctaveOptions.java @@ -1,4 +1,4 @@ -package me.totalfreedom.plex.world; +package dev.plex.world; import lombok.Getter; diff --git a/src/main/java/me/totalfreedom/plex/listener/impl/AdminListener.java b/src/main/java/me/totalfreedom/plex/listener/impl/AdminListener.java deleted file mode 100644 index a60db9d..0000000 --- a/src/main/java/me/totalfreedom/plex/listener/impl/AdminListener.java +++ /dev/null @@ -1,44 +0,0 @@ -package me.totalfreedom.plex.listener.impl; - -import me.totalfreedom.plex.event.AdminAddEvent; -import me.totalfreedom.plex.event.AdminRemoveEvent; -import me.totalfreedom.plex.event.AdminSetRankEvent; -import me.totalfreedom.plex.listener.PlexListener; -import me.totalfreedom.plex.player.PlexPlayer; -import me.totalfreedom.plex.rank.enums.Rank; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.event.EventHandler; - -public class AdminListener extends PlexListener -{ - - @EventHandler - public void onAdminAdd(AdminAddEvent event) - { - String userSender = event.getSender().getName(); - PlexPlayer target = event.getPlexPlayer(); - - Bukkit.broadcastMessage(String.format(ChatColor.RED + "%s - Adding %s to the admin list!", userSender, target.getName())); - } - - @EventHandler - public void onAdminRemove(AdminRemoveEvent event) - { - String userSender = event.getSender().getName(); - PlexPlayer target = event.getPlexPlayer(); - - Bukkit.broadcastMessage(String.format(ChatColor.RED + "%s - Removing %s from the admin list!", userSender, target.getName())); - } - - @EventHandler - public void onAdminSetrank(AdminSetRankEvent event) - { - String userSender = event.getSender().getName(); - PlexPlayer target = event.getPlexPlayer(); - Rank newRank = event.getRank(); - - Bukkit.broadcastMessage(String.format(ChatColor.RED + "%s - Setting %s's rank to %s!", userSender, target.getName(), newRank.name().toUpperCase())); - } - -} diff --git a/src/main/java/me/totalfreedom/plex/storage/StorageType.java b/src/main/java/me/totalfreedom/plex/storage/StorageType.java deleted file mode 100644 index b694b26..0000000 --- a/src/main/java/me/totalfreedom/plex/storage/StorageType.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.totalfreedom.plex.storage; - -public enum StorageType -{ - MONGO, SQL, SQLITE -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 7d25d9f..b25f1b8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,19 +1,19 @@ # Plex Configuration File server: - name: "TotalFreedom" + name: "ExampleFreedom" motd: "%servername% - Minecraft %mcversion%" colorize_motd: true data: central: - storage: sqlite # use mariadb, mongodb, or sqlite here + storage: sqlite # Use mariadb, mongodb, or sqlite here user: "" password: "" hostname: 127.0.0.1 port: 27017 db: "plex" - side: # This is redis, leave password blank if auth is false + side: # This is Redis, leave password blank if auth is false auth: true hostname: 127.0.0.1 port: 6379 diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml index 63d2b11..2748834 100644 --- a/src/main/resources/messages.yml +++ b/src/main/resources/messages.yml @@ -54,4 +54,7 @@ nameHistoryFail: Something went wrong while trying to retrieve name history o gameModeSetTo: Your gamemode has been set to . setOtherPlayerGameModeTo: You set 's gamemode to . playerSetOtherGameMode: set your gamemode to . -consoleMustDefinePlayer: You must define a player since you are running this command from console. \ No newline at end of file +consoleMustDefinePlayer: You must define a player since you are running this command from console. +newAdminAdded: - Adding to the admin list +adminRemoved: - Removing from the admin list +adminSetRank: - Setting 's rank to \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 17982c6..d9795b5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ${project.name} version: ${project.version} -author: Telesphoreo -main: me.totalfreedom.plex.Plex +authors: [Telesphoreo, taahanis, super] +main: dev.plex.Plex api-version: 1.16 \ No newline at end of file