diff --git a/README.md b/README.md index 50de2b9..7a36a2c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Praxi +# Practice > [!IMPORTANT] -> To use **Praxi** your server must be running on a 1.8 server! +> To use **Practice** your server must be running on a 1.8 server! The most configurable, efficient, and extensive practice plugin. @@ -13,16 +13,17 @@ The most configurable, efficient, and extensive practice plugin. ![image](https://github.com/Devlrxxh/practice/assets/125221056/054966cd-1603-4e9e-9bc2-800e9538849d) # Placeholders - - ``%praxi_lb___name%`` | Returns Player's Name in position + - ``%practice_lb___name%`` | Returns Player's Name in position - - ``%praxi_lb___elo%`` | Returns Player's ELO in position + - ``%practice_lb___elo%`` | Returns Player's ELO in position - - ``%praxi_leaderboards_update%`` | Returns time left till leaderboard reload + - ``%practice_leaderboards_update%`` | Returns time left till leaderboard reload # Credits ### [Funkyranveer - Praxi without dependencies](https://github.com/funkyranveer/practice-nodependents) -### Joeleoli - Made practice +### Joeleoli - Made praxi # TODO - ~~Add Stats Menu~~ - - Add Boxing + - ~~Add Boxing~~ +- ~~Add Leaderboards~~ diff --git a/pom.xml b/pom.xml index b67293e..dd742ee 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.funky + me.lrxh practice 1.0-SNAPSHOT @@ -121,11 +121,11 @@ co.aikar.commands - me.funky.acf + me.lrxh.acf org.bstats - me.funky.bstats + me.lrxh.bstats diff --git a/src/main/java/me/funky/praxi/Cache.java b/src/main/java/me/lrxh/practice/Cache.java similarity index 69% rename from src/main/java/me/funky/praxi/Cache.java rename to src/main/java/me/lrxh/practice/Cache.java index 8d18d7f..e026d50 100644 --- a/src/main/java/me/funky/praxi/Cache.java +++ b/src/main/java/me/lrxh/practice/Cache.java @@ -1,9 +1,9 @@ -package me.funky.praxi; +package me.lrxh.practice; import lombok.Getter; -import me.funky.praxi.match.Match; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.queue.QueueProfile; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.queue.QueueProfile; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/main/java/me/funky/praxi/Locale.java b/src/main/java/me/lrxh/practice/Locale.java similarity index 98% rename from src/main/java/me/funky/praxi/Locale.java rename to src/main/java/me/lrxh/practice/Locale.java index c518a75..eefb432 100644 --- a/src/main/java/me/funky/praxi/Locale.java +++ b/src/main/java/me/lrxh/practice/Locale.java @@ -1,7 +1,7 @@ -package me.funky.praxi; +package me.lrxh.practice; import lombok.AllArgsConstructor; -import me.funky.praxi.util.PlaceholderUtil; +import me.lrxh.practice.util.PlaceholderUtil; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/Placeholder.java b/src/main/java/me/lrxh/practice/Placeholder.java similarity index 89% rename from src/main/java/me/funky/praxi/Placeholder.java rename to src/main/java/me/lrxh/practice/Placeholder.java index 958353d..afe5f9f 100644 --- a/src/main/java/me/funky/praxi/Placeholder.java +++ b/src/main/java/me/lrxh/practice/Placeholder.java @@ -1,10 +1,10 @@ -package me.funky.praxi; +package me.lrxh.practice; import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import me.funky.praxi.leaderboards.Leaderboard; -import me.funky.praxi.leaderboards.PlayerElo; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.TimeUtil; +import me.lrxh.practice.leaderboards.Leaderboard; +import me.lrxh.practice.leaderboards.PlayerElo; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.TimeUtil; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/me/funky/praxi/Practice.java b/src/main/java/me/lrxh/practice/Practice.java similarity index 79% rename from src/main/java/me/funky/praxi/Practice.java rename to src/main/java/me/lrxh/practice/Practice.java index 88366d6..1a240f9 100644 --- a/src/main/java/me/funky/praxi/Practice.java +++ b/src/main/java/me/lrxh/practice/Practice.java @@ -1,4 +1,4 @@ -package me.funky.praxi; +package me.lrxh.practice; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.CommandCompletions; @@ -8,53 +8,53 @@ import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; import lombok.Getter; -import me.funky.praxi.arena.*; -import me.funky.praxi.arena.command.ArenaCommand; -import me.funky.praxi.commands.admin.general.MainCommand; -import me.funky.praxi.commands.donater.FlyCommand; -import me.funky.praxi.commands.event.map.*; -import me.funky.praxi.commands.event.user.HostCommand; -import me.funky.praxi.commands.event.vote.EventMapVoteCommand; -import me.funky.praxi.commands.user.PingCommand; -import me.funky.praxi.commands.user.StatsCommand; -import me.funky.praxi.commands.user.duels.DuelAcceptCommand; -import me.funky.praxi.commands.user.duels.DuelCommand; -import me.funky.praxi.commands.user.duels.RematchCommand; -import me.funky.praxi.commands.user.match.SpectateCommand; -import me.funky.praxi.commands.user.match.StopSpectatingCommand; -import me.funky.praxi.commands.user.match.ViewInventoryCommand; -import me.funky.praxi.commands.user.party.*; -import me.funky.praxi.essentials.Essentials; -import me.funky.praxi.event.Event; -import me.funky.praxi.event.EventTypeAdapter; -import me.funky.praxi.event.game.EventGameListener; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.EventGameMapTypeAdapter; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.kit.KitEditorListener; -import me.funky.praxi.kit.KitTypeAdapter; -import me.funky.praxi.kit.command.KitCommand; -import me.funky.praxi.leaderboards.LeaderboardThread; -import me.funky.praxi.leaderboards.LeaderboardsCommand; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.MatchListener; -import me.funky.praxi.party.Party; -import me.funky.praxi.party.PartyListener; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileListener; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.queue.QueueListener; -import me.funky.praxi.queue.QueueThread; -import me.funky.praxi.scoreboard.ScoreboardAdapter; -import me.funky.praxi.setting.ProfileSettingsCommand; -import me.funky.praxi.setting.SettingsCommand; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.Console; -import me.funky.praxi.util.InventoryUtil; -import me.funky.praxi.util.assemble.Assemble; -import me.funky.praxi.util.command.Honcho; -import me.funky.praxi.util.config.BasicConfigurationFile; -import me.funky.praxi.util.menu.MenuListener; +import me.lrxh.practice.arena.*; +import me.lrxh.practice.arena.command.ArenaCommand; +import me.lrxh.practice.commands.admin.general.MainCommand; +import me.lrxh.practice.commands.donater.FlyCommand; +import me.lrxh.practice.commands.event.map.*; +import me.lrxh.practice.commands.event.user.HostCommand; +import me.lrxh.practice.commands.event.vote.EventMapVoteCommand; +import me.lrxh.practice.commands.user.PingCommand; +import me.lrxh.practice.commands.user.StatsCommand; +import me.lrxh.practice.commands.user.duels.DuelAcceptCommand; +import me.lrxh.practice.commands.user.duels.DuelCommand; +import me.lrxh.practice.commands.user.duels.RematchCommand; +import me.lrxh.practice.commands.user.match.SpectateCommand; +import me.lrxh.practice.commands.user.match.StopSpectatingCommand; +import me.lrxh.practice.commands.user.match.ViewInventoryCommand; +import me.lrxh.practice.commands.user.party.*; +import me.lrxh.practice.essentials.Essentials; +import me.lrxh.practice.event.Event; +import me.lrxh.practice.event.EventTypeAdapter; +import me.lrxh.practice.event.game.EventGameListener; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.EventGameMapTypeAdapter; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.kit.KitEditorListener; +import me.lrxh.practice.kit.KitTypeAdapter; +import me.lrxh.practice.kit.command.KitCommand; +import me.lrxh.practice.leaderboards.LeaderboardThread; +import me.lrxh.practice.leaderboards.LeaderboardsCommand; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.MatchListener; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.party.PartyListener; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileListener; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.queue.QueueListener; +import me.lrxh.practice.queue.QueueThread; +import me.lrxh.practice.scoreboard.ScoreboardAdapter; +import me.lrxh.practice.setting.ProfileSettingsCommand; +import me.lrxh.practice.setting.SettingsCommand; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.Console; +import me.lrxh.practice.util.InventoryUtil; +import me.lrxh.practice.util.assemble.Assemble; +import me.lrxh.practice.util.command.Honcho; +import me.lrxh.practice.util.config.BasicConfigurationFile; +import me.lrxh.practice.util.menu.MenuListener; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.Difficulty; @@ -194,7 +194,7 @@ public void onEnable() { } Console.sendMessage(CC.translate("&7&m-----------------------------------------")); Console.sendMessage(CC.translate(" ")); - Console.sendMessage(CC.translate("&7| &cPraxi Practice Core")); + Console.sendMessage(CC.translate("&7| &cPractice Core")); Console.sendMessage(CC.translate(" ")); Console.sendMessage(CC.translate("&7| &fAutor(s): &c" + getInstance().getDescription().getAuthors().toString().replace("[", "").replace("]", ""))); Console.sendMessage(CC.translate("&7| &fVersion: &c" + getInstance().getDescription().getVersion())); diff --git a/src/main/java/me/funky/praxi/arena/Arena.java b/src/main/java/me/lrxh/practice/arena/Arena.java similarity index 95% rename from src/main/java/me/funky/praxi/arena/Arena.java rename to src/main/java/me/lrxh/practice/arena/Arena.java index 5f20512..18da064 100644 --- a/src/main/java/me/funky/praxi/arena/Arena.java +++ b/src/main/java/me/lrxh/practice/arena/Arena.java @@ -1,13 +1,13 @@ -package me.funky.praxi.arena; +package me.lrxh.practice.arena; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.cuboid.Cuboid; -import me.funky.praxi.arena.impl.SharedArena; -import me.funky.praxi.arena.impl.StandaloneArena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.cuboid.Cuboid; +import me.lrxh.practice.arena.impl.SharedArena; +import me.lrxh.practice.arena.impl.StandaloneArena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/me/funky/praxi/arena/ArenaListener.java b/src/main/java/me/lrxh/practice/arena/ArenaListener.java similarity index 95% rename from src/main/java/me/funky/praxi/arena/ArenaListener.java rename to src/main/java/me/lrxh/practice/arena/ArenaListener.java index 89f55f9..22b5059 100644 --- a/src/main/java/me/funky/praxi/arena/ArenaListener.java +++ b/src/main/java/me/lrxh/practice/arena/ArenaListener.java @@ -1,10 +1,10 @@ -package me.funky.praxi.arena; +package me.lrxh.practice.arena; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.selection.Selection; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.MatchState; -import me.funky.praxi.util.CC; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.selection.Selection; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.MatchState; +import me.lrxh.practice.util.CC; import org.bukkit.Difficulty; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/arena/ArenaType.java b/src/main/java/me/lrxh/practice/arena/ArenaType.java similarity index 82% rename from src/main/java/me/funky/praxi/arena/ArenaType.java rename to src/main/java/me/lrxh/practice/arena/ArenaType.java index ce1c314..9623471 100644 --- a/src/main/java/me/funky/praxi/arena/ArenaType.java +++ b/src/main/java/me/lrxh/practice/arena/ArenaType.java @@ -1,4 +1,4 @@ -package me.funky.praxi.arena; +package me.lrxh.practice.arena; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/arena/ArenaTypeAdapter.java b/src/main/java/me/lrxh/practice/arena/ArenaTypeAdapter.java similarity index 65% rename from src/main/java/me/funky/praxi/arena/ArenaTypeAdapter.java rename to src/main/java/me/lrxh/practice/arena/ArenaTypeAdapter.java index 98162e1..aa5a078 100644 --- a/src/main/java/me/funky/praxi/arena/ArenaTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/arena/ArenaTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.arena; +package me.lrxh.practice.arena; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class ArenaTypeAdapter implements CommandTypeAdapter { diff --git a/src/main/java/me/funky/praxi/arena/ArenaTypeTypeAdapter.java b/src/main/java/me/lrxh/practice/arena/ArenaTypeTypeAdapter.java similarity index 76% rename from src/main/java/me/funky/praxi/arena/ArenaTypeTypeAdapter.java rename to src/main/java/me/lrxh/practice/arena/ArenaTypeTypeAdapter.java index 5e02d27..adbd0e3 100644 --- a/src/main/java/me/funky/praxi/arena/ArenaTypeTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/arena/ArenaTypeTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.arena; +package me.lrxh.practice.arena; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class ArenaTypeTypeAdapter implements CommandTypeAdapter { diff --git a/src/main/java/me/funky/praxi/arena/SpawnType.java b/src/main/java/me/lrxh/practice/arena/SpawnType.java similarity index 52% rename from src/main/java/me/funky/praxi/arena/SpawnType.java rename to src/main/java/me/lrxh/practice/arena/SpawnType.java index 4b7b743..ab43093 100644 --- a/src/main/java/me/funky/praxi/arena/SpawnType.java +++ b/src/main/java/me/lrxh/practice/arena/SpawnType.java @@ -1,4 +1,4 @@ -package me.funky.praxi.arena; +package me.lrxh.practice.arena; public enum SpawnType { A, B diff --git a/src/main/java/me/funky/praxi/arena/command/ArenaCommand.java b/src/main/java/me/lrxh/practice/arena/command/ArenaCommand.java similarity index 96% rename from src/main/java/me/funky/praxi/arena/command/ArenaCommand.java rename to src/main/java/me/lrxh/practice/arena/command/ArenaCommand.java index cdb909f..3ced5c6 100644 --- a/src/main/java/me/funky/praxi/arena/command/ArenaCommand.java +++ b/src/main/java/me/lrxh/practice/arena/command/ArenaCommand.java @@ -1,20 +1,20 @@ -package me.funky.praxi.arena.command; +package me.lrxh.practice.arena.command; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.arena.ArenaType; -import me.funky.praxi.arena.SpawnType; -import me.funky.praxi.arena.generator.ArenaGenerator; -import me.funky.praxi.arena.generator.Schematic; -import me.funky.praxi.arena.impl.SharedArena; -import me.funky.praxi.arena.impl.StandaloneArena; -import me.funky.praxi.arena.selection.Selection; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ChatComponentBuilder; -import me.funky.praxi.util.ChatHelper; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.arena.ArenaType; +import me.lrxh.practice.arena.SpawnType; +import me.lrxh.practice.arena.generator.ArenaGenerator; +import me.lrxh.practice.arena.generator.Schematic; +import me.lrxh.practice.arena.impl.SharedArena; +import me.lrxh.practice.arena.impl.StandaloneArena; +import me.lrxh.practice.arena.selection.Selection; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ChatComponentBuilder; +import me.lrxh.practice.util.ChatHelper; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import org.apache.commons.lang.StringEscapeUtils; diff --git a/src/main/java/me/funky/praxi/arena/cuboid/Cuboid.java b/src/main/java/me/lrxh/practice/arena/cuboid/Cuboid.java similarity index 99% rename from src/main/java/me/funky/praxi/arena/cuboid/Cuboid.java rename to src/main/java/me/lrxh/practice/arena/cuboid/Cuboid.java index c691100..2098ca3 100644 --- a/src/main/java/me/funky/praxi/arena/cuboid/Cuboid.java +++ b/src/main/java/me/lrxh/practice/arena/cuboid/Cuboid.java @@ -1,4 +1,4 @@ -package me.funky.praxi.arena.cuboid; +package me.lrxh.practice.arena.cuboid; import lombok.Data; import org.bukkit.Bukkit; diff --git a/src/main/java/me/funky/praxi/arena/cuboid/CuboidDirection.java b/src/main/java/me/lrxh/practice/arena/cuboid/CuboidDirection.java similarity index 95% rename from src/main/java/me/funky/praxi/arena/cuboid/CuboidDirection.java rename to src/main/java/me/lrxh/practice/arena/cuboid/CuboidDirection.java index ca1a56d..7ac1898 100644 --- a/src/main/java/me/funky/praxi/arena/cuboid/CuboidDirection.java +++ b/src/main/java/me/lrxh/practice/arena/cuboid/CuboidDirection.java @@ -1,4 +1,4 @@ -package me.funky.praxi.arena.cuboid; +package me.lrxh.practice.arena.cuboid; /** * Represents directions that can be applied to certain faces and actions of a Cuboid diff --git a/src/main/java/me/funky/praxi/arena/generator/ArenaGenerator.java b/src/main/java/me/lrxh/practice/arena/generator/ArenaGenerator.java similarity index 96% rename from src/main/java/me/funky/praxi/arena/generator/ArenaGenerator.java rename to src/main/java/me/lrxh/practice/arena/generator/ArenaGenerator.java index 68bc1f6..85c50b4 100644 --- a/src/main/java/me/funky/praxi/arena/generator/ArenaGenerator.java +++ b/src/main/java/me/lrxh/practice/arena/generator/ArenaGenerator.java @@ -1,12 +1,12 @@ -package me.funky.praxi.arena.generator; +package me.lrxh.practice.arena.generator; import com.boydti.fawe.util.TaskManager; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.arena.ArenaType; -import me.funky.praxi.arena.impl.SharedArena; -import me.funky.praxi.arena.impl.StandaloneArena; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.arena.ArenaType; +import me.lrxh.practice.arena.impl.SharedArena; +import me.lrxh.practice.arena.impl.StandaloneArena; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; diff --git a/src/main/java/me/funky/praxi/arena/generator/Schematic.java b/src/main/java/me/lrxh/practice/arena/generator/Schematic.java similarity index 96% rename from src/main/java/me/funky/praxi/arena/generator/Schematic.java rename to src/main/java/me/lrxh/practice/arena/generator/Schematic.java index 41d3733..607db5e 100644 --- a/src/main/java/me/funky/praxi/arena/generator/Schematic.java +++ b/src/main/java/me/lrxh/practice/arena/generator/Schematic.java @@ -1,4 +1,4 @@ -package me.funky.praxi.arena.generator; +package me.lrxh.practice.arena.generator; import com.sk89q.worldedit.CuboidClipboard; import com.sk89q.worldedit.EditSession; diff --git a/src/main/java/me/funky/praxi/arena/impl/SharedArena.java b/src/main/java/me/lrxh/practice/arena/impl/SharedArena.java similarity index 89% rename from src/main/java/me/funky/praxi/arena/impl/SharedArena.java rename to src/main/java/me/lrxh/practice/arena/impl/SharedArena.java index d4fa70e..2a12eff 100644 --- a/src/main/java/me/funky/praxi/arena/impl/SharedArena.java +++ b/src/main/java/me/lrxh/practice/arena/impl/SharedArena.java @@ -1,11 +1,11 @@ -package me.funky.praxi.arena.impl; +package me.lrxh.practice.arena.impl; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.arena.ArenaType; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.arena.ArenaType; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/me/funky/praxi/arena/impl/StandaloneArena.java b/src/main/java/me/lrxh/practice/arena/impl/StandaloneArena.java similarity index 93% rename from src/main/java/me/funky/praxi/arena/impl/StandaloneArena.java rename to src/main/java/me/lrxh/practice/arena/impl/StandaloneArena.java index 9faa322..0a05a34 100644 --- a/src/main/java/me/funky/praxi/arena/impl/StandaloneArena.java +++ b/src/main/java/me/lrxh/practice/arena/impl/StandaloneArena.java @@ -1,10 +1,10 @@ -package me.funky.praxi.arena.impl; +package me.lrxh.practice.arena.impl; import lombok.Getter; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.arena.ArenaType; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.arena.ArenaType; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/me/funky/praxi/arena/selection/Selection.java b/src/main/java/me/lrxh/practice/arena/selection/Selection.java similarity index 93% rename from src/main/java/me/funky/praxi/arena/selection/Selection.java rename to src/main/java/me/lrxh/practice/arena/selection/Selection.java index 15a35c1..4f7a564 100644 --- a/src/main/java/me/funky/praxi/arena/selection/Selection.java +++ b/src/main/java/me/lrxh/practice/arena/selection/Selection.java @@ -1,11 +1,11 @@ -package me.funky.praxi.arena.selection; +package me.lrxh.practice.arena.selection; import lombok.Data; import lombok.NonNull; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.cuboid.Cuboid; -import me.funky.praxi.util.ItemBuilder; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.cuboid.Cuboid; +import me.lrxh.practice.util.ItemBuilder; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/commands/admin/general/MainCommand.java b/src/main/java/me/lrxh/practice/commands/admin/general/MainCommand.java similarity index 89% rename from src/main/java/me/funky/praxi/commands/admin/general/MainCommand.java rename to src/main/java/me/lrxh/practice/commands/admin/general/MainCommand.java index 6b205de..e397c8a 100644 --- a/src/main/java/me/funky/praxi/commands/admin/general/MainCommand.java +++ b/src/main/java/me/lrxh/practice/commands/admin/general/MainCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.admin.general; +package me.lrxh.practice.commands.admin.general; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import me.funky.praxi.Practice; -import me.funky.praxi.util.CC; +import me.lrxh.practice.Practice; +import me.lrxh.practice.util.CC; import org.bukkit.entity.Player; @@ -16,7 +16,7 @@ public class MainCommand extends BaseCommand { @Subcommand("help") public void help(Player player) { player.sendMessage(CC.translate("&7&m-----------------------------------------")); - player.sendMessage(CC.translate("&c" + Practice.getInstance().getName() + " Practice Core")); + player.sendMessage(CC.translate("&c" + Practice.getInstance().getName() + " Core")); player.sendMessage(" "); player.sendMessage(CC.translate("&7* &c/practice setspawn &7- &fSet server spawn")); player.sendMessage(CC.translate("&7* &c/practice reload &7- &fReload all configs")); diff --git a/src/main/java/me/funky/praxi/commands/donater/FlyCommand.java b/src/main/java/me/lrxh/practice/commands/donater/FlyCommand.java similarity index 88% rename from src/main/java/me/funky/praxi/commands/donater/FlyCommand.java rename to src/main/java/me/lrxh/practice/commands/donater/FlyCommand.java index 555bbe4..56bcfc0 100644 --- a/src/main/java/me/funky/praxi/commands/donater/FlyCommand.java +++ b/src/main/java/me/lrxh/practice/commands/donater/FlyCommand.java @@ -1,13 +1,13 @@ -package me.funky.praxi.commands.donater; +package me.lrxh.practice.commands.donater; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Default; import co.aikar.commands.annotation.Description; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.CC; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.CC; import org.bukkit.entity.Player; @CommandAlias("fly") diff --git a/src/main/java/me/funky/praxi/commands/event/map/EventMapCreateCommand.java b/src/main/java/me/lrxh/practice/commands/event/map/EventMapCreateCommand.java similarity index 73% rename from src/main/java/me/funky/praxi/commands/event/map/EventMapCreateCommand.java rename to src/main/java/me/lrxh/practice/commands/event/map/EventMapCreateCommand.java index 533f9d7..54af390 100644 --- a/src/main/java/me/funky/praxi/commands/event/map/EventMapCreateCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/map/EventMapCreateCommand.java @@ -1,11 +1,11 @@ -package me.funky.praxi.commands.event.map; - -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.impl.SpreadEventGameMap; -import me.funky.praxi.event.game.map.impl.TeamEventGameMap; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; +package me.lrxh.practice.commands.event.map; + +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.impl.SpreadEventGameMap; +import me.lrxh.practice.event.game.map.impl.TeamEventGameMap; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "event map create", permission = "practice.admin.event") diff --git a/src/main/java/me/funky/praxi/commands/event/map/EventMapDeleteCommand.java b/src/main/java/me/lrxh/practice/commands/event/map/EventMapDeleteCommand.java similarity index 70% rename from src/main/java/me/funky/praxi/commands/event/map/EventMapDeleteCommand.java rename to src/main/java/me/lrxh/practice/commands/event/map/EventMapDeleteCommand.java index 7a5984e..021709a 100644 --- a/src/main/java/me/funky/praxi/commands/event/map/EventMapDeleteCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/map/EventMapDeleteCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.event.map; +package me.lrxh.practice.commands.event.map; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "event map delete", permission = "practice.admin.event") diff --git a/src/main/java/me/funky/praxi/commands/event/map/EventMapSetSpawnCommand.java b/src/main/java/me/lrxh/practice/commands/event/map/EventMapSetSpawnCommand.java similarity index 90% rename from src/main/java/me/funky/praxi/commands/event/map/EventMapSetSpawnCommand.java rename to src/main/java/me/lrxh/practice/commands/event/map/EventMapSetSpawnCommand.java index b2bca27..c2e7778 100644 --- a/src/main/java/me/funky/praxi/commands/event/map/EventMapSetSpawnCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/map/EventMapSetSpawnCommand.java @@ -1,11 +1,11 @@ -package me.funky.praxi.commands.event.map; +package me.lrxh.practice.commands.event.map; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.impl.SpreadEventGameMap; -import me.funky.praxi.event.game.map.impl.TeamEventGameMap; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.impl.SpreadEventGameMap; +import me.lrxh.practice.event.game.map.impl.TeamEventGameMap; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"event map set spawn", "event map add spawn"}, permission = "practice.admin.event") diff --git a/src/main/java/me/funky/praxi/commands/event/map/EventMapStatusCommand.java b/src/main/java/me/lrxh/practice/commands/event/map/EventMapStatusCommand.java similarity index 83% rename from src/main/java/me/funky/praxi/commands/event/map/EventMapStatusCommand.java rename to src/main/java/me/lrxh/practice/commands/event/map/EventMapStatusCommand.java index 4756ba2..ea55b7a 100644 --- a/src/main/java/me/funky/praxi/commands/event/map/EventMapStatusCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/map/EventMapStatusCommand.java @@ -1,14 +1,14 @@ -package me.funky.praxi.commands.event.map; +package me.lrxh.practice.commands.event.map; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.impl.SpreadEventGameMap; -import me.funky.praxi.event.game.map.impl.TeamEventGameMap; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.impl.SpreadEventGameMap; +import me.lrxh.practice.event.game.map.impl.TeamEventGameMap; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.entity.Player; -@CommandMeta(label = "event map status", permission = "praxi.admin.event") +@CommandMeta(label = "event map status", permission = "practice.admin.event") public class EventMapStatusCommand { public void execute(Player player, EventGameMap gameMap) { diff --git a/src/main/java/me/funky/praxi/commands/event/map/EventMapsCommand.java b/src/main/java/me/lrxh/practice/commands/event/map/EventMapsCommand.java similarity index 75% rename from src/main/java/me/funky/praxi/commands/event/map/EventMapsCommand.java rename to src/main/java/me/lrxh/practice/commands/event/map/EventMapsCommand.java index 818f056..b23ac46 100644 --- a/src/main/java/me/funky/praxi/commands/event/map/EventMapsCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/map/EventMapsCommand.java @@ -1,8 +1,8 @@ -package me.funky.praxi.commands.event.map; +package me.lrxh.practice.commands.event.map; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "event maps", permission = "practice.admin.event") diff --git a/src/main/java/me/funky/praxi/commands/event/user/HostCommand.java b/src/main/java/me/lrxh/practice/commands/event/user/HostCommand.java similarity index 88% rename from src/main/java/me/funky/praxi/commands/event/user/HostCommand.java rename to src/main/java/me/lrxh/practice/commands/event/user/HostCommand.java index f7fdac8..7503cc5 100644 --- a/src/main/java/me/funky/praxi/commands/event/user/HostCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/user/HostCommand.java @@ -1,18 +1,18 @@ -package me.funky.praxi.commands.event.user; +package me.lrxh.practice.commands.event.user; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import me.funky.praxi.Praxi; -import me.funky.praxi.event.Event; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.EventGameState; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.menu.EventHostMenu; -import me.funky.praxi.event.impl.sumo.SumoEvent; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.Cooldown; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.Event; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.EventGameState; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.menu.EventHostMenu; +import me.lrxh.practice.event.impl.sumo.SumoEvent; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.Cooldown; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -38,15 +38,15 @@ public void open(Player player) { } @Subcommand("help") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") public void help(Player player) { - for (String line : Praxi.getInstance().getMainConfig().getStringList("EVENT.HELP")) { + for (String line : Practice.getInstance().getMainConfig().getStringList("EVENT.HELP")) { player.sendMessage(CC.translate(line)); } } @Subcommand("cancel") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") public void cancel(Player player) { if (EventGame.getActiveGame() != null) { EventGame.getActiveGame().getGameLogic().cancelEvent(); @@ -57,14 +57,14 @@ public void cancel(Player player) { } @Subcommand("clearcooldown") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") public void clearcooldown(Player player) { EventGame.setCooldown(new Cooldown(0)); player.sendMessage(ChatColor.GREEN + "You cleared the event cooldown."); } @Subcommand("forcestart") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") public void forcestart(Player player) { if (EventGame.getActiveGame() != null) { EventGame game = EventGame.getActiveGame(); @@ -84,7 +84,7 @@ public void forcestart(Player player) { } @Subcommand("info") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") public void info(Player player) { if (EventGame.getActiveGame() == null) { player.sendMessage(CC.RED + "There is no active event."); @@ -146,7 +146,7 @@ public void leave(Player player) { } @Subcommand("add map") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") @CommandCompletion("@events @maps") @Syntax(" ") public void addmap(Player player, String eventString, String map) { @@ -175,7 +175,7 @@ public void addmap(Player player, String eventString, String map) { } @Subcommand("admin") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") public void admin(Player player) { player.sendMessage(CC.CHAT_BAR); player.sendMessage(CC.GOLD + "Event Admin"); @@ -188,7 +188,7 @@ public void admin(Player player) { } @Subcommand("remove map") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") @CommandCompletion("@events @maps") @Syntax(" ") public void removemap(Player player, String eventString, String map) { @@ -215,7 +215,7 @@ public void removemap(Player player, String eventString, String map) { } @Subcommand("remove map") - @CommandPermission("praxi.admin.event") + @CommandPermission("practice.admin.event") @CommandCompletion("@event") @Syntax("") public void removemap(Player player, String eventString) { diff --git a/src/main/java/me/funky/praxi/commands/event/vote/EventMapVoteCommand.java b/src/main/java/me/lrxh/practice/commands/event/vote/EventMapVoteCommand.java similarity index 73% rename from src/main/java/me/funky/praxi/commands/event/vote/EventMapVoteCommand.java rename to src/main/java/me/lrxh/practice/commands/event/vote/EventMapVoteCommand.java index 8bda359..1c8ac2d 100644 --- a/src/main/java/me/funky/praxi/commands/event/vote/EventMapVoteCommand.java +++ b/src/main/java/me/lrxh/practice/commands/event/vote/EventMapVoteCommand.java @@ -1,12 +1,12 @@ -package me.funky.praxi.commands.event.vote; +package me.lrxh.practice.commands.event.vote; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.Cooldown; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.Cooldown; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/commands/user/PingCommand.java b/src/main/java/me/lrxh/practice/commands/user/PingCommand.java similarity index 87% rename from src/main/java/me/funky/praxi/commands/user/PingCommand.java rename to src/main/java/me/lrxh/practice/commands/user/PingCommand.java index a182100..e3035d5 100644 --- a/src/main/java/me/funky/praxi/commands/user/PingCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/PingCommand.java @@ -1,12 +1,12 @@ -package me.funky.praxi.commands.user; +package me.lrxh.practice.commands.user; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.Default; import co.aikar.commands.annotation.Description; -import me.funky.praxi.Locale; -import me.funky.praxi.util.BukkitReflection; +import me.lrxh.practice.Locale; +import me.lrxh.practice.util.BukkitReflection; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/commands/user/StatsCommand.java b/src/main/java/me/lrxh/practice/commands/user/StatsCommand.java similarity index 89% rename from src/main/java/me/funky/praxi/commands/user/StatsCommand.java rename to src/main/java/me/lrxh/practice/commands/user/StatsCommand.java index 8129848..3ce5e68 100644 --- a/src/main/java/me/funky/praxi/commands/user/StatsCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/StatsCommand.java @@ -1,11 +1,11 @@ -package me.funky.praxi.commands.user; +package me.lrxh.practice.commands.user; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.Default; import co.aikar.commands.annotation.Description; -import me.funky.praxi.menus.StatsMenu; +import me.lrxh.practice.menus.StatsMenu; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/commands/user/duels/DuelAcceptCommand.java b/src/main/java/me/lrxh/practice/commands/user/duels/DuelAcceptCommand.java similarity index 88% rename from src/main/java/me/funky/praxi/commands/user/duels/DuelAcceptCommand.java rename to src/main/java/me/lrxh/practice/commands/user/duels/DuelAcceptCommand.java index 7f1b66f..748ac5e 100644 --- a/src/main/java/me/funky/praxi/commands/user/duels/DuelAcceptCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/duels/DuelAcceptCommand.java @@ -1,17 +1,17 @@ -package me.funky.praxi.commands.user.duels; - -import me.funky.praxi.arena.Arena; -import me.funky.praxi.duel.DuelRequest; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.impl.BasicTeamMatch; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.TeamGameParticipant; -import me.funky.praxi.party.Party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; +package me.lrxh.practice.commands.user.duels; + +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.duel.DuelRequest; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.impl.BasicTeamMatch; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.TeamGameParticipant; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "duel accept") diff --git a/src/main/java/me/funky/praxi/commands/user/duels/DuelCommand.java b/src/main/java/me/lrxh/practice/commands/user/duels/DuelCommand.java similarity index 87% rename from src/main/java/me/funky/praxi/commands/user/duels/DuelCommand.java rename to src/main/java/me/lrxh/practice/commands/user/duels/DuelCommand.java index 46c9b03..d483a9e 100644 --- a/src/main/java/me/funky/praxi/commands/user/duels/DuelCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/duels/DuelCommand.java @@ -1,12 +1,12 @@ -package me.funky.praxi.commands.user.duels; - -import me.funky.praxi.duel.DuelProcedure; -import me.funky.praxi.duel.DuelRequest; -import me.funky.praxi.duel.menu.DuelSelectKitMenu; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; +package me.lrxh.practice.commands.user.duels; + +import me.lrxh.practice.duel.DuelProcedure; +import me.lrxh.practice.duel.DuelRequest; +import me.lrxh.practice.duel.menu.DuelSelectKitMenu; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "duel") diff --git a/src/main/java/me/funky/praxi/commands/user/duels/RematchCommand.java b/src/main/java/me/lrxh/practice/commands/user/duels/RematchCommand.java similarity index 82% rename from src/main/java/me/funky/praxi/commands/user/duels/RematchCommand.java rename to src/main/java/me/lrxh/practice/commands/user/duels/RematchCommand.java index 3025f97..b4e7980 100644 --- a/src/main/java/me/funky/praxi/commands/user/duels/RematchCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/duels/RematchCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.duels; +package me.lrxh.practice.commands.user.duels; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.meta.ProfileRematchData; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.meta.ProfileRematchData; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "rematch") diff --git a/src/main/java/me/funky/praxi/commands/user/match/SpectateCommand.java b/src/main/java/me/lrxh/practice/commands/user/match/SpectateCommand.java similarity index 86% rename from src/main/java/me/funky/praxi/commands/user/match/SpectateCommand.java rename to src/main/java/me/lrxh/practice/commands/user/match/SpectateCommand.java index bdb5b1a..1573d58 100644 --- a/src/main/java/me/funky/praxi/commands/user/match/SpectateCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/match/SpectateCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.match; +package me.lrxh.practice.commands.user.match; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"spectate", "spec"}) diff --git a/src/main/java/me/funky/praxi/commands/user/match/StopSpectatingCommand.java b/src/main/java/me/lrxh/practice/commands/user/match/StopSpectatingCommand.java similarity index 76% rename from src/main/java/me/funky/praxi/commands/user/match/StopSpectatingCommand.java rename to src/main/java/me/lrxh/practice/commands/user/match/StopSpectatingCommand.java index 1087c2d..d0c52b3 100644 --- a/src/main/java/me/funky/praxi/commands/user/match/StopSpectatingCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/match/StopSpectatingCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.match; +package me.lrxh.practice.commands.user.match; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = "spec leave") diff --git a/src/main/java/me/funky/praxi/commands/user/match/ViewInventoryCommand.java b/src/main/java/me/lrxh/practice/commands/user/match/ViewInventoryCommand.java similarity index 73% rename from src/main/java/me/funky/praxi/commands/user/match/ViewInventoryCommand.java rename to src/main/java/me/lrxh/practice/commands/user/match/ViewInventoryCommand.java index 2c801ea..80e9550 100644 --- a/src/main/java/me/funky/praxi/commands/user/match/ViewInventoryCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/match/ViewInventoryCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.match; +package me.lrxh.practice.commands.user.match; -import me.funky.praxi.match.MatchSnapshot; -import me.funky.praxi.match.menu.MatchDetailsMenu; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.match.MatchSnapshot; +import me.lrxh.practice.match.menu.MatchDetailsMenu; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; import java.util.UUID; diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyChatCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyChatCommand.java similarity index 71% rename from src/main/java/me/funky/praxi/commands/user/party/PartyChatCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyChatCommand.java index 9d51f07..afc230e 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyChatCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyChatCommand.java @@ -1,7 +1,7 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"party chat", "p chat"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyCloseCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyCloseCommand.java similarity index 74% rename from src/main/java/me/funky/praxi/commands/user/party/PartyCloseCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyCloseCommand.java index 8321d14..5c43520 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyCloseCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyCloseCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.party.PartyPrivacy; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.party.PartyPrivacy; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p close", "party close", "p lock", "party lock"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyCreateCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyCreateCommand.java similarity index 71% rename from src/main/java/me/funky/praxi/commands/user/party/PartyCreateCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyCreateCommand.java index e854daa..3440c3c 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyCreateCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyCreateCommand.java @@ -1,12 +1,12 @@ -package me.funky.praxi.commands.user.party; - -import me.funky.praxi.Locale; -import me.funky.praxi.party.Party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +package me.lrxh.practice.commands.user.party; + +import me.lrxh.practice.Locale; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p create", "party create"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyDisbandCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyDisbandCommand.java similarity index 77% rename from src/main/java/me/funky/praxi/commands/user/party/PartyDisbandCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyDisbandCommand.java index 2af257c..0298cd5 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyDisbandCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyDisbandCommand.java @@ -1,8 +1,8 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p disband", "party disband"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyHelpCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyHelpCommand.java similarity index 65% rename from src/main/java/me/funky/praxi/commands/user/party/PartyHelpCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyHelpCommand.java index 9a979a2..81adf42 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyHelpCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyHelpCommand.java @@ -1,7 +1,7 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.Locale; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.Locale; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p", "p help", "party", "party help"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyInfoCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyInfoCommand.java similarity index 70% rename from src/main/java/me/funky/praxi/commands/user/party/PartyInfoCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyInfoCommand.java index aa230b8..5b4966c 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyInfoCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyInfoCommand.java @@ -1,8 +1,8 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p info", "party info"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyInviteCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyInviteCommand.java similarity index 87% rename from src/main/java/me/funky/praxi/commands/user/party/PartyInviteCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyInviteCommand.java index 94a0a78..80afd69 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyInviteCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyInviteCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.party.PartyPrivacy; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.party.PartyPrivacy; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p invite", "party invite"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyJoinCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyJoinCommand.java similarity index 84% rename from src/main/java/me/funky/praxi/commands/user/party/PartyJoinCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyJoinCommand.java index 3871413..103a007 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyJoinCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyJoinCommand.java @@ -1,10 +1,10 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.party.Party; -import me.funky.praxi.party.PartyPrivacy; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.party.PartyPrivacy; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p join", "party join"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyKickCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyKickCommand.java similarity index 84% rename from src/main/java/me/funky/praxi/commands/user/party/PartyKickCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyKickCommand.java index 685e03c..07fcf16 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyKickCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyKickCommand.java @@ -1,8 +1,8 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p kick", "party kick"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyLeaveCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyLeaveCommand.java similarity index 75% rename from src/main/java/me/funky/praxi/commands/user/party/PartyLeaveCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyLeaveCommand.java index 31fbe08..de9ec60 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyLeaveCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyLeaveCommand.java @@ -1,8 +1,8 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p leave", "party leave"}) diff --git a/src/main/java/me/funky/praxi/commands/user/party/PartyOpenCommand.java b/src/main/java/me/lrxh/practice/commands/user/party/PartyOpenCommand.java similarity index 74% rename from src/main/java/me/funky/praxi/commands/user/party/PartyOpenCommand.java rename to src/main/java/me/lrxh/practice/commands/user/party/PartyOpenCommand.java index af03f0f..fcb63a6 100644 --- a/src/main/java/me/funky/praxi/commands/user/party/PartyOpenCommand.java +++ b/src/main/java/me/lrxh/practice/commands/user/party/PartyOpenCommand.java @@ -1,9 +1,9 @@ -package me.funky.praxi.commands.user.party; +package me.lrxh.practice.commands.user.party; -import me.funky.praxi.party.PartyPrivacy; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.party.PartyPrivacy; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.entity.Player; @CommandMeta(label = {"p open", "party open", "p unlock", "party unlock"}) diff --git a/src/main/java/me/funky/praxi/duel/DuelProcedure.java b/src/main/java/me/lrxh/practice/duel/DuelProcedure.java similarity index 91% rename from src/main/java/me/funky/praxi/duel/DuelProcedure.java rename to src/main/java/me/lrxh/practice/duel/DuelProcedure.java index a16070b..429b02a 100644 --- a/src/main/java/me/funky/praxi/duel/DuelProcedure.java +++ b/src/main/java/me/lrxh/practice/duel/DuelProcedure.java @@ -1,14 +1,14 @@ -package me.funky.praxi.duel; +package me.lrxh.practice.duel; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Locale; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.BukkitReflection; -import me.funky.praxi.util.ChatComponentBuilder; -import me.funky.praxi.util.ChatHelper; +import me.lrxh.practice.Locale; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.BukkitReflection; +import me.lrxh.practice.util.ChatComponentBuilder; +import me.lrxh.practice.util.ChatHelper; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/duel/DuelRequest.java b/src/main/java/me/lrxh/practice/duel/DuelRequest.java similarity index 92% rename from src/main/java/me/funky/praxi/duel/DuelRequest.java rename to src/main/java/me/lrxh/practice/duel/DuelRequest.java index 3d68274..6b7cf04 100644 --- a/src/main/java/me/funky/praxi/duel/DuelRequest.java +++ b/src/main/java/me/lrxh/practice/duel/DuelRequest.java @@ -1,9 +1,9 @@ -package me.funky.praxi.duel; +package me.lrxh.practice.duel; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/duel/menu/DuelSelectArenaMenu.java b/src/main/java/me/lrxh/practice/duel/menu/DuelSelectArenaMenu.java similarity index 88% rename from src/main/java/me/funky/praxi/duel/menu/DuelSelectArenaMenu.java rename to src/main/java/me/lrxh/practice/duel/menu/DuelSelectArenaMenu.java index 98c0131..9ee7e27 100644 --- a/src/main/java/me/funky/praxi/duel/menu/DuelSelectArenaMenu.java +++ b/src/main/java/me/lrxh/practice/duel/menu/DuelSelectArenaMenu.java @@ -1,14 +1,14 @@ -package me.funky.praxi.duel.menu; +package me.lrxh.practice.duel.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.arena.ArenaType; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.arena.ArenaType; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/duel/menu/DuelSelectKitMenu.java b/src/main/java/me/lrxh/practice/duel/menu/DuelSelectKitMenu.java similarity index 87% rename from src/main/java/me/funky/praxi/duel/menu/DuelSelectKitMenu.java rename to src/main/java/me/lrxh/practice/duel/menu/DuelSelectKitMenu.java index b597fe5..e757f00 100644 --- a/src/main/java/me/funky/praxi/duel/menu/DuelSelectKitMenu.java +++ b/src/main/java/me/lrxh/practice/duel/menu/DuelSelectKitMenu.java @@ -1,14 +1,14 @@ -package me.funky.praxi.duel.menu; +package me.lrxh.practice.duel.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/funky/praxi/essentials/Essentials.java b/src/main/java/me/lrxh/practice/essentials/Essentials.java similarity index 93% rename from src/main/java/me/funky/praxi/essentials/Essentials.java rename to src/main/java/me/lrxh/practice/essentials/Essentials.java index e41ed53..c6eb994 100644 --- a/src/main/java/me/funky/praxi/essentials/Essentials.java +++ b/src/main/java/me/lrxh/practice/essentials/Essentials.java @@ -1,8 +1,8 @@ -package me.funky.praxi.essentials; +package me.lrxh.practice.essentials; -import me.funky.praxi.Practice; -import me.funky.praxi.essentials.event.SpawnTeleportEvent; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.essentials.event.SpawnTeleportEvent; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Entity; diff --git a/src/main/java/me/funky/praxi/essentials/EssentialsListener.java b/src/main/java/me/lrxh/practice/essentials/EssentialsListener.java similarity index 95% rename from src/main/java/me/funky/praxi/essentials/EssentialsListener.java rename to src/main/java/me/lrxh/practice/essentials/EssentialsListener.java index 2438bea..8a29004 100644 --- a/src/main/java/me/funky/praxi/essentials/EssentialsListener.java +++ b/src/main/java/me/lrxh/practice/essentials/EssentialsListener.java @@ -1,6 +1,6 @@ -package me.funky.praxi.essentials; +package me.lrxh.practice.essentials; -import me.funky.praxi.util.CC; +import me.lrxh.practice.util.CC; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/me/funky/praxi/essentials/event/SpawnTeleportEvent.java b/src/main/java/me/lrxh/practice/essentials/event/SpawnTeleportEvent.java similarity index 86% rename from src/main/java/me/funky/praxi/essentials/event/SpawnTeleportEvent.java rename to src/main/java/me/lrxh/practice/essentials/event/SpawnTeleportEvent.java index 7386bf4..41efe7b 100644 --- a/src/main/java/me/funky/praxi/essentials/event/SpawnTeleportEvent.java +++ b/src/main/java/me/lrxh/practice/essentials/event/SpawnTeleportEvent.java @@ -1,8 +1,8 @@ -package me.funky.praxi.essentials.event; +package me.lrxh.practice.essentials.event; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.util.BaseEvent; +import me.lrxh.practice.util.BaseEvent; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/me/funky/praxi/event/Event.java b/src/main/java/me/lrxh/practice/event/Event.java similarity index 78% rename from src/main/java/me/funky/praxi/event/Event.java rename to src/main/java/me/lrxh/practice/event/Event.java index b813799..3d75f3c 100644 --- a/src/main/java/me/funky/praxi/event/Event.java +++ b/src/main/java/me/lrxh/practice/event/Event.java @@ -1,9 +1,9 @@ -package me.funky.praxi.event; +package me.lrxh.practice.event; -import me.funky.praxi.Praxi; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.EventGameLogic; -import me.funky.praxi.event.impl.sumo.SumoEvent; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.EventGameLogic; +import me.lrxh.practice.event.impl.sumo.SumoEvent; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.Listener; @@ -21,11 +21,11 @@ static void init() { for (Event event : events) { for (Listener listener : event.getListeners()) { - Praxi.getInstance().getServer().getPluginManager().registerEvents(listener, Praxi.getInstance()); + Practice.getInstance().getServer().getPluginManager().registerEvents(listener, Practice.getInstance()); } for (Object command : event.getCommands()) { - Praxi.getInstance().getHoncho().registerCommand(command); + Practice.getInstance().getHoncho().registerCommand(command); } } } diff --git a/src/main/java/me/funky/praxi/event/EventTypeAdapter.java b/src/main/java/me/lrxh/practice/event/EventTypeAdapter.java similarity index 79% rename from src/main/java/me/funky/praxi/event/EventTypeAdapter.java rename to src/main/java/me/lrxh/practice/event/EventTypeAdapter.java index b8c74d7..ed12666 100644 --- a/src/main/java/me/funky/praxi/event/EventTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/event/EventTypeAdapter.java @@ -1,7 +1,7 @@ -package me.funky.praxi.event; +package me.lrxh.practice.event; -import me.funky.praxi.event.impl.sumo.SumoEvent; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.event.impl.sumo.SumoEvent; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/me/funky/praxi/event/game/EventGame.java b/src/main/java/me/lrxh/practice/event/game/EventGame.java similarity index 93% rename from src/main/java/me/funky/praxi/event/game/EventGame.java rename to src/main/java/me/lrxh/practice/event/game/EventGame.java index 5caf8be..f2eea62 100644 --- a/src/main/java/me/funky/praxi/event/game/EventGame.java +++ b/src/main/java/me/lrxh/practice/event/game/EventGame.java @@ -1,14 +1,14 @@ -package me.funky.praxi.event.game; +package me.lrxh.practice.event.game; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Locale; -import me.funky.praxi.event.Event; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.vote.EventGameMapVoteData; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.GamePlayer; -import me.funky.praxi.util.*; +import me.lrxh.practice.Locale; +import me.lrxh.practice.event.Event; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.vote.EventGameMapVoteData; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.GamePlayer; +import me.lrxh.practice.util.*; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/me/funky/praxi/event/game/EventGameListener.java b/src/main/java/me/lrxh/practice/event/game/EventGameListener.java similarity index 95% rename from src/main/java/me/funky/praxi/event/game/EventGameListener.java rename to src/main/java/me/lrxh/practice/event/game/EventGameListener.java index 544d796..501067f 100644 --- a/src/main/java/me/funky/praxi/event/game/EventGameListener.java +++ b/src/main/java/me/lrxh/practice/event/game/EventGameListener.java @@ -1,10 +1,10 @@ -package me.funky.praxi.event.game; +package me.lrxh.practice.event.game; -import me.funky.praxi.event.impl.sumo.SumoEvent; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; +import me.lrxh.practice.event.impl.sumo.SumoEvent; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.EventHandler; diff --git a/src/main/java/me/funky/praxi/event/game/EventGameLogic.java b/src/main/java/me/lrxh/practice/event/game/EventGameLogic.java similarity index 89% rename from src/main/java/me/funky/praxi/event/game/EventGameLogic.java rename to src/main/java/me/lrxh/practice/event/game/EventGameLogic.java index df8e75a..1ecdc8b 100644 --- a/src/main/java/me/funky/praxi/event/game/EventGameLogic.java +++ b/src/main/java/me/lrxh/practice/event/game/EventGameLogic.java @@ -1,6 +1,6 @@ -package me.funky.praxi.event.game; +package me.lrxh.practice.event.game; -import me.funky.praxi.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.EventGameMap; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/main/java/me/funky/praxi/event/game/EventGameLogicTask.java b/src/main/java/me/lrxh/practice/event/game/EventGameLogicTask.java similarity index 96% rename from src/main/java/me/funky/praxi/event/game/EventGameLogicTask.java rename to src/main/java/me/lrxh/practice/event/game/EventGameLogicTask.java index 0951615..41e8a11 100644 --- a/src/main/java/me/funky/praxi/event/game/EventGameLogicTask.java +++ b/src/main/java/me/lrxh/practice/event/game/EventGameLogicTask.java @@ -1,9 +1,9 @@ -package me.funky.praxi.event.game; +package me.lrxh.practice.event.game; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Locale; -import me.funky.praxi.util.TimeUtil; +import me.lrxh.practice.Locale; +import me.lrxh.practice.util.TimeUtil; import org.bukkit.Sound; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/me/funky/praxi/event/game/EventGameState.java b/src/main/java/me/lrxh/practice/event/game/EventGameState.java similarity index 91% rename from src/main/java/me/funky/praxi/event/game/EventGameState.java rename to src/main/java/me/lrxh/practice/event/game/EventGameState.java index 20e9095..d298d52 100644 --- a/src/main/java/me/funky/praxi/event/game/EventGameState.java +++ b/src/main/java/me/lrxh/practice/event/game/EventGameState.java @@ -1,4 +1,4 @@ -package me.funky.praxi.event.game; +package me.lrxh.practice.event.game; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/event/game/map/EventGameMap.java b/src/main/java/me/lrxh/practice/event/game/map/EventGameMap.java similarity index 81% rename from src/main/java/me/funky/praxi/event/game/map/EventGameMap.java rename to src/main/java/me/lrxh/practice/event/game/map/EventGameMap.java index 2142ad9..c55efcf 100644 --- a/src/main/java/me/funky/praxi/event/game/map/EventGameMap.java +++ b/src/main/java/me/lrxh/practice/event/game/map/EventGameMap.java @@ -1,12 +1,12 @@ -package me.funky.praxi.event.game.map; +package me.lrxh.practice.event.game.map; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Praxi; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.map.impl.SpreadEventGameMap; -import me.funky.praxi.event.game.map.impl.TeamEventGameMap; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.map.impl.SpreadEventGameMap; +import me.lrxh.practice.event.game.map.impl.TeamEventGameMap; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; @@ -56,7 +56,7 @@ public static List getCompletedMaps() { } public static void init() { - FileConfiguration config = Praxi.getInstance().getEventsConfig().getConfiguration(); + FileConfiguration config = Practice.getInstance().getEventsConfig().getConfiguration(); for (String key : config.getConfigurationSection("EVENT_MAPS").getKeys(false)) { final String path = "EVENT_MAPS." + key + "."; @@ -103,23 +103,23 @@ public static void init() { public abstract void teleportFighters(EventGame game); public void save() { - FileConfiguration config = Praxi.getInstance().getEventsConfig().getConfiguration(); + FileConfiguration config = Practice.getInstance().getEventsConfig().getConfiguration(); config.set("EVENT_MAPS." + mapName, null); config.set("EVENT_MAPS." + mapName + ".SPECTATOR_POINT", LocationUtil.serialize(spectatorPoint)); try { - config.save(Praxi.getInstance().getEventsConfig().getFile()); + config.save(Practice.getInstance().getEventsConfig().getFile()); } catch (IOException e) { e.printStackTrace(); } } public void delete() { - FileConfiguration config = Praxi.getInstance().getEventsConfig().getConfiguration(); + FileConfiguration config = Practice.getInstance().getEventsConfig().getConfiguration(); config.set("EVENT_MAPS." + mapName, null); try { - config.save(Praxi.getInstance().getEventsConfig().getFile()); + config.save(Practice.getInstance().getEventsConfig().getFile()); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/me/funky/praxi/event/game/map/EventGameMapTypeAdapter.java b/src/main/java/me/lrxh/practice/event/game/map/EventGameMapTypeAdapter.java similarity index 65% rename from src/main/java/me/funky/praxi/event/game/map/EventGameMapTypeAdapter.java rename to src/main/java/me/lrxh/practice/event/game/map/EventGameMapTypeAdapter.java index 6cdf3be..8c7b79e 100644 --- a/src/main/java/me/funky/praxi/event/game/map/EventGameMapTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/event/game/map/EventGameMapTypeAdapter.java @@ -1,7 +1,7 @@ -package me.funky.praxi.event.game.map; +package me.lrxh.practice.event.game.map; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class EventGameMapTypeAdapter implements CommandTypeAdapter { diff --git a/src/main/java/me/funky/praxi/event/game/map/impl/SpreadEventGameMap.java b/src/main/java/me/lrxh/practice/event/game/map/impl/SpreadEventGameMap.java similarity index 76% rename from src/main/java/me/funky/praxi/event/game/map/impl/SpreadEventGameMap.java rename to src/main/java/me/lrxh/practice/event/game/map/impl/SpreadEventGameMap.java index 91b7a12..a2ffa4e 100644 --- a/src/main/java/me/funky/praxi/event/game/map/impl/SpreadEventGameMap.java +++ b/src/main/java/me/lrxh/practice/event/game/map/impl/SpreadEventGameMap.java @@ -1,12 +1,12 @@ -package me.funky.praxi.event.game.map.impl; +package me.lrxh.practice.event.game.map.impl; import lombok.Getter; -import me.funky.praxi.Praxi; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.GamePlayer; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.GamePlayer; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; @@ -57,13 +57,13 @@ public boolean isSetup() { public void save() { super.save(); - FileConfiguration config = Praxi.getInstance().getEventsConfig().getConfiguration(); + FileConfiguration config = Practice.getInstance().getEventsConfig().getConfiguration(); config.set("EVENT_MAPS." + getMapName() + ".TYPE", "SPREAD"); config.set("EVENT_MAPS." + getMapName() + ".SPAWN_LOCATIONS", spawnLocations .stream().map(LocationUtil::serialize).collect(Collectors.toList())); try { - config.save(Praxi.getInstance().getEventsConfig().getFile()); + config.save(Practice.getInstance().getEventsConfig().getFile()); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/me/funky/praxi/event/game/map/impl/TeamEventGameMap.java b/src/main/java/me/lrxh/practice/event/game/map/impl/TeamEventGameMap.java similarity index 85% rename from src/main/java/me/funky/praxi/event/game/map/impl/TeamEventGameMap.java rename to src/main/java/me/lrxh/practice/event/game/map/impl/TeamEventGameMap.java index 1920812..f743156 100644 --- a/src/main/java/me/funky/praxi/event/game/map/impl/TeamEventGameMap.java +++ b/src/main/java/me/lrxh/practice/event/game/map/impl/TeamEventGameMap.java @@ -1,14 +1,14 @@ -package me.funky.praxi.event.game.map.impl; +package me.lrxh.practice.event.game.map.impl; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.impl.sumo.SumoGameLogic; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.GamePlayer; -import me.funky.praxi.util.LocationUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.impl.sumo.SumoGameLogic; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.GamePlayer; +import me.lrxh.practice.util.LocationUtil; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/event/game/map/vote/EventGameMapVoteData.java b/src/main/java/me/lrxh/practice/event/game/map/vote/EventGameMapVoteData.java similarity index 90% rename from src/main/java/me/funky/praxi/event/game/map/vote/EventGameMapVoteData.java rename to src/main/java/me/lrxh/practice/event/game/map/vote/EventGameMapVoteData.java index 89991b9..eb7a92d 100644 --- a/src/main/java/me/funky/praxi/event/game/map/vote/EventGameMapVoteData.java +++ b/src/main/java/me/lrxh/practice/event/game/map/vote/EventGameMapVoteData.java @@ -1,4 +1,4 @@ -package me.funky.praxi.event.game.map.vote; +package me.lrxh.practice.event.game.map.vote; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/event/game/menu/EventHostMenu.java b/src/main/java/me/lrxh/practice/event/game/menu/EventHostMenu.java similarity index 90% rename from src/main/java/me/funky/praxi/event/game/menu/EventHostMenu.java rename to src/main/java/me/lrxh/practice/event/game/menu/EventHostMenu.java index a97a803..4574dbc 100644 --- a/src/main/java/me/funky/praxi/event/game/menu/EventHostMenu.java +++ b/src/main/java/me/lrxh/practice/event/game/menu/EventHostMenu.java @@ -1,17 +1,17 @@ -package me.funky.praxi.event.game.menu; +package me.lrxh.practice.event.game.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.event.Event; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.vote.EventGameMapVoteData; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.TextSplitter; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.Event; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.vote.EventGameMapVoteData; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.TextSplitter; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/event/impl/sumo/SumoEvent.java b/src/main/java/me/lrxh/practice/event/impl/sumo/SumoEvent.java similarity index 87% rename from src/main/java/me/funky/praxi/event/impl/sumo/SumoEvent.java rename to src/main/java/me/lrxh/practice/event/impl/sumo/SumoEvent.java index 56de8a0..f1abc50 100644 --- a/src/main/java/me/funky/praxi/event/impl/sumo/SumoEvent.java +++ b/src/main/java/me/lrxh/practice/event/impl/sumo/SumoEvent.java @@ -1,14 +1,14 @@ -package me.funky.praxi.event.impl.sumo; +package me.lrxh.practice.event.impl.sumo; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.event.Event; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.EventGameLogic; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.LocationUtil; -import me.funky.praxi.util.config.BasicConfigurationFile; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.Event; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.EventGameLogic; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.LocationUtil; +import me.lrxh.practice.util.config.BasicConfigurationFile; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/me/funky/praxi/event/impl/sumo/SumoGameLogic.java b/src/main/java/me/lrxh/practice/event/impl/sumo/SumoGameLogic.java similarity index 94% rename from src/main/java/me/funky/praxi/event/impl/sumo/SumoGameLogic.java rename to src/main/java/me/lrxh/practice/event/impl/sumo/SumoGameLogic.java index 5ede1fa..9dd59e2 100644 --- a/src/main/java/me/funky/praxi/event/impl/sumo/SumoGameLogic.java +++ b/src/main/java/me/lrxh/practice/event/impl/sumo/SumoGameLogic.java @@ -1,26 +1,26 @@ -package me.funky.praxi.event.impl.sumo; +package me.lrxh.practice.event.impl.sumo; import lombok.Getter; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.event.game.EventGame; -import me.funky.praxi.event.game.EventGameLogic; -import me.funky.praxi.event.game.EventGameLogicTask; -import me.funky.praxi.event.game.EventGameState; -import me.funky.praxi.event.game.map.EventGameMap; -import me.funky.praxi.event.game.map.vote.EventGameMapVoteData; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.GamePlayer; -import me.funky.praxi.participant.TeamGameParticipant; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; -import me.funky.praxi.profile.visibility.VisibilityLogic; -import me.funky.praxi.util.BlockUtil; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.Cooldown; -import me.funky.praxi.util.PlayerUtil; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.game.EventGame; +import me.lrxh.practice.event.game.EventGameLogic; +import me.lrxh.practice.event.game.EventGameLogicTask; +import me.lrxh.practice.event.game.EventGameState; +import me.lrxh.practice.event.game.map.EventGameMap; +import me.lrxh.practice.event.game.map.vote.EventGameMapVoteData; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.GamePlayer; +import me.lrxh.practice.participant.TeamGameParticipant; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; +import me.lrxh.practice.profile.visibility.VisibilityLogic; +import me.lrxh.practice.util.BlockUtil; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.Cooldown; +import me.lrxh.practice.util.PlayerUtil; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Sound; diff --git a/src/main/java/me/funky/praxi/kit/Kit.java b/src/main/java/me/lrxh/practice/kit/Kit.java similarity index 94% rename from src/main/java/me/funky/praxi/kit/Kit.java rename to src/main/java/me/lrxh/practice/kit/Kit.java index 68142ae..352f879 100644 --- a/src/main/java/me/funky/praxi/kit/Kit.java +++ b/src/main/java/me/lrxh/practice/kit/Kit.java @@ -1,14 +1,14 @@ -package me.funky.praxi.kit; +package me.lrxh.practice.kit; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.kit.meta.KitEditRules; -import me.funky.praxi.kit.meta.KitGameRules; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.InventoryUtil; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.config.BasicConfigurationFile; +import me.lrxh.practice.Practice; +import me.lrxh.practice.kit.meta.KitEditRules; +import me.lrxh.practice.kit.meta.KitGameRules; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.InventoryUtil; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.config.BasicConfigurationFile; import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/funky/praxi/kit/KitEditorListener.java b/src/main/java/me/lrxh/practice/kit/KitEditorListener.java similarity index 92% rename from src/main/java/me/funky/praxi/kit/KitEditorListener.java rename to src/main/java/me/lrxh/practice/kit/KitEditorListener.java index abbec70..93a47f2 100644 --- a/src/main/java/me/funky/praxi/kit/KitEditorListener.java +++ b/src/main/java/me/lrxh/practice/kit/KitEditorListener.java @@ -1,13 +1,13 @@ -package me.funky.praxi.kit; - -import me.funky.praxi.Locale; -import me.funky.praxi.kit.menu.KitEditorSelectKitMenu; -import me.funky.praxi.kit.menu.KitManagementMenu; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; -import me.funky.praxi.util.CC; +package me.lrxh.practice.kit; + +import me.lrxh.practice.Locale; +import me.lrxh.practice.kit.menu.KitEditorSelectKitMenu; +import me.lrxh.practice.kit.menu.KitManagementMenu; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; +import me.lrxh.practice.util.CC; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/me/funky/praxi/kit/KitLoadout.java b/src/main/java/me/lrxh/practice/kit/KitLoadout.java similarity index 95% rename from src/main/java/me/funky/praxi/kit/KitLoadout.java rename to src/main/java/me/lrxh/practice/kit/KitLoadout.java index 3c2d8f2..4c46d7e 100644 --- a/src/main/java/me/funky/praxi/kit/KitLoadout.java +++ b/src/main/java/me/lrxh/practice/kit/KitLoadout.java @@ -1,4 +1,4 @@ -package me.funky.praxi.kit; +package me.lrxh.practice.kit; import lombok.Data; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/funky/praxi/kit/KitTypeAdapter.java b/src/main/java/me/lrxh/practice/kit/KitTypeAdapter.java similarity index 65% rename from src/main/java/me/funky/praxi/kit/KitTypeAdapter.java rename to src/main/java/me/lrxh/practice/kit/KitTypeAdapter.java index 1614813..f110d8b 100644 --- a/src/main/java/me/funky/praxi/kit/KitTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/kit/KitTypeAdapter.java @@ -1,7 +1,7 @@ -package me.funky.praxi.kit; +package me.lrxh.practice.kit; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class KitTypeAdapter implements CommandTypeAdapter { diff --git a/src/main/java/me/funky/praxi/kit/command/KitCommand.java b/src/main/java/me/lrxh/practice/kit/command/KitCommand.java similarity index 97% rename from src/main/java/me/funky/praxi/kit/command/KitCommand.java rename to src/main/java/me/lrxh/practice/kit/command/KitCommand.java index a0323d6..56c1af8 100644 --- a/src/main/java/me/funky/praxi/kit/command/KitCommand.java +++ b/src/main/java/me/lrxh/practice/kit/command/KitCommand.java @@ -1,14 +1,14 @@ -package me.funky.praxi.kit.command; +package me.lrxh.practice.kit.command; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.CC; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.CC; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/kit/menu/KitEditorMenu.java b/src/main/java/me/lrxh/practice/kit/menu/KitEditorMenu.java similarity index 93% rename from src/main/java/me/funky/praxi/kit/menu/KitEditorMenu.java rename to src/main/java/me/lrxh/practice/kit/menu/KitEditorMenu.java index 526224f..5a05c0f 100644 --- a/src/main/java/me/funky/praxi/kit/menu/KitEditorMenu.java +++ b/src/main/java/me/lrxh/practice/kit/menu/KitEditorMenu.java @@ -1,20 +1,20 @@ -package me.funky.praxi.kit.menu; +package me.lrxh.practice.kit.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.kit.KitLoadout; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.meta.ProfileKitData; -import me.funky.praxi.util.BukkitReflection; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.PlayerUtil; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.button.DisplayButton; +import me.lrxh.practice.Practice; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.kit.KitLoadout; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.meta.ProfileKitData; +import me.lrxh.practice.util.BukkitReflection; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.PlayerUtil; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.button.DisplayButton; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/kit/menu/KitEditorSelectKitMenu.java b/src/main/java/me/lrxh/practice/kit/menu/KitEditorSelectKitMenu.java similarity index 65% rename from src/main/java/me/funky/praxi/kit/menu/KitEditorSelectKitMenu.java rename to src/main/java/me/lrxh/practice/kit/menu/KitEditorSelectKitMenu.java index c649b35..157bf24 100644 --- a/src/main/java/me/funky/praxi/kit/menu/KitEditorSelectKitMenu.java +++ b/src/main/java/me/lrxh/practice/kit/menu/KitEditorSelectKitMenu.java @@ -1,13 +1,13 @@ -package me.funky.praxi.kit.menu; +package me.lrxh.practice.kit.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Praxi; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; @@ -22,17 +22,17 @@ public class KitEditorSelectKitMenu extends Menu { @Override public String getTitle(Player player) { - return Praxi.getInstance().getMenusConfig().getString("KIT-EDITOR.TITLE"); + return Practice.getInstance().getMenusConfig().getString("KIT-EDITOR.TITLE"); } @Override public int getSize() { - return Praxi.getInstance().getMenusConfig().getInteger("KIT-EDITOR.SIZE"); + return Practice.getInstance().getMenusConfig().getInteger("KIT-EDITOR.SIZE"); } @Override public Filters getFilter() { - return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("KIT-EDITOR.FILTER")); + return Filters.valueOf(Practice.getInstance().getMenusConfig().getString("KIT-EDITOR.FILTER")); } @Override @@ -55,9 +55,9 @@ private static class KitDisplayButton extends Button { @Override public ItemStack getButtonItem(Player player) { - List lore = new ArrayList<>(Praxi.getInstance().getMenusConfig().getStringList("KIT-EDITOR.LORE")); + List lore = new ArrayList<>(Practice.getInstance().getMenusConfig().getStringList("KIT-EDITOR.LORE")); return new ItemBuilder(kit.getDisplayIcon()) - .name(Praxi.getInstance().getMenusConfig().getString("KIT-EDITOR.KIT-NAME").replace("", kit.getName())) + .name(Practice.getInstance().getMenusConfig().getString("KIT-EDITOR.KIT-NAME").replace("", kit.getName())) .lore(lore) .clearFlags() .build(); diff --git a/src/main/java/me/funky/praxi/kit/menu/KitManagementMenu.java b/src/main/java/me/lrxh/practice/kit/menu/KitManagementMenu.java similarity index 94% rename from src/main/java/me/funky/praxi/kit/menu/KitManagementMenu.java rename to src/main/java/me/lrxh/practice/kit/menu/KitManagementMenu.java index edec940..b830ef7 100644 --- a/src/main/java/me/funky/praxi/kit/menu/KitManagementMenu.java +++ b/src/main/java/me/lrxh/practice/kit/menu/KitManagementMenu.java @@ -1,15 +1,15 @@ -package me.funky.praxi.kit.menu; +package me.lrxh.practice.kit.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.kit.KitLoadout; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.button.BackButton; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.kit.KitLoadout; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.button.BackButton; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/kit/meta/KitEditRules.java b/src/main/java/me/lrxh/practice/kit/meta/KitEditRules.java similarity index 89% rename from src/main/java/me/funky/praxi/kit/meta/KitEditRules.java rename to src/main/java/me/lrxh/practice/kit/meta/KitEditRules.java index 813a65e..cb37653 100644 --- a/src/main/java/me/funky/praxi/kit/meta/KitEditRules.java +++ b/src/main/java/me/lrxh/practice/kit/meta/KitEditRules.java @@ -1,4 +1,4 @@ -package me.funky.praxi.kit.meta; +package me.lrxh.practice.kit.meta; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/funky/praxi/kit/meta/KitGameRules.java b/src/main/java/me/lrxh/practice/kit/meta/KitGameRules.java similarity index 91% rename from src/main/java/me/funky/praxi/kit/meta/KitGameRules.java rename to src/main/java/me/lrxh/practice/kit/meta/KitGameRules.java index 0885e62..b911ab4 100644 --- a/src/main/java/me/funky/praxi/kit/meta/KitGameRules.java +++ b/src/main/java/me/lrxh/practice/kit/meta/KitGameRules.java @@ -1,4 +1,4 @@ -package me.funky.praxi.kit.meta; +package me.lrxh.practice.kit.meta; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/funky/praxi/leaderboards/Leaderboard.java b/src/main/java/me/lrxh/practice/leaderboards/Leaderboard.java similarity index 95% rename from src/main/java/me/funky/praxi/leaderboards/Leaderboard.java rename to src/main/java/me/lrxh/practice/leaderboards/Leaderboard.java index b424d96..518fa24 100644 --- a/src/main/java/me/funky/praxi/leaderboards/Leaderboard.java +++ b/src/main/java/me/lrxh/practice/leaderboards/Leaderboard.java @@ -1,9 +1,9 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.profile.Profile; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.profile.Profile; import org.bson.Document; import java.util.*; diff --git a/src/main/java/me/funky/praxi/leaderboards/LeaderboardThread.java b/src/main/java/me/lrxh/practice/leaderboards/LeaderboardThread.java similarity index 91% rename from src/main/java/me/funky/praxi/leaderboards/LeaderboardThread.java rename to src/main/java/me/lrxh/practice/leaderboards/LeaderboardThread.java index 8ba630c..be43f4c 100644 --- a/src/main/java/me/funky/praxi/leaderboards/LeaderboardThread.java +++ b/src/main/java/me/lrxh/practice/leaderboards/LeaderboardThread.java @@ -1,9 +1,9 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; -import me.funky.praxi.Practice; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.Console; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.Console; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/leaderboards/LeaderboardsCommand.java b/src/main/java/me/lrxh/practice/leaderboards/LeaderboardsCommand.java similarity index 90% rename from src/main/java/me/funky/praxi/leaderboards/LeaderboardsCommand.java rename to src/main/java/me/lrxh/practice/leaderboards/LeaderboardsCommand.java index 37fb4f8..f8aee1e 100644 --- a/src/main/java/me/funky/praxi/leaderboards/LeaderboardsCommand.java +++ b/src/main/java/me/lrxh/practice/leaderboards/LeaderboardsCommand.java @@ -1,8 +1,8 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import me.funky.praxi.util.CC; +import me.lrxh.practice.util.CC; import org.bukkit.entity.Player; @CommandAlias("leaderboard|leaderboards|lb|lbs") diff --git a/src/main/java/me/funky/praxi/leaderboards/LeaderboardsMenu.java b/src/main/java/me/lrxh/practice/leaderboards/LeaderboardsMenu.java similarity index 71% rename from src/main/java/me/funky/praxi/leaderboards/LeaderboardsMenu.java rename to src/main/java/me/lrxh/practice/leaderboards/LeaderboardsMenu.java index 223132c..637269a 100644 --- a/src/main/java/me/funky/praxi/leaderboards/LeaderboardsMenu.java +++ b/src/main/java/me/lrxh/practice/leaderboards/LeaderboardsMenu.java @@ -1,15 +1,15 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; import lombok.AllArgsConstructor; -import me.funky.praxi.Praxi; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.TimeUtil; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.TimeUtil; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Material; import org.bukkit.SkullType; import org.bukkit.entity.Player; @@ -30,17 +30,17 @@ public class LeaderboardsMenu extends Menu { @Override public int getSize() { - return Praxi.getInstance().getMenusConfig().getInteger("LEADERBOARD.SIZE"); + return Practice.getInstance().getMenusConfig().getInteger("LEADERBOARD.SIZE"); } @Override public Filters getFilter() { - return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("LEADERBOARD.FILTER")); + return Filters.valueOf(Practice.getInstance().getMenusConfig().getString("LEADERBOARD.FILTER")); } @Override public String getTitle(Player player) { - return Praxi.getInstance().getMenusConfig().getString("LEADERBOARD.TITLE"); + return Practice.getInstance().getMenusConfig().getString("LEADERBOARD.TITLE"); } @Override @@ -49,7 +49,7 @@ public Map getButtons(Player player) { int i = 10; - for (Queue queue : Praxi.getInstance().getCache().getQueues()) { + for (Queue queue : Practice.getInstance().getCache().getQueues()) { if (!queue.isRanked()) { buttons.put(i++, new LeaderboardKitButton(queue)); } @@ -71,7 +71,7 @@ public ItemStack getButtonItem(Player player) { List lore = new ArrayList<>(); Profile profile = Profile.getByUuid(player.getUniqueId()); - for (String line : Praxi.getInstance().getMenusConfig().getStringList("LEADERBOARD.GLOBAL-STATS.LORE")) { + for (String line : Practice.getInstance().getMenusConfig().getStringList("LEADERBOARD.GLOBAL-STATS.LORE")) { line = line.replaceAll("", String.valueOf(profile.getWins())); line = line.replaceAll("", String.valueOf(profile.getLoses())); line = line.replaceAll("", String.valueOf(profile.getElo())); @@ -81,7 +81,7 @@ public ItemStack getButtonItem(Player player) { return new ItemBuilder(head) - .name(Praxi.getInstance().getMenusConfig().getString("LEADERBOARD.GLOBAL-STATS.GLOBAL-STATS-NAME")) + .name(Practice.getInstance().getMenusConfig().getString("LEADERBOARD.GLOBAL-STATS.GLOBAL-STATS-NAME")) .lore(lore) .clearEnchantments() .clearFlags() @@ -99,13 +99,13 @@ private class LeaderboardKitButton extends Button { public ItemStack getButtonItem(Player player) { List lore = new ArrayList<>(); lore.add(""); - lore.add(Praxi.getInstance().getMenusConfig().getString("LEADERBOARD.PLAYER-ELO") + lore.add(Practice.getInstance().getMenusConfig().getString("LEADERBOARD.PLAYER-ELO") .replace("", String.valueOf(Profile.getByUuid(player.getUniqueId()).getKitData().get(queue.getKit()).getElo()))); for (int i = 1; i <= 10; i++) { PlayerElo playerElo = Leaderboard.getEloLeaderboards().get(queue.getKit().getName()).getTopPlayers().get(i - 1); - lore.add(Praxi.getInstance().getMenusConfig().getString("LEADERBOARD.POSITION") + lore.add(Practice.getInstance().getMenusConfig().getString("LEADERBOARD.POSITION") .replace("", String.valueOf(i)) .replace("", String.valueOf(playerElo.getElo())) .replace("", playerElo.getPlayerName())); @@ -113,7 +113,7 @@ public ItemStack getButtonItem(Player player) { lore.add(""); lore.add(CC.translate("&aUpdating in " + TimeUtil.millisToTimer(Leaderboard.getRefreshTime())) + " minutes"); return new ItemBuilder(queue.getKit().getDisplayIcon()) - .name(Praxi.getInstance().getMenusConfig().getString("LEADERBOARD.KIT-NAME") + .name(Practice.getInstance().getMenusConfig().getString("LEADERBOARD.KIT-NAME") .replace("", queue.getKit().getName())) .lore(lore) .clearEnchantments() diff --git a/src/main/java/me/funky/praxi/leaderboards/PlayerElo.java b/src/main/java/me/lrxh/practice/leaderboards/PlayerElo.java similarity index 90% rename from src/main/java/me/funky/praxi/leaderboards/PlayerElo.java rename to src/main/java/me/lrxh/practice/leaderboards/PlayerElo.java index 1f0a589..bf3fb5a 100644 --- a/src/main/java/me/funky/praxi/leaderboards/PlayerElo.java +++ b/src/main/java/me/lrxh/practice/leaderboards/PlayerElo.java @@ -1,4 +1,4 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/leaderboards/Positions.java b/src/main/java/me/lrxh/practice/leaderboards/Positions.java similarity index 89% rename from src/main/java/me/funky/praxi/leaderboards/Positions.java rename to src/main/java/me/lrxh/practice/leaderboards/Positions.java index e33447d..9ef3811 100644 --- a/src/main/java/me/funky/praxi/leaderboards/Positions.java +++ b/src/main/java/me/lrxh/practice/leaderboards/Positions.java @@ -1,4 +1,4 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/leaderboards/QueueLeaderboard.java b/src/main/java/me/lrxh/practice/leaderboards/QueueLeaderboard.java similarity index 86% rename from src/main/java/me/funky/praxi/leaderboards/QueueLeaderboard.java rename to src/main/java/me/lrxh/practice/leaderboards/QueueLeaderboard.java index 9d0ca00..16cf331 100644 --- a/src/main/java/me/funky/praxi/leaderboards/QueueLeaderboard.java +++ b/src/main/java/me/lrxh/practice/leaderboards/QueueLeaderboard.java @@ -1,4 +1,4 @@ -package me.funky.praxi.leaderboards; +package me.lrxh.practice.leaderboards; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/match/Match.java b/src/main/java/me/lrxh/practice/match/Match.java similarity index 96% rename from src/main/java/me/funky/praxi/match/Match.java rename to src/main/java/me/lrxh/practice/match/Match.java index aeba8d3..1f7090a 100644 --- a/src/main/java/me/funky/praxi/match/Match.java +++ b/src/main/java/me/lrxh/practice/match/Match.java @@ -1,28 +1,28 @@ -package me.funky.praxi.match; +package me.lrxh.practice.match; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketContainer; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.match.task.MatchLogicTask; -import me.funky.praxi.match.task.MatchPearlCooldownTask; -import me.funky.praxi.match.task.MatchResetTask; -import me.funky.praxi.match.task.MatchSnapshotCleanupTask; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.GamePlayer; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.meta.ProfileKitData; -import me.funky.praxi.profile.visibility.VisibilityLogic; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.*; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.match.task.MatchLogicTask; +import me.lrxh.practice.match.task.MatchPearlCooldownTask; +import me.lrxh.practice.match.task.MatchResetTask; +import me.lrxh.practice.match.task.MatchSnapshotCleanupTask; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.GamePlayer; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.meta.ProfileKitData; +import me.lrxh.practice.profile.visibility.VisibilityLogic; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.*; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.*; import org.bukkit.block.BlockState; diff --git a/src/main/java/me/funky/praxi/match/MatchListener.java b/src/main/java/me/lrxh/practice/match/MatchListener.java similarity index 97% rename from src/main/java/me/funky/praxi/match/MatchListener.java rename to src/main/java/me/lrxh/practice/match/MatchListener.java index 10c378f..7a8664d 100644 --- a/src/main/java/me/funky/praxi/match/MatchListener.java +++ b/src/main/java/me/lrxh/practice/match/MatchListener.java @@ -1,17 +1,17 @@ -package me.funky.praxi.match; - -import me.funky.praxi.Locale; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.KitLoadout; -import me.funky.praxi.match.menu.ViewInventoryMenu; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.Cooldown; -import me.funky.praxi.util.PlayerUtil; -import me.funky.praxi.util.TimeUtil; +package me.lrxh.practice.match; + +import me.lrxh.practice.Locale; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.KitLoadout; +import me.lrxh.practice.match.menu.ViewInventoryMenu; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.Cooldown; +import me.lrxh.practice.util.PlayerUtil; +import me.lrxh.practice.util.TimeUtil; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/src/main/java/me/funky/praxi/match/MatchSnapshot.java b/src/main/java/me/lrxh/practice/match/MatchSnapshot.java similarity index 98% rename from src/main/java/me/funky/praxi/match/MatchSnapshot.java rename to src/main/java/me/lrxh/practice/match/MatchSnapshot.java index 0788173..21d7d43 100644 --- a/src/main/java/me/funky/praxi/match/MatchSnapshot.java +++ b/src/main/java/me/lrxh/practice/match/MatchSnapshot.java @@ -1,4 +1,4 @@ -package me.funky.praxi.match; +package me.lrxh.practice.match; import lombok.Data; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/match/MatchState.java b/src/main/java/me/lrxh/practice/match/MatchState.java similarity index 76% rename from src/main/java/me/funky/praxi/match/MatchState.java rename to src/main/java/me/lrxh/practice/match/MatchState.java index a957d04..6d40202 100644 --- a/src/main/java/me/funky/praxi/match/MatchState.java +++ b/src/main/java/me/lrxh/practice/match/MatchState.java @@ -1,4 +1,4 @@ -package me.funky.praxi.match; +package me.lrxh.practice.match; public enum MatchState { diff --git a/src/main/java/me/funky/praxi/match/impl/BasicFreeForAllMatch.java b/src/main/java/me/lrxh/practice/match/impl/BasicFreeForAllMatch.java similarity index 91% rename from src/main/java/me/funky/praxi/match/impl/BasicFreeForAllMatch.java rename to src/main/java/me/lrxh/practice/match/impl/BasicFreeForAllMatch.java index 645f605..b08198f 100644 --- a/src/main/java/me/funky/praxi/match/impl/BasicFreeForAllMatch.java +++ b/src/main/java/me/lrxh/practice/match/impl/BasicFreeForAllMatch.java @@ -1,18 +1,18 @@ -package me.funky.praxi.match.impl; - -import me.funky.praxi.Locale; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.MatchSnapshot; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.meta.ProfileKitData; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ChatComponentBuilder; -import me.funky.praxi.util.PlayerUtil; +package me.lrxh.practice.match.impl; + +import me.lrxh.practice.Locale; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.MatchSnapshot; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.meta.ProfileKitData; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ChatComponentBuilder; +import me.lrxh.practice.util.PlayerUtil; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/me/funky/praxi/match/impl/BasicTeamMatch.java b/src/main/java/me/lrxh/practice/match/impl/BasicTeamMatch.java similarity index 95% rename from src/main/java/me/funky/praxi/match/impl/BasicTeamMatch.java rename to src/main/java/me/lrxh/practice/match/impl/BasicTeamMatch.java index 9745b49..a6fb6a4 100644 --- a/src/main/java/me/funky/praxi/match/impl/BasicTeamMatch.java +++ b/src/main/java/me/lrxh/practice/match/impl/BasicTeamMatch.java @@ -1,21 +1,21 @@ -package me.funky.praxi.match.impl; +package me.lrxh.practice.match.impl; import lombok.Getter; -import me.funky.praxi.Locale; -import me.funky.praxi.Praxi; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.MatchSnapshot; -import me.funky.praxi.match.MatchState; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.meta.ProfileRematchData; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.ChatComponentBuilder; -import me.funky.praxi.util.TimeUtil; -import me.funky.praxi.util.elo.EloUtil; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.MatchSnapshot; +import me.lrxh.practice.match.MatchState; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.meta.ProfileRematchData; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.ChatComponentBuilder; +import me.lrxh.practice.util.TimeUtil; +import me.lrxh.practice.util.elo.EloUtil; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; @@ -147,7 +147,7 @@ public void run() { } } } - }.runTaskLater(Praxi.getInstance(), 10L); + }.runTaskLater(Practice.getInstance(), 10L); if (ranked) { diff --git a/src/main/java/me/funky/praxi/match/menu/MatchDetailsMenu.java b/src/main/java/me/lrxh/practice/match/menu/MatchDetailsMenu.java similarity index 93% rename from src/main/java/me/funky/praxi/match/menu/MatchDetailsMenu.java rename to src/main/java/me/lrxh/practice/match/menu/MatchDetailsMenu.java index 2747000..950dbfe 100644 --- a/src/main/java/me/funky/praxi/match/menu/MatchDetailsMenu.java +++ b/src/main/java/me/lrxh/practice/match/menu/MatchDetailsMenu.java @@ -1,15 +1,15 @@ -package me.funky.praxi.match.menu; +package me.lrxh.practice.match.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.match.MatchSnapshot; -import me.funky.praxi.util.InventoryUtil; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.PotionUtil; -import me.funky.praxi.util.TimeUtil; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.button.DisplayButton; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.match.MatchSnapshot; +import me.lrxh.practice.util.InventoryUtil; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.PotionUtil; +import me.lrxh.practice.util.TimeUtil; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.button.DisplayButton; +import me.lrxh.practice.util.menu.filters.Filters; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/match/menu/ViewInventoryMenu.java b/src/main/java/me/lrxh/practice/match/menu/ViewInventoryMenu.java similarity index 94% rename from src/main/java/me/funky/praxi/match/menu/ViewInventoryMenu.java rename to src/main/java/me/lrxh/practice/match/menu/ViewInventoryMenu.java index 6dd2af3..f44f184 100644 --- a/src/main/java/me/funky/praxi/match/menu/ViewInventoryMenu.java +++ b/src/main/java/me/lrxh/practice/match/menu/ViewInventoryMenu.java @@ -1,10 +1,10 @@ -package me.funky.praxi.match.menu; +package me.lrxh.practice.match.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.util.*; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.button.DisplayButton; +import me.lrxh.practice.util.*; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.button.DisplayButton; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/match/participant/MatchGamePlayer.java b/src/main/java/me/lrxh/practice/match/participant/MatchGamePlayer.java similarity index 90% rename from src/main/java/me/funky/praxi/match/participant/MatchGamePlayer.java rename to src/main/java/me/lrxh/practice/match/participant/MatchGamePlayer.java index 1e195e9..a32e363 100644 --- a/src/main/java/me/funky/praxi/match/participant/MatchGamePlayer.java +++ b/src/main/java/me/lrxh/practice/match/participant/MatchGamePlayer.java @@ -1,8 +1,8 @@ -package me.funky.praxi.match.participant; +package me.lrxh.practice.match.participant; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.participant.GamePlayer; +import me.lrxh.practice.participant.GamePlayer; import java.util.UUID; diff --git a/src/main/java/me/funky/praxi/match/task/MatchLogicTask.java b/src/main/java/me/lrxh/practice/match/task/MatchLogicTask.java similarity index 87% rename from src/main/java/me/funky/praxi/match/task/MatchLogicTask.java rename to src/main/java/me/lrxh/practice/match/task/MatchLogicTask.java index cf3c05d..9c9587b 100644 --- a/src/main/java/me/funky/praxi/match/task/MatchLogicTask.java +++ b/src/main/java/me/lrxh/practice/match/task/MatchLogicTask.java @@ -1,13 +1,13 @@ -package me.funky.praxi.match.task; +package me.lrxh.practice.match.task; import lombok.Setter; -import me.funky.praxi.Locale; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.MatchState; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.GamePlayer; -import me.funky.praxi.util.PlayerUtil; +import me.lrxh.practice.Locale; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.MatchState; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.GamePlayer; +import me.lrxh.practice.util.PlayerUtil; import org.bukkit.Sound; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/me/funky/praxi/match/task/MatchPearlCooldownTask.java b/src/main/java/me/lrxh/practice/match/task/MatchPearlCooldownTask.java similarity index 87% rename from src/main/java/me/funky/praxi/match/task/MatchPearlCooldownTask.java rename to src/main/java/me/lrxh/practice/match/task/MatchPearlCooldownTask.java index 845322f..8c351d7 100644 --- a/src/main/java/me/funky/praxi/match/task/MatchPearlCooldownTask.java +++ b/src/main/java/me/lrxh/practice/match/task/MatchPearlCooldownTask.java @@ -1,9 +1,9 @@ -package me.funky.praxi.match.task; +package me.lrxh.practice.match.task; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/me/funky/praxi/match/task/MatchResetTask.java b/src/main/java/me/lrxh/practice/match/task/MatchResetTask.java similarity index 97% rename from src/main/java/me/funky/praxi/match/task/MatchResetTask.java rename to src/main/java/me/lrxh/practice/match/task/MatchResetTask.java index b596bb9..13c2e55 100644 --- a/src/main/java/me/funky/praxi/match/task/MatchResetTask.java +++ b/src/main/java/me/lrxh/practice/match/task/MatchResetTask.java @@ -1,4 +1,4 @@ -package me.funky.praxi.match.task; +package me.lrxh.practice.match.task; import com.boydti.fawe.util.EditSessionBuilder; import com.boydti.fawe.util.TaskManager; @@ -6,7 +6,7 @@ import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BaseBlock; import lombok.AllArgsConstructor; -import me.funky.praxi.match.Match; +import me.lrxh.practice.match.Match; import org.bukkit.Location; import org.bukkit.block.BlockState; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/me/funky/praxi/match/task/MatchSnapshotCleanupTask.java b/src/main/java/me/lrxh/practice/match/task/MatchSnapshotCleanupTask.java similarity index 80% rename from src/main/java/me/funky/praxi/match/task/MatchSnapshotCleanupTask.java rename to src/main/java/me/lrxh/practice/match/task/MatchSnapshotCleanupTask.java index c02f42d..6378365 100644 --- a/src/main/java/me/funky/praxi/match/task/MatchSnapshotCleanupTask.java +++ b/src/main/java/me/lrxh/practice/match/task/MatchSnapshotCleanupTask.java @@ -1,6 +1,6 @@ -package me.funky.praxi.match.task; +package me.lrxh.practice.match.task; -import me.funky.praxi.match.MatchSnapshot; +import me.lrxh.practice.match.MatchSnapshot; import org.bukkit.scheduler.BukkitRunnable; public class MatchSnapshotCleanupTask extends BukkitRunnable { diff --git a/src/main/java/me/funky/praxi/menus/StatsMenu.java b/src/main/java/me/lrxh/practice/menus/StatsMenu.java similarity index 92% rename from src/main/java/me/funky/praxi/menus/StatsMenu.java rename to src/main/java/me/lrxh/practice/menus/StatsMenu.java index 1bd4ea5..8549037 100644 --- a/src/main/java/me/funky/praxi/menus/StatsMenu.java +++ b/src/main/java/me/lrxh/practice/menus/StatsMenu.java @@ -1,14 +1,14 @@ -package me.funky.praxi.menus; +package me.lrxh.practice.menus; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.match.Match; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Material; import org.bukkit.SkullType; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/participant/GameParticipant.java b/src/main/java/me/lrxh/practice/participant/GameParticipant.java similarity index 98% rename from src/main/java/me/funky/praxi/participant/GameParticipant.java rename to src/main/java/me/lrxh/practice/participant/GameParticipant.java index cdeb126..0b4a88a 100644 --- a/src/main/java/me/funky/praxi/participant/GameParticipant.java +++ b/src/main/java/me/lrxh/practice/participant/GameParticipant.java @@ -1,4 +1,4 @@ -package me.funky.praxi.participant; +package me.lrxh.practice.participant; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/funky/praxi/participant/GamePlayer.java b/src/main/java/me/lrxh/practice/participant/GamePlayer.java similarity index 92% rename from src/main/java/me/funky/praxi/participant/GamePlayer.java rename to src/main/java/me/lrxh/practice/participant/GamePlayer.java index 9beec8a..b3595ae 100644 --- a/src/main/java/me/funky/praxi/participant/GamePlayer.java +++ b/src/main/java/me/lrxh/practice/participant/GamePlayer.java @@ -1,4 +1,4 @@ -package me.funky.praxi.participant; +package me.lrxh.practice.participant; import lombok.Data; import org.bukkit.Bukkit; diff --git a/src/main/java/me/funky/praxi/participant/TeamGameParticipant.java b/src/main/java/me/lrxh/practice/participant/TeamGameParticipant.java similarity index 98% rename from src/main/java/me/funky/praxi/participant/TeamGameParticipant.java rename to src/main/java/me/lrxh/practice/participant/TeamGameParticipant.java index 2c43bca..23c9226 100644 --- a/src/main/java/me/funky/praxi/participant/TeamGameParticipant.java +++ b/src/main/java/me/lrxh/practice/participant/TeamGameParticipant.java @@ -1,4 +1,4 @@ -package me.funky.praxi.participant; +package me.lrxh.practice.participant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/funky/praxi/party/Party.java b/src/main/java/me/lrxh/practice/party/Party.java similarity index 92% rename from src/main/java/me/funky/praxi/party/Party.java rename to src/main/java/me/lrxh/practice/party/Party.java index 9a62840..4e3f0e5 100644 --- a/src/main/java/me/funky/praxi/party/Party.java +++ b/src/main/java/me/lrxh/practice/party/Party.java @@ -1,17 +1,17 @@ -package me.funky.praxi.party; +package me.lrxh.practice.party; import lombok.Getter; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.duel.DuelRequest; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.visibility.VisibilityLogic; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ChatComponentBuilder; -import me.funky.praxi.util.ChatHelper; -import me.funky.praxi.util.PlaceholderUtil; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.duel.DuelRequest; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.visibility.VisibilityLogic; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ChatComponentBuilder; +import me.lrxh.practice.util.ChatHelper; +import me.lrxh.practice.util.PlaceholderUtil; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/party/PartyEvent.java b/src/main/java/me/lrxh/practice/party/PartyEvent.java similarity index 84% rename from src/main/java/me/funky/praxi/party/PartyEvent.java rename to src/main/java/me/lrxh/practice/party/PartyEvent.java index 3bf7de8..f39d614 100644 --- a/src/main/java/me/funky/praxi/party/PartyEvent.java +++ b/src/main/java/me/lrxh/practice/party/PartyEvent.java @@ -1,4 +1,4 @@ -package me.funky.praxi.party; +package me.lrxh.practice.party; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/party/PartyInvite.java b/src/main/java/me/lrxh/practice/party/PartyInvite.java similarity index 91% rename from src/main/java/me/funky/praxi/party/PartyInvite.java rename to src/main/java/me/lrxh/practice/party/PartyInvite.java index 53f640e..027cd73 100644 --- a/src/main/java/me/funky/praxi/party/PartyInvite.java +++ b/src/main/java/me/lrxh/practice/party/PartyInvite.java @@ -1,4 +1,4 @@ -package me.funky.praxi.party; +package me.lrxh.practice.party; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/party/PartyListener.java b/src/main/java/me/lrxh/practice/party/PartyListener.java similarity index 89% rename from src/main/java/me/funky/praxi/party/PartyListener.java rename to src/main/java/me/lrxh/practice/party/PartyListener.java index f9db7de..6de9337 100644 --- a/src/main/java/me/funky/praxi/party/PartyListener.java +++ b/src/main/java/me/lrxh/practice/party/PartyListener.java @@ -1,10 +1,10 @@ -package me.funky.praxi.party; +package me.lrxh.practice.party; -import me.funky.praxi.party.menu.OtherPartiesMenu; -import me.funky.praxi.party.menu.PartyEventSelectEventMenu; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; +import me.lrxh.practice.party.menu.OtherPartiesMenu; +import me.lrxh.practice.party.menu.PartyEventSelectEventMenu; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/me/funky/praxi/party/PartyPrivacy.java b/src/main/java/me/lrxh/practice/party/PartyPrivacy.java similarity index 85% rename from src/main/java/me/funky/praxi/party/PartyPrivacy.java rename to src/main/java/me/lrxh/practice/party/PartyPrivacy.java index 34c7376..adbfd3d 100644 --- a/src/main/java/me/funky/praxi/party/PartyPrivacy.java +++ b/src/main/java/me/lrxh/practice/party/PartyPrivacy.java @@ -1,4 +1,4 @@ -package me.funky.praxi.party; +package me.lrxh.practice.party; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/party/menu/OtherPartiesMenu.java b/src/main/java/me/lrxh/practice/party/menu/OtherPartiesMenu.java similarity index 89% rename from src/main/java/me/funky/praxi/party/menu/OtherPartiesMenu.java rename to src/main/java/me/lrxh/practice/party/menu/OtherPartiesMenu.java index bcd0c45..6a76cf5 100644 --- a/src/main/java/me/funky/praxi/party/menu/OtherPartiesMenu.java +++ b/src/main/java/me/lrxh/practice/party/menu/OtherPartiesMenu.java @@ -1,14 +1,14 @@ -package me.funky.praxi.party.menu; +package me.lrxh.practice.party.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.party.Party; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/party/menu/PartyEventSelectEventMenu.java b/src/main/java/me/lrxh/practice/party/menu/PartyEventSelectEventMenu.java similarity index 65% rename from src/main/java/me/funky/praxi/party/menu/PartyEventSelectEventMenu.java rename to src/main/java/me/lrxh/practice/party/menu/PartyEventSelectEventMenu.java index baba071..8bfaa6c 100644 --- a/src/main/java/me/funky/praxi/party/menu/PartyEventSelectEventMenu.java +++ b/src/main/java/me/lrxh/practice/party/menu/PartyEventSelectEventMenu.java @@ -1,14 +1,14 @@ -package me.funky.praxi.party.menu; +package me.lrxh.practice.party.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Praxi; -import me.funky.praxi.party.PartyEvent; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.party.PartyEvent; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -21,17 +21,17 @@ public class PartyEventSelectEventMenu extends Menu { @Override public String getTitle(Player player) { - return Praxi.getInstance().getMenusConfig().getString("PARTY.EVENTS.TITLE"); + return Practice.getInstance().getMenusConfig().getString("PARTY.EVENTS.TITLE"); } @Override public int getSize() { - return Praxi.getInstance().getMenusConfig().getInteger("PARTY.EVENTS.SIZE"); + return Practice.getInstance().getMenusConfig().getInteger("PARTY.EVENTS.SIZE"); } @Override public Filters getFilter() { - return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("PARTY.EVENTS.FILTER")); + return Filters.valueOf(Practice.getInstance().getMenusConfig().getString("PARTY.EVENTS.FILTER")); } @Override @@ -50,7 +50,7 @@ private static class SelectEventButton extends Button { @Override public ItemStack getButtonItem(Player player) { return new ItemBuilder(partyEvent == PartyEvent.FFA ? Material.QUARTZ : Material.REDSTONE) - .name(Praxi.getInstance().getMenusConfig().getString("PARTY.EVENTS.EVENT-COLOR").replace("", partyEvent.getName())) + .name(Practice.getInstance().getMenusConfig().getString("PARTY.EVENTS.EVENT-COLOR").replace("", partyEvent.getName())) .clearFlags() .build(); } diff --git a/src/main/java/me/funky/praxi/party/menu/PartyEventSelectKitMenu.java b/src/main/java/me/lrxh/practice/party/menu/PartyEventSelectKitMenu.java similarity index 85% rename from src/main/java/me/funky/praxi/party/menu/PartyEventSelectKitMenu.java rename to src/main/java/me/lrxh/practice/party/menu/PartyEventSelectKitMenu.java index 3a21804..0288a27 100644 --- a/src/main/java/me/funky/praxi/party/menu/PartyEventSelectKitMenu.java +++ b/src/main/java/me/lrxh/practice/party/menu/PartyEventSelectKitMenu.java @@ -1,22 +1,22 @@ -package me.funky.praxi.party.menu; +package me.lrxh.practice.party.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.impl.BasicFreeForAllMatch; -import me.funky.praxi.match.impl.BasicTeamMatch; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.participant.TeamGameParticipant; -import me.funky.praxi.party.Party; -import me.funky.praxi.party.PartyEvent; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.impl.BasicFreeForAllMatch; +import me.lrxh.practice.match.impl.BasicTeamMatch; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.participant.TeamGameParticipant; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.party.PartyEvent; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/profile/KillEffects.java b/src/main/java/me/lrxh/practice/profile/KillEffects.java similarity index 88% rename from src/main/java/me/funky/praxi/profile/KillEffects.java rename to src/main/java/me/lrxh/practice/profile/KillEffects.java index 663be95..84154e9 100644 --- a/src/main/java/me/funky/praxi/profile/KillEffects.java +++ b/src/main/java/me/lrxh/practice/profile/KillEffects.java @@ -1,4 +1,4 @@ -package me.funky.praxi.profile; +package me.lrxh.practice.profile; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/profile/Profile.java b/src/main/java/me/lrxh/practice/profile/Profile.java similarity index 93% rename from src/main/java/me/funky/praxi/profile/Profile.java rename to src/main/java/me/lrxh/practice/profile/Profile.java index 965a1e7..c941053 100644 --- a/src/main/java/me/funky/praxi/profile/Profile.java +++ b/src/main/java/me/lrxh/practice/profile/Profile.java @@ -1,4 +1,4 @@ -package me.funky.praxi.profile; +package me.lrxh.practice.profile; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -9,22 +9,22 @@ import com.mongodb.client.model.ReplaceOptions; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.duel.DuelProcedure; -import me.funky.praxi.duel.DuelRequest; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.kit.KitLoadout; -import me.funky.praxi.match.Match; -import me.funky.praxi.party.Party; -import me.funky.praxi.profile.meta.ProfileKitData; -import me.funky.praxi.profile.meta.ProfileKitEditorData; -import me.funky.praxi.profile.meta.ProfileRematchData; -import me.funky.praxi.profile.meta.option.ProfileOptions; -import me.funky.praxi.queue.QueueProfile; -import me.funky.praxi.setting.Colors; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.Cooldown; -import me.funky.praxi.util.InventoryUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.duel.DuelProcedure; +import me.lrxh.practice.duel.DuelRequest; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.kit.KitLoadout; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.party.Party; +import me.lrxh.practice.profile.meta.ProfileKitData; +import me.lrxh.practice.profile.meta.ProfileKitEditorData; +import me.lrxh.practice.profile.meta.ProfileRematchData; +import me.lrxh.practice.profile.meta.option.ProfileOptions; +import me.lrxh.practice.queue.QueueProfile; +import me.lrxh.practice.setting.Colors; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.Cooldown; +import me.lrxh.practice.util.InventoryUtil; import org.bson.Document; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/profile/ProfileListener.java b/src/main/java/me/lrxh/practice/profile/ProfileListener.java similarity index 91% rename from src/main/java/me/funky/praxi/profile/ProfileListener.java rename to src/main/java/me/lrxh/practice/profile/ProfileListener.java index 5bab15d..6975816 100644 --- a/src/main/java/me/funky/praxi/profile/ProfileListener.java +++ b/src/main/java/me/lrxh/practice/profile/ProfileListener.java @@ -1,16 +1,16 @@ -package me.funky.praxi.profile; - -import me.funky.praxi.Practice; -import me.funky.praxi.essentials.event.SpawnTeleportEvent; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; -import me.funky.praxi.profile.meta.option.button.AllowSpectatorsOptionButton; -import me.funky.praxi.profile.meta.option.button.DuelRequestsOptionButton; -import me.funky.praxi.profile.meta.option.button.ShowScoreboardOptionButton; -import me.funky.praxi.profile.option.OptionsOpenedEvent; -import me.funky.praxi.profile.visibility.VisibilityLogic; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.PlaceholderUtil; +package me.lrxh.practice.profile; + +import me.lrxh.practice.Practice; +import me.lrxh.practice.essentials.event.SpawnTeleportEvent; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; +import me.lrxh.practice.profile.meta.option.button.AllowSpectatorsOptionButton; +import me.lrxh.practice.profile.meta.option.button.DuelRequestsOptionButton; +import me.lrxh.practice.profile.meta.option.button.ShowScoreboardOptionButton; +import me.lrxh.practice.profile.option.OptionsOpenedEvent; +import me.lrxh.practice.profile.visibility.VisibilityLogic; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.PlaceholderUtil; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/main/java/me/funky/praxi/profile/ProfileState.java b/src/main/java/me/lrxh/practice/profile/ProfileState.java similarity index 74% rename from src/main/java/me/funky/praxi/profile/ProfileState.java rename to src/main/java/me/lrxh/practice/profile/ProfileState.java index e534a62..56c2656 100644 --- a/src/main/java/me/funky/praxi/profile/ProfileState.java +++ b/src/main/java/me/lrxh/practice/profile/ProfileState.java @@ -1,4 +1,4 @@ -package me.funky.praxi.profile; +package me.lrxh.practice.profile; public enum ProfileState { diff --git a/src/main/java/me/funky/praxi/profile/hotbar/Hotbar.java b/src/main/java/me/lrxh/practice/profile/hotbar/Hotbar.java similarity index 94% rename from src/main/java/me/funky/praxi/profile/hotbar/Hotbar.java rename to src/main/java/me/lrxh/practice/profile/hotbar/Hotbar.java index d2eedd3..4569cf6 100644 --- a/src/main/java/me/funky/praxi/profile/hotbar/Hotbar.java +++ b/src/main/java/me/lrxh/practice/profile/hotbar/Hotbar.java @@ -1,11 +1,11 @@ -package me.funky.praxi.profile.hotbar; +package me.lrxh.practice.profile.hotbar; import lombok.Getter; -import me.funky.praxi.Practice; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.PlayerUtil; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.PlayerUtil; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/me/funky/praxi/profile/hotbar/HotbarItem.java b/src/main/java/me/lrxh/practice/profile/hotbar/HotbarItem.java similarity index 91% rename from src/main/java/me/funky/praxi/profile/hotbar/HotbarItem.java rename to src/main/java/me/lrxh/practice/profile/hotbar/HotbarItem.java index e4c5186..3e439c8 100644 --- a/src/main/java/me/funky/praxi/profile/hotbar/HotbarItem.java +++ b/src/main/java/me/lrxh/practice/profile/hotbar/HotbarItem.java @@ -1,8 +1,8 @@ -package me.funky.praxi.profile.hotbar; +package me.lrxh.practice.profile.hotbar; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.profile.ProfileState; +import me.lrxh.practice.profile.ProfileState; import java.util.regex.Pattern; diff --git a/src/main/java/me/funky/praxi/profile/meta/ProfileKitData.java b/src/main/java/me/lrxh/practice/profile/meta/ProfileKitData.java similarity index 93% rename from src/main/java/me/funky/praxi/profile/meta/ProfileKitData.java rename to src/main/java/me/lrxh/practice/profile/meta/ProfileKitData.java index 506a92c..24f271f 100644 --- a/src/main/java/me/funky/praxi/profile/meta/ProfileKitData.java +++ b/src/main/java/me/lrxh/practice/profile/meta/ProfileKitData.java @@ -1,10 +1,10 @@ -package me.funky.praxi.profile.meta; +package me.lrxh.practice.profile.meta; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.kit.KitLoadout; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; +import me.lrxh.practice.kit.KitLoadout; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; diff --git a/src/main/java/me/funky/praxi/profile/meta/ProfileKitEditorData.java b/src/main/java/me/lrxh/practice/profile/meta/ProfileKitEditorData.java similarity index 78% rename from src/main/java/me/funky/praxi/profile/meta/ProfileKitEditorData.java rename to src/main/java/me/lrxh/practice/profile/meta/ProfileKitEditorData.java index 6d84515..187de02 100644 --- a/src/main/java/me/funky/praxi/profile/meta/ProfileKitEditorData.java +++ b/src/main/java/me/lrxh/practice/profile/meta/ProfileKitEditorData.java @@ -1,9 +1,9 @@ -package me.funky.praxi.profile.meta; +package me.lrxh.practice.profile.meta; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.kit.KitLoadout; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.kit.KitLoadout; public class ProfileKitEditorData { diff --git a/src/main/java/me/funky/praxi/profile/meta/ProfileRematchData.java b/src/main/java/me/lrxh/practice/profile/meta/ProfileRematchData.java similarity index 89% rename from src/main/java/me/funky/praxi/profile/meta/ProfileRematchData.java rename to src/main/java/me/lrxh/practice/profile/meta/ProfileRematchData.java index 0e63810..7885455 100644 --- a/src/main/java/me/funky/praxi/profile/meta/ProfileRematchData.java +++ b/src/main/java/me/lrxh/practice/profile/meta/ProfileRematchData.java @@ -1,20 +1,20 @@ -package me.funky.praxi.profile.meta; +package me.lrxh.practice.profile.meta; import lombok.Getter; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.impl.BasicTeamMatch; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ChatComponentBuilder; -import me.funky.praxi.util.ChatHelper; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.impl.BasicTeamMatch; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ChatComponentBuilder; +import me.lrxh.practice.util.ChatHelper; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/profile/meta/option/ProfileOptions.java b/src/main/java/me/lrxh/practice/profile/meta/option/ProfileOptions.java similarity index 79% rename from src/main/java/me/funky/praxi/profile/meta/option/ProfileOptions.java rename to src/main/java/me/lrxh/practice/profile/meta/option/ProfileOptions.java index 384b767..2b0a17c 100644 --- a/src/main/java/me/funky/praxi/profile/meta/option/ProfileOptions.java +++ b/src/main/java/me/lrxh/practice/profile/meta/option/ProfileOptions.java @@ -1,11 +1,11 @@ -package me.funky.praxi.profile.meta.option; +package me.lrxh.practice.profile.meta.option; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; -import me.funky.praxi.Practice; -import me.funky.praxi.profile.KillEffects; -import me.funky.praxi.setting.Colors; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.KillEffects; +import me.lrxh.practice.setting.Colors; @Setter @Getter diff --git a/src/main/java/me/funky/praxi/profile/meta/option/button/AllowSpectatorsOptionButton.java b/src/main/java/me/lrxh/practice/profile/meta/option/button/AllowSpectatorsOptionButton.java similarity index 87% rename from src/main/java/me/funky/praxi/profile/meta/option/button/AllowSpectatorsOptionButton.java rename to src/main/java/me/lrxh/practice/profile/meta/option/button/AllowSpectatorsOptionButton.java index fcf2fac..a5d1178 100644 --- a/src/main/java/me/funky/praxi/profile/meta/option/button/AllowSpectatorsOptionButton.java +++ b/src/main/java/me/lrxh/practice/profile/meta/option/button/AllowSpectatorsOptionButton.java @@ -1,8 +1,8 @@ -package me.funky.praxi.profile.meta.option.button; +package me.lrxh.practice.profile.meta.option.button; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.option.ProfileOptionButton; -import me.funky.praxi.util.ItemBuilder; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.option.ProfileOptionButton; +import me.lrxh.practice.util.ItemBuilder; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/profile/meta/option/button/DuelRequestsOptionButton.java b/src/main/java/me/lrxh/practice/profile/meta/option/button/DuelRequestsOptionButton.java similarity index 86% rename from src/main/java/me/funky/praxi/profile/meta/option/button/DuelRequestsOptionButton.java rename to src/main/java/me/lrxh/practice/profile/meta/option/button/DuelRequestsOptionButton.java index 9d83296..bd9b55c 100644 --- a/src/main/java/me/funky/praxi/profile/meta/option/button/DuelRequestsOptionButton.java +++ b/src/main/java/me/lrxh/practice/profile/meta/option/button/DuelRequestsOptionButton.java @@ -1,8 +1,8 @@ -package me.funky.praxi.profile.meta.option.button; +package me.lrxh.practice.profile.meta.option.button; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.option.ProfileOptionButton; -import me.funky.praxi.util.ItemBuilder; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.option.ProfileOptionButton; +import me.lrxh.practice.util.ItemBuilder; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/profile/meta/option/button/ShowScoreboardOptionButton.java b/src/main/java/me/lrxh/practice/profile/meta/option/button/ShowScoreboardOptionButton.java similarity index 87% rename from src/main/java/me/funky/praxi/profile/meta/option/button/ShowScoreboardOptionButton.java rename to src/main/java/me/lrxh/practice/profile/meta/option/button/ShowScoreboardOptionButton.java index b88d687..8933c29 100644 --- a/src/main/java/me/funky/praxi/profile/meta/option/button/ShowScoreboardOptionButton.java +++ b/src/main/java/me/lrxh/practice/profile/meta/option/button/ShowScoreboardOptionButton.java @@ -1,8 +1,8 @@ -package me.funky.praxi.profile.meta.option.button; +package me.lrxh.practice.profile.meta.option.button; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.option.ProfileOptionButton; -import me.funky.praxi.util.ItemBuilder; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.option.ProfileOptionButton; +import me.lrxh.practice.util.ItemBuilder; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/profile/option/OptionsOpenedEvent.java b/src/main/java/me/lrxh/practice/profile/option/OptionsOpenedEvent.java similarity index 80% rename from src/main/java/me/funky/praxi/profile/option/OptionsOpenedEvent.java rename to src/main/java/me/lrxh/practice/profile/option/OptionsOpenedEvent.java index 195fa2a..fe7016f 100644 --- a/src/main/java/me/funky/praxi/profile/option/OptionsOpenedEvent.java +++ b/src/main/java/me/lrxh/practice/profile/option/OptionsOpenedEvent.java @@ -1,8 +1,8 @@ -package me.funky.praxi.profile.option; +package me.lrxh.practice.profile.option; import lombok.Getter; import lombok.RequiredArgsConstructor; -import me.funky.praxi.util.BaseEvent; +import me.lrxh.practice.util.BaseEvent; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/me/funky/praxi/profile/option/ProfileOptionButton.java b/src/main/java/me/lrxh/practice/profile/option/ProfileOptionButton.java similarity index 88% rename from src/main/java/me/funky/praxi/profile/option/ProfileOptionButton.java rename to src/main/java/me/lrxh/practice/profile/option/ProfileOptionButton.java index 7abe270..4fdfa7e 100644 --- a/src/main/java/me/funky/praxi/profile/option/ProfileOptionButton.java +++ b/src/main/java/me/lrxh/practice/profile/option/ProfileOptionButton.java @@ -1,10 +1,10 @@ -package me.funky.praxi.profile.option; +package me.lrxh.practice.profile.option; import lombok.AllArgsConstructor; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.TextSplitter; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.TextSplitter; +import me.lrxh.practice.util.menu.Button; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/profile/visibility/VisibilityLogic.java b/src/main/java/me/lrxh/practice/profile/visibility/VisibilityLogic.java similarity index 92% rename from src/main/java/me/funky/praxi/profile/visibility/VisibilityLogic.java rename to src/main/java/me/lrxh/practice/profile/visibility/VisibilityLogic.java index ed4a496..d090ed0 100644 --- a/src/main/java/me/funky/praxi/profile/visibility/VisibilityLogic.java +++ b/src/main/java/me/lrxh/practice/profile/visibility/VisibilityLogic.java @@ -1,8 +1,8 @@ -package me.funky.praxi.profile.visibility; +package me.lrxh.practice.profile.visibility; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/queue/Queue.java b/src/main/java/me/lrxh/practice/queue/Queue.java similarity index 90% rename from src/main/java/me/funky/praxi/queue/Queue.java rename to src/main/java/me/lrxh/practice/queue/Queue.java index 32c4155..6cc05d2 100644 --- a/src/main/java/me/funky/praxi/queue/Queue.java +++ b/src/main/java/me/lrxh/practice/queue/Queue.java @@ -1,12 +1,12 @@ -package me.funky.praxi.queue; +package me.lrxh.practice.queue; import lombok.Getter; -import me.funky.praxi.Locale; -import me.funky.praxi.Practice; -import me.funky.praxi.kit.Kit; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.kit.Kit; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/queue/QueueListener.java b/src/main/java/me/lrxh/practice/queue/QueueListener.java similarity index 74% rename from src/main/java/me/funky/praxi/queue/QueueListener.java rename to src/main/java/me/lrxh/practice/queue/QueueListener.java index bbb3ece..1a9dc05 100644 --- a/src/main/java/me/funky/praxi/queue/QueueListener.java +++ b/src/main/java/me/lrxh/practice/queue/QueueListener.java @@ -1,12 +1,12 @@ -package me.funky.praxi.queue; - -import me.funky.praxi.Locale; -import me.funky.praxi.Praxi; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.profile.hotbar.Hotbar; -import me.funky.praxi.profile.hotbar.HotbarItem; -import me.funky.praxi.queue.menu.QueueSelectKitMenu; +package me.lrxh.practice.queue; + +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.profile.hotbar.Hotbar; +import me.lrxh.practice.profile.hotbar.HotbarItem; +import me.lrxh.practice.queue.menu.QueueSelectKitMenu; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -27,8 +27,8 @@ public void onPlayerInteractEvent(PlayerInteractEvent event) { boolean cancelled = true; if (hotbarItem == HotbarItem.QUEUE_JOIN_RANKED) { - if (profile.getWins() < Praxi.getInstance().getMainConfig().getInteger("RANKED.REQUIRED-WINS")) { - event.getPlayer().sendMessage(Locale.RANKED_ERROR.format(event.getPlayer(), Praxi.getInstance().getMainConfig().getInteger("RANKED.REQUIRED-WINS") - profile.getWins())); + if (profile.getWins() < Practice.getInstance().getMainConfig().getInteger("RANKED.REQUIRED-WINS")) { + event.getPlayer().sendMessage(Locale.RANKED_ERROR.format(event.getPlayer(), Practice.getInstance().getMainConfig().getInteger("RANKED.REQUIRED-WINS") - profile.getWins())); return; } if (!profile.isBusy()) { diff --git a/src/main/java/me/funky/praxi/queue/QueueProfile.java b/src/main/java/me/lrxh/practice/queue/QueueProfile.java similarity index 96% rename from src/main/java/me/funky/praxi/queue/QueueProfile.java rename to src/main/java/me/lrxh/practice/queue/QueueProfile.java index 2ce7c20..9f8519a 100644 --- a/src/main/java/me/funky/praxi/queue/QueueProfile.java +++ b/src/main/java/me/lrxh/practice/queue/QueueProfile.java @@ -1,7 +1,7 @@ -package me.funky.praxi.queue; +package me.lrxh.practice.queue; import lombok.Data; -import me.funky.praxi.Locale; +import me.lrxh.practice.Locale; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/queue/QueueThread.java b/src/main/java/me/lrxh/practice/queue/QueueThread.java similarity index 81% rename from src/main/java/me/funky/praxi/queue/QueueThread.java rename to src/main/java/me/lrxh/practice/queue/QueueThread.java index 1559188..5c8bfab 100644 --- a/src/main/java/me/funky/praxi/queue/QueueThread.java +++ b/src/main/java/me/lrxh/practice/queue/QueueThread.java @@ -1,14 +1,14 @@ -package me.funky.praxi.queue; - -import me.funky.praxi.Locale; -import me.funky.praxi.Praxi; -import me.funky.praxi.arena.Arena; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.impl.BasicTeamMatch; -import me.funky.praxi.match.participant.MatchGamePlayer; -import me.funky.praxi.participant.GameParticipant; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.BukkitReflection; +package me.lrxh.practice.queue; + +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.arena.Arena; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.impl.BasicTeamMatch; +import me.lrxh.practice.match.participant.MatchGamePlayer; +import me.lrxh.practice.participant.GameParticipant; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.BukkitReflection; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -19,21 +19,21 @@ public class QueueThread extends Thread { public void run() { while (true) { try { - for (QueueProfile queueProfile : Praxi.getInstance().getCache().getPlayers()) { - Praxi.getInstance().getCache().getPlayers().forEach(QueueProfile::tickRange); + for (QueueProfile queueProfile : Practice.getInstance().getCache().getPlayers()) { + Practice.getInstance().getCache().getPlayers().forEach(QueueProfile::tickRange); - if (Praxi.getInstance().getCache().getPlayers().size() < 2) { + if (Practice.getInstance().getCache().getPlayers().size() < 2) { continue; } - for (QueueProfile firstQueueProfile : Praxi.getInstance().getCache().getPlayers()) { + for (QueueProfile firstQueueProfile : Practice.getInstance().getCache().getPlayers()) { Player firstPlayer = Bukkit.getPlayer(firstQueueProfile.getPlayerUuid()); if (firstPlayer == null) { continue; } - for (QueueProfile secondQueueProfile : Praxi.getInstance().getCache().getPlayers()) { + for (QueueProfile secondQueueProfile : Practice.getInstance().getCache().getPlayers()) { if (secondQueueProfile.getPlayerUuid() == firstQueueProfile.getPlayerUuid()) break; if (!firstQueueProfile.areSame(secondQueueProfile)) { @@ -80,8 +80,8 @@ public void run() { arena.setActive(true); // Remove players from queue - Praxi.getInstance().getCache().getPlayers().remove(firstQueueProfile); - Praxi.getInstance().getCache().getPlayers().remove(secondQueueProfile); + Practice.getInstance().getCache().getPlayers().remove(firstQueueProfile); + Practice.getInstance().getCache().getPlayers().remove(secondQueueProfile); secondQueueProfile.getQueue().removeQueue(); firstQueueProfile.getQueue().removeQueue(); @@ -111,7 +111,7 @@ public void run() { public void run() { match.start(); } - }.runTask(Praxi.getInstance()); + }.runTask(Practice.getInstance()); } } } diff --git a/src/main/java/me/funky/praxi/queue/menu/QueueSelectKitMenu.java b/src/main/java/me/lrxh/practice/queue/menu/QueueSelectKitMenu.java similarity index 92% rename from src/main/java/me/funky/praxi/queue/menu/QueueSelectKitMenu.java rename to src/main/java/me/lrxh/practice/queue/menu/QueueSelectKitMenu.java index 01cccde..f187d92 100644 --- a/src/main/java/me/funky/praxi/queue/menu/QueueSelectKitMenu.java +++ b/src/main/java/me/lrxh/practice/queue/menu/QueueSelectKitMenu.java @@ -1,17 +1,17 @@ -package me.funky.praxi.queue.menu; +package me.lrxh.practice.queue.menu; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.leaderboards.Leaderboard; -import me.funky.praxi.leaderboards.PlayerElo; -import me.funky.praxi.match.Match; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.queue.Queue; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.leaderboards.Leaderboard; +import me.lrxh.practice.leaderboards.PlayerElo; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.queue.Queue; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/scoreboard/ScoreboardAdapter.java b/src/main/java/me/lrxh/practice/scoreboard/ScoreboardAdapter.java similarity index 89% rename from src/main/java/me/funky/praxi/scoreboard/ScoreboardAdapter.java rename to src/main/java/me/lrxh/practice/scoreboard/ScoreboardAdapter.java index f89b619..8811882 100644 --- a/src/main/java/me/funky/praxi/scoreboard/ScoreboardAdapter.java +++ b/src/main/java/me/lrxh/practice/scoreboard/ScoreboardAdapter.java @@ -1,13 +1,13 @@ -package me.funky.praxi.scoreboard; +package me.lrxh.practice.scoreboard; -import me.funky.praxi.Practice; -import me.funky.praxi.match.Match; -import me.funky.praxi.match.MatchState; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.queue.QueueProfile; -import me.funky.praxi.util.PlaceholderUtil; -import me.funky.praxi.util.assemble.AssembleAdapter; +import me.lrxh.practice.Practice; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.match.MatchState; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.queue.QueueProfile; +import me.lrxh.practice.util.PlaceholderUtil; +import me.lrxh.practice.util.assemble.AssembleAdapter; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/me/funky/praxi/setting/Colors.java b/src/main/java/me/lrxh/practice/setting/Colors.java similarity index 92% rename from src/main/java/me/funky/praxi/setting/Colors.java rename to src/main/java/me/lrxh/practice/setting/Colors.java index 94fcc44..86b6d80 100644 --- a/src/main/java/me/funky/praxi/setting/Colors.java +++ b/src/main/java/me/lrxh/practice/setting/Colors.java @@ -1,4 +1,4 @@ -package me.funky.praxi.setting; +package me.lrxh.practice.setting; import lombok.Getter; import org.bukkit.ChatColor; diff --git a/src/main/java/me/funky/praxi/setting/ProfileSettingsCommand.java b/src/main/java/me/lrxh/practice/setting/ProfileSettingsCommand.java similarity index 93% rename from src/main/java/me/funky/praxi/setting/ProfileSettingsCommand.java rename to src/main/java/me/lrxh/practice/setting/ProfileSettingsCommand.java index fe4c4f1..3bcb4e9 100644 --- a/src/main/java/me/funky/praxi/setting/ProfileSettingsCommand.java +++ b/src/main/java/me/lrxh/practice/setting/ProfileSettingsCommand.java @@ -1,4 +1,4 @@ -package me.funky.praxi.setting; +package me.lrxh.practice.setting; import co.aikar.commands.BaseCommand; diff --git a/src/main/java/me/funky/praxi/setting/ProfileSettingsMenu.java b/src/main/java/me/lrxh/practice/setting/ProfileSettingsMenu.java similarity index 89% rename from src/main/java/me/funky/praxi/setting/ProfileSettingsMenu.java rename to src/main/java/me/lrxh/practice/setting/ProfileSettingsMenu.java index 85b91f0..e0d1236 100644 --- a/src/main/java/me/funky/praxi/setting/ProfileSettingsMenu.java +++ b/src/main/java/me/lrxh/practice/setting/ProfileSettingsMenu.java @@ -1,14 +1,14 @@ -package me.funky.praxi.setting; +package me.lrxh.practice.setting; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.event.game.menu.EventHostMenu; -import me.funky.praxi.menus.StatsMenu; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.event.game.menu.EventHostMenu; +import me.lrxh.practice.menus.StatsMenu; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/setting/Settings.java b/src/main/java/me/lrxh/practice/setting/Settings.java similarity index 96% rename from src/main/java/me/funky/praxi/setting/Settings.java rename to src/main/java/me/lrxh/practice/setting/Settings.java index 2455a25..8035d35 100644 --- a/src/main/java/me/funky/praxi/setting/Settings.java +++ b/src/main/java/me/lrxh/practice/setting/Settings.java @@ -1,4 +1,4 @@ -package me.funky.praxi.setting; +package me.lrxh.practice.setting; import lombok.Getter; import org.bukkit.Material; diff --git a/src/main/java/me/funky/praxi/setting/SettingsCommand.java b/src/main/java/me/lrxh/practice/setting/SettingsCommand.java similarity index 92% rename from src/main/java/me/funky/praxi/setting/SettingsCommand.java rename to src/main/java/me/lrxh/practice/setting/SettingsCommand.java index 2aeaa29..8330b50 100644 --- a/src/main/java/me/funky/praxi/setting/SettingsCommand.java +++ b/src/main/java/me/lrxh/practice/setting/SettingsCommand.java @@ -1,4 +1,4 @@ -package me.funky.praxi.setting; +package me.lrxh.practice.setting; import co.aikar.commands.BaseCommand; diff --git a/src/main/java/me/funky/praxi/setting/SettingsMenu.java b/src/main/java/me/lrxh/practice/setting/SettingsMenu.java similarity index 89% rename from src/main/java/me/funky/praxi/setting/SettingsMenu.java rename to src/main/java/me/lrxh/practice/setting/SettingsMenu.java index 4ab77cb..1265be7 100644 --- a/src/main/java/me/funky/praxi/setting/SettingsMenu.java +++ b/src/main/java/me/lrxh/practice/setting/SettingsMenu.java @@ -1,18 +1,18 @@ -package me.funky.praxi.setting; +package me.lrxh.practice.setting; -import me.funky.praxi.Locale; -import me.funky.praxi.Praxi; -import me.funky.praxi.profile.KillEffects; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.visibility.VisibilityLogic; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.assemble.AssembleBoard; -import me.funky.praxi.util.assemble.events.AssembleBoardCreateEvent; -import me.funky.praxi.util.assemble.events.AssembleBoardDestroyEvent; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Locale; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.KillEffects; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.visibility.VisibilityLogic; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.assemble.AssembleBoard; +import me.lrxh.practice.util.assemble.events.AssembleBoardCreateEvent; +import me.lrxh.practice.util.assemble.events.AssembleBoardDestroyEvent; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -29,20 +29,22 @@ public SettingsMenu() { @Override public String getTitle(Player player) { - return Praxi.getInstance().getMenusConfig().getString("SETTINGS.TITLE"); + return Practice.getInstance().getMenusConfig().getString("SETTINGS.TITLE"); } @Override public int getSize() { - return Praxi.getInstance().getMenusConfig().getInteger("SETTINGS.SIZE"); + return Practice.getInstance().getMenusConfig().getInteger("SETTINGS.SIZE"); } @Override public Filters getFilter() { - return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("SETTINGS.FILTER")); + return Filters.valueOf(Practice.getInstance().getMenusConfig().getString("SETTINGS.FILTER")); } - + public boolean resetCursor() { + return false; + } @Override public Map getButtons(Player player) { HashMap buttons = new HashMap<>(); @@ -243,7 +245,7 @@ public ItemStack getButtonItem(Player player) { break; } } - return new ItemBuilder(this.settings.getMaterial()).name(Praxi.getInstance().getMenusConfig().getString("SETTINGS.SETTING-NAME").replace("", settings.getName())).lore(lore).clearEnchantments().clearFlags().clearFlags().build(); + return new ItemBuilder(this.settings.getMaterial()).name(Practice.getInstance().getMenusConfig().getString("SETTINGS.SETTING-NAME").replace("", settings.getName())).lore(lore).clearEnchantments().clearFlags().clearFlags().build(); } @Override @@ -315,7 +317,7 @@ public void clicked(Player player, ClickType clickType) { break; } case KILL_EFFECTS: { - if (!player.hasPermission("praxi.killeffect." + profile.getOptions().killEffect().getDisplayName())) { + if (!player.hasPermission("practice.killeffect." + profile.getOptions().killEffect().getDisplayName())) { player.sendMessage(CC.translate("&cYou don't have permission to use this kill effect")); break; } @@ -337,7 +339,7 @@ public void clicked(Player player, ClickType clickType) { break; } case THEME: { - if (!player.hasPermission("praxi.options.theme.selector")) { + if (!player.hasPermission("practice.options.theme.selector")) { player.sendMessage(CC.translate("&cYou don't have permission to use the theme selector")); break; } @@ -370,7 +372,7 @@ public void showScoreboard(Profile profile, boolean b) { profile.getOptions().showScoreboard(b); if (profile.getOptions().showScoreboard()) { - if (Praxi.getInstance().getAssemble().isCallEvents()) { + if (Practice.getInstance().getAssemble().isCallEvents()) { AssembleBoardCreateEvent createEvent = new AssembleBoardCreateEvent(profile.getPlayer()); Bukkit.getPluginManager().callEvent(createEvent); @@ -379,10 +381,10 @@ public void showScoreboard(Profile profile, boolean b) { } } - Praxi.getInstance().getAssemble().getBoards().put(profile.getPlayer().getUniqueId(), - new AssembleBoard(profile.getPlayer(), Praxi.getInstance().getAssemble())); + Practice.getInstance().getAssemble().getBoards().put(profile.getPlayer().getUniqueId(), + new AssembleBoard(profile.getPlayer(), Practice.getInstance().getAssemble())); } else { - if (Praxi.getInstance().getAssemble().isCallEvents()) { + if (Practice.getInstance().getAssemble().isCallEvents()) { AssembleBoardDestroyEvent destroyEvent = new AssembleBoardDestroyEvent(profile.getPlayer()); Bukkit.getPluginManager().callEvent(destroyEvent); @@ -391,8 +393,8 @@ public void showScoreboard(Profile profile, boolean b) { } } - Praxi.getInstance().getAssemble().getBoards().get(profile.getPlayer().getUniqueId()).getObjective().unregister(); - Praxi.getInstance().getAssemble().getBoards().remove(profile.getPlayer().getUniqueId()); + Practice.getInstance().getAssemble().getBoards().get(profile.getPlayer().getUniqueId()).getObjective().unregister(); + Practice.getInstance().getAssemble().getBoards().remove(profile.getPlayer().getUniqueId()); } } } diff --git a/src/main/java/me/funky/praxi/util/BaseEvent.java b/src/main/java/me/lrxh/practice/util/BaseEvent.java similarity index 87% rename from src/main/java/me/funky/praxi/util/BaseEvent.java rename to src/main/java/me/lrxh/practice/util/BaseEvent.java index b0cc17b..434cf03 100644 --- a/src/main/java/me/funky/praxi/util/BaseEvent.java +++ b/src/main/java/me/lrxh/practice/util/BaseEvent.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; -import me.funky.praxi.Practice; +import me.lrxh.practice.Practice; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/funky/praxi/util/BlockUtil.java b/src/main/java/me/lrxh/practice/util/BlockUtil.java similarity index 99% rename from src/main/java/me/funky/praxi/util/BlockUtil.java rename to src/main/java/me/lrxh/practice/util/BlockUtil.java index 7221b6a..1fff432 100644 --- a/src/main/java/me/funky/praxi/util/BlockUtil.java +++ b/src/main/java/me/lrxh/practice/util/BlockUtil.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/me/funky/praxi/util/BukkitReflection.java b/src/main/java/me/lrxh/practice/util/BukkitReflection.java similarity index 99% rename from src/main/java/me/funky/praxi/util/BukkitReflection.java rename to src/main/java/me/lrxh/practice/util/BukkitReflection.java index 62633da..30c5e09 100644 --- a/src/main/java/me/funky/praxi/util/BukkitReflection.java +++ b/src/main/java/me/lrxh/practice/util/BukkitReflection.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.bukkit.Bukkit; import org.bukkit.Server; diff --git a/src/main/java/me/funky/praxi/util/CC.java b/src/main/java/me/lrxh/practice/util/CC.java similarity index 99% rename from src/main/java/me/funky/praxi/util/CC.java rename to src/main/java/me/lrxh/practice/util/CC.java index 27a2053..94af389 100644 --- a/src/main/java/me/funky/praxi/util/CC.java +++ b/src/main/java/me/lrxh/practice/util/CC.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.ChatColor; diff --git a/src/main/java/me/funky/praxi/util/ChatComponentBuilder.java b/src/main/java/me/lrxh/practice/util/ChatComponentBuilder.java similarity index 99% rename from src/main/java/me/funky/praxi/util/ChatComponentBuilder.java rename to src/main/java/me/lrxh/practice/util/ChatComponentBuilder.java index 3c149e3..a8dfb31 100644 --- a/src/main/java/me/funky/praxi/util/ChatComponentBuilder.java +++ b/src/main/java/me/lrxh/practice/util/ChatComponentBuilder.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.*; diff --git a/src/main/java/me/funky/praxi/util/ChatHelper.java b/src/main/java/me/lrxh/practice/util/ChatHelper.java similarity index 94% rename from src/main/java/me/funky/praxi/util/ChatHelper.java rename to src/main/java/me/lrxh/practice/util/ChatHelper.java index 919965c..509752e 100644 --- a/src/main/java/me/funky/praxi/util/ChatHelper.java +++ b/src/main/java/me/lrxh/practice/util/ChatHelper.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import net.md_5.bungee.api.chat.ClickEvent; diff --git a/src/main/java/me/funky/praxi/util/Console.java b/src/main/java/me/lrxh/practice/util/Console.java similarity index 91% rename from src/main/java/me/funky/praxi/util/Console.java rename to src/main/java/me/lrxh/practice/util/Console.java index 5a32ba7..2ee9e08 100644 --- a/src/main/java/me/funky/praxi/util/Console.java +++ b/src/main/java/me/lrxh/practice/util/Console.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.bukkit.Bukkit; diff --git a/src/main/java/me/funky/praxi/util/Cooldown.java b/src/main/java/me/lrxh/practice/util/Cooldown.java similarity index 96% rename from src/main/java/me/funky/praxi/util/Cooldown.java rename to src/main/java/me/lrxh/practice/util/Cooldown.java index aad1165..e59477e 100644 --- a/src/main/java/me/funky/praxi/util/Cooldown.java +++ b/src/main/java/me/lrxh/practice/util/Cooldown.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import lombok.Data; diff --git a/src/main/java/me/funky/praxi/util/InventoryUtil.java b/src/main/java/me/lrxh/practice/util/InventoryUtil.java similarity index 99% rename from src/main/java/me/funky/praxi/util/InventoryUtil.java rename to src/main/java/me/lrxh/practice/util/InventoryUtil.java index 675bc3f..261b7df 100644 --- a/src/main/java/me/funky/praxi/util/InventoryUtil.java +++ b/src/main/java/me/lrxh/practice/util/InventoryUtil.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; -import me.funky.praxi.Practice; +import me.lrxh.practice.Practice; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/funky/praxi/util/ItemBuilder.java b/src/main/java/me/lrxh/practice/util/ItemBuilder.java similarity index 99% rename from src/main/java/me/funky/praxi/util/ItemBuilder.java rename to src/main/java/me/lrxh/practice/util/ItemBuilder.java index 489f1a9..659b203 100644 --- a/src/main/java/me/funky/praxi/util/ItemBuilder.java +++ b/src/main/java/me/lrxh/practice/util/ItemBuilder.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/me/funky/praxi/util/LocationUtil.java b/src/main/java/me/lrxh/practice/util/LocationUtil.java similarity index 97% rename from src/main/java/me/funky/praxi/util/LocationUtil.java rename to src/main/java/me/lrxh/practice/util/LocationUtil.java index 2136a03..8aa3d35 100644 --- a/src/main/java/me/funky/praxi/util/LocationUtil.java +++ b/src/main/java/me/lrxh/practice/util/LocationUtil.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/me/funky/praxi/util/MathHelper.java b/src/main/java/me/lrxh/practice/util/MathHelper.java similarity index 89% rename from src/main/java/me/funky/praxi/util/MathHelper.java rename to src/main/java/me/lrxh/practice/util/MathHelper.java index 4e57b60..620043e 100644 --- a/src/main/java/me/funky/praxi/util/MathHelper.java +++ b/src/main/java/me/lrxh/practice/util/MathHelper.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; public class MathHelper { diff --git a/src/main/java/me/funky/praxi/util/PlaceholderUtil.java b/src/main/java/me/lrxh/practice/util/PlaceholderUtil.java similarity index 94% rename from src/main/java/me/funky/praxi/util/PlaceholderUtil.java rename to src/main/java/me/lrxh/practice/util/PlaceholderUtil.java index 18fb382..01bbff6 100644 --- a/src/main/java/me/funky/praxi/util/PlaceholderUtil.java +++ b/src/main/java/me/lrxh/practice/util/PlaceholderUtil.java @@ -1,11 +1,11 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import lombok.experimental.UtilityClass; -import me.funky.praxi.Practice; -import me.funky.praxi.match.Match; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.profile.ProfileState; -import me.funky.praxi.queue.QueueProfile; +import me.lrxh.practice.Practice; +import me.lrxh.practice.match.Match; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.profile.ProfileState; +import me.lrxh.practice.queue.QueueProfile; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/PlayerSnapshot.java b/src/main/java/me/lrxh/practice/util/PlayerSnapshot.java similarity index 93% rename from src/main/java/me/funky/praxi/util/PlayerSnapshot.java rename to src/main/java/me/lrxh/practice/util/PlayerSnapshot.java index 522d542..e420f04 100644 --- a/src/main/java/me/funky/praxi/util/PlayerSnapshot.java +++ b/src/main/java/me/lrxh/practice/util/PlayerSnapshot.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import lombok.Getter; import org.bukkit.Bukkit; diff --git a/src/main/java/me/funky/praxi/util/PlayerUtil.java b/src/main/java/me/lrxh/practice/util/PlayerUtil.java similarity index 98% rename from src/main/java/me/funky/praxi/util/PlayerUtil.java rename to src/main/java/me/lrxh/practice/util/PlayerUtil.java index 8e4cf09..070bad4 100644 --- a/src/main/java/me/funky/praxi/util/PlayerUtil.java +++ b/src/main/java/me/lrxh/practice/util/PlayerUtil.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; -import me.funky.praxi.Practice; +import me.lrxh.practice.Practice; import net.minecraft.server.v1_8_R3.MinecraftServer; import net.minecraft.server.v1_8_R3.PacketPlayOutEntityStatus; import net.minecraft.server.v1_8_R3.PacketPlayOutNamedEntitySpawn; diff --git a/src/main/java/me/funky/praxi/util/PotionUtil.java b/src/main/java/me/lrxh/practice/util/PotionUtil.java similarity index 95% rename from src/main/java/me/funky/praxi/util/PotionUtil.java rename to src/main/java/me/lrxh/practice/util/PotionUtil.java index ba7c2ba..33347fd 100644 --- a/src/main/java/me/funky/praxi/util/PotionUtil.java +++ b/src/main/java/me/lrxh/practice/util/PotionUtil.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import org.bukkit.potion.PotionEffectType; diff --git a/src/main/java/me/funky/praxi/util/TextSplitter.java b/src/main/java/me/lrxh/practice/util/TextSplitter.java similarity index 97% rename from src/main/java/me/funky/praxi/util/TextSplitter.java rename to src/main/java/me/lrxh/practice/util/TextSplitter.java index 4342a63..1da4d01 100644 --- a/src/main/java/me/funky/praxi/util/TextSplitter.java +++ b/src/main/java/me/lrxh/practice/util/TextSplitter.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/me/funky/praxi/util/TimeUtil.java b/src/main/java/me/lrxh/practice/util/TimeUtil.java similarity index 99% rename from src/main/java/me/funky/praxi/util/TimeUtil.java rename to src/main/java/me/lrxh/practice/util/TimeUtil.java index f6a82bb..acf21ed 100644 --- a/src/main/java/me/funky/praxi/util/TimeUtil.java +++ b/src/main/java/me/lrxh/practice/util/TimeUtil.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util; +package me.lrxh.practice.util; import java.sql.Timestamp; import java.text.DecimalFormat; diff --git a/src/main/java/me/funky/praxi/util/assemble/Assemble.java b/src/main/java/me/lrxh/practice/util/assemble/Assemble.java similarity index 94% rename from src/main/java/me/funky/praxi/util/assemble/Assemble.java rename to src/main/java/me/lrxh/practice/util/assemble/Assemble.java index 510fe18..78f63e5 100644 --- a/src/main/java/me/funky/praxi/util/assemble/Assemble.java +++ b/src/main/java/me/lrxh/practice/util/assemble/Assemble.java @@ -1,9 +1,9 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.scoreboard.ScoreboardAdapter; -import me.funky.praxi.util.assemble.events.AssembleBoardCreateEvent; +import me.lrxh.practice.scoreboard.ScoreboardAdapter; +import me.lrxh.practice.util.assemble.events.AssembleBoardCreateEvent; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleAdapter.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleAdapter.java similarity index 91% rename from src/main/java/me/funky/praxi/util/assemble/AssembleAdapter.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleAdapter.java index 3c1b92e..e6f8f29 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleAdapter.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleAdapter.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleBoard.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleBoard.java similarity index 97% rename from src/main/java/me/funky/praxi/util/assemble/AssembleBoard.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleBoard.java index 5996bae..9906a3c 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleBoard.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleBoard.java @@ -1,7 +1,7 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import lombok.Getter; -import me.funky.praxi.util.assemble.events.AssembleBoardCreatedEvent; +import me.lrxh.practice.util.assemble.events.AssembleBoardCreatedEvent; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleBoardEntry.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleBoardEntry.java similarity index 98% rename from src/main/java/me/funky/praxi/util/assemble/AssembleBoardEntry.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleBoardEntry.java index 11bc5f8..b15ae10 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleBoardEntry.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleBoardEntry.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import lombok.Setter; import org.bukkit.scoreboard.Scoreboard; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleException.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleException.java similarity index 85% rename from src/main/java/me/funky/praxi/util/assemble/AssembleException.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleException.java index 2928a0d..9552c5b 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleException.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleException.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; public class AssembleException extends RuntimeException { diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleListener.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleListener.java similarity index 89% rename from src/main/java/me/funky/praxi/util/assemble/AssembleListener.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleListener.java index d889998..885b0ea 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleListener.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleListener.java @@ -1,8 +1,8 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import lombok.Getter; -import me.funky.praxi.util.assemble.events.AssembleBoardCreateEvent; -import me.funky.praxi.util.assemble.events.AssembleBoardDestroyEvent; +import me.lrxh.practice.util.assemble.events.AssembleBoardCreateEvent; +import me.lrxh.practice.util.assemble.events.AssembleBoardDestroyEvent; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleStyle.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleStyle.java similarity index 95% rename from src/main/java/me/funky/praxi/util/assemble/AssembleStyle.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleStyle.java index fa85929..dc5aed1 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleStyle.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleStyle.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import lombok.Getter; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleThread.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleThread.java similarity index 98% rename from src/main/java/me/funky/praxi/util/assemble/AssembleThread.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleThread.java index 5fb5aef..fa68524 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleThread.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleThread.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; -import me.funky.praxi.profile.Profile; +import me.lrxh.practice.profile.Profile; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/assemble/AssembleUtils.java b/src/main/java/me/lrxh/practice/util/assemble/AssembleUtils.java similarity index 96% rename from src/main/java/me/funky/praxi/util/assemble/AssembleUtils.java rename to src/main/java/me/lrxh/practice/util/assemble/AssembleUtils.java index 092b30f..0e533a2 100644 --- a/src/main/java/me/funky/praxi/util/assemble/AssembleUtils.java +++ b/src/main/java/me/lrxh/practice/util/assemble/AssembleUtils.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble; +package me.lrxh.practice.util.assemble; import org.bukkit.ChatColor; diff --git a/src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardCreateEvent.java b/src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardCreateEvent.java similarity index 93% rename from src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardCreateEvent.java rename to src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardCreateEvent.java index 318c16c..8d88f3e 100644 --- a/src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardCreateEvent.java +++ b/src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardCreateEvent.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble.events; +package me.lrxh.practice.util.assemble.events; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardCreatedEvent.java b/src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardCreatedEvent.java similarity index 86% rename from src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardCreatedEvent.java rename to src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardCreatedEvent.java index 7838f9b..0c98ae3 100644 --- a/src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardCreatedEvent.java +++ b/src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardCreatedEvent.java @@ -1,8 +1,8 @@ -package me.funky.praxi.util.assemble.events; +package me.lrxh.practice.util.assemble.events; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.util.assemble.AssembleBoard; +import me.lrxh.practice.util.assemble.AssembleBoard; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardDestroyEvent.java b/src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardDestroyEvent.java similarity index 93% rename from src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardDestroyEvent.java rename to src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardDestroyEvent.java index fa4fc36..838fc08 100644 --- a/src/main/java/me/funky/praxi/util/assemble/events/AssembleBoardDestroyEvent.java +++ b/src/main/java/me/lrxh/practice/util/assemble/events/AssembleBoardDestroyEvent.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.assemble.events; +package me.lrxh.practice.util.assemble.events; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/me/funky/praxi/util/callback/Callback.java b/src/main/java/me/lrxh/practice/util/callback/Callback.java similarity index 81% rename from src/main/java/me/funky/praxi/util/callback/Callback.java rename to src/main/java/me/lrxh/practice/util/callback/Callback.java index 8ed0dcd..ba34eab 100644 --- a/src/main/java/me/funky/praxi/util/callback/Callback.java +++ b/src/main/java/me/lrxh/practice/util/callback/Callback.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.callback; +package me.lrxh.practice.util.callback; import java.io.Serializable; diff --git a/src/main/java/me/funky/praxi/util/callback/ReturnableTypeCallback.java b/src/main/java/me/lrxh/practice/util/callback/ReturnableTypeCallback.java similarity index 61% rename from src/main/java/me/funky/praxi/util/callback/ReturnableTypeCallback.java rename to src/main/java/me/lrxh/practice/util/callback/ReturnableTypeCallback.java index d8b4266..67e4841 100644 --- a/src/main/java/me/funky/praxi/util/callback/ReturnableTypeCallback.java +++ b/src/main/java/me/lrxh/practice/util/callback/ReturnableTypeCallback.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.callback; +package me.lrxh.practice.util.callback; public interface ReturnableTypeCallback { diff --git a/src/main/java/me/funky/praxi/util/callback/TypeCallback.java b/src/main/java/me/lrxh/practice/util/callback/TypeCallback.java similarity index 86% rename from src/main/java/me/funky/praxi/util/callback/TypeCallback.java rename to src/main/java/me/lrxh/practice/util/callback/TypeCallback.java index ee87115..bb53701 100644 --- a/src/main/java/me/funky/praxi/util/callback/TypeCallback.java +++ b/src/main/java/me/lrxh/practice/util/callback/TypeCallback.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.callback; +package me.lrxh.practice.util.callback; import java.io.Serializable; diff --git a/src/main/java/me/funky/praxi/util/command/Honcho.java b/src/main/java/me/lrxh/practice/util/command/Honcho.java similarity index 95% rename from src/main/java/me/funky/praxi/util/command/Honcho.java rename to src/main/java/me/lrxh/practice/util/command/Honcho.java index 807dede..0909ef9 100644 --- a/src/main/java/me/funky/praxi/util/command/Honcho.java +++ b/src/main/java/me/lrxh/practice/util/command/Honcho.java @@ -1,18 +1,18 @@ -package me.funky.praxi.util.command; +package me.lrxh.practice.util.command; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; -import me.funky.praxi.util.command.command.CPL; -import me.funky.praxi.util.command.command.CommandMeta; -import me.funky.praxi.util.command.command.CommandOption; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; -import me.funky.praxi.util.command.command.adapter.impl.*; -import me.funky.praxi.util.command.map.CommandData; -import me.funky.praxi.util.command.map.MethodData; -import me.funky.praxi.util.command.map.ParameterData; +import me.lrxh.practice.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CommandMeta; +import me.lrxh.practice.util.command.command.CommandOption; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.impl.*; +import me.lrxh.practice.util.command.map.CommandData; +import me.lrxh.practice.util.command.map.MethodData; +import me.lrxh.practice.util.command.map.ParameterData; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; diff --git a/src/main/java/me/funky/praxi/util/command/HonchoExecutor.java b/src/main/java/me/lrxh/practice/util/command/HonchoExecutor.java similarity index 95% rename from src/main/java/me/funky/praxi/util/command/HonchoExecutor.java rename to src/main/java/me/lrxh/practice/util/command/HonchoExecutor.java index 5549812..0b921cd 100644 --- a/src/main/java/me/funky/praxi/util/command/HonchoExecutor.java +++ b/src/main/java/me/lrxh/practice/util/command/HonchoExecutor.java @@ -1,10 +1,10 @@ -package me.funky.praxi.util.command; +package me.lrxh.practice.util.command; -import me.funky.praxi.util.command.command.CommandOption; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; -import me.funky.praxi.util.command.map.CommandData; -import me.funky.praxi.util.command.map.MethodData; -import me.funky.praxi.util.command.map.ParameterData; +import me.lrxh.practice.util.command.command.CommandOption; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.map.CommandData; +import me.lrxh.practice.util.command.map.MethodData; +import me.lrxh.practice.util.command.map.ParameterData; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/me/funky/praxi/util/command/HonchoTabCompleter.java b/src/main/java/me/lrxh/practice/util/command/HonchoTabCompleter.java similarity index 86% rename from src/main/java/me/funky/praxi/util/command/HonchoTabCompleter.java rename to src/main/java/me/lrxh/practice/util/command/HonchoTabCompleter.java index 1a47db1..8e6c5e6 100644 --- a/src/main/java/me/funky/praxi/util/command/HonchoTabCompleter.java +++ b/src/main/java/me/lrxh/practice/util/command/HonchoTabCompleter.java @@ -1,10 +1,10 @@ -package me.funky.praxi.util.command; +package me.lrxh.practice.util.command; -import me.funky.praxi.util.command.command.CommandOption; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; -import me.funky.praxi.util.command.map.CommandData; -import me.funky.praxi.util.command.map.MethodData; -import me.funky.praxi.util.command.map.ParameterData; +import me.lrxh.practice.util.command.command.CommandOption; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.map.CommandData; +import me.lrxh.practice.util.command.map.MethodData; +import me.lrxh.practice.util.command.map.ParameterData; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/me/funky/praxi/util/command/command/CPL.java b/src/main/java/me/lrxh/practice/util/command/command/CPL.java similarity index 85% rename from src/main/java/me/funky/praxi/util/command/command/CPL.java rename to src/main/java/me/lrxh/practice/util/command/command/CPL.java index a29c68f..7666fff 100644 --- a/src/main/java/me/funky/praxi/util/command/command/CPL.java +++ b/src/main/java/me/lrxh/practice/util/command/command/CPL.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.command.command; +package me.lrxh.practice.util.command.command; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/me/funky/praxi/util/command/command/CommandMeta.java b/src/main/java/me/lrxh/practice/util/command/command/CommandMeta.java similarity index 91% rename from src/main/java/me/funky/praxi/util/command/command/CommandMeta.java rename to src/main/java/me/lrxh/practice/util/command/command/CommandMeta.java index 77d9ca5..23522ed 100644 --- a/src/main/java/me/funky/praxi/util/command/command/CommandMeta.java +++ b/src/main/java/me/lrxh/practice/util/command/command/CommandMeta.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.command.command; +package me.lrxh.practice.util.command.command; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/me/funky/praxi/util/command/command/CommandOption.java b/src/main/java/me/lrxh/practice/util/command/command/CommandOption.java similarity index 81% rename from src/main/java/me/funky/praxi/util/command/command/CommandOption.java rename to src/main/java/me/lrxh/practice/util/command/command/CommandOption.java index e77508e..c880516 100644 --- a/src/main/java/me/funky/praxi/util/command/command/CommandOption.java +++ b/src/main/java/me/lrxh/practice/util/command/command/CommandOption.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.command.command; +package me.lrxh.practice.util.command.command; public class CommandOption { private final String tag; diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/CommandTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/CommandTypeAdapter.java similarity index 83% rename from src/main/java/me/funky/praxi/util/command/command/adapter/CommandTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/CommandTypeAdapter.java index 371d663..f939679 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/CommandTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/CommandTypeAdapter.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.command.command.adapter; +package me.lrxh.practice.util.command.command.adapter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/BooleanTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/BooleanTypeAdapter.java similarity index 81% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/BooleanTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/BooleanTypeAdapter.java index b06f21a..fd2f131 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/BooleanTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/BooleanTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/CommandOptionTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/CommandOptionTypeAdapter.java similarity index 61% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/CommandOptionTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/CommandOptionTypeAdapter.java index d69ad53..4563522 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/CommandOptionTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/CommandOptionTypeAdapter.java @@ -1,7 +1,7 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.CommandOption; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.CommandOption; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class CommandOptionTypeAdapter implements CommandTypeAdapter { @Override diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/GameModeTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/GameModeTypeAdapter.java similarity index 90% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/GameModeTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/GameModeTypeAdapter.java index 70298df..925fd7c 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/GameModeTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/GameModeTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; import org.bukkit.GameMode; import java.util.ArrayList; diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/IntegerTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/IntegerTypeAdapter.java similarity index 61% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/IntegerTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/IntegerTypeAdapter.java index 2c7f960..da111f5 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/IntegerTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/IntegerTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class IntegerTypeAdapter implements CommandTypeAdapter { @Override diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/OfflinePlayerTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/OfflinePlayerTypeAdapter.java similarity index 85% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/OfflinePlayerTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/OfflinePlayerTypeAdapter.java index 33bb72b..ac8bd47 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/OfflinePlayerTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/OfflinePlayerTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/PlayerTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/PlayerTypeAdapter.java similarity index 84% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/PlayerTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/PlayerTypeAdapter.java index 2d1f4d3..b728b79 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/PlayerTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/PlayerTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/StringTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/StringTypeAdapter.java similarity index 58% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/StringTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/StringTypeAdapter.java index 95c2521..d43d26c 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/StringTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/StringTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; public class StringTypeAdapter implements CommandTypeAdapter { @Override diff --git a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/WorldTypeAdapter.java b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/WorldTypeAdapter.java similarity index 63% rename from src/main/java/me/funky/praxi/util/command/command/adapter/impl/WorldTypeAdapter.java rename to src/main/java/me/lrxh/practice/util/command/command/adapter/impl/WorldTypeAdapter.java index 78993db..59cd1ff 100644 --- a/src/main/java/me/funky/praxi/util/command/command/adapter/impl/WorldTypeAdapter.java +++ b/src/main/java/me/lrxh/practice/util/command/command/adapter/impl/WorldTypeAdapter.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.adapter.impl; +package me.lrxh.practice.util.command.command.adapter.impl; -import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter; +import me.lrxh.practice.util.command.command.adapter.CommandTypeAdapter; import org.bukkit.Bukkit; public class WorldTypeAdapter implements CommandTypeAdapter { diff --git a/src/main/java/me/funky/praxi/util/command/command/example/BroadcastCommand.java b/src/main/java/me/lrxh/practice/util/command/command/example/BroadcastCommand.java similarity index 73% rename from src/main/java/me/funky/praxi/util/command/command/example/BroadcastCommand.java rename to src/main/java/me/lrxh/practice/util/command/command/example/BroadcastCommand.java index 0760bc1..643ac33 100644 --- a/src/main/java/me/funky/praxi/util/command/command/example/BroadcastCommand.java +++ b/src/main/java/me/lrxh/practice/util/command/command/example/BroadcastCommand.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.command.example; +package me.lrxh.practice.util.command.command.example; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.util.command.command.CommandMeta; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/me/funky/praxi/util/command/map/CommandData.java b/src/main/java/me/lrxh/practice/util/command/map/CommandData.java similarity index 85% rename from src/main/java/me/funky/praxi/util/command/map/CommandData.java rename to src/main/java/me/lrxh/practice/util/command/map/CommandData.java index 7ce40ae..ea11aff 100644 --- a/src/main/java/me/funky/praxi/util/command/map/CommandData.java +++ b/src/main/java/me/lrxh/practice/util/command/map/CommandData.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.map; +package me.lrxh.practice.util.command.map; -import me.funky.praxi.util.command.command.CommandMeta; +import me.lrxh.practice.util.command.command.CommandMeta; public class CommandData { private final Object instance; diff --git a/src/main/java/me/funky/praxi/util/command/map/MethodData.java b/src/main/java/me/lrxh/practice/util/command/map/MethodData.java similarity index 91% rename from src/main/java/me/funky/praxi/util/command/map/MethodData.java rename to src/main/java/me/lrxh/practice/util/command/map/MethodData.java index c342484..513dff2 100644 --- a/src/main/java/me/funky/praxi/util/command/map/MethodData.java +++ b/src/main/java/me/lrxh/practice/util/command/map/MethodData.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.command.map; +package me.lrxh.practice.util.command.map; import java.lang.reflect.Method; diff --git a/src/main/java/me/funky/praxi/util/command/map/ParameterData.java b/src/main/java/me/lrxh/practice/util/command/map/ParameterData.java similarity index 83% rename from src/main/java/me/funky/praxi/util/command/map/ParameterData.java rename to src/main/java/me/lrxh/practice/util/command/map/ParameterData.java index 0fc75b8..e4482ba 100644 --- a/src/main/java/me/funky/praxi/util/command/map/ParameterData.java +++ b/src/main/java/me/lrxh/practice/util/command/map/ParameterData.java @@ -1,6 +1,6 @@ -package me.funky.praxi.util.command.map; +package me.lrxh.practice.util.command.map; -import me.funky.praxi.util.command.command.CPL; +import me.lrxh.practice.util.command.command.CPL; public class ParameterData { private final String name; diff --git a/src/main/java/me/funky/praxi/util/config/AbstractConfigurationFile.java b/src/main/java/me/lrxh/practice/util/config/AbstractConfigurationFile.java similarity index 95% rename from src/main/java/me/funky/praxi/util/config/AbstractConfigurationFile.java rename to src/main/java/me/lrxh/practice/util/config/AbstractConfigurationFile.java index 51a121d..336a5a4 100644 --- a/src/main/java/me/funky/praxi/util/config/AbstractConfigurationFile.java +++ b/src/main/java/me/lrxh/practice/util/config/AbstractConfigurationFile.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.config; +package me.lrxh.practice.util.config; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/me/funky/praxi/util/config/BasicConfigurationFile.java b/src/main/java/me/lrxh/practice/util/config/BasicConfigurationFile.java similarity index 97% rename from src/main/java/me/funky/praxi/util/config/BasicConfigurationFile.java rename to src/main/java/me/lrxh/practice/util/config/BasicConfigurationFile.java index a95a110..57b8379 100644 --- a/src/main/java/me/funky/praxi/util/config/BasicConfigurationFile.java +++ b/src/main/java/me/lrxh/practice/util/config/BasicConfigurationFile.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.config; +package me.lrxh.practice.util.config; import lombok.Getter; import org.bukkit.ChatColor; diff --git a/src/main/java/me/funky/praxi/util/config/LanguageConfigurationFile.java b/src/main/java/me/lrxh/practice/util/config/LanguageConfigurationFile.java similarity index 99% rename from src/main/java/me/funky/praxi/util/config/LanguageConfigurationFile.java rename to src/main/java/me/lrxh/practice/util/config/LanguageConfigurationFile.java index 51a0054..4f17e42 100644 --- a/src/main/java/me/funky/praxi/util/config/LanguageConfigurationFile.java +++ b/src/main/java/me/lrxh/practice/util/config/LanguageConfigurationFile.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.config; +package me.lrxh.practice.util.config; import org.bukkit.ChatColor; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/me/funky/praxi/util/config/LanguageConfigurationFileLocale.java b/src/main/java/me/lrxh/practice/util/config/LanguageConfigurationFileLocale.java similarity index 96% rename from src/main/java/me/funky/praxi/util/config/LanguageConfigurationFileLocale.java rename to src/main/java/me/lrxh/practice/util/config/LanguageConfigurationFileLocale.java index 9c37bd0..66aedc0 100644 --- a/src/main/java/me/funky/praxi/util/config/LanguageConfigurationFileLocale.java +++ b/src/main/java/me/lrxh/practice/util/config/LanguageConfigurationFileLocale.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.config; +package me.lrxh.practice.util.config; public enum LanguageConfigurationFileLocale { ENGLISH("en"), diff --git a/src/main/java/me/funky/praxi/util/elo/EloUtil.java b/src/main/java/me/lrxh/practice/util/elo/EloUtil.java similarity index 98% rename from src/main/java/me/funky/praxi/util/elo/EloUtil.java rename to src/main/java/me/lrxh/practice/util/elo/EloUtil.java index 246cb71..8ad93a7 100644 --- a/src/main/java/me/funky/praxi/util/elo/EloUtil.java +++ b/src/main/java/me/lrxh/practice/util/elo/EloUtil.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.elo; +package me.lrxh.practice.util.elo; public class EloUtil { diff --git a/src/main/java/me/funky/praxi/util/elo/KFactor.java b/src/main/java/me/lrxh/practice/util/elo/KFactor.java similarity index 86% rename from src/main/java/me/funky/praxi/util/elo/KFactor.java rename to src/main/java/me/lrxh/practice/util/elo/KFactor.java index ed6295d..bce4309 100644 --- a/src/main/java/me/funky/praxi/util/elo/KFactor.java +++ b/src/main/java/me/lrxh/practice/util/elo/KFactor.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.elo; +package me.lrxh.practice.util.elo; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/me/funky/praxi/util/menu/Button.java b/src/main/java/me/lrxh/practice/util/menu/Button.java similarity index 97% rename from src/main/java/me/funky/praxi/util/menu/Button.java rename to src/main/java/me/lrxh/practice/util/menu/Button.java index 3e7ac98..7db3bf4 100644 --- a/src/main/java/me/funky/praxi/util/menu/Button.java +++ b/src/main/java/me/lrxh/practice/util/menu/Button.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.menu; +package me.lrxh.practice.util.menu; import org.apache.commons.lang.StringUtils; import org.bukkit.Material; diff --git a/src/main/java/me/funky/praxi/util/menu/Menu.java b/src/main/java/me/lrxh/practice/util/menu/Menu.java similarity index 97% rename from src/main/java/me/funky/praxi/util/menu/Menu.java rename to src/main/java/me/lrxh/practice/util/menu/Menu.java index f88707a..3277441 100644 --- a/src/main/java/me/funky/praxi/util/menu/Menu.java +++ b/src/main/java/me/lrxh/practice/util/menu/Menu.java @@ -1,11 +1,11 @@ -package me.funky.praxi.util.menu; +package me.lrxh.practice.util.menu; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.Practice; -import me.funky.praxi.profile.Profile; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.menu.filters.Filters; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.menu.filters.Filters; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/me/funky/praxi/util/menu/MenuListener.java b/src/main/java/me/lrxh/practice/util/menu/MenuListener.java similarity index 97% rename from src/main/java/me/funky/praxi/util/menu/MenuListener.java rename to src/main/java/me/lrxh/practice/util/menu/MenuListener.java index fb6feaf..f8920a5 100644 --- a/src/main/java/me/funky/praxi/util/menu/MenuListener.java +++ b/src/main/java/me/lrxh/practice/util/menu/MenuListener.java @@ -1,7 +1,7 @@ -package me.funky.praxi.util.menu; +package me.lrxh.practice.util.menu; -import me.funky.praxi.Practice; -import me.funky.praxi.profile.Profile; +import me.lrxh.practice.Practice; +import me.lrxh.practice.profile.Profile; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/menu/button/BackButton.java b/src/main/java/me/lrxh/practice/util/menu/button/BackButton.java similarity index 77% rename from src/main/java/me/funky/praxi/util/menu/button/BackButton.java rename to src/main/java/me/lrxh/practice/util/menu/button/BackButton.java index 89b07ca..e9ae021 100644 --- a/src/main/java/me/funky/praxi/util/menu/button/BackButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/button/BackButton.java @@ -1,10 +1,10 @@ -package me.funky.praxi.util.menu.button; +package me.lrxh.practice.util.menu.button; import lombok.AllArgsConstructor; -import me.funky.praxi.Practice; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; +import me.lrxh.practice.Practice; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/util/menu/button/ConfirmationButton.java b/src/main/java/me/lrxh/practice/util/menu/button/ConfirmationButton.java similarity index 89% rename from src/main/java/me/funky/praxi/util/menu/button/ConfirmationButton.java rename to src/main/java/me/lrxh/practice/util/menu/button/ConfirmationButton.java index 2d25204..959c73e 100644 --- a/src/main/java/me/funky/praxi/util/menu/button/ConfirmationButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/button/ConfirmationButton.java @@ -1,9 +1,9 @@ -package me.funky.praxi.util.menu.button; +package me.lrxh.practice.util.menu.button; import lombok.AllArgsConstructor; -import me.funky.praxi.util.callback.TypeCallback; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; +import me.lrxh.practice.util.callback.TypeCallback; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/me/funky/praxi/util/menu/button/DisplayButton.java b/src/main/java/me/lrxh/practice/util/menu/button/DisplayButton.java similarity index 89% rename from src/main/java/me/funky/praxi/util/menu/button/DisplayButton.java rename to src/main/java/me/lrxh/practice/util/menu/button/DisplayButton.java index bda2e78..e768c39 100644 --- a/src/main/java/me/funky/praxi/util/menu/button/DisplayButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/button/DisplayButton.java @@ -1,9 +1,9 @@ -package me.funky.praxi.util.menu.button; +package me.lrxh.practice.util.menu.button; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.menu.Button; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/me/funky/praxi/util/menu/button/JumpToMenuButton.java b/src/main/java/me/lrxh/practice/util/menu/button/JumpToMenuButton.java similarity index 82% rename from src/main/java/me/funky/praxi/util/menu/button/JumpToMenuButton.java rename to src/main/java/me/lrxh/practice/util/menu/button/JumpToMenuButton.java index 609fb8d..0d01365 100644 --- a/src/main/java/me/funky/praxi/util/menu/button/JumpToMenuButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/button/JumpToMenuButton.java @@ -1,7 +1,7 @@ -package me.funky.praxi.util.menu.button; +package me.lrxh.practice.util.menu.button; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/funky/praxi/util/menu/filters/Filters.java b/src/main/java/me/lrxh/practice/util/menu/filters/Filters.java similarity index 56% rename from src/main/java/me/funky/praxi/util/menu/filters/Filters.java rename to src/main/java/me/lrxh/practice/util/menu/filters/Filters.java index 255a63a..ffc8051 100644 --- a/src/main/java/me/funky/praxi/util/menu/filters/Filters.java +++ b/src/main/java/me/lrxh/practice/util/menu/filters/Filters.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.menu.filters; +package me.lrxh.practice.util.menu.filters; public enum Filters { BORDER, diff --git a/src/main/java/me/funky/praxi/util/menu/menus/ConfirmMenu.java b/src/main/java/me/lrxh/practice/util/menu/menus/ConfirmMenu.java similarity index 85% rename from src/main/java/me/funky/praxi/util/menu/menus/ConfirmMenu.java rename to src/main/java/me/lrxh/practice/util/menu/menus/ConfirmMenu.java index c9d1ee5..dd03358 100644 --- a/src/main/java/me/funky/praxi/util/menu/menus/ConfirmMenu.java +++ b/src/main/java/me/lrxh/practice/util/menu/menus/ConfirmMenu.java @@ -1,9 +1,9 @@ -package me.funky.praxi.util.menu.menus; +package me.lrxh.practice.util.menu.menus; -import me.funky.praxi.util.callback.TypeCallback; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.button.ConfirmationButton; +import me.lrxh.practice.util.callback.TypeCallback; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.button.ConfirmationButton; import org.bukkit.entity.Player; import java.util.HashMap; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/FilterablePaginatedMenu.java b/src/main/java/me/lrxh/practice/util/menu/pagination/FilterablePaginatedMenu.java similarity index 91% rename from src/main/java/me/funky/praxi/util/menu/pagination/FilterablePaginatedMenu.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/FilterablePaginatedMenu.java index f52c401..dead764 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/FilterablePaginatedMenu.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/FilterablePaginatedMenu.java @@ -1,8 +1,8 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.Getter; import lombok.Setter; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.menu.Button; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/JumpToPageButton.java b/src/main/java/me/lrxh/practice/util/menu/pagination/JumpToPageButton.java similarity index 92% rename from src/main/java/me/funky/praxi/util/menu/pagination/JumpToPageButton.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/JumpToPageButton.java index ed39c69..a37220d 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/JumpToPageButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/JumpToPageButton.java @@ -1,7 +1,7 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.AllArgsConstructor; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.menu.Button; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/PageButton.java b/src/main/java/me/lrxh/practice/util/menu/pagination/PageButton.java similarity index 95% rename from src/main/java/me/funky/praxi/util/menu/pagination/PageButton.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/PageButton.java index d6f811d..dea3582 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/PageButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/PageButton.java @@ -1,8 +1,8 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.AllArgsConstructor; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/PageFilter.java b/src/main/java/me/lrxh/practice/util/menu/pagination/PageFilter.java similarity index 92% rename from src/main/java/me/funky/praxi/util/menu/pagination/PageFilter.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/PageFilter.java index 94bbb96..a58f57c 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/PageFilter.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/PageFilter.java @@ -1,4 +1,4 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/PageFilterButton.java b/src/main/java/me/lrxh/practice/util/menu/pagination/PageFilterButton.java similarity index 94% rename from src/main/java/me/funky/praxi/util/menu/pagination/PageFilterButton.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/PageFilterButton.java index 4ee3d94..ff23eb2 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/PageFilterButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/PageFilterButton.java @@ -1,9 +1,9 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.AllArgsConstructor; -import me.funky.praxi.util.CC; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.CC; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; import org.apache.commons.lang.StringEscapeUtils; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/PageInfoButton.java b/src/main/java/me/lrxh/practice/util/menu/pagination/PageInfoButton.java similarity index 90% rename from src/main/java/me/funky/praxi/util/menu/pagination/PageInfoButton.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/PageInfoButton.java index f57b0f4..33dd2ee 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/PageInfoButton.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/PageInfoButton.java @@ -1,8 +1,8 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.AllArgsConstructor; -import me.funky.praxi.util.ItemBuilder; -import me.funky.praxi.util.menu.Button; +import me.lrxh.practice.util.ItemBuilder; +import me.lrxh.practice.util.menu.Button; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/PaginatedMenu.java b/src/main/java/me/lrxh/practice/util/menu/pagination/PaginatedMenu.java similarity index 95% rename from src/main/java/me/funky/praxi/util/menu/pagination/PaginatedMenu.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/PaginatedMenu.java index 51e470f..b68d463 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/PaginatedMenu.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/PaginatedMenu.java @@ -1,8 +1,8 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.Getter; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; import org.bukkit.entity.Player; import java.util.HashMap; diff --git a/src/main/java/me/funky/praxi/util/menu/pagination/ViewAllPagesMenu.java b/src/main/java/me/lrxh/practice/util/menu/pagination/ViewAllPagesMenu.java similarity index 83% rename from src/main/java/me/funky/praxi/util/menu/pagination/ViewAllPagesMenu.java rename to src/main/java/me/lrxh/practice/util/menu/pagination/ViewAllPagesMenu.java index ea12f8d..a3b349b 100644 --- a/src/main/java/me/funky/praxi/util/menu/pagination/ViewAllPagesMenu.java +++ b/src/main/java/me/lrxh/practice/util/menu/pagination/ViewAllPagesMenu.java @@ -1,11 +1,11 @@ -package me.funky.praxi.util.menu.pagination; +package me.lrxh.practice.util.menu.pagination; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import me.funky.praxi.util.menu.Button; -import me.funky.praxi.util.menu.Menu; -import me.funky.praxi.util.menu.button.BackButton; +import me.lrxh.practice.util.menu.Button; +import me.lrxh.practice.util.menu.Menu; +import me.lrxh.practice.util.menu.button.BackButton; import org.bukkit.entity.Player; import java.util.HashMap; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index d6e67bd..39458d8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,6 +1,6 @@ MONGO: URI: "mongodb+srv://lrxh:KlR0lOFSbtAxanOi@cluster0.st1wrul.mongodb.net/?retryWrites=true&w=majority" - DATABASE: "praxi" + DATABASE: "practice" RANKED: REQUIRED-WINS: 3 ERROR-MESSAGE: '&cYou cannot join ranked queues with less than 10 unranked 1v1 wins. @@ -10,11 +10,11 @@ LEADERBOARD: UPDATE-TIME: 1 JOIN_MESSAGE: - '&7&m--------------------------------' - - '&fWelcome to the PvPHood Network!' + - '&fWelcome to the Practice Network!' - ' ' - - ' &f✦ Discord: &fdiscord.gg/pvphood' - - ' &f✦ Twitter: &ftwitter.com/@pvphoodmc' - - ' &f✦ Store: &fstore.pvphood.com' + - ' &f✦ Discord: &fdiscord.gg/server' + - ' &f✦ Twitter: &ftwitter.com/@server' + - ' &f✦ Store: &fstore.server.net' - ' ' - '&7&m--------------------------------' PING: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 56800ad..107de0d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -main: me.funky.practice.Practice +main: me.lrxh.practice.Practice name: Practice version: '1.0.0' author: funkyranveer, joeleoli, lugami, lrxh