diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml index 27e29c403..641f165de 100644 --- a/.github/workflows/qodana_code_quality.yml +++ b/.github/workflows/qodana_code_quality.yml @@ -28,7 +28,7 @@ jobs: env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} with: - pr-mode: false + pr-mode: true use-caches: true post-pr-comment: true use-annotations: true diff --git a/.github/workflows/sync-dev.yml b/.github/workflows/sync-dev.yml deleted file mode 100644 index 8d11f0e8a..000000000 --- a/.github/workflows/sync-dev.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Sync Dev with Master - -on: - pull_request: - types: [ closed ] - branches: [ "master", "main" ] - -jobs: - sync-branch: - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'dev' - - permissions: - contents: write - - steps: - - name: Checkout Master/Main - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.base.ref }} - fetch-depth: 0 - - - name: Force Sync Dev - run: | - git push origin HEAD:dev --force \ No newline at end of file diff --git a/.gitignore b/.gitignore index b360767bf..3dc7a5a85 100644 --- a/.gitignore +++ b/.gitignore @@ -96,8 +96,6 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -target/ - pom.xml.tag pom.xml.releaseBackup pom.xml.versionsBackup @@ -112,3 +110,6 @@ buildNumber.properties # Common working directory run/ + +# Local scripts +reset-dev.sh \ No newline at end of file diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Interface/Team.java b/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Interface/Team.java deleted file mode 100644 index 18653b075..000000000 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Interface/Team.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Interface; - -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import org.bukkit.entity.Player; - -public interface Team { - - TeamEnum getTeam(Player player); - -} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/LadderHandle.java b/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/LadderHandle.java deleted file mode 100644 index f60025f3e..000000000 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/LadderHandle.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface; - -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import org.bukkit.event.Event; - -public interface LadderHandle { - - boolean handleEvents(Event e, Match match); - -} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Basic.java b/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Basic.java deleted file mode 100644 index 3f7791dfa..000000000 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Basic.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; - -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import org.bukkit.event.Event; - -public class Basic extends NormalLadder implements LadderHandle { - - public Basic(String name, LadderType type) { - super(name, type); - } - - @Override - public boolean handleEvents(Event e, Match match) { - return false; - } - -} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Build.java b/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Build.java deleted file mode 100644 index 1ff0fffdb..000000000 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Build.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; - -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import org.bukkit.event.Event; - -public class Build extends NormalLadder implements LadderHandle { - - public Build(String name, LadderType type) { - super(name, type); - } - - @Override - public boolean handleEvents(Event e, Match match) { - return false; - } - -} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Types/LbMainType.java b/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Types/LbMainType.java deleted file mode 100644 index 9714a0af1..000000000 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Types/LbMainType.java +++ /dev/null @@ -1,8 +0,0 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Types; - -public enum LbMainType { - - GLOBAL, - LADDER, - -} \ No newline at end of file diff --git a/core/src/main/java/dev/nandi0813/practice/Util/BlockFaceUtil.java b/core/src/main/java/dev/nandi0813/practice/Util/BlockFaceUtil.java deleted file mode 100644 index 90b78b593..000000000 --- a/core/src/main/java/dev/nandi0813/practice/Util/BlockFaceUtil.java +++ /dev/null @@ -1,15 +0,0 @@ -package dev.nandi0813.practice.Util; - -import org.bukkit.block.BlockFace; -import org.bukkit.util.Vector; - -public enum BlockFaceUtil { - ; - - public static Vector getDirection(BlockFace face) { - Vector direction = new Vector(face.getModX(), face.getModY(), face.getModZ()); - direction.normalize(); - return direction; - } - -} diff --git a/core/src/main/java/dev/nandi0813/practice/ZonePractice.java b/core/src/main/java/dev/nandi0813/practice/ZonePractice.java index 9cb947d76..812d1a695 100644 --- a/core/src/main/java/dev/nandi0813/practice/ZonePractice.java +++ b/core/src/main/java/dev/nandi0813/practice/ZonePractice.java @@ -1,50 +1,50 @@ package dev.nandi0813.practice; import com.github.retrooper.packetevents.PacketEvents; -import dev.nandi0813.practice.Command.Accept.AcceptCommand; -import dev.nandi0813.practice.Command.Arena.ArenaCommand; -import dev.nandi0813.practice.Command.Division.DivisionsCommand; -import dev.nandi0813.practice.Command.Duel.DuelCommand; -import dev.nandi0813.practice.Command.Event.EventCommand; -import dev.nandi0813.practice.Command.FFA.FFACommand; -import dev.nandi0813.practice.Command.Hologram.HologramCommand; -import dev.nandi0813.practice.Command.Ladder.LadderCommand; -import dev.nandi0813.practice.Command.MatchStats.MatchStatsCommand; -import dev.nandi0813.practice.Command.Party.PartyCommand; -import dev.nandi0813.practice.Command.Practice.PracticeCommand; -import dev.nandi0813.practice.Command.Preview.PreviewCommand; -import dev.nandi0813.practice.Command.PrivateMessage.MessageCommand; -import dev.nandi0813.practice.Command.PrivateMessage.ReplyCommand; -import dev.nandi0813.practice.Command.Settings.SettingsCommand; -import dev.nandi0813.practice.Command.Setup.SetupCommand; -import dev.nandi0813.practice.Command.SingleCommands.*; -import dev.nandi0813.practice.Command.Spectate.SpectateCommand; -import dev.nandi0813.practice.Command.Staff.StaffCommand; -import dev.nandi0813.practice.Command.Statistics.StatisticsCommand; -import dev.nandi0813.practice.Listener.*; -import dev.nandi0813.practice.Manager.Arena.ArenaListener; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.*; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.EntityHiderListener; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; -import dev.nandi0813.practice.Manager.PlayerDisplay.Tab.TabListManager; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Module.Util.VersionChecker; -import dev.nandi0813.practice.Util.*; -import dev.nandi0813.practice.Util.PlaceholderAPI.PlayerExpansion; +import dev.nandi0813.practice.command.accept.AcceptCommand; +import dev.nandi0813.practice.command.arena.ArenaCommand; +import dev.nandi0813.practice.command.division.DivisionsCommand; +import dev.nandi0813.practice.command.duel.DuelCommand; +import dev.nandi0813.practice.command.event.EventCommand; +import dev.nandi0813.practice.command.ffa.FFACommand; +import dev.nandi0813.practice.command.hologram.HologramCommand; +import dev.nandi0813.practice.command.ladder.LadderCommand; +import dev.nandi0813.practice.command.matchstats.MatchStatsCommand; +import dev.nandi0813.practice.command.party.PartyCommand; +import dev.nandi0813.practice.command.practice.PracticeCommand; +import dev.nandi0813.practice.command.preview.PreviewCommand; +import dev.nandi0813.practice.command.privatemessage.MessageCommand; +import dev.nandi0813.practice.command.privatemessage.ReplyCommand; +import dev.nandi0813.practice.command.settings.SettingsCommand; +import dev.nandi0813.practice.command.setup.SetupCommand; +import dev.nandi0813.practice.command.singlecommands.*; +import dev.nandi0813.practice.command.spectate.SpectateCommand; +import dev.nandi0813.practice.command.staff.StaffCommand; +import dev.nandi0813.practice.command.statistics.StatisticsCommand; +import dev.nandi0813.practice.listener.*; +import dev.nandi0813.practice.manager.arena.ArenaListener; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.*; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.util.EntityHiderListener; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.manager.playerdisplay.tab.TabListManager; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.module.util.VersionChecker; +import dev.nandi0813.practice.util.*; +import dev.nandi0813.practice.util.placeholderapi.PlayerExpansion; import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder; import lombok.Getter; import net.kyori.adventure.platform.bukkit.BukkitAudiences; diff --git a/core/src/main/java/dev/nandi0813/practice/ZonePracticeApiImpl.java b/core/src/main/java/dev/nandi0813/practice/ZonePracticeApiImpl.java index 3b4d3d484..a0ee2c12d 100644 --- a/core/src/main/java/dev/nandi0813/practice/ZonePracticeApiImpl.java +++ b/core/src/main/java/dev/nandi0813/practice/ZonePracticeApiImpl.java @@ -3,14 +3,14 @@ import dev.nandi0813.api.Enum.DivisionName; import dev.nandi0813.api.Enum.WeightClass; import dev.nandi0813.api.ZonePracticeApi; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.entity.Player; public class ZonePracticeApiImpl extends ZonePracticeApi { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Accept/AcceptCommand.java b/core/src/main/java/dev/nandi0813/practice/command/accept/AcceptCommand.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Accept/AcceptCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/accept/AcceptCommand.java index 13bede19d..a180d1c6c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Accept/AcceptCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/accept/AcceptCommand.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Command.Accept; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Duel.DuelManager; -import dev.nandi0813.practice.Manager.Duel.DuelRequest; -import dev.nandi0813.practice.Manager.Party.MatchRequest.PartyRequest; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.accept; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.duel.DuelManager; +import dev.nandi0813.practice.manager.duel.DuelRequest; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.party.matchrequest.PartyRequest; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/ArenaCommand.java b/core/src/main/java/dev/nandi0813/practice/command/arena/ArenaCommand.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/ArenaCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/ArenaCommand.java index 649580f01..5b4e63b79 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/ArenaCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/ArenaCommand.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Arena; +package dev.nandi0813.practice.command.arena; -import dev.nandi0813.practice.Command.Arena.Arguments.*; -import dev.nandi0813.practice.Command.Arena.Arguments.Set.BedArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.arena.arguments.*; +import dev.nandi0813.practice.command.arena.arguments.Set.BedArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/CreateArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/CreateArg.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/CreateArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/CreateArg.java index 7b6db9f02..eb2218510 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/CreateArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/CreateArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.Arena.ArenaCreateGui; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.guis.arena.ArenaCreateGui; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import java.text.Normalizer; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/DeleteArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/DeleteArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/DeleteArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/DeleteArg.java index d246664a3..4bdd91b7b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/DeleteArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/DeleteArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/DisableArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/DisableArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/DisableArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/DisableArg.java index b99914057..5699af862 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/DisableArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/DisableArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/EnableArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/EnableArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/EnableArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/EnableArg.java index 9efb8a15a..17186969a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/EnableArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/EnableArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/FreezeArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/FreezeArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/FreezeArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/FreezeArg.java index c93bb9cfc..b5f7aa955 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/FreezeArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/FreezeArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/HelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/HelpArg.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/HelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/HelpArg.java index e242aaf61..2c1973efc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/HelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/HelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/InfoArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/InfoArg.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/InfoArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/InfoArg.java index e5593caf7..071b6a53c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/InfoArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/InfoArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/BedArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/BedArg.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/BedArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/BedArg.java index 664253365..f22ba5739 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/BedArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/BedArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Util.BedLocation; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.util.BedLocation; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/BuildmaxArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/BuildmaxArg.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/BuildmaxArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/BuildmaxArg.java index f30e61c36..2c91a9ba4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/BuildmaxArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/BuildmaxArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; +package dev.nandi0813.practice.command.arena.arguments.Set; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/CornerArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/CornerArg.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/CornerArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/CornerArg.java index 305209adc..ead4e6d72 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/CornerArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/CornerArg.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/DeadzoneArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/DeadzoneArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/DeadzoneArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/DeadzoneArg.java index 6542eda97..91126a682 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/DeadzoneArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/DeadzoneArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; +package dev.nandi0813.practice.command.arena.arguments.Set; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/FfaPositionArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/FfaPositionArg.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/FfaPositionArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/FfaPositionArg.java index ad7daebc0..60c44f55d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/FfaPositionArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/FfaPositionArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/IconArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/IconArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/IconArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/IconArg.java index e8b670022..b5e5f286e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/IconArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/IconArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PortalArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PortalArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PortalArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PortalArg.java index 17738d7fc..fedf9359d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PortalArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PortalArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Util.PortalLocation; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.util.PortalLocation; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PortalProtArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PortalProtArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PortalProtArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PortalProtArg.java index b1d5e1af1..442c1bd45 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PortalProtArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PortalProtArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; +package dev.nandi0813.practice.command.arena.arguments.Set; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PositionArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PositionArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PositionArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PositionArg.java index 1421e4e9e..2bcc4e72c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/PositionArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/PositionArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/SideBuildLimitArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/SideBuildLimitArg.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/SideBuildLimitArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/SideBuildLimitArg.java index cd2bac621..bf7c628e8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/Set/SideBuildLimitArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/Set/SideBuildLimitArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Arena.Arguments.Set; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.arena.arguments.Set; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/SetArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/SetArg.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/SetArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/SetArg.java index c3fa5b7bb..b9dbc0f70 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/SetArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/SetArg.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Command.Arena.Arguments.Set.*; +import dev.nandi0813.practice.command.arena.arguments.Set.*; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/StopArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/StopArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/StopArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/StopArg.java index cc34dbb46..c9a1913cc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/StopArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/StopArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/TeleportArg.java b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/TeleportArg.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/TeleportArg.java rename to core/src/main/java/dev/nandi0813/practice/command/arena/arguments/TeleportArg.java index 9a224cdaa..f1ad9076c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Arena/Arguments/TeleportArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/arena/arguments/TeleportArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Arena.Arguments; +package dev.nandi0813.practice.command.arena.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Division/DivisionsCommand.java b/core/src/main/java/dev/nandi0813/practice/command/division/DivisionsCommand.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Command/Division/DivisionsCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/division/DivisionsCommand.java index 11a7600d8..9ac0c3e1b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Division/DivisionsCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/division/DivisionsCommand.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Division; +package dev.nandi0813.practice.command.division; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.DivisionGui; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.guis.DivisionGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Duel/DuelCommand.java b/core/src/main/java/dev/nandi0813/practice/command/duel/DuelCommand.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Command/Duel/DuelCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/duel/DuelCommand.java index 04169a3ca..6ea2c0048 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Duel/DuelCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/duel/DuelCommand.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Duel; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Duel.DuelManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUIs.Selectors.LadderSelectorGui; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.duel; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.duel.DuelManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.guis.selectors.LadderSelectorGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/EventCommand.java b/core/src/main/java/dev/nandi0813/practice/command/event/EventCommand.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/EventCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/event/EventCommand.java index 3ed1eed1b..adefa81a2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/EventCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/EventCommand.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Event; +package dev.nandi0813.practice.command.event; -import dev.nandi0813.practice.Command.Event.Arguments.Events.*; -import dev.nandi0813.practice.Command.Event.Arguments.HelpArg; -import dev.nandi0813.practice.Command.Event.Arguments.HostArg; -import dev.nandi0813.practice.Command.Event.Arguments.JoinArg; -import dev.nandi0813.practice.Command.Event.Arguments.StopArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.event.arguments.Events.*; +import dev.nandi0813.practice.command.event.arguments.HelpArg; +import dev.nandi0813.practice.command.event.arguments.HostArg; +import dev.nandi0813.practice.command.event.arguments.JoinArg; +import dev.nandi0813.practice.command.event.arguments.StopArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/BracketsArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/BracketsArg.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/BracketsArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/BracketsArg.java index 041a13693..e4d7247ce 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/BracketsArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/BracketsArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; - -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.BracketsData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.event.arguments.Events; + +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.BracketsData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/JuggernautArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/JuggernautArg.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/JuggernautArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/JuggernautArg.java index 7e5d924ad..909611aad 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/JuggernautArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/JuggernautArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; - -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut.JuggernautData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.event.arguments.Events; + +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut.JuggernautData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/LMSArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/LMSArg.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/LMSArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/LMSArg.java index 5e5849ab4..6110642aa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/LMSArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/LMSArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; - -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS.LMSData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.event.arguments.Events; + +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.ffa.lms.LMSData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/OITCArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/OITCArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/OITCArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/OITCArg.java index 2c7276e9b..26ce1666b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/OITCArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/OITCArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; +package dev.nandi0813.practice.command.event.arguments.Events; -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC.OITCData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.ffa.oitc.OITCData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/SpleggArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SpleggArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/SpleggArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SpleggArg.java index dd5297215..fd99e93d2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/SpleggArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SpleggArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; +package dev.nandi0813.practice.command.event.arguments.Events; -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg.SpleggData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.ffa.splegg.SpleggData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/SumoArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SumoArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/SumoArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SumoArg.java index 7f35476b9..f690d0eda 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/SumoArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/SumoArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; +package dev.nandi0813.practice.command.event.arguments.Events; -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo.SumoData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.duel.sumo.SumoData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/TNTTagArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/TNTTagArg.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/TNTTagArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/TNTTagArg.java index eb801996e..60c94f9e1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/Events/TNTTagArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/Events/TNTTagArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Event.Arguments.Events; +package dev.nandi0813.practice.command.event.arguments.Events; -import dev.nandi0813.practice.Command.Event.Arguments.SpawnPointArg; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag.TNTTagData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.event.arguments.SpawnPointArg; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag.TNTTagData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/HelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/HelpArg.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/HelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/HelpArg.java index 95ea83c66..16cd506fa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/HelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/HelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Event.Arguments; +package dev.nandi0813.practice.command.event.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/HostArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/HostArg.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/HostArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/HostArg.java index 8f81aedaf..60383d442 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/HostArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/HostArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Event.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.event.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HostArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/JoinArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/JoinArg.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/JoinArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/JoinArg.java index 40b603eb2..74ec700d7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/JoinArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/JoinArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Event.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.event.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum JoinArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/SpawnPointArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/SpawnPointArg.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/SpawnPointArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/SpawnPointArg.java index 50466774e..b8c37f0df 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/SpawnPointArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/SpawnPointArg.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Command.Event.Arguments; +package dev.nandi0813.practice.command.event.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/StopArg.java b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/StopArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/StopArg.java rename to core/src/main/java/dev/nandi0813/practice/command/event/arguments/StopArg.java index 58d2cba61..388f1f412 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Event/Arguments/StopArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/event/arguments/StopArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Event.Arguments; +package dev.nandi0813.practice.command.event.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/FFA/FFACommand.java b/core/src/main/java/dev/nandi0813/practice/command/ffa/FFACommand.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Command/FFA/FFACommand.java rename to core/src/main/java/dev/nandi0813/practice/command/ffa/FFACommand.java index be895f863..8f857bc4e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/FFA/FFACommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ffa/FFACommand.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Command.FFA; +package dev.nandi0813.practice.command.ffa; -import dev.nandi0813.practice.Command.FFA.Arguments.*; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.ffa.arguments.*; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/HelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/HelpArg.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/HelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/HelpArg.java index ae9984d0f..d8ed76ee7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/HelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/HelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.FFA.Arguments; +package dev.nandi0813.practice.command.ffa.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/JoinArg.java b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/JoinArg.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/JoinArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/JoinArg.java index 7c79471b9..c262b4049 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/JoinArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/JoinArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.FFA.Arguments; +package dev.nandi0813.practice.command.ffa.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/LeaveArg.java b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/LeaveArg.java similarity index 57% rename from core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/LeaveArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/LeaveArg.java index 017055a71..bf2df8e67 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/LeaveArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/LeaveArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.FFA.Arguments; +package dev.nandi0813.practice.command.ffa.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum LeaveArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/ListArg.java b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/ListArg.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/ListArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/ListArg.java index 600ae30da..ccbc0af92 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/ListArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/ListArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.FFA.Arguments; +package dev.nandi0813.practice.command.ffa.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/SpectateArg.java b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/SpectateArg.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/SpectateArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/SpectateArg.java index 36a692237..7717f9d41 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/FFA/Arguments/SpectateArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/SpectateArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.FFA.Arguments; +package dev.nandi0813.practice.command.ffa.arguments; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Hologram/HologramCommand.java b/core/src/main/java/dev/nandi0813/practice/command/hologram/HologramCommand.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Hologram/HologramCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/hologram/HologramCommand.java index 168862883..01951489f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Hologram/HologramCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/hologram/HologramCommand.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Command.Hologram; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Hologram.HologramSetupManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramType; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.GlobalHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderDynamicHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderStaticHologram; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Server.WorldEnum; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.hologram; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.hologram.HologramSetupManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramType; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.GlobalHologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderDynamicHologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderStaticHologram; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.server.WorldEnum; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/LadderCommand.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/LadderCommand.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/LadderCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/LadderCommand.java index bd4663a78..4865a902f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/LadderCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/LadderCommand.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Command.Ladder; +package dev.nandi0813.practice.command.ladder; -import dev.nandi0813.practice.Command.Ladder.Arguments.*; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.command.ladder.arguments.*; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/CreateArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/CreateArg.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/CreateArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/CreateArg.java index 02f551c0a..5b162e9df 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/CreateArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/CreateArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.Ladder.LadderCreateGui; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.guis.ladder.LadderCreateGui; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import java.text.Normalizer; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/DeleteArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/DeleteArg.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/DeleteArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/DeleteArg.java index a40779315..119fba513 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/DeleteArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/DeleteArg.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.ladder.arguments; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/EffectArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/EffectArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/EffectArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/EffectArg.java index 77e43fe4f..1e823c150 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/EffectArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/EffectArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/FreezeArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/FreezeArg.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/FreezeArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/FreezeArg.java index ba214812b..2c6a065d8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/FreezeArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/FreezeArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/HelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/HelpArg.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/HelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/HelpArg.java index 9bb49fc4f..9b3eac206 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/HelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/HelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/IconArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/IconArg.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/IconArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/IconArg.java index a17a5776c..4d213e6a7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/IconArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/IconArg.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.ladder.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/InfoArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/InfoArg.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/InfoArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/InfoArg.java index ba42bb3bf..aad281dd0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/InfoArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/InfoArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/InventoryArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/InventoryArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/InventoryArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/InventoryArg.java index 75897ca37..9753231e1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/InventoryArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/InventoryArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.ladder.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/SetArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/SetArg.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/SetArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/SetArg.java index 1f494400b..34dd9071a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/SetArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/SetArg.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/StopArg.java b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/StopArg.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/StopArg.java rename to core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/StopArg.java index bcd96c77a..9d1161548 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Ladder/Arguments/StopArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/ladder/arguments/StopArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Ladder.Arguments; +package dev.nandi0813.practice.command.ladder.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/MatchStats/MatchStatsCommand.java b/core/src/main/java/dev/nandi0813/practice/command/matchstats/MatchStatsCommand.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Command/MatchStats/MatchStatsCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/matchstats/MatchStatsCommand.java index 615d1150e..047743bbb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/MatchStats/MatchStatsCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/matchstats/MatchStatsCommand.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.MatchStats; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.matchstats; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/PartyCommand.java b/core/src/main/java/dev/nandi0813/practice/command/party/PartyCommand.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/PartyCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/party/PartyCommand.java index 0cb8bc4d8..a0e70bba6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/PartyCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/PartyCommand.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Party; - -import dev.nandi0813.practice.Command.Party.Arguments.*; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.party; + +import dev.nandi0813.practice.command.party.arguments.*; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyAcceptArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyAcceptArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyAcceptArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyAcceptArg.java index eed60a379..598e226ba 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyAcceptArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyAcceptArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyDisbandArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyDisbandArg.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyDisbandArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyDisbandArg.java index 588d2daad..8ca39b685 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyDisbandArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyDisbandArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum PartyDisbandArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyHelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyHelpArg.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyHelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyHelpArg.java index 646f879ff..413797ea3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyHelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyHelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum PartyHelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyInfoArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyInfoArg.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyInfoArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyInfoArg.java index 2816bf6c9..374f3f59f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyInfoArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyInfoArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyInviteArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyInviteArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyInviteArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyInviteArg.java index 11020f4c8..8ef692bd5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyInviteArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyInviteArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Party.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.party.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyJoinArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyJoinArg.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyJoinArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyJoinArg.java index 90dc26864..1504ca5ee 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyJoinArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyJoinArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum PartyJoinArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyKickArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyKickArg.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyKickArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyKickArg.java index c6809ff49..9c80ae71b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyKickArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyKickArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyLeaderArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyLeaderArg.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyLeaderArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyLeaderArg.java index 8fc6b4db0..965ed8c78 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyLeaderArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyLeaderArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyLeaveArg.java b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyLeaveArg.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyLeaveArg.java rename to core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyLeaveArg.java index 6d1695b84..9271927dd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Party/Arguments/PartyLeaveArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/party/arguments/PartyLeaveArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Party.Arguments; +package dev.nandi0813.practice.command.party.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum PartyLeaveArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/PracticeCommand.java b/core/src/main/java/dev/nandi0813/practice/command/practice/PracticeCommand.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/PracticeCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/PracticeCommand.java index 7879e4cf1..0ae92a220 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/PracticeCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/PracticeCommand.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Command.Practice; +package dev.nandi0813.practice.command.practice; -import dev.nandi0813.practice.Command.Practice.Arguments.*; +import dev.nandi0813.practice.command.practice.arguments.*; import org.bukkit.command.*; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/ArenasArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ArenasArg.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/ArenasArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ArenasArg.java index 23feab828..560389e7d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/ArenasArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ArenasArg.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; +package dev.nandi0813.practice.command.practice.arguments; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/EloArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/EloArg.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/EloArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/EloArg.java index 1a235c633..112eaa9f8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/EloArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/EloArg.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/Exp.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/Exp.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/Exp.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/Exp.java index e655c42eb..0ce2fc1f9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/Exp.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/Exp.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/GoldenHeadArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/GoldenHeadArg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/GoldenHeadArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/GoldenHeadArg.java index f5c9eed4c..74bfc5bd0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/GoldenHeadArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/GoldenHeadArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; +package dev.nandi0813.practice.command.practice.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.GoldenHead; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.GoldenHead; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/HelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/HelpArg.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/HelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/HelpArg.java index 97d957acf..bdba27916 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/HelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/HelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; +package dev.nandi0813.practice.command.practice.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/InfoArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/InfoArg.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/InfoArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/InfoArg.java index 3f732c74c..28818eb06 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/InfoArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/InfoArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.Profile.ProfileSetupGui; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.guis.profile.ProfileSetupGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/LobbyArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/LobbyArg.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/LobbyArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/LobbyArg.java index 9ffb07f43..901e3fdf5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/LobbyArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/LobbyArg.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; +package dev.nandi0813.practice.command.practice.arguments; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/NametagArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/NametagArg.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/NametagArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/NametagArg.java index 2a29a0372..58f975b0f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/NametagArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/NametagArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryUtil; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.InventoryUtil; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/RankedArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RankedArg.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/RankedArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RankedArg.java index 12f6483de..4d36e0c07 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/RankedArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RankedArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/RenameArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RenameArg.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/RenameArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RenameArg.java index f33fde03d..dde11490d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/RenameArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/RenameArg.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; +package dev.nandi0813.practice.command.practice.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/ResetArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ResetArg.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/ResetArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ResetArg.java index 5f28b572b..82693a30c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/ResetArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/ResetArg.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/TeleportArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/TeleportArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/TeleportArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/TeleportArg.java index e75d0ba3f..6f251cf99 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/TeleportArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/TeleportArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; +package dev.nandi0813.practice.command.practice.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/UnrankedArg.java b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/UnrankedArg.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/UnrankedArg.java rename to core/src/main/java/dev/nandi0813/practice/command/practice/arguments/UnrankedArg.java index 9abff2989..e9d859520 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Practice/Arguments/UnrankedArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/practice/arguments/UnrankedArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Practice.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.practice.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Preview/PreviewCommand.java b/core/src/main/java/dev/nandi0813/practice/command/preview/PreviewCommand.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Preview/PreviewCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/preview/PreviewCommand.java index df3976726..51697501b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Preview/PreviewCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/preview/PreviewCommand.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Command.Preview; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.preview; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/MessageCommand.java b/core/src/main/java/dev/nandi0813/practice/command/privatemessage/MessageCommand.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/MessageCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/privatemessage/MessageCommand.java index 922948915..617280a8a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/MessageCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/privatemessage/MessageCommand.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.PrivateMessage; +package dev.nandi0813.practice.command.privatemessage; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/PrivateMessageCommand.java b/core/src/main/java/dev/nandi0813/practice/command/privatemessage/PrivateMessageCommand.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/PrivateMessageCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/privatemessage/PrivateMessageCommand.java index 46073481d..827893083 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/PrivateMessageCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/privatemessage/PrivateMessageCommand.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Command.PrivateMessage; +package dev.nandi0813.practice.command.privatemessage; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/ReplyCommand.java b/core/src/main/java/dev/nandi0813/practice/command/privatemessage/ReplyCommand.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/ReplyCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/privatemessage/ReplyCommand.java index 474f64878..0fa4f926b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/PrivateMessage/ReplyCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/privatemessage/ReplyCommand.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.PrivateMessage; +package dev.nandi0813.practice.command.privatemessage; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Settings/SettingsCommand.java b/core/src/main/java/dev/nandi0813/practice/command/settings/SettingsCommand.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Command/Settings/SettingsCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/settings/SettingsCommand.java index d182b6e66..f3bfa7286 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Settings/SettingsCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/settings/SettingsCommand.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.Settings; +package dev.nandi0813.practice.command.settings; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Setup/SetupCommand.java b/core/src/main/java/dev/nandi0813/practice/command/setup/SetupCommand.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Command/Setup/SetupCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/setup/SetupCommand.java index bb1b99282..6f7e91ae7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Setup/SetupCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/setup/SetupCommand.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Setup; +package dev.nandi0813.practice.command.setup; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Server.ServerHubGui; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.server.ServerHubGui; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/CopyKitCommand.java b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/CopyKitCommand.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/CopyKitCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/singlecommands/CopyKitCommand.java index 4857c960a..ecfb5a228 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/CopyKitCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/CopyKitCommand.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Command.SingleCommands; +package dev.nandi0813.practice.command.singlecommands; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/EditorCommand.java b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/EditorCommand.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/EditorCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/singlecommands/EditorCommand.java index bd5a9ea30..82f188b51 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/EditorCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/EditorCommand.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.SingleCommands; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.singlecommands; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/IgnoreQueueCommand.java b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/IgnoreQueueCommand.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/IgnoreQueueCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/singlecommands/IgnoreQueueCommand.java index 2ad769959..6ac0c347c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/IgnoreQueueCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/IgnoreQueueCommand.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Command.SingleCommands; +package dev.nandi0813.practice.command.singlecommands; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/LeaveCommand.java b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/LeaveCommand.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/LeaveCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/singlecommands/LeaveCommand.java index e9b4e6b6c..e28412dce 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/LeaveCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/LeaveCommand.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Command.SingleCommands; +package dev.nandi0813.practice.command.singlecommands; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/RankedCommand.java b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/RankedCommand.java similarity index 74% rename from core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/RankedCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/singlecommands/RankedCommand.java index ddcf40560..9cb2714ad 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/RankedCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/RankedCommand.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Command.SingleCommands; +package dev.nandi0813.practice.command.singlecommands; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Queue.QueueManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.queue.QueueManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/UnrankedCommand.java b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/UnrankedCommand.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/UnrankedCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/singlecommands/UnrankedCommand.java index 828043635..2154170db 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/SingleCommands/UnrankedCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/singlecommands/UnrankedCommand.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Command.SingleCommands; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Queue.QueueManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.singlecommands; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.queue.QueueManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Spectate/SpectateCommand.java b/core/src/main/java/dev/nandi0813/practice/command/spectate/SpectateCommand.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Command/Spectate/SpectateCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/spectate/SpectateCommand.java index ec13f99e1..11d903597 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Spectate/SpectateCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/spectate/SpectateCommand.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Command.Spectate; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.spectate; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/StaffCommand.java b/core/src/main/java/dev/nandi0813/practice/command/staff/StaffCommand.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/StaffCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/StaffCommand.java index 7684fdc8c..3b270e135 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/StaffCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/StaffCommand.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Staff; +package dev.nandi0813.practice.command.staff; -import dev.nandi0813.practice.Command.Staff.Arguments.*; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; +import dev.nandi0813.practice.command.staff.arguments.*; +import dev.nandi0813.practice.manager.backend.ConfigManager; import org.bukkit.command.*; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/ChatArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/ChatArg.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/ChatArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/ChatArg.java index ee8e981a1..791f512b7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/ChatArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/ChatArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.command.staff.arguments; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.entity.Player; public enum ChatArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/EnableArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/EnableArg.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/EnableArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/EnableArg.java index 9e0965eb4..fcbb995a6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/EnableArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/EnableArg.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; +package dev.nandi0813.practice.command.staff.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum EnableArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/FollowArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/FollowArg.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/FollowArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/FollowArg.java index dba0920c3..2c44ca900 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/FollowArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/FollowArg.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; +package dev.nandi0813.practice.command.staff.arguments; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.entity.Player; public enum FollowArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/ForceEndArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/ForceEndArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/ForceEndArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/ForceEndArg.java index ccb2cc45b..5bb5373d5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/ForceEndArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/ForceEndArg.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Runnable.Round.RoundEndRunnable; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.staff.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.runnable.round.RoundEndRunnable; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/HelpArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/HelpArg.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/HelpArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/HelpArg.java index 5fefc964e..386d06958 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/HelpArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/HelpArg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; +package dev.nandi0813.practice.command.staff.arguments; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public enum HelpArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/StopArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/StopArg.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/StopArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/StopArg.java index d84b66ced..49cd512ad 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/StopArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/StopArg.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Interface.Spectatable; +package dev.nandi0813.practice.command.staff.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.interfaces.Spectatable; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/VanishArg.java b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/VanishArg.java similarity index 74% rename from core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/VanishArg.java rename to core/src/main/java/dev/nandi0813/practice/command/staff/arguments/VanishArg.java index d705264ba..90045b9bb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Staff/Arguments/VanishArg.java +++ b/core/src/main/java/dev/nandi0813/practice/command/staff/arguments/VanishArg.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Command.Staff.Arguments; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; +package dev.nandi0813.practice.command.staff.arguments; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.entityhider.PlayerHider; import org.bukkit.entity.Player; public enum VanishArg { diff --git a/core/src/main/java/dev/nandi0813/practice/Command/Statistics/StatisticsCommand.java b/core/src/main/java/dev/nandi0813/practice/command/statistics/StatisticsCommand.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Command/Statistics/StatisticsCommand.java rename to core/src/main/java/dev/nandi0813/practice/command/statistics/StatisticsCommand.java index 7535873e9..8bd035287 100644 --- a/core/src/main/java/dev/nandi0813/practice/Command/Statistics/StatisticsCommand.java +++ b/core/src/main/java/dev/nandi0813/practice/command/statistics/StatisticsCommand.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Command.Statistics; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard.LbSelectorGui; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.command.statistics; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.guis.leaderboard.LbSelectorGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/EntityDamage.java b/core/src/main/java/dev/nandi0813/practice/listener/EntityDamage.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Listener/EntityDamage.java rename to core/src/main/java/dev/nandi0813/practice/listener/EntityDamage.java index e59e1b201..72533254d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/EntityDamage.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/EntityDamage.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Server.WorldEnum; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.server.WorldEnum; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/ItemConsume.java b/core/src/main/java/dev/nandi0813/practice/listener/ItemConsume.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Listener/ItemConsume.java rename to core/src/main/java/dev/nandi0813/practice/listener/ItemConsume.java index b00976542..370e7a939 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/ItemConsume.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/ItemConsume.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerChat.java b/core/src/main/java/dev/nandi0813/practice/listener/PlayerChat.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Listener/PlayerChat.java rename to core/src/main/java/dev/nandi0813/practice/listener/PlayerChat.java index 8e80b384a..a5ecf669c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerChat.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/PlayerChat.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; -import dev.nandi0813.practice.Util.SoftDependUtil; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.SoftDependUtil; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import litebans.api.Database; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerCommandPreprocess.java b/core/src/main/java/dev/nandi0813/practice/listener/PlayerCommandPreprocess.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Listener/PlayerCommandPreprocess.java rename to core/src/main/java/dev/nandi0813/practice/listener/PlayerCommandPreprocess.java index eb7c979b2..8d51e5743 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerCommandPreprocess.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/PlayerCommandPreprocess.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerInteract.java b/core/src/main/java/dev/nandi0813/practice/listener/PlayerInteract.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Listener/PlayerInteract.java rename to core/src/main/java/dev/nandi0813/practice/listener/PlayerInteract.java index 415d12da0..75c323d5a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerInteract.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/PlayerInteract.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerJoin.java b/core/src/main/java/dev/nandi0813/practice/listener/PlayerJoin.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Listener/PlayerJoin.java rename to core/src/main/java/dev/nandi0813/practice/listener/PlayerJoin.java index 20be4629f..d74e7e083 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerJoin.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/PlayerJoin.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.PlayerDisplay.Nametag.NametagManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Util.PermanentConfig; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.playerdisplay.nametag.NametagManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.util.PermanentConfig; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerQuit.java b/core/src/main/java/dev/nandi0813/practice/listener/PlayerQuit.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Listener/PlayerQuit.java rename to core/src/main/java/dev/nandi0813/practice/listener/PlayerQuit.java index 75079b278..88bd22151 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/PlayerQuit.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/PlayerQuit.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/ProjectileLaunch.java b/core/src/main/java/dev/nandi0813/practice/listener/ProjectileLaunch.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Listener/ProjectileLaunch.java rename to core/src/main/java/dev/nandi0813/practice/listener/ProjectileLaunch.java index 43424bd2b..704f39de3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/ProjectileLaunch.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/ProjectileLaunch.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; import org.bukkit.entity.Arrow; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Listener/WeatherChange.java b/core/src/main/java/dev/nandi0813/practice/listener/WeatherChange.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Listener/WeatherChange.java rename to core/src/main/java/dev/nandi0813/practice/listener/WeatherChange.java index 3b3ede852..3296893d2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Listener/WeatherChange.java +++ b/core/src/main/java/dev/nandi0813/practice/listener/WeatherChange.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Listener; +package dev.nandi0813.practice.listener; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaFile.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaFile.java similarity index 62% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaFile.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaFile.java index cdc963449..c32cabc9c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaFile.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaFile.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Arena; +package dev.nandi0813.practice.manager.arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.ConfigFile; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.ConfigFile; public class ArenaFile extends ConfigFile { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaListener.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaListener.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaListener.java index f86821edf..1d57b7e33 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaListener.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Arena; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; +package dev.nandi0813.practice.manager.arena; + +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaManager.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaManager.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaManager.java index 9ad93b886..41de14f45 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaManager.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.Arena; - -import dev.nandi0813.practice.Command.Arena.Arguments.CreateArg; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.StartUpCallback; +package dev.nandi0813.practice.manager.arena; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.command.arena.arguments.CreateArg; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.StartUpCallback; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaType.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaType.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaType.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaType.java index b3081adb3..2e89dea05 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/ArenaType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/ArenaType.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Arena; +package dev.nandi0813.practice.manager.arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Arena.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/Arena.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Arena.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/Arena.java index 0931f718c..ad2d65418 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Arena.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/Arena.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.ArenaType; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.NormalArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; +package dev.nandi0813.practice.manager.arena.arenas; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.ArenaType; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.NormalArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/ArenaCopy.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/ArenaCopy.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/ArenaCopy.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/ArenaCopy.java index ff19a82a6..bf5622cad 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/ArenaCopy.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/ArenaCopy.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas; +package dev.nandi0813.practice.manager.arena.arenas; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.NormalArena; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.NormalArena; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; @Getter diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/FFAArena.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/FFAArena.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/FFAArena.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/FFAArena.java index d627d0160..749214a43 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/FFAArena.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/FFAArena.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.ArenaType; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; +package dev.nandi0813.practice.manager.arena.arenas; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.ArenaType; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; import lombok.Getter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/BasicArena.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/BasicArena.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/BasicArena.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/BasicArena.java index cfc77cc1c..4ec481ee0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/BasicArena.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/BasicArena.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas.Interface; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; +package dev.nandi0813.practice.manager.arena.arenas.interfaces; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/DisplayArena.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/DisplayArena.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/DisplayArena.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/DisplayArena.java index 9504a4b70..ef5bed751 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/DisplayArena.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/DisplayArena.java @@ -1,21 +1,21 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas.Interface; - -import dev.nandi0813.practice.Manager.Arena.ArenaFile; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.ArenaType; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.ArenaCopy; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.arena.arenas.interfaces; + +import dev.nandi0813.practice.manager.arena.ArenaFile; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.ArenaType; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.ArenaCopy; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/DisplayName.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/DisplayName.java similarity index 50% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/DisplayName.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/DisplayName.java index c777dabea..8a232f3ab 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/DisplayName.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/DisplayName.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas.Interface; +package dev.nandi0813.practice.manager.arena.arenas.interfaces; public interface DisplayName { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/NormalArena.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/NormalArena.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/NormalArena.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/NormalArena.java index 43ce45d19..ac16300ce 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Arenas/Interface/NormalArena.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/interfaces/NormalArena.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Arena.Arenas.Interface; +package dev.nandi0813.practice.manager.arena.arenas.interfaces; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Arena.Util.BedLocation; -import dev.nandi0813.practice.Manager.Arena.Util.PortalLocation; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.arena.util.BedLocation; +import dev.nandi0813.practice.manager.arena.util.PortalLocation; import lombok.Getter; import lombok.Setter; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/ArenaUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaUtil.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/ArenaUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaUtil.java index a764ccdf9..10c962def 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/ArenaUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaUtil.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Arena.Util; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.ArenaCopy; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.NumberUtil; +package dev.nandi0813.practice.manager.arena.util; + +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.ArenaCopy; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.NumberUtil; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/ArenaWorldUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaWorldUtil.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/ArenaWorldUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaWorldUtil.java index 3fdb6a27c..0e5981546 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/ArenaWorldUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/ArenaWorldUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Arena.Util; +package dev.nandi0813.practice.manager.arena.util; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/BedLocation.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/BedLocation.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/BedLocation.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/util/BedLocation.java index b41756ffd..faf9beef5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/BedLocation.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/BedLocation.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Arena.Util; +package dev.nandi0813.practice.manager.arena.util; import lombok.Getter; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/PortalLocation.java b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/PortalLocation.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/PortalLocation.java rename to core/src/main/java/dev/nandi0813/practice/manager/arena/util/PortalLocation.java index 636977652..e6623d610 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Arena/Util/PortalLocation.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/arena/util/PortalLocation.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Arena.Util; +package dev.nandi0813.practice.manager.arena.util; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Cuboid; import lombok.Getter; import org.bukkit.Location; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/BackendManager.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/BackendManager.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/BackendManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/BackendManager.java index 045e1ca92..290df6531 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/BackendManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/BackendManager.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/BackendUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/BackendUtil.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/BackendUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/BackendUtil.java index 0676f56e7..b9d51d272 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/BackendUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/BackendUtil.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.Common; import org.bukkit.Material; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.enchantments.Enchantment; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/ConfigFile.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/ConfigFile.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/ConfigFile.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/ConfigFile.java index beeb0b20c..6900aa9b7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/ConfigFile.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/ConfigFile.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/ConfigManager.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/ConfigManager.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/ConfigManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/ConfigManager.java index 0821417f6..1519d90c3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/ConfigManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/ConfigManager.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/GUIFile.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/GUIFile.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/GUIFile.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/GUIFile.java index 4a7f1f557..ed52dbe0d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/GUIFile.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/GUIFile.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/LanguageManager.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/LanguageManager.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/LanguageManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/LanguageManager.java index 03290657b..4cbb96bbf 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/LanguageManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/LanguageManager.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/MysqlManager.java b/core/src/main/java/dev/nandi0813/practice/manager/backend/MysqlManager.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/Backend/MysqlManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/backend/MysqlManager.java index ab3984079..00fbd5230 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Backend/MysqlManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/backend/MysqlManager.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Backend; +package dev.nandi0813.practice.manager.backend; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import java.io.BufferedReader; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Division/Division.java b/core/src/main/java/dev/nandi0813/practice/manager/division/Division.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/Division/Division.java rename to core/src/main/java/dev/nandi0813/practice/manager/division/Division.java index 75cf4bdbb..566e3f576 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Division/Division.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/division/Division.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Division; +package dev.nandi0813.practice.manager.division; import dev.nandi0813.practice.ZonePractice; import lombok.Getter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionComparator.java b/core/src/main/java/dev/nandi0813/practice/manager/division/DivisionComparator.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionComparator.java rename to core/src/main/java/dev/nandi0813/practice/manager/division/DivisionComparator.java index 9d8d4b7f0..028284257 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionComparator.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/division/DivisionComparator.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Division; +package dev.nandi0813.practice.manager.division; import java.util.Comparator; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionManager.java b/core/src/main/java/dev/nandi0813/practice/manager/division/DivisionManager.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/division/DivisionManager.java index 63fa48b05..c83e4549f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/division/DivisionManager.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Division; +package dev.nandi0813.practice.manager.division; import dev.nandi0813.api.Event.Match.MatchEndEvent; -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/division/DivisionUtil.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/division/DivisionUtil.java index a793a9fab..5a1b9b862 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Division/DivisionUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/division/DivisionUtil.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Division; +package dev.nandi0813.practice.manager.division; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.NumberUtil; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.NumberUtil; public enum DivisionUtil { ; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Duel/DuelManager.java b/core/src/main/java/dev/nandi0813/practice/manager/duel/DuelManager.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Duel/DuelManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/duel/DuelManager.java index 27b66431f..a5a45287c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Duel/DuelManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/duel/DuelManager.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Duel; +package dev.nandi0813.practice.manager.duel; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Duel/DuelRequest.java b/core/src/main/java/dev/nandi0813/practice/manager/duel/DuelRequest.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Duel/DuelRequest.java rename to core/src/main/java/dev/nandi0813/practice/manager/duel/DuelRequest.java index 679cd2dd9..d745433bb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Duel/DuelRequest.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/duel/DuelRequest.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Duel; +package dev.nandi0813.practice.manager.duel; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderUtil; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.util.LadderUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import lombok.Setter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Belowname/BelowNameManager.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/belowname/BelowNameManager.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Belowname/BelowNameManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/belowname/BelowNameManager.java index a06d65c9e..4f6dc4c0b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Belowname/BelowNameManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/belowname/BelowNameManager.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Belowname; +package dev.nandi0813.practice.manager.fight.belowname; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListener; @@ -6,8 +6,8 @@ import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerDisplayScoreboard; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerScoreboardObjective; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerUpdateScore; -import dev.nandi0813.practice.Module.Util.ClassImport; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.module.util.ClassImport; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/EventListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventListener.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/EventListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventListener.java index d441436dd..8308baef9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/EventListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventListener.java @@ -1,22 +1,22 @@ -package dev.nandi0813.practice.Manager.Fight.Event; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.Brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS.LMS; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag.TNTTag; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.EnderpearlRunnable; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.fight.event; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.Brackets; +import dev.nandi0813.practice.manager.fight.event.events.ffa.lms.LMS; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag.TNTTag; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.EnderpearlRunnable; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.entity.EnderPearl; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/EventManager.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventManager.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/EventManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventManager.java index 673d4e65b..e7fcc6d18 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/EventManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventManager.java @@ -1,38 +1,38 @@ -package dev.nandi0813.practice.Manager.Fight.Event; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.Brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.BracketsData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.BracketsListener; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo.Sumo; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo.SumoData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo.SumoListener; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS.LMS; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS.LMSData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS.LMSListener; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC.OITC; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC.OITCData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC.OITCListener; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg.Splegg; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg.SpleggData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg.SpleggListener; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut.Juggernaut; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut.JuggernautData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut.JuggernautListener; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag.TNTTag; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag.TNTTagData; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag.TNTTagListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventListenerInterface; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.EventHostGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSetupManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StartUpCallback; +package dev.nandi0813.practice.manager.fight.event; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.Brackets; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.BracketsData; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.BracketsListener; +import dev.nandi0813.practice.manager.fight.event.events.duel.sumo.Sumo; +import dev.nandi0813.practice.manager.fight.event.events.duel.sumo.SumoData; +import dev.nandi0813.practice.manager.fight.event.events.duel.sumo.SumoListener; +import dev.nandi0813.practice.manager.fight.event.events.ffa.lms.LMS; +import dev.nandi0813.practice.manager.fight.event.events.ffa.lms.LMSData; +import dev.nandi0813.practice.manager.fight.event.events.ffa.lms.LMSListener; +import dev.nandi0813.practice.manager.fight.event.events.ffa.oitc.OITC; +import dev.nandi0813.practice.manager.fight.event.events.ffa.oitc.OITCData; +import dev.nandi0813.practice.manager.fight.event.events.ffa.oitc.OITCListener; +import dev.nandi0813.practice.manager.fight.event.events.ffa.splegg.Splegg; +import dev.nandi0813.practice.manager.fight.event.events.ffa.splegg.SpleggData; +import dev.nandi0813.practice.manager.fight.event.events.ffa.splegg.SpleggListener; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut.Juggernaut; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut.JuggernautData; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut.JuggernautListener; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag.TNTTag; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag.TNTTagData; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag.TNTTagListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventListenerInterface; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.guis.EventHostGui; +import dev.nandi0813.practice.manager.gui.setup.event.EventSetupManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StartUpCallback; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Enum/EventStatus.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/enums/EventStatus.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Enum/EventStatus.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/enums/EventStatus.java index 71f487fac..02f3b1cd6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Enum/EventStatus.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/enums/EventStatus.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Enum; +package dev.nandi0813.practice.manager.fight.event.enums; public enum EventStatus { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Enum/EventType.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/enums/EventType.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Enum/EventType.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/enums/EventType.java index db3256dda..91d6ca07b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Enum/EventType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/enums/EventType.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Enum; +package dev.nandi0813.practice.manager.fight.event.enums; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/Brackets.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/Brackets.java similarity index 74% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/Brackets.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/Brackets.java index 8a042ab69..342031d43 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/Brackets.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/Brackets.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets; +package dev.nandi0813.practice.manager.fight.event.events.duel.brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelEvent; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEvent; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/BracketsData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/BracketsData.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/BracketsData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/BracketsData.java index b5e2bbb43..baa628e61 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/BracketsData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/BracketsData.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets; +package dev.nandi0813.practice.manager.fight.event.events.duel.brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelEventData; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEventData; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import java.io.IOException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/BracketsListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/BracketsListener.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/BracketsListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/BracketsListener.java index 47462915d..93208fd09 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Brackets/BracketsListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/brackets/BracketsListener.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets; +package dev.nandi0813.practice.manager.fight.event.events.duel.brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelFight; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelFight; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.ProjectileLaunchEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelEvent.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelEvent.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelEvent.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelEvent.java index 5dafea7fc..a86582bf2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelEvent.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelEvent.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface; +package dev.nandi0813.practice.manager.fight.event.events.duel.interfaces; import dev.nandi0813.api.Event.Event.EventEndEvent; import dev.nandi0813.api.Event.Spectate.Start.EventSpectateStartEvent; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.DurationRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.StartRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.runnables.DurationRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.StartRunnable; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelEventData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelEventData.java similarity index 59% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelEventData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelEventData.java index 74a680cef..d91a8f850 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelEventData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelEventData.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface; +package dev.nandi0813.practice.manager.fight.event.events.duel.interfaces; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; import org.bukkit.Location; public abstract class DuelEventData extends EventData { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelFight.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelFight.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelFight.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelFight.java index 8a7a30f08..37c0c1e2a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelFight.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelFight.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface; +package dev.nandi0813.practice.manager.fight.event.events.duel.interfaces; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelListener.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelListener.java index d9b2afa1b..17777aa82 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/DuelListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/DuelListener.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface; +package dev.nandi0813.practice.manager.fight.event.events.duel.interfaces; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventListenerInterface; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventListenerInterface; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.player.PlayerDropItemEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/NextFightCallback.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/NextFightCallback.java similarity index 60% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/NextFightCallback.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/NextFightCallback.java index 2875181af..606ea7ad8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Interface/NextFightCallback.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/interfaces/NextFightCallback.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface; +package dev.nandi0813.practice.manager.fight.event.events.duel.interfaces; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/Sumo.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/Sumo.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/Sumo.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/Sumo.java index cc0c7b3e3..dfcf87b25 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/Sumo.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/Sumo.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo; +package dev.nandi0813.practice.manager.fight.event.events.duel.sumo; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelEvent; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEvent; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/SumoData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoData.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/SumoData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoData.java index 1a8f85b8f..68a86125b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/SumoData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoData.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo; +package dev.nandi0813.practice.manager.fight.event.events.duel.sumo; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelEventData; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEventData; import java.io.IOException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/SumoListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoListener.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/SumoListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoListener.java index 7e605b191..12737865c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/Duel/Sumo/SumoListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/duel/sumo/SumoListener.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Sumo; +package dev.nandi0813.practice.manager.fight.event.events.duel.sumo; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelFight; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelFight; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Interface/FFAEvent.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/interfaces/FFAEvent.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Interface/FFAEvent.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/interfaces/FFAEvent.java index 8b48df1a7..2666ff6de 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Interface/FFAEvent.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/interfaces/FFAEvent.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface; +package dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces; import dev.nandi0813.api.Event.Event.EventEndEvent; import dev.nandi0813.api.Event.Spectate.Start.EventSpectateStartEvent; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.FullRunnableInterface; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.DurationRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.StartRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.fight.event.interfaces.FullRunnableInterface; +import dev.nandi0813.practice.manager.fight.event.runnables.DurationRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.StartRunnable; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.entityhider.PlayerHider; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Interface/FFAListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/interfaces/FFAListener.java similarity index 58% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Interface/FFAListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/interfaces/FFAListener.java index 8d29bd274..7f246cb53 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Interface/FFAListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/interfaces/FFAListener.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface; +package dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventListenerInterface; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventListenerInterface; import org.bukkit.event.player.PlayerQuitEvent; public abstract class FFAListener extends EventListenerInterface { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMS.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMS.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMS.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMS.java index 30e0b3e93..99db94872 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMS.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMS.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS; +package dev.nandi0813.practice.manager.fight.event.events.ffa.lms; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAEvent; -import dev.nandi0813.practice.Module.Interfaces.KitData; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAEvent; +import dev.nandi0813.practice.module.interfaces.KitData; import org.bukkit.entity.Player; public class LMS extends FFAEvent { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMSData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMSData.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMSData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMSData.java index 3f0a371ae..320b9e4da 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMSData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMSData.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS; +package dev.nandi0813.practice.manager.fight.event.events.ffa.lms; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import java.io.IOException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMSListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMSListener.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMSListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMSListener.java index 401383647..e04e4e2fd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/LMS/LMSListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/lms/LMSListener.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS; +package dev.nandi0813.practice.manager.fight.event.events.ffa.lms; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITC.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITC.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITC.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITC.java index 2f6fbf153..697e3ee74 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITC.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITC.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC; +package dev.nandi0813.practice.manager.fight.event.events.ffa.oitc; import dev.nandi0813.api.Event.Event.EventEndEvent; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAEvent; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAEvent; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITCData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITCData.java similarity index 61% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITCData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITCData.java index 1970d4a39..1d3fdef7c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITCData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITCData.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC; +package dev.nandi0813.practice.manager.fight.event.events.ffa.oitc; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; import java.io.IOException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITCListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITCListener.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITCListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITCListener.java index ff6993ad4..8632af9eb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/OITC/OITCListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/oitc/OITCListener.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC; - -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Cuboid; +package dev.nandi0813.practice.manager.fight.event.events.ffa.oitc; + +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.Material; import org.bukkit.entity.Arrow; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/Splegg.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/Splegg.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/Splegg.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/Splegg.java index 985b29372..ddd8c279d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/Splegg.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/Splegg.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg; +package dev.nandi0813.practice.manager.fight.event.events.ffa.splegg; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAEvent; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAEvent; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/SpleggData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/SpleggData.java similarity index 73% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/SpleggData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/SpleggData.java index e03df046c..4b3a937c3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/SpleggData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/SpleggData.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg; +package dev.nandi0813.practice.manager.fight.event.events.ffa.splegg; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; import lombok.Getter; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/SpleggListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/SpleggListener.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/SpleggListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/SpleggListener.java index 98c6a363f..b9ca645da 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/FFA/Splegg/SpleggListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/ffa/splegg/SpleggListener.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg; +package dev.nandi0813.practice.manager.fight.event.events.ffa.splegg; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Egg; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/Juggernaut.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/Juggernaut.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/Juggernaut.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/Juggernaut.java index bc34aa18a..344a2570a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/Juggernaut.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/Juggernaut.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut; +package dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut; import dev.nandi0813.api.Event.Event.EventEndEvent; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAEvent; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Module.Interfaces.KitData; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAEvent; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.module.interfaces.KitData; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/JuggernautData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/JuggernautData.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/JuggernautData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/JuggernautData.java index 75aec8971..7235f0a68 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/JuggernautData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/JuggernautData.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut; +package dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import java.io.IOException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/JuggernautListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/JuggernautListener.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/JuggernautListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/JuggernautListener.java index 7af676235..b513c9853 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/Juggernaut/JuggernautListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/juggernaut/JuggernautListener.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut; +package dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Interface.FFAListener; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.events.ffa.interfaces.FFAListener; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTag.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTag.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTag.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTag.java index 5bb6b9d90..dcd50b9c0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTag.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTag.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag; +package dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag; import dev.nandi0813.api.Event.Event.EventEndEvent; import dev.nandi0813.api.Event.Spectate.Start.EventSpectateStartEvent; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.DurationRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.StartRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.runnables.DurationRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.StartRunnable; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTagData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTagData.java similarity index 60% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTagData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTagData.java index e8a9b9787..dab1ad0f5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTagData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTagData.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag; +package dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; import java.io.IOException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTagListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTagListener.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTagListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTagListener.java index 4999e8c56..3ec44aa17 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Events/OneVsAll/TnTTag/TNTTagListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/events/onevsall/tnttag/TNTTagListener.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag; +package dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventListenerInterface; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventListenerInterface; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/Event.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/Event.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/Event.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/Event.java index 8baf09c54..b5b6e2c1b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/Event.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/Event.java @@ -1,26 +1,26 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Interface; +package dev.nandi0813.practice.manager.fight.event.interfaces; import dev.nandi0813.api.Event.Event.EventEndEvent; import dev.nandi0813.api.Event.Event.EventStartEvent; import dev.nandi0813.api.Event.Spectate.End.EventSpectateEndEvent; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.DurationRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.EndRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.Queue.QueueRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.StartRunnable; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; -import dev.nandi0813.practice.Util.Interface.Spectatable; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.fight.event.runnables.DurationRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.EndRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.StartRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.queue.QueueRunnable; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.fightmapchange.FightChange; +import dev.nandi0813.practice.util.interfaces.Spectatable; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/EventData.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/EventData.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/EventData.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/EventData.java index 2cc70f242..31acc9dde 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/EventData.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/EventData.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Interface; - -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Cuboid; +package dev.nandi0813.practice.manager.fight.event.interfaces; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.Cuboid; import lombok.Getter; import lombok.Setter; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/EventListenerInterface.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/EventListenerInterface.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/EventListenerInterface.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/EventListenerInterface.java index e77d0cb23..c31e27170 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/EventListenerInterface.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/EventListenerInterface.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Interface; +package dev.nandi0813.practice.manager.fight.event.interfaces; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/FullRunnableInterface.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/FullRunnableInterface.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/FullRunnableInterface.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/FullRunnableInterface.java index 2101a3174..4906963c3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Interface/FullRunnableInterface.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/FullRunnableInterface.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Interface; +package dev.nandi0813.practice.manager.fight.event.interfaces; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.DurationRunnable; -import dev.nandi0813.practice.Manager.Fight.Event.Runnables.StartRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.DurationRunnable; +import dev.nandi0813.practice.manager.fight.event.runnables.StartRunnable; import lombok.Getter; @Getter diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/DurationRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/DurationRunnable.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/DurationRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/DurationRunnable.java index 150e08a76..531ec1cd9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/DurationRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/DurationRunnable.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Runnables; +package dev.nandi0813.practice.manager.fight.event.runnables; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.util.interfaces.Runnable; public class DurationRunnable extends Runnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/EndRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/EndRunnable.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/EndRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/EndRunnable.java index 5b46625fc..9ce01a0dc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/EndRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/EndRunnable.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Runnables; +package dev.nandi0813.practice.manager.fight.event.runnables; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.util.interfaces.Runnable; public class EndRunnable extends Runnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/StartRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/StartRunnable.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/StartRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/StartRunnable.java index 32cedf983..8c4e557cd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/StartRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/StartRunnable.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Runnables; +package dev.nandi0813.practice.manager.fight.event.runnables; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.util.interfaces.Runnable; public class StartRunnable extends Runnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/Queue/QueueRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueRunnable.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/Queue/QueueRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueRunnable.java index fb1d472ed..13d40fb37 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/Queue/QueueRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueRunnable.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Runnables.Queue; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Interface.Runnable; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.fight.event.runnables.queue; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.interfaces.Runnable; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/Queue/QueueStartRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueStartRunnable.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/Queue/QueueStartRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueStartRunnable.java index 2e0bde209..e5335f2f9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Runnables/Queue/QueueStartRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueStartRunnable.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Runnables.Queue; +package dev.nandi0813.practice.manager.fight.event.runnables.queue; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.interfaces.Runnable; import org.bukkit.entity.Player; public class QueueStartRunnable extends Runnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Util/EventUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/util/EventUtil.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Util/EventUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/event/util/EventUtil.java index 9e0efac47..f2ad4b049 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Event/Util/EventUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/event/util/EventUtil.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Fight.Event.Util; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSetupManager; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.NumberUtil; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.fight.event.util; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.event.EventSetupManager; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.NumberUtil; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFAListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAListener.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFAListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAListener.java index 73f20a424..8f47961bd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFAListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAListener.java @@ -1,24 +1,24 @@ -package dev.nandi0813.practice.Manager.Fight.FFA; - -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.Util.BlockUtil; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.ListenerUtil; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.GoldenAppleRunnable; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; -import dev.nandi0813.practice.Util.NumberUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.fight.ffa; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.util.BlockUtil; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.ListenerUtil; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.NumberUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.GoldenAppleRunnable; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; +import dev.nandi0813.practice.util.fightmapchange.FightChange; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -40,7 +40,7 @@ import java.util.List; import java.util.Objects; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public abstract class FFAListener implements Listener { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFAManager.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAManager.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFAManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAManager.java index 2763a95a0..1a3727a58 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFAManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAManager.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.FFA; +package dev.nandi0813.practice.manager.fight.ffa; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.interfaces.Spectatable; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/BuildRollback.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/BuildRollback.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/BuildRollback.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/BuildRollback.java index f32ccec1b..12edca920 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/BuildRollback.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/BuildRollback.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.FFA.FFA; +package dev.nandi0813.practice.manager.fight.ffa.game; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.util.fightmapchange.FightChange; +import dev.nandi0813.practice.util.interfaces.Runnable; import lombok.Getter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/FFA.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFA.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/FFA.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFA.java index 1d8bdf556..d79632e2a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/FFA.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFA.java @@ -1,30 +1,30 @@ -package dev.nandi0813.practice.Manager.Fight.FFA.FFA; +package dev.nandi0813.practice.manager.fight.ffa.game; import dev.nandi0813.api.Event.FFARemovePlayerEvent; import dev.nandi0813.api.Event.Spectate.End.FFASpectateEndEvent; import dev.nandi0813.api.Event.Spectate.Start.FFASpectateStartEvent; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Util.KitUtil; -import dev.nandi0813.practice.Manager.Fight.Util.FightPlayer; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; -import dev.nandi0813.practice.Util.Interface.Spectatable; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.util.KitUtil; +import dev.nandi0813.practice.manager.fight.util.FightPlayer; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.fightmapchange.FightChange; +import dev.nandi0813.practice.util.interfaces.Spectatable; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/LadderSelector.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/LadderSelector.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/LadderSelector.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/LadderSelector.java index bc40f2a83..a1f11e0bf 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/FFA/FFA/LadderSelector.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/LadderSelector.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Fight.FFA.FFA; - -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.fight.ffa.game; + +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Match.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/Match.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Match.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/Match.java index 3466c54d1..e44753792 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Match.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/Match.java @@ -1,40 +1,40 @@ -package dev.nandi0813.practice.Manager.Fight.Match; +package dev.nandi0813.practice.manager.fight.match; import dev.nandi0813.api.Event.Match.MatchEndEvent; import dev.nandi0813.api.Event.Match.MatchStartEvent; import dev.nandi0813.api.Event.Spectate.End.MatchSpectateEndEvent; import dev.nandi0813.api.Event.Spectate.Start.MatchSpectateStartEvent; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.NormalArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.*; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchFightPlayer; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIs.MatchStatsGui; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Module.Interfaces.ChangedBlock; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; -import dev.nandi0813.practice.Util.Interface.Spectatable; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.NormalArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.*; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.util.MatchFightPlayer; +import dev.nandi0813.practice.manager.fight.match.util.MatchUtil; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.guis.MatchStatsGui; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.module.interfaces.ChangedBlock; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.fightmapchange.FightChange; +import dev.nandi0813.practice.util.interfaces.Spectatable; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/MatchManager.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/MatchManager.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/MatchManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/MatchManager.java index 52b421766..a886bf6ff 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/MatchManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/MatchManager.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Fight.Match; +package dev.nandi0813.practice.manager.fight.match; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListenerPriority; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Fight.Belowname.BelowNameManager; -import dev.nandi0813.practice.Manager.Fight.Match.Listener.LadderSettingListener; -import dev.nandi0813.practice.Manager.Fight.Match.Listener.StartListener; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Util.RematchRequest; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.fight.belowname.BelowNameManager; +import dev.nandi0813.practice.manager.fight.match.listener.LadderSettingListener; +import dev.nandi0813.practice.manager.fight.match.listener.StartListener; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.util.RematchRequest; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.interfaces.Spectatable; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Round.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/Round.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Round.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/Round.java index 99e2b0ace..3f2b1cba1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Round.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/Round.java @@ -1,23 +1,23 @@ -package dev.nandi0813.practice.Manager.Fight.Match; +package dev.nandi0813.practice.manager.fight.match; import dev.nandi0813.api.Event.Match.MatchRoundEndEvent; import dev.nandi0813.api.Event.Match.MatchRoundStartEvent; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Runnable.Round.RoundEndRunnable; -import dev.nandi0813.practice.Manager.Fight.Match.Runnable.Round.RoundStartRunnable; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchFightPlayer; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TempKillPlayer; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.manager.fight.match.runnable.round.RoundEndRunnable; +import dev.nandi0813.practice.manager.fight.match.runnable.round.RoundStartRunnable; +import dev.nandi0813.practice.manager.fight.match.util.MatchFightPlayer; +import dev.nandi0813.practice.manager.fight.match.util.MatchUtil; +import dev.nandi0813.practice.manager.fight.match.util.TempKillPlayer; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/MatchStatus.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/MatchStatus.java similarity index 54% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/MatchStatus.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/MatchStatus.java index 723c9044e..4bb100334 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/MatchStatus.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/MatchStatus.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Enum; +package dev.nandi0813.practice.manager.fight.match.enums; public enum MatchStatus { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/MatchType.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/MatchType.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/MatchType.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/MatchType.java index 7e3635886..8fa11256c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/MatchType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/MatchType.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Enum; +package dev.nandi0813.practice.manager.fight.match.enums; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; public enum MatchType { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/RoundStatus.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/RoundStatus.java similarity index 50% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/RoundStatus.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/RoundStatus.java index 5acfdd769..a03b3cde1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/RoundStatus.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/RoundStatus.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Enum; +package dev.nandi0813.practice.manager.fight.match.enums; public enum RoundStatus { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/TeamEnum.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/TeamEnum.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/TeamEnum.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/TeamEnum.java index 0a7d97de1..15e1f9bfe 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/TeamEnum.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/TeamEnum.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Enum; +package dev.nandi0813.practice.manager.fight.match.enums; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; import lombok.Getter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/WeightClass.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/WeightClass.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/WeightClass.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/WeightClass.java index d1ae667b4..f88f9e65d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Enum/WeightClass.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/enums/WeightClass.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Enum; +package dev.nandi0813.practice.manager.fight.match.enums; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; public enum WeightClass { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Interface/PlayerWinner.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/interfaces/PlayerWinner.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Interface/PlayerWinner.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/interfaces/PlayerWinner.java index 79b810ecb..a9c21e0c9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Interface/PlayerWinner.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/interfaces/PlayerWinner.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Interface; +package dev.nandi0813.practice.manager.fight.match.interfaces; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/manager/fight/match/interfaces/Team.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/interfaces/Team.java new file mode 100644 index 000000000..68445dc8c --- /dev/null +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/interfaces/Team.java @@ -0,0 +1,10 @@ +package dev.nandi0813.practice.manager.fight.match.interfaces; + +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import org.bukkit.entity.Player; + +public interface Team { + + TeamEnum getTeam(Player player); + +} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/LadderSettingListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderSettingListener.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/LadderSettingListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderSettingListener.java index 476387dea..4bb289947 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/LadderSettingListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderSettingListener.java @@ -1,34 +1,34 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Listener; +package dev.nandi0813.practice.manager.fight.match.listener; import dev.nandi0813.api.Event.Match.MatchEndEvent; import dev.nandi0813.api.Event.Match.MatchStartEvent; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Util.DeleteRunnable; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchFightPlayer; -import dev.nandi0813.practice.Manager.Fight.Match.Util.RematchRequest; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.GoldenAppleRunnable; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.util.DeleteRunnable; +import dev.nandi0813.practice.manager.fight.match.util.MatchFightPlayer; +import dev.nandi0813.practice.manager.fight.match.util.RematchRequest; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.GoldenAppleRunnable; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/LadderTypeListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderTypeListener.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/LadderTypeListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderTypeListener.java index 25300453b..aabb447c5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/LadderTypeListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderTypeListener.java @@ -1,31 +1,31 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Listener; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Runnable.Game.BridgeArrowRunnable; -import dev.nandi0813.practice.Manager.Fight.Util.BlockUtil; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.ListenerUtil; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Type.Bridges; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.NumberUtil; -import dev.nandi0813.practice.Util.PermanentConfig; +package dev.nandi0813.practice.manager.fight.match.listener; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchStatus; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.runnable.game.BridgeArrowRunnable; +import dev.nandi0813.practice.manager.fight.util.BlockUtil; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.ListenerUtil; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.type.Bridges; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.NumberUtil; +import dev.nandi0813.practice.util.PermanentConfig; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -48,8 +48,8 @@ import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.MetadataValue; -import static dev.nandi0813.practice.Util.PermanentConfig.FIGHT_ENTITY; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.FIGHT_ENTITY; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public abstract class LadderTypeListener implements Listener { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/StartListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/StartListener.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/StartListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/StartListener.java index c66363afd..8833c03ee 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Listener/StartListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/StartListener.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Listener; +package dev.nandi0813.practice.manager.fight.match.listener; import dev.nandi0813.api.Event.Match.MatchRoundStartEvent; import dev.nandi0813.api.Event.Match.MatchStartEvent; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Server.ServerManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.server.ServerManager; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Game/BridgeArrowRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/game/BridgeArrowRunnable.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Game/BridgeArrowRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/game/BridgeArrowRunnable.java index 37cfdfb10..bdb0842eb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Game/BridgeArrowRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/game/BridgeArrowRunnable.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Runnable.Game; +package dev.nandi0813.practice.manager.fight.match.runnable.game; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Util.Runnable.GameRunnable; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.util.Runnable.GameRunnable; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.cooldown.CooldownObject; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Round/RoundEndRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/round/RoundEndRunnable.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Round/RoundEndRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/round/RoundEndRunnable.java index 948a3a3f9..fa00c1374 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Round/RoundEndRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/round/RoundEndRunnable.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Runnable.Round; +package dev.nandi0813.practice.manager.fight.match.runnable.round; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.MatchStatus; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Round/RoundStartRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/round/RoundStartRunnable.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Round/RoundStartRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/round/RoundStartRunnable.java index b241e0d22..e2b76b362 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Runnable/Round/RoundStartRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/runnable/round/RoundStartRunnable.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Runnable.Round; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Server.Sound.SoundManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundType; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.fight.match.runnable.round; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.MatchStatus; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.server.sound.SoundManager; +import dev.nandi0813.practice.manager.server.sound.SoundType; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/Duel/Duel.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/duel/Duel.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/Duel/Duel.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/duel/Duel.java index d1895abfa..fcabaeef2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/Duel/Duel.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/duel/Duel.java @@ -1,30 +1,30 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.Duel; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchFightPlayer; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TempKillPlayer; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempDead; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.PlayerDisplay.Nametag.NametagManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundType; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.fight.match.type.duel; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.MatchStatus; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.manager.fight.match.util.MatchFightPlayer; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.match.util.TempKillPlayer; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempDead; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.playerdisplay.nametag.NametagManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.sound.SoundManager; +import dev.nandi0813.practice.manager.server.sound.SoundType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/Duel/DuelRound.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/duel/DuelRound.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/Duel/DuelRound.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/duel/DuelRound.java index 65b8b44be..cae0a50a8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/Duel/DuelRound.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/duel/DuelRound.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.Duel; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.PlayerWinner; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Util.EndMessageUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.RewardCommandManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.Statistics.LadderStats; +package dev.nandi0813.practice.manager.fight.match.type.duel; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.interfaces.PlayerWinner; +import dev.nandi0813.practice.manager.fight.match.util.EndMessageUtil; +import dev.nandi0813.practice.manager.fight.match.util.MatchUtil; +import dev.nandi0813.practice.manager.fight.match.util.RewardCommandManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.statistics.LadderStats; import lombok.Getter; import lombok.Setter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PartyFFA/PartyFFA.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/partyffa/PartyFFA.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PartyFFA/PartyFFA.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/partyffa/PartyFFA.java index 0863d5ff6..ea436c53d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PartyFFA/PartyFFA.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/partyffa/PartyFFA.java @@ -1,24 +1,24 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchPlayerUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.PlayerDisplay.Nametag.NametagManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundType; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.fight.match.type.partyffa; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.MatchStatus; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.util.MatchPlayerUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.playerdisplay.nametag.NametagManager; +import dev.nandi0813.practice.manager.server.sound.SoundManager; +import dev.nandi0813.practice.manager.server.sound.SoundType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PartyFFA/PartyFfaRound.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/partyffa/PartyFfaRound.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PartyFFA/PartyFfaRound.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/partyffa/PartyFfaRound.java index 30834a525..6b16bf3dd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PartyFFA/PartyFfaRound.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/partyffa/PartyFfaRound.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA; +package dev.nandi0813.practice.manager.fight.match.type.partyffa; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.PlayerWinner; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Util.EndMessageUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.interfaces.PlayerWinner; +import dev.nandi0813.practice.manager.fight.match.util.EndMessageUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PlayersVsPlayers.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/PlayersVsPlayers.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PlayersVsPlayers.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/PlayersVsPlayers.java index 3d81ee8f7..30a7893b1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PlayersVsPlayers.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/PlayersVsPlayers.java @@ -1,24 +1,24 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchPlayerUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TempKillPlayer; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempDead; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Server.Sound.SoundManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundType; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.fight.match.type.playersvsplayers; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.MatchStatus; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.manager.fight.match.util.MatchPlayerUtil; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.match.util.TempKillPlayer; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempDead; +import dev.nandi0813.practice.manager.server.sound.SoundManager; +import dev.nandi0813.practice.manager.server.sound.SoundType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PlayersVsPlayersRound.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/PlayersVsPlayersRound.java similarity index 59% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PlayersVsPlayersRound.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/PlayersVsPlayersRound.java index ae7758f14..fbcb489fa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PlayersVsPlayersRound.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/PlayersVsPlayersRound.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers; +package dev.nandi0813.practice.manager.fight.match.type.playersvsplayers; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartySplit/PartySplit.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partysplit/PartySplit.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartySplit/PartySplit.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partysplit/PartySplit.java index 0cd03570b..4ebd7631e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartySplit/PartySplit.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partysplit/PartySplit.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit; +package dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayers; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.PlayerDisplay.Nametag.NametagManager; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayers; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.playerdisplay.nametag.NametagManager; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartySplit/PartySplitRound.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partysplit/PartySplitRound.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartySplit/PartySplitRound.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partysplit/PartySplitRound.java index 86dbfe659..7f0baa16e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartySplit/PartySplitRound.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partysplit/PartySplitRound.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit; +package dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayersRound; -import dev.nandi0813.practice.Manager.Fight.Match.Util.EndMessageUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayersRound; +import dev.nandi0813.practice.manager.fight.match.util.EndMessageUtil; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; public class PartySplitRound extends PlayersVsPlayersRound { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartyVsParty/PartyVsParty.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partyvsparty/PartyVsParty.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartyVsParty/PartyVsParty.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partyvsparty/PartyVsParty.java index e214c200b..5ac1e3f06 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartyVsParty/PartyVsParty.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partyvsparty/PartyVsParty.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty; +package dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayers; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.PlayerDisplay.Nametag.NametagManager; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayers; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.playerdisplay.nametag.NametagManager; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartyVsParty/PartyVsPartyRound.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partyvsparty/PartyVsPartyRound.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartyVsParty/PartyVsPartyRound.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partyvsparty/PartyVsPartyRound.java index 3db5ad9b4..c740f0950 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Type/PlayersVsPlayers/PartyVsParty/PartyVsPartyRound.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/type/playersvsplayers/partyvsparty/PartyVsPartyRound.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty; +package dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayersRound; -import dev.nandi0813.practice.Manager.Fight.Match.Util.EndMessageUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayersRound; +import dev.nandi0813.practice.manager.fight.match.util.EndMessageUtil; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; public class PartyVsPartyRound extends PlayersVsPlayersRound { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/CustomKit.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/CustomKit.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/CustomKit.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/CustomKit.java index a797628b1..00dfc8a04 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/CustomKit.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/CustomKit.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/DeleteRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/DeleteRunnable.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/DeleteRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/DeleteRunnable.java index 4e53d6710..93841c6d1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/DeleteRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/DeleteRunnable.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; import org.bukkit.Bukkit; public enum DeleteRunnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/EndMessageUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/EndMessageUtil.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/EndMessageUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/EndMessageUtil.java index a282b06ca..8b76fdf3a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/EndMessageUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/EndMessageUtil.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA.PartyFFA; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit.PartySplit; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty.PartyVsParty; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +package dev.nandi0813.practice.manager.fight.match.util; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.type.partyffa.PartyFFA; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit.PartySplit; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty.PartyVsParty; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/KitUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/KitUtil.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/KitUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/KitUtil.java index 4e8a1ce77..91549a195 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/KitUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/KitUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/KnockbackUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/KnockbackUtil.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/KnockbackUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/KnockbackUtil.java index d865c92ee..7daf02792 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/KnockbackUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/KnockbackUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; -import dev.nandi0813.practice.Manager.Ladder.Enum.KnockbackType; +import dev.nandi0813.practice.manager.ladder.enums.KnockbackType; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchFightPlayer.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchFightPlayer.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchFightPlayer.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchFightPlayer.java index 9a069fb57..6bc750599 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchFightPlayer.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchFightPlayer.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Util.FightPlayer; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +package dev.nandi0813.practice.manager.fight.match.util; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.util.FightPlayer; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchPlayerUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchPlayerUtil.java similarity index 77% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchPlayerUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchPlayerUtil.java index 104c13bac..07c2fbcdf 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchPlayerUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchPlayerUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchUtil.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchUtil.java index 9289f6bf0..d2640da81 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/MatchUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/MatchUtil.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA.PartyFFA; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Type.SkyWars; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.NumberUtil; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.fight.match.util; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.type.partyffa.PartyFFA; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.type.SkyWars; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.NumberUtil; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/RematchRequest.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/RematchRequest.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/RematchRequest.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/RematchRequest.java index 727880bc5..2825d46d8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/RematchRequest.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/RematchRequest.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Duel.DuelManager; -import dev.nandi0813.practice.Manager.Duel.DuelRequest; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Inventory.Inventories.LobbyInventory; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.fight.match.util; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.duel.DuelManager; +import dev.nandi0813.practice.manager.duel.DuelRequest; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventories.LobbyInventory; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/RewardCommandManager.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/RewardCommandManager.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/RewardCommandManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/RewardCommandManager.java index 5c282d8d8..dea11c358 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/RewardCommandManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/RewardCommandManager.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Server.ServerManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.server.ServerManager; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/TeamUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/TeamUtil.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/TeamUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/TeamUtil.java index 1c87be52c..51c4002f5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/TeamUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/TeamUtil.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; +package dev.nandi0813.practice.manager.fight.match.util; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit.PartySplit; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty.PartyVsParty; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayers; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.PermanentConfig; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayers; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit.PartySplit; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty.PartyVsParty; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.PermanentConfig; import org.bukkit.entity.Player; public enum TeamUtil { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/TempKillPlayer.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/TempKillPlayer.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/TempKillPlayer.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/TempKillPlayer.java index 3329031ee..71d93f664 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Match/Util/TempKillPlayer.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/match/util/TempKillPlayer.java @@ -1,22 +1,22 @@ -package dev.nandi0813.practice.Manager.Fight.Match.Util; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.FightMapChange.TempBlockChange; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.fight.match.util; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.fightmapchange.TempBlockChange; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; -import static dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil.replaceTeamNames; +import static dev.nandi0813.practice.manager.fight.match.util.TeamUtil.replaceTeamNames; public class TempKillPlayer extends BukkitRunnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/BlockUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/BlockUtil.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/BlockUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/BlockUtil.java index 6e1cc27e5..a27495fbd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/BlockUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/BlockUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Util; +package dev.nandi0813.practice.manager.fight.util; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Module.Util.ClassImport; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.block.Block; import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.Metadatable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/DeathCause.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/DeathCause.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/DeathCause.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/DeathCause.java index 76bd18554..069d0ada5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/DeathCause.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/DeathCause.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Fight.Util; +package dev.nandi0813.practice.manager.fight.util; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; import lombok.Getter; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/EntityHiderListener.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/EntityHiderListener.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/EntityHiderListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/EntityHiderListener.java index 53a7302fd..a259b3cf5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/EntityHiderListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/EntityHiderListener.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Fight.Util; +package dev.nandi0813.practice.manager.fight.util; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListener; @@ -9,20 +9,20 @@ import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityEffect; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSoundEffect; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.Brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelFight; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Server.WorldEnum; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.Brackets; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelFight; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.server.WorldEnum; import io.github.retrooper.packetevents.util.SpigotConversionUtil; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/FightPlayer.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/FightPlayer.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/FightPlayer.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/FightPlayer.java index eaea3b30b..1ce807e08 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/FightPlayer.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/FightPlayer.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Fight.Util; +package dev.nandi0813.practice.manager.fight.util; -import dev.nandi0813.practice.Manager.Fight.Util.Runnable.GameRunnable; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; +import dev.nandi0813.practice.manager.fight.util.Runnable.GameRunnable; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.interfaces.Spectatable; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/FightUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/FightUtil.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/FightUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/FightUtil.java index f2accb18e..7fc6339fc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/FightUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/FightUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Util; +package dev.nandi0813.practice.manager.fight.util; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.util.interfaces.Spectatable; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; import org.bukkit.entity.Fireball; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/ListenerUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/ListenerUtil.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/ListenerUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/ListenerUtil.java index 744696fc4..27e7ef283 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/ListenerUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/ListenerUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Fight.Util; +package dev.nandi0813.practice.manager.fight.util; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Runnable/EnderPearlRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/Runnable/EnderPearlRunnable.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Runnable/EnderPearlRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/Runnable/EnderPearlRunnable.java index d20fcb879..7e63b0d5f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Runnable/EnderPearlRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/Runnable/EnderPearlRunnable.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Util.Runnable; +package dev.nandi0813.practice.manager.fight.util.Runnable; -import dev.nandi0813.practice.Manager.Fight.Util.FightPlayer; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; +import dev.nandi0813.practice.manager.fight.util.FightPlayer; +import dev.nandi0813.practice.util.cooldown.CooldownObject; import org.bukkit.entity.Player; public class EnderPearlRunnable extends GameRunnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Runnable/GameRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/Runnable/GameRunnable.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Runnable/GameRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/Runnable/GameRunnable.java index f83850d82..868e8bc72 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Runnable/GameRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/Runnable/GameRunnable.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Fight.Util.Runnable; - -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.FightPlayer; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; +package dev.nandi0813.practice.manager.fight.util.Runnable; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.util.FightPlayer; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Stats/Statistic.java b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/Stats/Statistic.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Stats/Statistic.java rename to core/src/main/java/dev/nandi0813/practice/manager/fight/util/Stats/Statistic.java index 72949b7c6..ca00ded88 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Fight/Util/Stats/Statistic.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/fight/util/Stats/Statistic.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Fight.Util.Stats; +package dev.nandi0813.practice.manager.fight.util.Stats; -import dev.nandi0813.practice.Module.Interfaces.StatisticListener; -import dev.nandi0813.practice.Util.NumberUtil; +import dev.nandi0813.practice.module.interfaces.StatisticListener; +import dev.nandi0813.practice.util.NumberUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUI.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUI.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/GUI.java index 1ba7a9bb4..dee5c9610 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUI.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.GUI; +package dev.nandi0813.practice.manager.gui; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGUI; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGUI; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUIItem.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/GUIItem.java index f2073f589..d3508f5aa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUIItem.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.GUI; +package dev.nandi0813.practice.manager.gui; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIManager.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUIManager.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/GUIManager.java index da580e639..e6ad57495 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUIManager.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.GUI; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.PremadeCustom.CustomLadderEditorGui; -import dev.nandi0813.practice.Manager.GUI.Setup.SetupHubGui; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; +package dev.nandi0813.practice.manager.gui; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.guis.customladder.premadecustom.CustomLadderEditorGui; +import dev.nandi0813.practice.manager.gui.setup.SetupHubGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIType.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUIType.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIType.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/GUIType.java index e8ef15378..0a27f79e0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/GUIType.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.GUI; +package dev.nandi0813.practice.manager.gui; public enum GUIType { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/ConfirmGUI/ConfirmGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/confirmgui/ConfirmGUI.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/ConfirmGUI/ConfirmGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/confirmgui/ConfirmGUI.java index da256be14..9bc098e6a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/ConfirmGUI/ConfirmGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/confirmgui/ConfirmGUI.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.GUI.ConfirmGUI; +package dev.nandi0813.practice.manager.gui.confirmgui; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Util.InventoryUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/ConfirmGUI/ConfirmGuiType.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/confirmgui/ConfirmGuiType.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/ConfirmGUI/ConfirmGuiType.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/confirmgui/ConfirmGuiType.java index f965a55e8..14a6a2993 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/ConfirmGUI/ConfirmGuiType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/confirmgui/ConfirmGuiType.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.GUI.ConfirmGUI; +package dev.nandi0813.practice.manager.gui.confirmgui; import lombok.Getter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/DivisionGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/DivisionGui.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/DivisionGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/DivisionGui.java index 388bac693..c505728c8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/DivisionGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/DivisionGui.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Division.DivisionUtil; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StatisticUtil; +package dev.nandi0813.practice.manager.gui.guis; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.division.DivisionUtil; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StatisticUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/EventHostGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/EventHostGui.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/EventHostGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/EventHostGui.java index 8266757e9..49560c89f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/EventHostGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/EventHostGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventType; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/MatchStatsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/MatchStatsGui.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/MatchStatsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/MatchStatsGui.java index 4410e35ff..a9a779902 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/MatchStatsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/MatchStatsGui.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/PlayerInvGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/PlayerInvGui.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/PlayerInvGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/PlayerInvGui.java index 43a454767..5081bb260 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/PlayerInvGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/PlayerInvGui.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/SpectatorMenuGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/SpectatorMenuGui.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/SpectatorMenuGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/SpectatorMenuGui.java index a3d2b3bda..78034ccdf 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/SpectatorMenuGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/SpectatorMenuGui.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Util.FightUtil; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PageUtil; +package dev.nandi0813.practice.manager.gui.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.util.FightUtil; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.PageUtil; +import dev.nandi0813.practice.util.interfaces.Spectatable; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Arena/ArenaCreateGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/arena/ArenaCreateGui.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Arena/ArenaCreateGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/arena/ArenaCreateGui.java index 2c4d83a52..298f04eff 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Arena/ArenaCreateGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/arena/ArenaCreateGui.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Arena; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.ArenaType; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.arena; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.ArenaType; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/EditorMenuGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/EditorMenuGui.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/EditorMenuGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/EditorMenuGui.java index 52426d2c5..e41b13780 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/EditorMenuGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/EditorMenuGui.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder; +package dev.nandi0813.practice.manager.gui.guis.customladder; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PlayerCustomKitSelector.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/PlayerCustomKitSelector.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PlayerCustomKitSelector.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/PlayerCustomKitSelector.java index fbe52a675..1aeb9ddb6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PlayerCustomKitSelector.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/PlayerCustomKitSelector.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.customladder; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderEditorGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderEditorGui.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderEditorGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderEditorGui.java index 78e7175fa..6c04b52ee 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderEditorGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderEditorGui.java @@ -1,27 +1,27 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.PremadeCustom; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.Util.CustomKit; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.WeightClassType; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Module.Util.VersionChecker; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.customladder.premadecustom; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.fight.match.util.CustomKit; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.WeightClassType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.module.util.VersionChecker; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderSelectorGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderSelectorGui.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderSelectorGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderSelectorGui.java index 2ba87884e..7d7ddca6d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderSelectorGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderSelectorGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.PremadeCustom; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.customladder.premadecustom; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderSumGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderSumGui.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderSumGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderSumGui.java index abef51ebd..34f459590 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/CustomLadder/PremadeCustom/CustomLadderSumGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/customladder/premadecustom/CustomLadderSumGui.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.PremadeCustom; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.customladder.premadecustom; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Ladder/LadderCreateGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/ladder/LadderCreateGui.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Ladder/LadderCreateGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/ladder/LadderCreateGui.java index 1a56fa57f..6fafb1e8a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Ladder/LadderCreateGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/ladder/LadderCreateGui.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Ladder; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.ladder; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Ladder/LadderPreviewGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/ladder/LadderPreviewGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Ladder/LadderPreviewGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/ladder/LadderPreviewGui.java index 350595212..c11fa8731 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Ladder/LadderPreviewGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/ladder/LadderPreviewGui.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Ladder; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.ladder; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbEloGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbEloGui.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbEloGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbEloGui.java index 078f6169e..306be670a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbEloGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbEloGui.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.leaderboard; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbGuiUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbGuiUtil.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbGuiUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbGuiUtil.java index d6a790c15..e99c2a2e9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbGuiUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbGuiUtil.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.leaderboard; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.Material; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbProfileStatGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbProfileStatGui.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbProfileStatGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbProfileStatGui.java index 5de2c4b58..4947c441f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbProfileStatGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbProfileStatGui.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.leaderboard; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbSelectorGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbSelectorGui.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbSelectorGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbSelectorGui.java index ed655305f..6d0196319 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbSelectorGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbSelectorGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Division.DivisionUtil; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.GUIs.DivisionGui; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StatisticUtil; +package dev.nandi0813.practice.manager.gui.guis.leaderboard; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.division.DivisionUtil; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.guis.DivisionGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StatisticUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbWinGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbWinGui.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbWinGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbWinGui.java index eab23f69f..ad40eb7c2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Leaderboard/LbWinGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbWinGui.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.leaderboard; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/OtherPartiesGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/OtherPartiesGui.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/OtherPartiesGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/OtherPartiesGui.java index ca0f2e366..3429d5e87 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/OtherPartiesGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/OtherPartiesGui.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Party; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.GUIs.Selectors.LadderSelectorGui; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.party; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.guis.selectors.LadderSelectorGui; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/PartyEventsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartyEventsGui.java similarity index 73% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/PartyEventsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartyEventsGui.java index a5836e2d6..976f767b9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/PartyEventsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartyEventsGui.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Party; +package dev.nandi0813.practice.manager.gui.guis.party; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.GUIs.Selectors.LadderSelectorGui; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.InventoryUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.guis.selectors.LadderSelectorGui; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/PartySettingsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartySettingsGui.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/PartySettingsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartySettingsGui.java index bf196951b..7a67949ab 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Party/PartySettingsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartySettingsGui.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Party; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.party; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileLadderStats.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileLadderStats.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileLadderStats.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileLadderStats.java index 98611ef01..6636e5f36 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileLadderStats.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileLadderStats.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Profile; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.Statistics.LadderStats; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.profile; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.statistics.LadderStats; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileSettingsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileSettingsGui.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileSettingsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileSettingsGui.java index 3705772df..50622647d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileSettingsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileSettingsGui.java @@ -1,23 +1,23 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Profile; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileWorldTime; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.profile; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileWorldTime; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; +import dev.nandi0813.practice.util.entityhider.PlayerHider; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileSetupGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileSetupGui.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileSetupGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileSetupGui.java index f5922fb8c..5d3313f1b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Profile/ProfileSetupGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/profile/ProfileSetupGui.java @@ -1,27 +1,27 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Profile; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.RankedBan; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Interface.Spectatable; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.guis.profile; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.RankedBan; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.interfaces.Spectatable; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/QueueGuiUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/QueueGuiUtil.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/QueueGuiUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/QueueGuiUtil.java index 860475da3..f0cc7fab3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/QueueGuiUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/QueueGuiUtil.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Queue; +package dev.nandi0813.practice.manager.gui.guis.queue; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.OfflinePlayer; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/RankedGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/RankedGui.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/RankedGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/RankedGui.java index cee3d960f..73ba7e01e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/RankedGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/RankedGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Queue; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Queue.QueueManager; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.queue; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.queue.QueueManager; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/UnrankedGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/UnrankedGui.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/UnrankedGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/UnrankedGui.java index 72e7775bf..22acbf3be 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Queue/UnrankedGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/UnrankedGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Queue; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Queue.QueueManager; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.queue; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.queue.QueueManager; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/ArenaSelectorGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/ArenaSelectorGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/ArenaSelectorGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/ArenaSelectorGui.java index 5991f039f..fca1dcea9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/ArenaSelectorGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/ArenaSelectorGui.java @@ -1,25 +1,25 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Selectors; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Duel.DuelManager; -import dev.nandi0813.practice.Manager.Duel.DuelRequest; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderUtil; -import dev.nandi0813.practice.Manager.Party.MatchRequest.PartyRequest; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.selectors; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.duel.DuelManager; +import dev.nandi0813.practice.manager.duel.DuelRequest; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.util.LadderUtil; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.party.matchrequest.PartyRequest; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/DuelRoundSelectorGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/DuelRoundSelectorGui.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/DuelRoundSelectorGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/DuelRoundSelectorGui.java index 6a584dfdb..f751eb45c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/DuelRoundSelectorGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/DuelRoundSelectorGui.java @@ -1,24 +1,24 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Selectors; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Duel.DuelManager; -import dev.nandi0813.practice.Manager.Duel.DuelRequest; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Party.MatchRequest.PartyRequest; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.selectors; + +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.duel.DuelManager; +import dev.nandi0813.practice.manager.duel.DuelRequest; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.party.matchrequest.PartyRequest; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/LadderSelectorGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/LadderSelectorGui.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/LadderSelectorGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/LadderSelectorGui.java index 83cc5055b..5781644ec 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/LadderSelectorGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/LadderSelectorGui.java @@ -1,32 +1,32 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Selectors; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Duel.DuelManager; -import dev.nandi0813.practice.Manager.Duel.DuelRequest; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA.PartyFFA; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit.PartySplit; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderUtil; -import dev.nandi0813.practice.Manager.Party.MatchRequest.PartyRequest; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.guis.selectors; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.duel.DuelManager; +import dev.nandi0813.practice.manager.duel.DuelRequest; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.type.partyffa.PartyFFA; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit.PartySplit; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.ladder.util.LadderUtil; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.party.matchrequest.PartyRequest; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/MatchStarterGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/MatchStarterGui.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/MatchStarterGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/MatchStarterGui.java index b412b7976..d54fafbfc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/GUIs/Selectors/MatchStarterGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/guis/selectors/MatchStarterGui.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.GUIs.Selectors; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA.PartyFFA; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit.PartySplit; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Party.Party; +package dev.nandi0813.practice.manager.gui.guis.selectors; + +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.type.partyffa.PartyFFA; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit.PartySplit; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.party.Party; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/SetupHubGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/SetupHubGui.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/SetupHubGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/SetupHubGui.java index d7fba2ad3..053f6dae9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/SetupHubGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/SetupHubGui.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.GUI.Setup; +package dev.nandi0813.practice.manager.gui.setup; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Server.ServerHubGui; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.server.ServerHubGui; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSetupManager.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSetupManager.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSetupManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSetupManager.java index 097fc28c5..cc48ec592 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSetupManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSetupManager.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal.ArenaMainGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal.CopyGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal.LadderSingleGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal.LadderTypeGui; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +package dev.nandi0813.practice.manager.gui.setup.arena; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal.ArenaMainGui; +import dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal.CopyGui; +import dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal.LadderSingleGui; +import dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal.LadderTypeGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -47,8 +47,8 @@ public void buildArenaSetupGUIs(DisplayArena arena) { Map guis = new HashMap<>(); if (arena instanceof FFAArena) { - guis.put(GUIType.Arena_Main, new dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.FFA.ArenaMainGui((FFAArena) arena)); - guis.put(GUIType.Arena_Ladders_Single, new dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.FFA.LadderSingleGui((FFAArena) arena)); + guis.put(GUIType.Arena_Main, new dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.ffa.ArenaMainGui((FFAArena) arena)); + guis.put(GUIType.Arena_Ladders_Single, new dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.ffa.LadderSingleGui((FFAArena) arena)); } else { guis.put(GUIType.Arena_Main, new ArenaMainGui((Arena) arena)); guis.put(GUIType.Arena_Ladders_Single, new LadderSingleGui((Arena) arena)); diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSetupUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSetupUtil.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSetupUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSetupUtil.java index a06fcb947..8da7976ad 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSetupUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSetupUtil.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.gui.setup.arena; + +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSummaryGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSummaryGui.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSummaryGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSummaryGui.java index e443c4f78..4980b51d3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSummaryGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/ArenaSummaryGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.DisplayArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PageUtil; +package dev.nandi0813.practice.manager.gui.setup.arena; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.DisplayArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.PageUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/ArenaMainGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/ArenaMainGui.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/ArenaMainGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/ArenaMainGui.java index e1cdab1bd..1ad48399b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/ArenaMainGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/ArenaMainGui.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.FFA; - -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.ffa; + +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/FFASettingsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/FFASettingsGui.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/FFASettingsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/FFASettingsGui.java index f23ff9d07..87f5d7062 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/FFASettingsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/FFASettingsGui.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.FFA; - -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.ffa; + +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/LadderSingleGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/LadderSingleGui.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/LadderSingleGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/LadderSingleGui.java index d6ea3527c..a3f2d3e55 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/FFA/LadderSingleGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/LadderSingleGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.FFA; - -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.ffa; + +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/ArenaMainGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/ArenaMainGui.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/ArenaMainGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/ArenaMainGui.java index 4c6cab2b4..b308676fd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/ArenaMainGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/ArenaMainGui.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupUtil; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSummaryGui; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupUtil; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSummaryGui; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/CopyGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/CopyGui.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/CopyGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/CopyGui.java index 73ca42716..80a3f31d7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/CopyGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/CopyGui.java @@ -1,23 +1,23 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.ArenaCopy; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupUtil; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PageUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.ArenaCopy; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupUtil; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.PageUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/LadderSingleGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/LadderSingleGui.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/LadderSingleGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/LadderSingleGui.java index 709d3f322..91ebfc7d4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/LadderSingleGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/LadderSingleGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupUtil; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupUtil; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/LadderTypeGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/LadderTypeGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/LadderTypeGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/LadderTypeGui.java index d76a0206d..999fe4ba6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Arena/ArenaSettings/Normal/LadderTypeGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/normal/LadderTypeGui.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSettings.Normal; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.arena.arenasettings.normal; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSetupManager.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSetupManager.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSetupManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSetupManager.java index add87cec5..2c9c8b659 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSetupManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSetupManager.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Event; - -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSettings.EventMainGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSettings.SettingsGui; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.gui.setup.event; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.event.eventsettings.EventMainGui; +import dev.nandi0813.practice.manager.gui.setup.event.eventsettings.SettingsGui; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.block.Block; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSetupUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSetupUtil.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSetupUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSetupUtil.java index 561f17b41..f53d8e3d4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSetupUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSetupUtil.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Event; +package dev.nandi0813.practice.manager.gui.setup.event; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSummaryGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSummaryGui.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSummaryGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSummaryGui.java index f1f1da99f..00a729875 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSummaryGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/EventSummaryGui.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Event; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.event; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSettings/EventMainGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/eventsettings/EventMainGui.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSettings/EventMainGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/eventsettings/EventMainGui.java index 6426c915a..8a3da21a0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSettings/EventMainGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/eventsettings/EventMainGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSettings; - -import dev.nandi0813.practice.Manager.Arena.Util.ArenaUtil; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.Fight.Event.Util.EventUtil; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSetupUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.event.eventsettings; + +import dev.nandi0813.practice.manager.arena.util.ArenaUtil; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.fight.event.util.EventUtil; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.event.EventSetupManager; +import dev.nandi0813.practice.manager.gui.setup.event.EventSetupUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Location; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSettings/SettingsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/eventsettings/SettingsGui.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSettings/SettingsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/eventsettings/SettingsGui.java index 56c0131f7..8cfc3581f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Event/EventSettings/SettingsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/event/eventsettings/SettingsGui.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.EventData; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Event.EventSetupUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.event.eventsettings; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.EventData; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.event.EventSetupManager; +import dev.nandi0813.practice.manager.gui.setup.event.EventSetupUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramMainGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramMainGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramMainGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramMainGui.java index 98fc5e009..a705ed5c6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramMainGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramMainGui.java @@ -1,21 +1,21 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Hologram; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramType; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderDynamicHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderStaticHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.setup.hologram; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramType; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderDynamicHologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderStaticHologram; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramSetupManager.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramSetupManager.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramSetupManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramSetupManager.java index 17e31cd7c..912ad0c73 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramSetupManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramSetupManager.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Hologram; +package dev.nandi0813.practice.manager.gui.setup.hologram; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramSummaryGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramSummaryGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramSummaryGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramSummaryGui.java index fa98a1e9c..9f09d143d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/HologramSummaryGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/HologramSummaryGui.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Hologram; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.hologram; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/LadderGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/LadderGui.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/LadderGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/LadderGui.java index fb0d32403..6b5463799 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Hologram/LadderGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/hologram/LadderGui.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Hologram; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderDynamicHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderStaticHologram; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.hologram; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderDynamicHologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderStaticHologram; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSetupManager.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/LadderSetupManager.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSetupManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/LadderSetupManager.java index ad230d076..1baa74db0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSetupManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/LadderSetupManager.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder; - -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.*; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Ladder.Type.SkyWars; +package dev.nandi0813.practice.manager.gui.setup.ladder; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.*; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.type.SkyWars; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSummaryGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/LadderSummaryGui.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSummaryGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/LadderSummaryGui.java index 26ac7b3e2..47435c06e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSummaryGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/LadderSummaryGui.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/CustomKitGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/CustomKitGui.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/CustomKitGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/CustomKitGui.java index 7eddb5af1..5632ff793 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/CustomKitGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/CustomKitGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/DestroyableBlocksGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/DestroyableBlocksGui.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/DestroyableBlocksGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/DestroyableBlocksGui.java index 27b33e33f..b1211c6e2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/DestroyableBlocksGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/DestroyableBlocksGui.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Util.BasicItem; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.BasicItem; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/InventoryGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/InventoryGui.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/InventoryGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/InventoryGui.java index 6420145ac..d99136755 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/InventoryGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/InventoryGui.java @@ -1,21 +1,21 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.VersionChecker; -import dev.nandi0813.practice.Util.ArmorUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.VersionChecker; +import dev.nandi0813.practice.util.ArmorUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/LadderMainGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/LadderMainGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/LadderMainGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/LadderMainGui.java index e00f12a42..ae2ac8297 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/LadderMainGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/LadderMainGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.util.LadderUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/MatchTypeGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/MatchTypeGui.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/MatchTypeGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/MatchTypeGui.java index d9cd2894c..880954fb9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/MatchTypeGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/MatchTypeGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Enum.WeightClassType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.enums.WeightClassType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/BoxingHitsItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/BoxingHitsItem.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/BoxingHitsItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/BoxingHitsItem.java index 14f08733c..d346ca8aa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/BoxingHitsItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/BoxingHitsItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Type.Boxing; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.type.Boxing; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/DropInventoryItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/DropInventoryItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/DropInventoryItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/DropInventoryItem.java index f6153792a..643f6751b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/DropInventoryItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/DropInventoryItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class DropInventoryItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/EditableItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/EditableItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/EditableItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/EditableItem.java index 3780771fa..9b1f15000 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/EditableItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/EditableItem.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class EditableItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/EnderpearlItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/EnderpearlItem.java similarity index 73% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/EnderpearlItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/EnderpearlItem.java index 13d7a037b..f088ccc59 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/EnderpearlItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/EnderpearlItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class EnderpearlItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/FireballCooldownItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/FireballCooldownItem.java similarity index 74% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/FireballCooldownItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/FireballCooldownItem.java index d6daeadb7..58f6f68b9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/FireballCooldownItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/FireballCooldownItem.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Type.FireballFight; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.type.FireballFight; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/GoldenAppleItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/GoldenAppleItem.java similarity index 74% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/GoldenAppleItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/GoldenAppleItem.java index 89abd7b99..b45b3e4ff 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/GoldenAppleItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/GoldenAppleItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class GoldenAppleItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HealthBelowNameItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HealthBelowNameItem.java similarity index 67% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HealthBelowNameItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HealthBelowNameItem.java index cb5d6b52a..857389465 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HealthBelowNameItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HealthBelowNameItem.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class HealthBelowNameItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HitdelayItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HitdelayItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HitdelayItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HitdelayItem.java index 1a5d33925..fe2fcdb1e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HitdelayItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HitdelayItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class HitdelayItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HungerItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HungerItem.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HungerItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HungerItem.java index 09598f566..878e83795 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/HungerItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/HungerItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class HungerItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/KnockbackItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/KnockbackItem.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/KnockbackItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/KnockbackItem.java index b3aeed69b..24a99caf4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/KnockbackItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/KnockbackItem.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.KnockbackType; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.KnockbackType; import org.apache.commons.lang3.StringUtils; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/MaxDurationItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/MaxDurationItem.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/MaxDurationItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/MaxDurationItem.java index f7579a210..982b3564a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/MaxDurationItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/MaxDurationItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class MaxDurationItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/MultiRoundStartCountdownItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/MultiRoundStartCountdownItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/MultiRoundStartCountdownItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/MultiRoundStartCountdownItem.java index 9ff795c2f..a8078206c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/MultiRoundStartCountdownItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/MultiRoundStartCountdownItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class MultiRoundStartCountdownItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RankedItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RankedItem.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RankedItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RankedItem.java index db4cde31b..df8b614f1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RankedItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RankedItem.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.WeightClassType; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.WeightClassType; import org.apache.commons.lang3.StringUtils; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RegenerationItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RegenerationItem.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RegenerationItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RegenerationItem.java index 310c41b2d..3d779b7c7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RegenerationItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RegenerationItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class RegenerationItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RoundsItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RoundsItem.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RoundsItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RoundsItem.java index fca607fcb..fc0d86e14 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/RoundsItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/RoundsItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class RoundsItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/SkywarsLootItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/SkywarsLootItem.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/SkywarsLootItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/SkywarsLootItem.java index fb4a2351e..002ff2bb8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/SkywarsLootItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/SkywarsLootItem.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Type.SkyWars; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.type.SkyWars; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/StartCountdownItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/StartCountdownItem.java similarity index 73% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/StartCountdownItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/StartCountdownItem.java index 11f3e59c5..058ee7e8d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/StartCountdownItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/StartCountdownItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class StartCountdownItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/StartMovingItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/StartMovingItem.java similarity index 69% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/StartMovingItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/StartMovingItem.java index d10278473..369f7fcef 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/StartMovingItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/StartMovingItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class StartMovingItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TempRespawnTimeItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TempRespawnTimeItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TempRespawnTimeItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TempRespawnTimeItem.java index 3c1d82d7b..f93e33cae 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TempRespawnTimeItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TempRespawnTimeItem.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempDead; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempDead; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TempbuildDelayItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TempbuildDelayItem.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TempbuildDelayItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TempbuildDelayItem.java index a63fb7402..8a40abf8f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TempbuildDelayItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TempbuildDelayItem.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempBuild; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempBuild; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TntFuseTimeItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TntFuseTimeItem.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TntFuseTimeItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TntFuseTimeItem.java index 14de08bc4..63bd39c7c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/Items/TntFuseTimeItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/Items/TntFuseTimeItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingItem; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingItem; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import org.bukkit.event.inventory.InventoryClickEvent; public class TntFuseTimeItem extends SettingItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingItem.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingItem.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingItem.java index 7a59feeb1..27e7acbdc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; import lombok.Getter; import lombok.Setter; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingType.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingType.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingType.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingType.java index a78bbf57b..531b4840b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingType.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings; public enum SettingType { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingsGui.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingsGui.java index bb95f84d6..0441c0fcf 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/Settings/SettingsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/Settings/SettingsGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.Items.*; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Type.Boxing; -import dev.nandi0813.practice.Manager.Ladder.Type.SkyWars; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.Items.*; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.type.Boxing; +import dev.nandi0813.practice.manager.ladder.type.SkyWars; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/SkyWarsLootGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/SkyWarsLootGui.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/SkyWarsLootGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/SkyWarsLootGui.java index e0fb5bcea..90367d745 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Ladder/LadderSettings/SkyWarsLootGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/ladder/laddersettings/SkyWarsLootGui.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Ladder.Type.SkyWars; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.type.SkyWars; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerArmorLobbyGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerArmorLobbyGui.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerArmorLobbyGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerArmorLobbyGui.java index f2bccc951..c7bf3b008 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerArmorLobbyGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerArmorLobbyGui.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Server; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Util.ArmorUtil; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.server; + +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.util.ArmorUtil; +import dev.nandi0813.practice.util.InventoryUtil; import lombok.Getter; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; -import static dev.nandi0813.practice.Manager.Inventory.Inventory.InventoryType; +import static dev.nandi0813.practice.manager.inventory.Inventory.InventoryType; public class ServerArmorLobbyGui extends GUI { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerEventsGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerEventsGui.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerEventsGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerEventsGui.java index 1a232f7f4..74db8f6d1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerEventsGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerEventsGui.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Server; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.gui.setup.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerHubGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerHubGui.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerHubGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerHubGui.java index a3ed53de2..2381321c9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerHubGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerHubGui.java @@ -1,22 +1,22 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Server; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.gui.setup.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerMatchesGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerMatchesGui.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerMatchesGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerMatchesGui.java index 6d4faeaf5..ee9625a71 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerMatchesGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerMatchesGui.java @@ -1,21 +1,21 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Server; - -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PageUtil; +package dev.nandi0813.practice.manager.gui.setup.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.PageUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerSaveGui.java b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerSaveGui.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerSaveGui.java rename to core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerSaveGui.java index a1aabaab0..a5794495a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/GUI/Setup/Server/ServerSaveGui.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/gui/setup/server/ServerSaveGui.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.GUI.Setup.Server; +package dev.nandi0813.practice.manager.gui.setup.server; -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Backend.GUIFile; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Backend.MysqlManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.backend.GUIFile; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.MysqlManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/Inventory.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/Inventory.java index 07e231c94..e37948c64 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/Inventory.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Inventory; +package dev.nandi0813.practice.manager.inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.ExtraInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvArmor; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.inventory.inventoryitem.ExtraInvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvArmor; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.module.util.ClassImport; import lombok.Getter; import org.bukkit.Material; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryListener.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryListener.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryListener.java index fc3787619..adb520c71 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryListener.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Inventory; - -import dev.nandi0813.practice.Manager.Inventory.Inventories.StaffInventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems.CheckInventoryInvItem; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Server.WorldEnum; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.inventory; + +import dev.nandi0813.practice.manager.inventory.inventories.StaffInventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems.CheckInventoryInvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.server.WorldEnum; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryManager.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryManager.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryManager.java index 6c2207822..5bd080ff7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryManager.java @@ -1,21 +1,21 @@ -package dev.nandi0813.practice.Manager.Inventory; - -import dev.nandi0813.practice.Manager.Backend.BackendManager; -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Inventory.Inventories.*; -import dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate.SpecEventInventory; -import dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate.SpecFfaInventory; -import dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate.SpecMatchInventory; -import dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate.SpecModeLobbyInventory; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.ItemSerializationUtil; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.inventory; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.BackendManager; +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.inventory.inventories.*; +import dev.nandi0813.practice.manager.inventory.inventories.spectate.SpecEventInventory; +import dev.nandi0813.practice.manager.inventory.inventories.spectate.SpecFfaInventory; +import dev.nandi0813.practice.manager.inventory.inventories.spectate.SpecMatchInventory; +import dev.nandi0813.practice.manager.inventory.inventories.spectate.SpecModeLobbyInventory; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.ItemSerializationUtil; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryUtil.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryUtil.java index 580e78f4b..7715a873e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/InventoryUtil.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Inventory; +package dev.nandi0813.practice.manager.inventory; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.PlayerDisplay.Nametag.NametagManager; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.playerdisplay.nametag.NametagManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/EventQueueInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/EventQueueInventory.java similarity index 72% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/EventQueueInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/EventQueueInventory.java index dd7089e56..d59623787 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/EventQueueInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/EventQueueInventory.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories; - -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.QueueItems.EventQueueLeaveInvItem; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.inventory.inventories; + +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.queueitems.EventQueueLeaveInvItem; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/LobbyInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/LobbyInventory.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/LobbyInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/LobbyInventory.java index ec9199e5a..500a3cbf0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/LobbyInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/LobbyInventory.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories; +package dev.nandi0813.practice.manager.inventory.inventories; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems.*; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems.*; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/MatchQueueInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/MatchQueueInventory.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/MatchQueueInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/MatchQueueInventory.java index c79f6885e..33bd6b7e3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/MatchQueueInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/MatchQueueInventory.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories; - -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.QueueItems.MatchQueueLeaveInvItem; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +package dev.nandi0813.practice.manager.inventory.inventories; + +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.queueitems.MatchQueueLeaveInvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/PartyInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/PartyInventory.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/PartyInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/PartyInventory.java index b36a4fdab..93c5fed36 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/PartyInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/PartyInventory.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories; +package dev.nandi0813.practice.manager.inventory.inventories; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems.*; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems.*; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/StaffInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/StaffInventory.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/StaffInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/StaffInventory.java index 23fa3810a..5a37df35e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/StaffInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/StaffInventory.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories; - -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems.*; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +package dev.nandi0813.practice.manager.inventory.inventories; + +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems.*; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecEventInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecEventInventory.java similarity index 66% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecEventInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecEventInventory.java index 3c6d0b472..5be1ac580 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecEventInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecEventInventory.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate; +package dev.nandi0813.practice.manager.inventory.inventories.spectate; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.LeaveEventSpecInvItem; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.LeaveEventSpecInvItem; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecFfaInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecFfaInventory.java similarity index 66% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecFfaInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecFfaInventory.java index 1910aa665..cf096e830 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecFfaInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecFfaInventory.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate; +package dev.nandi0813.practice.manager.inventory.inventories.spectate; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.LeaveFfaSpecInvItem; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.LeaveFfaSpecInvItem; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecMatchInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecMatchInventory.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecMatchInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecMatchInventory.java index d4d62c436..8909ae8ea 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecMatchInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecMatchInventory.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate; +package dev.nandi0813.practice.manager.inventory.inventories.spectate; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.LeaveMatchSpecInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match.HideSpectatorsInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match.RandomMatchInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match.ShowSpectatorsInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match.SpecMenuInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.LeaveMatchSpecInvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match.HideSpectatorsInvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match.RandomMatchInvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match.ShowSpectatorsInvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match.SpecMenuInvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecModeLobbyInventory.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecModeLobbyInventory.java similarity index 57% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecModeLobbyInventory.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecModeLobbyInventory.java index 5abf233a1..80ce28c5f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/Inventories/Spectate/SpecModeLobbyInventory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventories/spectate/SpecModeLobbyInventory.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Inventory.Inventories.Spectate; +package dev.nandi0813.practice.manager.inventory.inventories.spectate; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Lobby.DisableSpecMode; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Lobby.RandomMatchInvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Lobby.SpecMenuInvItem; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Lobby.DisableSpecMode; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Lobby.RandomMatchInvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Lobby.SpecMenuInvItem; import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/ExtraInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/ExtraInvItem.java similarity index 77% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/ExtraInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/ExtraInvItem.java index f03a2d9f1..ea3b6a490 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/ExtraInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/ExtraInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem; +package dev.nandi0813.practice.manager.inventory.inventoryitem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; import org.bukkit.entity.Player; public class ExtraInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/InvArmor.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/InvArmor.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/InvArmor.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/InvArmor.java index c43363055..47c5b7efa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/InvArmor.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/InvArmor.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem; +package dev.nandi0813.practice.manager.inventory.inventoryitem; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/InvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/InvItem.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/InvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/InvItem.java index 28c8fce78..b640889d5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/InvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/InvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem; +package dev.nandi0813.practice.manager.inventory.inventoryitem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/KitEditorInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/KitEditorInvItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/KitEditorInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/KitEditorInvItem.java index e52870602..2771995ad 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/KitEditorInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/KitEditorInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class KitEditorInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/PartyCreateInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/PartyCreateInvItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/PartyCreateInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/PartyCreateInvItem.java index 8a9e10738..6c1d41fb9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/PartyCreateInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/PartyCreateInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Party.PartyManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.party.PartyManager; import org.bukkit.entity.Player; public class PartyCreateInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/RankedInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/RankedInvItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/RankedInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/RankedInvItem.java index 84070697f..ff041c9cb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/RankedInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/RankedInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class RankedInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/RematchInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/RematchInvItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/RematchInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/RematchInvItem.java index de9f432a4..dbb80ae68 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/RematchInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/RematchInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Util.RematchRequest; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.util.RematchRequest; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class RematchInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SettingsInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SettingsInvItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SettingsInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SettingsInvItem.java index 45d5a7581..3ebd041ff 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SettingsInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SettingsInvItem.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public class SettingsInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SetupInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SetupInvItem.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SetupInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SetupInvItem.java index 063438592..aa7425a07 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SetupInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SetupInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class SetupInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SpectateModeInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SpectateModeInvItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SpectateModeInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SpectateModeInvItem.java index 9fce378af..1cfb152a7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/SpectateModeInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/SpectateModeInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Player; public class SpectateModeInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/StaffMode.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/StaffMode.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/StaffMode.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/StaffMode.java index e8e92d0b4..044c61863 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/StaffMode.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/StaffMode.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Player; public class StaffMode extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/StatisticsInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/StatisticsInvItem.java similarity index 62% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/StatisticsInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/StatisticsInvItem.java index 786bb82fd..48ae6913e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/StatisticsInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/StatisticsInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.GUI.GUIs.Leaderboard.LbSelectorGui; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.gui.guis.leaderboard.LbSelectorGui; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Player; public class StatisticsInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/UnrankedInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/UnrankedInvItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/UnrankedInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/UnrankedInvItem.java index 83151f941..0e7a79010 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/LobbyItems/UnrankedInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/lobbyitems/UnrankedInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.LobbyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.lobbyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class UnrankedInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/KitEditorInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/KitEditorInvItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/KitEditorInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/KitEditorInvItem.java index 2524814f7..1c706cfc1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/KitEditorInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/KitEditorInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class KitEditorInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/LeavePartyInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/LeavePartyInvItem.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/LeavePartyInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/LeavePartyInvItem.java index 325c95371..67db3f810 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/LeavePartyInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/LeavePartyInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; import org.bukkit.entity.Player; public class LeavePartyInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/OtherPartiesInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/OtherPartiesInvItem.java similarity index 59% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/OtherPartiesInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/OtherPartiesInvItem.java index 689d023dc..d3ae03ee0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/OtherPartiesInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/OtherPartiesInvItem.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public class OtherPartiesInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartyGameInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartyGameInvItem.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartyGameInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartyGameInvItem.java index fa4c7b6a5..602e9612c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartyGameInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartyGameInvItem.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems; + +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public class PartyGameInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartyInfoInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartyInfoInvItem.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartyInfoInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartyInfoInvItem.java index b7ead53c9..4586a0fb4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartyInfoInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartyInfoInvItem.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class PartyInfoInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartySettingsInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartySettingsInvItem.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartySettingsInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartySettingsInvItem.java index 649a6e04e..f675d94b7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/PartyItems/PartySettingsInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/partyitems/PartySettingsInvItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.PartyItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.partyitems; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.entity.Player; public class PartySettingsInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/QueueItems/EventQueueLeaveInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/queueitems/EventQueueLeaveInvItem.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/QueueItems/EventQueueLeaveInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/queueitems/EventQueueLeaveInvItem.java index 2bf934976..463154a3e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/QueueItems/EventQueueLeaveInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/queueitems/EventQueueLeaveInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.QueueItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.queueitems; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class EventQueueLeaveInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/QueueItems/MatchQueueLeaveInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/queueitems/MatchQueueLeaveInvItem.java similarity index 66% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/QueueItems/MatchQueueLeaveInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/queueitems/MatchQueueLeaveInvItem.java index 0f2583df2..da8035cbb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/QueueItems/MatchQueueLeaveInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/queueitems/MatchQueueLeaveInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.QueueItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.queueitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Queue.Queue; -import dev.nandi0813.practice.Manager.Queue.QueueManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.queue.Queue; +import dev.nandi0813.practice.manager.queue.QueueManager; import org.bukkit.entity.Player; public class MatchQueueLeaveInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveEventSpecInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveEventSpecInvItem.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveEventSpecInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveEventSpecInvItem.java index 89874f9e9..3ad4cedce 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveEventSpecInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveEventSpecInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class LeaveEventSpecInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveFfaSpecInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveFfaSpecInvItem.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveFfaSpecInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveFfaSpecInvItem.java index c3ebfb557..ef82ff1ba 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveFfaSpecInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveFfaSpecInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class LeaveFfaSpecInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveMatchSpecInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveMatchSpecInvItem.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveMatchSpecInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveMatchSpecInvItem.java index 6142d83e7..7ccf65c7a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/LeaveMatchSpecInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/LeaveMatchSpecInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class LeaveMatchSpecInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/DisableSpecMode.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/DisableSpecMode.java similarity index 61% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/DisableSpecMode.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/DisableSpecMode.java index bc5e0ae96..c092dd6b5 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/DisableSpecMode.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/DisableSpecMode.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Lobby; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Lobby; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Player; public class DisableSpecMode extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/RandomMatchInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/RandomMatchInvItem.java similarity index 62% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/RandomMatchInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/RandomMatchInvItem.java index ad5484da4..71edfdb28 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/RandomMatchInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/RandomMatchInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Lobby; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Lobby; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; import org.bukkit.entity.Player; public class RandomMatchInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/SpecMenuInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/SpecMenuInvItem.java similarity index 61% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/SpecMenuInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/SpecMenuInvItem.java index aa6bba437..289fc9fd2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Lobby/SpecMenuInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Lobby/SpecMenuInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Lobby; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Lobby; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; import org.bukkit.entity.Player; public class SpecMenuInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/HideSpectatorsInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/HideSpectatorsInvItem.java similarity index 62% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/HideSpectatorsInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/HideSpectatorsInvItem.java index 0d715336b..810ecd92b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/HideSpectatorsInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/HideSpectatorsInvItem.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; +import dev.nandi0813.practice.util.entityhider.PlayerHider; import org.bukkit.entity.Player; public class HideSpectatorsInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/RandomMatchInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/RandomMatchInvItem.java similarity index 62% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/RandomMatchInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/RandomMatchInvItem.java index 2745209c6..a2fef327a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/RandomMatchInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/RandomMatchInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; import org.bukkit.entity.Player; public class RandomMatchInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/ShowSpectatorsInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/ShowSpectatorsInvItem.java similarity index 62% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/ShowSpectatorsInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/ShowSpectatorsInvItem.java index a98ce996f..f565e25c1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/ShowSpectatorsInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/ShowSpectatorsInvItem.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Inventory.Inventory; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.inventory.Inventory; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; +import dev.nandi0813.practice.util.entityhider.PlayerHider; import org.bukkit.entity.Player; public class ShowSpectatorsInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/SpecMenuInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/SpecMenuInvItem.java similarity index 61% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/SpecMenuInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/SpecMenuInvItem.java index d39e7f57f..362be40bb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/SpectatorItems/SpectatorModeItems/Match/SpecMenuInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/spectatoritems/spectatormodeitems/Match/SpecMenuInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.SpectatorItems.SpectatorModeItems.Match; +package dev.nandi0813.practice.manager.inventory.inventoryitem.spectatoritems.spectatormodeitems.Match; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; import org.bukkit.entity.Player; public class SpecMenuInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/CheckInventoryInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/CheckInventoryInvItem.java similarity index 70% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/CheckInventoryInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/CheckInventoryInvItem.java index dc554061c..d50bfaeea 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/CheckInventoryInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/CheckInventoryInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems; -import dev.nandi0813.practice.Manager.GUI.GUIs.PlayerInvGui; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; +import dev.nandi0813.practice.manager.gui.guis.PlayerInvGui; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; import org.bukkit.entity.Player; public class CheckInventoryInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/HideOffInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/HideOffInvItem.java similarity index 61% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/HideOffInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/HideOffInvItem.java index 4fbbc3e1c..1cd3e24a0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/HideOffInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/HideOffInvItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.entityhider.PlayerHider; import org.bukkit.entity.Player; public class HideOffInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/HideOnInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/HideOnInvItem.java similarity index 61% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/HideOnInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/HideOnInvItem.java index efa5a51ba..562e0b0a0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/HideOnInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/HideOnInvItem.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.EntityHider.PlayerHider; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.entityhider.PlayerHider; import org.bukkit.entity.Player; public class HideOnInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/LeaveSpecInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/LeaveSpecInvItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/LeaveSpecInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/LeaveSpecInvItem.java index 0082e16f5..9629a1678 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/LeaveSpecInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/LeaveSpecInvItem.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.interfaces.Spectatable; import org.bukkit.entity.Player; public class LeaveSpecInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/ModeOffInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/ModeOffInvItem.java similarity index 67% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/ModeOffInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/ModeOffInvItem.java index 98ba50367..ff00ce643 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/ModeOffInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/ModeOffInvItem.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; import org.bukkit.entity.Player; public class ModeOffInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/RandomMatchInvItem.java b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/RandomMatchInvItem.java similarity index 65% rename from core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/RandomMatchInvItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/RandomMatchInvItem.java index 92e55bcac..a65d04b9a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Inventory/InventoryItem/StaffItems/RandomMatchInvItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/inventory/inventoryitem/staffitems/RandomMatchInvItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Inventory.InventoryItem.StaffItems; +package dev.nandi0813.practice.manager.inventory.inventoryitem.staffitems; -import dev.nandi0813.practice.Manager.Inventory.InventoryItem.InvItem; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; +import dev.nandi0813.practice.manager.inventory.inventoryitem.InvItem; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; import org.bukkit.entity.Player; public class RandomMatchInvItem extends InvItem { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/LadderManager.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/LadderManager.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/LadderManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/LadderManager.java index 602fd9b2e..3f19c3d84 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/LadderManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/LadderManager.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Ladder; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.EditorMenuGui; -import dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.PremadeCustom.CustomLadderSelectorGui; -import dev.nandi0813.practice.Manager.GUI.GUIs.Queue.RankedGui; -import dev.nandi0813.practice.Manager.GUI.GUIs.Queue.UnrankedGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StartUpCallback; +package dev.nandi0813.practice.manager.ladder; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.guis.customladder.EditorMenuGui; +import dev.nandi0813.practice.manager.gui.guis.customladder.premadecustom.CustomLadderSelectorGui; +import dev.nandi0813.practice.manager.gui.guis.queue.RankedGui; +import dev.nandi0813.practice.manager.gui.guis.queue.UnrankedGui; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StartUpCallback; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Ladder.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/Ladder.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Ladder.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/Ladder.java index a4294dc3f..13304d2d9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Ladder.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/Ladder.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderKnockback; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.ladder.abstraction; + +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.util.LadderKnockback; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/CustomConfig.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/CustomConfig.java similarity index 73% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/CustomConfig.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/CustomConfig.java index 771d12a5b..b02b3289f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/CustomConfig.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/CustomConfig.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface; +package dev.nandi0813.practice.manager.ladder.abstraction.interfaces; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/LadderHandle.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/LadderHandle.java new file mode 100644 index 000000000..bb17eef3e --- /dev/null +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/LadderHandle.java @@ -0,0 +1,10 @@ +package dev.nandi0813.practice.manager.ladder.abstraction.interfaces; + +import dev.nandi0813.practice.manager.fight.match.Match; +import org.bukkit.event.Event; + +public interface LadderHandle { + + boolean handleEvents(Event e, Match match); + +} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/TempBuild.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/TempBuild.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/TempBuild.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/TempBuild.java index 2e54eb47a..12c587110 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/TempBuild.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/TempBuild.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface; - -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Util.BlockUtil; -import dev.nandi0813.practice.Manager.Fight.Util.ListenerUtil; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; -import dev.nandi0813.practice.Util.FightMapChange.TempBlockChange; +package dev.nandi0813.practice.manager.ladder.abstraction.interfaces; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.util.BlockUtil; +import dev.nandi0813.practice.manager.fight.util.ListenerUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.fightmapchange.FightChange; +import dev.nandi0813.practice.util.fightmapchange.TempBlockChange; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -18,7 +18,7 @@ import org.bukkit.metadata.MetadataValue; import org.jetbrains.annotations.NotNull; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public interface TempBuild { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/TempDead.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/TempDead.java similarity index 59% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/TempDead.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/TempDead.java index 384bba3e4..c24872cac 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Interface/TempDead.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/interfaces/TempDead.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface; +package dev.nandi0813.practice.manager.ladder.abstraction.interfaces; public interface TempDead { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/BedFight.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/BedFight.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/BedFight.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/BedFight.java index d693f38fd..a590282f3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/BedFight.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/BedFight.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal; +package dev.nandi0813.practice.manager.ladder.abstraction.normal; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TempKillPlayer; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempDead; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Server.Sound.SoundManager; -import dev.nandi0813.practice.Manager.Server.Sound.SoundType; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.util.TempKillPlayer; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempDead; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.server.sound.SoundManager; +import dev.nandi0813.practice.manager.server.sound.SoundType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Cuboid; import lombok.Getter; import lombok.Setter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/LadderFile.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/LadderFile.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/LadderFile.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/LadderFile.java index ed10c004f..5a34e1e42 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/LadderFile.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/LadderFile.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal; - -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Enum.WeightClassType; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderFileUtil; -import dev.nandi0813.practice.Util.BasicItem; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.ItemSerializationUtil; +package dev.nandi0813.practice.manager.ladder.abstraction.normal; + +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.enums.WeightClassType; +import dev.nandi0813.practice.manager.ladder.util.LadderFileUtil; +import dev.nandi0813.practice.util.BasicItem; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.ItemSerializationUtil; import org.bukkit.Material; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/NormalLadder.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/NormalLadder.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/NormalLadder.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/NormalLadder.java index 71f6a27b1..e2691f6f4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/NormalLadder.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/NormalLadder.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.GUIs.Ladder.LadderPreviewGui; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Enum.WeightClassType; -import dev.nandi0813.practice.Util.BasicItem; +package dev.nandi0813.practice.manager.ladder.abstraction.normal; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.guis.ladder.LadderPreviewGui; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.enums.WeightClassType; +import dev.nandi0813.practice.util.BasicItem; import lombok.Getter; import lombok.Setter; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/PortalFight.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/PortalFight.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/PortalFight.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/PortalFight.java index da5366d2b..03f962f6e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/Normal/PortalFight.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/PortalFight.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.NormalArena; -import dev.nandi0813.practice.Manager.Arena.Util.PortalLocation; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.PlayerWinner; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayersRound; -import dev.nandi0813.practice.Manager.Fight.Util.BlockUtil; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Module.Util.ClassImport; +package dev.nandi0813.practice.manager.ladder.abstraction.normal; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.NormalArena; +import dev.nandi0813.practice.manager.arena.util.PortalLocation; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.PlayerWinner; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayersRound; +import dev.nandi0813.practice.manager.fight.util.BlockUtil; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -26,7 +26,7 @@ import org.bukkit.metadata.MetadataValue; import org.jetbrains.annotations.NotNull; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public abstract class PortalFight extends NormalLadder { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/PlayerCustom/CustomLadder.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/playercustom/CustomLadder.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/PlayerCustom/CustomLadder.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/playercustom/CustomLadder.java index 5d9b9133f..6a392abc7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Abstraction/PlayerCustom/CustomLadder.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/playercustom/CustomLadder.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.PlayerKit.GUIs.MainGUI; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.Profile.Profile; +package dev.nandi0813.practice.manager.ladder.abstraction.playercustom; + +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.guis.MainGUI; +import dev.nandi0813.practice.manager.profile.Profile; import lombok.Getter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/KnockbackType.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/KnockbackType.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/KnockbackType.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/KnockbackType.java index 81ebee47f..dddd50b0c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/KnockbackType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/KnockbackType.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Ladder.Enum; +package dev.nandi0813.practice.manager.ladder.enums; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; import lombok.Getter; public enum KnockbackType { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/LadderType.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/LadderType.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/LadderType.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/LadderType.java index f5d764237..9fcf25a06 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/LadderType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/LadderType.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Ladder.Enum; +package dev.nandi0813.practice.manager.ladder.enums; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSettings.Settings.SettingType; -import dev.nandi0813.practice.Manager.Ladder.Type.*; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.laddersettings.Settings.SettingType; +import dev.nandi0813.practice.manager.ladder.type.*; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/WeightClassType.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/WeightClassType.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/WeightClassType.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/WeightClassType.java index 456546a29..c114e8469 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Enum/WeightClassType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/enums/WeightClassType.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Ladder.Enum; +package dev.nandi0813.practice.manager.ladder.enums; import lombok.Getter; diff --git a/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Basic.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Basic.java new file mode 100644 index 000000000..fc265bdc6 --- /dev/null +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Basic.java @@ -0,0 +1,20 @@ +package dev.nandi0813.practice.manager.ladder.type; + +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import org.bukkit.event.Event; + +public class Basic extends NormalLadder implements LadderHandle { + + public Basic(String name, LadderType type) { + super(name, type); + } + + @Override + public boolean handleEvents(Event e, Match match) { + return false; + } + +} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/BattleRush.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/BattleRush.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/BattleRush.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/BattleRush.java index 057f8725c..e99e4b54f 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/BattleRush.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/BattleRush.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; +package dev.nandi0813.practice.manager.ladder.type; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempBuild; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempDead; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.PortalFight; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempBuild; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempDead; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.PortalFight; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/BedWars.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/BedWars.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/BedWars.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/BedWars.java index 4f62a5ce2..65b16c6b1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/BedWars.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/BedWars.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; +package dev.nandi0813.practice.manager.ladder.type; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.BedFight; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Module.Util.ClassImport; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.BedFight; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.configuration.file.YamlConfiguration; @@ -21,7 +21,7 @@ import org.bukkit.metadata.FixedMetadataValue; import org.jetbrains.annotations.NotNull; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public class BedWars extends BedFight implements CustomConfig, LadderHandle { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Boxing.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Boxing.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Boxing.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Boxing.java index 022dced70..b7b5e6749 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Boxing.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Boxing.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; - -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.PlayerWinner; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PlayersVsPlayers; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; +package dev.nandi0813.practice.manager.ladder.type; + +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.PlayerWinner; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.PlayersVsPlayers; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Bridges.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Bridges.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Bridges.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Bridges.java index 25e086a30..7f49d40da 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Bridges.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Bridges.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; +package dev.nandi0813.practice.manager.ladder.type; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.PortalFight; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.PortalFight; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Build.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Build.java new file mode 100644 index 000000000..4d109cf65 --- /dev/null +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Build.java @@ -0,0 +1,20 @@ +package dev.nandi0813.practice.manager.ladder.type; + +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import org.bukkit.event.Event; + +public class Build extends NormalLadder implements LadderHandle { + + public Build(String name, LadderType type) { + super(name, type); + } + + @Override + public boolean handleEvents(Event e, Match match) { + return false; + } + +} diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/FireballFight.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/FireballFight.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/FireballFight.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/FireballFight.java index 0b92545c4..d7586eb1a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/FireballFight.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/FireballFight.java @@ -1,24 +1,24 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Util.BlockUtil; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.ListenerUtil; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.BedFight; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.FireballRunnable; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.ladder.type; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.util.BlockUtil; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.ListenerUtil; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.BedFight; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.FireballRunnable; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import lombok.Getter; import lombok.Setter; import org.bukkit.Material; @@ -45,8 +45,8 @@ import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.NotNull; -import static dev.nandi0813.practice.Util.PermanentConfig.FIGHT_ENTITY; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.FIGHT_ENTITY; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; @Getter @Setter diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/PearlFight.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/PearlFight.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/PearlFight.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/PearlFight.java index dec0596d2..5a15f79fc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/PearlFight.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/PearlFight.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; +package dev.nandi0813.practice.manager.ladder.type; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.TempBuild; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.TempBuild; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/SkyWars.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/SkyWars.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/SkyWars.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/SkyWars.java index c0f83604d..d0cdcd5bb 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/SkyWars.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/SkyWars.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; - -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchUtil; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.CustomConfig; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.ItemSerializationUtil; +package dev.nandi0813.practice.manager.ladder.type; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.util.MatchUtil; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.CustomConfig; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.ItemSerializationUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Spleef.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Spleef.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Spleef.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Spleef.java index 9f060b198..200e8a5ed 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Spleef.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Spleef.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; +package dev.nandi0813.practice.manager.ladder.type; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Sumo.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Sumo.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Sumo.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Sumo.java index a4daab1cc..6acf5c7ac 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Type/Sumo.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Sumo.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Ladder.Type; - -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Module.Util.ClassImport; +package dev.nandi0813.practice.manager.ladder.type; + +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderFileUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderFileUtil.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderFileUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderFileUtil.java index e9fe0e07d..f9a834db9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderFileUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderFileUtil.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Ladder.Util; +package dev.nandi0813.practice.manager.ladder.util; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.util.Common; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderKnockback.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderKnockback.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderKnockback.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderKnockback.java index 076a04b23..a793d8e43 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderKnockback.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderKnockback.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Ladder.Util; +package dev.nandi0813.practice.manager.ladder.util; -import dev.nandi0813.practice.Manager.Ladder.Enum.KnockbackType; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.ladder.enums.KnockbackType; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderUtil.java similarity index 83% rename from core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderUtil.java index 7b412f4bb..b6d589a47 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Ladder/Util/LadderUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderUtil.java @@ -1,26 +1,26 @@ -package dev.nandi0813.practice.Manager.Ladder.Util; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Backend.MysqlManager; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Hologram.HologramSetupManager; -import dev.nandi0813.practice.Manager.GUI.Setup.Ladder.LadderSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Type.SkyWars; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.ladder.util; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.MysqlManager; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.gui.setup.hologram.HologramSetupManager; +import dev.nandi0813.practice.manager.gui.setup.ladder.LadderSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.type.SkyWars; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Leaderboard.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/Leaderboard.java similarity index 75% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Leaderboard.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/Leaderboard.java index 2d5c9cc1c..12e780379 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Leaderboard.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/Leaderboard.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.Leaderboard; +package dev.nandi0813.practice.manager.leaderboard; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; import lombok.Getter; import lombok.Setter; import org.bukkit.OfflinePlayer; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/LeaderboardManager.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/LeaderboardManager.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/LeaderboardManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/LeaderboardManager.java index f6afa6a5e..74cf13f76 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/LeaderboardManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/LeaderboardManager.java @@ -1,23 +1,23 @@ -package dev.nandi0813.practice.Manager.Leaderboard; +package dev.nandi0813.practice.manager.leaderboard; import dev.nandi0813.api.Event.FFARemovePlayerEvent; import dev.nandi0813.api.Event.Match.MatchEndEvent; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Profile.Statistics.LadderStats; -import dev.nandi0813.practice.Util.StartUpCallback; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.statistics.LadderStats; +import dev.nandi0813.practice.util.StartUpCallback; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Hologram.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/Hologram.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Hologram.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/Hologram.java index a5e20afbf..62501c00c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Hologram.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/Hologram.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram; - -import dev.nandi0813.practice.Manager.Backend.BackendManager; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Hologram.HologramSetupManager; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.leaderboard.hologram; + +import dev.nandi0813.practice.manager.backend.BackendManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.hologram.HologramSetupManager; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramManager.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramManager.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramManager.java index 796be5f03..1cadd6b2c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramManager.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram; - -import dev.nandi0813.practice.Manager.Backend.BackendManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Hologram.HologramSetupManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.GlobalHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderDynamicHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms.LadderStaticHologram; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.leaderboard.hologram; + +import dev.nandi0813.practice.manager.backend.BackendManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.hologram.HologramSetupManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.GlobalHologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderDynamicHologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.holograms.LadderStaticHologram; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramRunnable.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramRunnable.java index e00bd6733..f47e6b967 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramRunnable.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram; +package dev.nandi0813.practice.manager.leaderboard.hologram; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramType.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramType.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramType.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramType.java index 536d161dd..e748982d9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/HologramType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/HologramType.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram; +package dev.nandi0813.practice.manager.leaderboard.hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; import lombok.Getter; @Getter diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/SetupHologramType.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/SetupHologramType.java similarity index 50% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/SetupHologramType.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/SetupHologramType.java index 764355e17..aa2c20ad0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/SetupHologramType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/SetupHologramType.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram; +package dev.nandi0813.practice.manager.leaderboard.hologram; public enum SetupHologramType { SETUP, diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/GlobalHologram.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/GlobalHologram.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/GlobalHologram.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/GlobalHologram.java index 3cfd10d4c..d76fee4ac 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/GlobalHologram.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/GlobalHologram.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms; +package dev.nandi0813.practice.manager.leaderboard.hologram.holograms; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramType; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramType; import org.bukkit.Location; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/LadderDynamicHologram.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/LadderDynamicHologram.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/LadderDynamicHologram.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/LadderDynamicHologram.java index 1b1a49a7e..d58cc0791 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/LadderDynamicHologram.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/LadderDynamicHologram.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms; +package dev.nandi0813.practice.manager.leaderboard.hologram.holograms; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramType; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramType; import lombok.Getter; import org.bukkit.Location; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/LadderStaticHologram.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/LadderStaticHologram.java similarity index 76% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/LadderStaticHologram.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/LadderStaticHologram.java index f0ac80122..83a1698ff 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Hologram/Holograms/LadderStaticHologram.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/holograms/LadderStaticHologram.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Hologram.Holograms; - -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.Hologram; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramType; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; +package dev.nandi0813.practice.manager.leaderboard.hologram.holograms; + +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.Hologram; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramType; import lombok.Getter; import lombok.Setter; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/types/LbMainType.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/types/LbMainType.java new file mode 100644 index 000000000..2f3995a28 --- /dev/null +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/types/LbMainType.java @@ -0,0 +1,8 @@ +package dev.nandi0813.practice.manager.leaderboard.types; + +public enum LbMainType { + + GLOBAL, + LADDER, + +} \ No newline at end of file diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Types/LbSecondaryType.java b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/types/LbSecondaryType.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Types/LbSecondaryType.java rename to core/src/main/java/dev/nandi0813/practice/manager/leaderboard/types/LbSecondaryType.java index 7b6a206d6..17f8b6056 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Leaderboard/Types/LbSecondaryType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/leaderboard/types/LbSecondaryType.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Leaderboard.Types; +package dev.nandi0813.practice.manager.leaderboard.types; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; import lombok.Getter; import java.util.List; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Party/BroadcastTask.java b/core/src/main/java/dev/nandi0813/practice/manager/party/BroadcastTask.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Party/BroadcastTask.java rename to core/src/main/java/dev/nandi0813/practice/manager/party/BroadcastTask.java index 554d9f847..262314c5c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Party/BroadcastTask.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/party/BroadcastTask.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Party; +package dev.nandi0813.practice.manager.party; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Party/Party.java b/core/src/main/java/dev/nandi0813/practice/manager/party/Party.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Party/Party.java rename to core/src/main/java/dev/nandi0813/practice/manager/party/Party.java index d75e9016d..206fa9b91 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Party/Party.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/party/Party.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Party; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.GUIs.Party.PartySettingsGui; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.party; + +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.guis.party.PartySettingsGui; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Party/PartyManager.java b/core/src/main/java/dev/nandi0813/practice/manager/party/PartyManager.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/Party/PartyManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/party/PartyManager.java index fd8b93698..7f345abbe 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Party/PartyManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/party/PartyManager.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Manager.Party; +package dev.nandi0813.practice.manager.party; import dev.nandi0813.api.Event.PartyCreateEvent; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.GUIs.Party.OtherPartiesGui; -import dev.nandi0813.practice.Manager.GUI.GUIs.Party.PartyEventsGui; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Party.MatchRequest.RequestManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.guis.party.OtherPartiesGui; +import dev.nandi0813.practice.manager.gui.guis.party.PartyEventsGui; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.party.matchrequest.RequestManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Party/MatchRequest/PartyRequest.java b/core/src/main/java/dev/nandi0813/practice/manager/party/matchrequest/PartyRequest.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Party/MatchRequest/PartyRequest.java rename to core/src/main/java/dev/nandi0813/practice/manager/party/matchrequest/PartyRequest.java index 5a9d466d3..b9b8cec4a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Party/MatchRequest/PartyRequest.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/party/matchrequest/PartyRequest.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Party.MatchRequest; - -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty.PartyVsParty; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderUtil; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; +package dev.nandi0813.practice.manager.party.matchrequest; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty.PartyVsParty; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.util.LadderUtil; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Party/MatchRequest/RequestManager.java b/core/src/main/java/dev/nandi0813/practice/manager/party/matchrequest/RequestManager.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/Party/MatchRequest/RequestManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/party/matchrequest/RequestManager.java index 2a476f6f6..6644f4ca3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Party/MatchRequest/RequestManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/party/matchrequest/RequestManager.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Party.MatchRequest; +package dev.nandi0813.practice.manager.party.matchrequest; -import dev.nandi0813.practice.Manager.Party.Party; +import dev.nandi0813.practice.manager.party.Party; import lombok.Getter; import java.util.HashMap; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/FakeTeam.java b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/FakeTeam.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/FakeTeam.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/FakeTeam.java index 6b9af69d0..9e7483f63 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/FakeTeam.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/FakeTeam.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.PlayerDisplay.Nametag; +package dev.nandi0813.practice.manager.playerdisplay.nametag; -import dev.nandi0813.practice.Module.Util.VersionChecker; +import dev.nandi0813.practice.module.util.VersionChecker; import lombok.Data; import lombok.Getter; import net.kyori.adventure.text.Component; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/NametagManager.java b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/NametagManager.java similarity index 99% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/NametagManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/NametagManager.java index 35bd9646a..fd42f505d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/NametagManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/NametagManager.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.PlayerDisplay.Nametag; +package dev.nandi0813.practice.manager.playerdisplay.nametag; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerTeams; import net.kyori.adventure.text.Component; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/Packet.java b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/Packet.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/Packet.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/Packet.java index b1fe5e7fd..e6840dfd6 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Nametag/Packet.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/nametag/Packet.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.PlayerDisplay.Nametag; +package dev.nandi0813.practice.manager.playerdisplay.nametag; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerTeams; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Tab/TabList.java b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/tab/TabList.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Tab/TabList.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/tab/TabList.java index af4ba5b34..a8a49a571 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Tab/TabList.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/tab/TabList.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.PlayerDisplay.Tab; +package dev.nandi0813.practice.manager.playerdisplay.tab; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.protocol.player.User; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerListHeaderAndFooter; -import dev.nandi0813.practice.Util.PAPIUtil; +import dev.nandi0813.practice.util.PAPIUtil; import org.bukkit.entity.Player; public class TabList { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Tab/TabListManager.java b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/tab/TabListManager.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Tab/TabListManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/tab/TabListManager.java index 1d59d3a55..a139e3217 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerDisplay/Tab/TabListManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerdisplay/tab/TabListManager.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.PlayerDisplay.Tab; +package dev.nandi0813.practice.manager.playerdisplay.tab; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/KitItems.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/KitItems.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/KitItems.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/KitItems.java index 0e5b929a8..a91db9cb9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/KitItems.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/KitItems.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.PlayerKit; +package dev.nandi0813.practice.manager.playerkit; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.Util.VersionChecker; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.util.VersionChecker; import lombok.Getter; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitEditing.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitEditing.java similarity index 63% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitEditing.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitEditing.java index 934b8c86f..fad3b11c2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitEditing.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitEditing.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.PlayerKit; +package dev.nandi0813.practice.manager.playerkit; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitManager.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitManager.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitManager.java index 6f437f724..f3b56ea97 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitManager.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.PlayerKit; - -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.PlayerKit.GUIs.CategoryGUI; -import dev.nandi0813.practice.Manager.PlayerKit.GUIs.ItemEditors.ArmorGUI; -import dev.nandi0813.practice.Manager.PlayerKit.GUIs.ItemEditors.ItemCategory; -import dev.nandi0813.practice.Manager.PlayerKit.GUIs.PotionsGUI; -import dev.nandi0813.practice.Manager.PlayerKit.Items.EditorIcon; +package dev.nandi0813.practice.manager.playerkit; + +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.playerkit.guis.CategoryGUI; +import dev.nandi0813.practice.manager.playerkit.guis.PotionsGUI; +import dev.nandi0813.practice.manager.playerkit.guis.itemeditors.ArmorGUI; +import dev.nandi0813.practice.manager.playerkit.guis.itemeditors.ItemCategory; +import dev.nandi0813.practice.manager.playerkit.items.EditorIcon; import lombok.Getter; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitUtil.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitUtil.java index 465179fb4..e64823386 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/PlayerKitUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/PlayerKitUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.PlayerKit; +package dev.nandi0813.practice.manager.playerkit; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.util.Common; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/StaticItems.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/StaticItems.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/StaticItems.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/StaticItems.java index e7950ab26..ce805c311 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/StaticItems.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/StaticItems.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.PlayerKit; +package dev.nandi0813.practice.manager.playerkit; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.PlayerKit.Items.EditorIcon; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Pair; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.playerkit.items.EditorIcon; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Pair; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/AmountChangeGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/AmountChangeGUI.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/AmountChangeGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/AmountChangeGUI.java index c4ade2440..aab641f44 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/AmountChangeGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/AmountChangeGUI.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs; - -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.playerkit.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.util.InventoryUtil; import net.wesjd.anvilgui.AnvilGUI; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/CategoryGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/CategoryGUI.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/CategoryGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/CategoryGUI.java index 090391bb5..8f26490b4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/CategoryGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/CategoryGUI.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs; - -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitEditing; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitUtil; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.PageUtil; +package dev.nandi0813.practice.manager.playerkit.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.PlayerKitEditing; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.PlayerKitUtil; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.PageUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/CustomSettingGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/CustomSettingGUI.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/CustomSettingGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/CustomSettingGUI.java index 92a485811..d89476a78 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/CustomSettingGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/CustomSettingGUI.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs; - -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.Ladder.Enum.KnockbackType; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.playerkit.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.ladder.enums.KnockbackType; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.util.InventoryUtil; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/EnchantGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/EnchantGUI.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/EnchantGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/EnchantGUI.java index 8cbd6c5cd..a2dc326a3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/EnchantGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/EnchantGUI.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs; - -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.playerkit.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.util.InventoryUtil; +import dev.nandi0813.practice.util.StringUtil; import net.wesjd.anvilgui.AnvilGUI; import org.bukkit.Bukkit; import org.bukkit.enchantments.Enchantment; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/MainGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/MainGUI.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/MainGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/MainGUI.java index 5cbeefc1e..47d809f9d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/MainGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/MainGUI.java @@ -1,22 +1,22 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.ConfirmGUI.ConfirmGuiType; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.KitItems; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitEditing; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.playerkit.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.confirmgui.ConfirmGuiType; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.playerkit.KitItems; +import dev.nandi0813.practice.manager.playerkit.PlayerKitEditing; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.InventoryUtil; import net.wesjd.anvilgui.AnvilGUI; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/PotionsGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/PotionsGUI.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/PotionsGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/PotionsGUI.java index 35193f1c6..c95b1fb13 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/PotionsGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/PotionsGUI.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs; - -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitEditing; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; +package dev.nandi0813.practice.manager.playerkit.guis; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.PlayerKitEditing; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ArmorGUI.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ArmorGUI.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ArmorGUI.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ArmorGUI.java index 18fa1a06d..8ac877a33 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ArmorGUI.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ArmorGUI.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs.ItemEditors; +package dev.nandi0813.practice.manager.playerkit.guis.itemeditors; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.EditorIcon; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitEditing; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.PlayerKitEditing; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.EditorIcon; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ItemCategory.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ItemCategory.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ItemCategory.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ItemCategory.java index 1d53827a9..3595bb2b3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ItemCategory.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ItemCategory.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs.ItemEditors; +package dev.nandi0813.practice.manager.playerkit.guis.itemeditors; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.EditorIcon; -import dev.nandi0813.practice.Manager.PlayerKit.Items.KitItem; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitEditing; -import dev.nandi0813.practice.Manager.PlayerKit.PlayerKitManager; -import dev.nandi0813.practice.Manager.PlayerKit.StaticItems; -import dev.nandi0813.practice.Util.InventoryUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.PlayerKitEditing; +import dev.nandi0813.practice.manager.playerkit.PlayerKitManager; +import dev.nandi0813.practice.manager.playerkit.StaticItems; +import dev.nandi0813.practice.manager.playerkit.items.EditorIcon; +import dev.nandi0813.practice.manager.playerkit.items.KitItem; +import dev.nandi0813.practice.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ItemEditor.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ItemEditor.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ItemEditor.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ItemEditor.java index 482138f76..ed3e2e634 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/GUIs/ItemEditors/ItemEditor.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/guis/itemeditors/ItemEditor.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Manager.PlayerKit.GUIs.ItemEditors; +package dev.nandi0813.practice.manager.playerkit.guis.itemeditors; -import dev.nandi0813.practice.Manager.GUI.GUI; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.PlayerKit.Items.EditorIcon; +import dev.nandi0813.practice.manager.gui.GUI; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.playerkit.items.EditorIcon; import org.bukkit.inventory.Inventory; import java.util.List; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/Items/EditorIcon.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/items/EditorIcon.java similarity index 73% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/Items/EditorIcon.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/items/EditorIcon.java index 75a77229e..60c04004b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/Items/EditorIcon.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/items/EditorIcon.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.PlayerKit.Items; +package dev.nandi0813.practice.manager.playerkit.items; -import dev.nandi0813.practice.Manager.GUI.GUIItem; +import dev.nandi0813.practice.manager.gui.GUIItem; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/Items/KitItem.java b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/items/KitItem.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/Items/KitItem.java rename to core/src/main/java/dev/nandi0813/practice/manager/playerkit/items/KitItem.java index d1b8e2266..378f929d0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/PlayerKit/Items/KitItem.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/playerkit/items/KitItem.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.PlayerKit.Items; +package dev.nandi0813.practice.manager.playerkit.items; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Profile.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/Profile.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Profile.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/Profile.java index e98bbe31f..2224812aa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Profile.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/Profile.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Profile; - -import dev.nandi0813.practice.Manager.Fight.Match.Util.CustomKit; -import dev.nandi0813.practice.Manager.GUI.GUIs.CustomLadder.PlayerCustomKitSelector; -import dev.nandi0813.practice.Manager.GUI.GUIs.Profile.ProfileSettingsGui; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.PlayerCustom.CustomLadder; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileWorldTime; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Group.GroupManager; -import dev.nandi0813.practice.Manager.Profile.Statistics.ProfileStat; -import dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.profile; + +import dev.nandi0813.practice.manager.fight.match.util.CustomKit; +import dev.nandi0813.practice.manager.gui.guis.customladder.PlayerCustomKitSelector; +import dev.nandi0813.practice.manager.gui.guis.profile.ProfileSettingsGui; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.abstraction.playercustom.CustomLadder; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.profile.enums.ProfileWorldTime; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.manager.profile.group.GroupManager; +import dev.nandi0813.practice.manager.profile.statistics.ProfileStat; +import dev.nandi0813.practice.module.interfaces.actionbar.ActionBar; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/ProfileFile.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileFile.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/ProfileFile.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileFile.java index d0802b9b1..54b60fcb0 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/ProfileFile.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileFile.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Manager.Profile; - -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Match.Util.CustomKit; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileWorldTime; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Group.GroupManager; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.ItemSerializationUtil; +package dev.nandi0813.practice.manager.profile; + +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.match.util.CustomKit; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.enums.ProfileWorldTime; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.manager.profile.group.GroupManager; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.ItemSerializationUtil; import net.kyori.adventure.text.Component; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/ProfileManager.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileManager.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/ProfileManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileManager.java index 44e8de10a..830a4ca7b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/ProfileManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileManager.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice.Manager.Profile; +package dev.nandi0813.practice.manager.profile; import dev.nandi0813.api.Event.NewPlayerJoin; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.Profile.ProfileSettingsGui; -import dev.nandi0813.practice.Util.StartUpCallback; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.gui.guis.profile.ProfileSettingsGui; +import dev.nandi0813.practice.util.StartUpCallback; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/RankedBan.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/RankedBan.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/RankedBan.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/RankedBan.java index 210fa0a40..593fcb169 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/RankedBan.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/RankedBan.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Profile; +package dev.nandi0813.practice.manager.profile; import dev.nandi0813.practice.ZonePractice; import lombok.Getter; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Enum/ProfileStatus.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/enums/ProfileStatus.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Enum/ProfileStatus.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/enums/ProfileStatus.java index 1cbc31ca5..9308203c9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Enum/ProfileStatus.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/enums/ProfileStatus.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Profile.Enum; +package dev.nandi0813.practice.manager.profile.enums; public enum ProfileStatus { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Enum/ProfileWorldTime.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/enums/ProfileWorldTime.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Enum/ProfileWorldTime.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/enums/ProfileWorldTime.java index 4150a950b..65f9d134b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Enum/ProfileWorldTime.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/enums/ProfileWorldTime.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Profile.Enum; +package dev.nandi0813.practice.manager.profile.enums; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; import lombok.Getter; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Group/Group.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/group/Group.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Group/Group.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/group/Group.java index 196931092..47ecff33d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Group/Group.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/group/Group.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Profile.Group; +package dev.nandi0813.practice.manager.profile.group; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; import lombok.Getter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Group/GroupManager.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/group/GroupManager.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Group/GroupManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/group/GroupManager.java index c3b2f94ca..f6d6a65d7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Group/GroupManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/group/GroupManager.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Profile.Group; +package dev.nandi0813.practice.manager.profile.group; -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Statistics/LadderStats.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/statistics/LadderStats.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Statistics/LadderStats.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/statistics/LadderStats.java index e4187b62d..50469fe21 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Statistics/LadderStats.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/statistics/LadderStats.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Profile.Statistics; +package dev.nandi0813.practice.manager.profile.statistics; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Statistics/ProfileStat.java b/core/src/main/java/dev/nandi0813/practice/manager/profile/statistics/ProfileStat.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Profile/Statistics/ProfileStat.java rename to core/src/main/java/dev/nandi0813/practice/manager/profile/statistics/ProfileStat.java index b00fe6871..079176b86 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Profile/Statistics/ProfileStat.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/profile/statistics/ProfileStat.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Profile.Statistics; - -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileFile; -import dev.nandi0813.practice.Util.NumberUtil; +package dev.nandi0813.practice.manager.profile.statistics; + +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileFile; +import dev.nandi0813.practice.util.NumberUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Queue.java b/core/src/main/java/dev/nandi0813/practice/manager/queue/Queue.java similarity index 85% rename from core/src/main/java/dev/nandi0813/practice/Manager/Queue/Queue.java rename to core/src/main/java/dev/nandi0813/practice/manager/queue/Queue.java index 71389e19f..cd4dfef03 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Queue.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/queue/Queue.java @@ -1,26 +1,26 @@ -package dev.nandi0813.practice.Manager.Queue; +package dev.nandi0813.practice.manager.queue; import dev.nandi0813.api.Event.Queue.QueueEndEvent; import dev.nandi0813.api.Event.Queue.QueueStartEvent; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.Util.LadderUtil; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Queue.Runnables.RankedSearchRunnable; -import dev.nandi0813.practice.Manager.Queue.Runnables.SearchRunnable; -import dev.nandi0813.practice.Manager.Queue.Runnables.UnrankedSearchRunnable; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Interface.Runnable; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.ladder.util.LadderUtil; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.queue.runnables.RankedSearchRunnable; +import dev.nandi0813.practice.manager.queue.runnables.SearchRunnable; +import dev.nandi0813.practice.manager.queue.runnables.UnrankedSearchRunnable; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.interfaces.Runnable; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/QueueManager.java b/core/src/main/java/dev/nandi0813/practice/manager/queue/QueueManager.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Queue/QueueManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/queue/QueueManager.java index cb3710a2d..df1946533 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/QueueManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/queue/QueueManager.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Queue; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.queue; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/RankedSearchRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/RankedSearchRunnable.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/RankedSearchRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/RankedSearchRunnable.java index 57f752218..cfed72caf 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/RankedSearchRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/RankedSearchRunnable.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Queue.Runnables; +package dev.nandi0813.practice.manager.queue.runnables; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Queue.Queue; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.queue.Queue; import org.bukkit.scheduler.BukkitRunnable; public class RankedSearchRunnable extends SearchRunnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/SearchRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/SearchRunnable.java similarity index 77% rename from core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/SearchRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/SearchRunnable.java index 569057cbd..d6be7bc8c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/SearchRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/SearchRunnable.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Manager.Queue.Runnables; +package dev.nandi0813.practice.manager.queue.runnables; -import dev.nandi0813.practice.Manager.Queue.Queue; -import dev.nandi0813.practice.Manager.Queue.QueueManager; -import dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.manager.queue.Queue; +import dev.nandi0813.practice.manager.queue.QueueManager; +import dev.nandi0813.practice.module.interfaces.actionbar.ActionBar; +import dev.nandi0813.practice.util.interfaces.Runnable; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/UnrankedSearchRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/UnrankedSearchRunnable.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/UnrankedSearchRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/UnrankedSearchRunnable.java index 96924677c..563246610 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Queue/Runnables/UnrankedSearchRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/queue/runnables/UnrankedSearchRunnable.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Queue.Runnables; +package dev.nandi0813.practice.manager.queue.runnables; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Division.Division; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Queue.Queue; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.division.Division; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.queue.Queue; import org.bukkit.scheduler.BukkitRunnable; import java.util.ArrayList; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/AutoSaveRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/server/AutoSaveRunnable.java similarity index 71% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/AutoSaveRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/AutoSaveRunnable.java index f7ac6d028..9fbfbfbd8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/AutoSaveRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/AutoSaveRunnable.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Manager.Server; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Backend.BackendManager; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Hologram.HologramManager; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.NumberUtil; +package dev.nandi0813.practice.manager.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.backend.BackendManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.leaderboard.hologram.HologramManager; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.NumberUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/InactiveProfileRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/server/InactiveProfileRunnable.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/InactiveProfileRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/InactiveProfileRunnable.java index 9b5e69f22..376623b7b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/InactiveProfileRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/InactiveProfileRunnable.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Server; +package dev.nandi0813.practice.manager.server; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Backend.MysqlManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.MysqlManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import dev.nandi0813.practice.ZonePractice; import lombok.Getter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/MysqlSaveRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/server/MysqlSaveRunnable.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/MysqlSaveRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/MysqlSaveRunnable.java index 5011fe3fd..3fbd86045 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/MysqlSaveRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/MysqlSaveRunnable.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice.Manager.Server; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.MysqlManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.MysqlManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.util.Common; import lombok.Getter; import org.bukkit.ChatColor; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/ProfileLimitRunnable.java b/core/src/main/java/dev/nandi0813/practice/manager/server/ProfileLimitRunnable.java similarity index 78% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/ProfileLimitRunnable.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/ProfileLimitRunnable.java index 595381830..f84db80a2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/ProfileLimitRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/ProfileLimitRunnable.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice.Manager.Server; - -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.manager.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/ServerManager.java b/core/src/main/java/dev/nandi0813/practice/manager/server/ServerManager.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/ServerManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/ServerManager.java index cc182cd6f..f1926d83b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/ServerManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/ServerManager.java @@ -1,21 +1,21 @@ -package dev.nandi0813.practice.Manager.Server; - -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Backend.BackendManager; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Division.DivisionManager; -import dev.nandi0813.practice.Manager.Inventory.InventoryManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.GoldenHead; -import dev.nandi0813.practice.Util.PlayerUtil.PlayerUtil; -import dev.nandi0813.practice.Util.StartUpTypes; +package dev.nandi0813.practice.manager.server; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.backend.BackendManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.division.DivisionManager; +import dev.nandi0813.practice.manager.inventory.InventoryManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.GoldenHead; +import dev.nandi0813.practice.util.StartUpTypes; +import dev.nandi0813.practice.util.playerutil.PlayerUtil; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/WorldEnum.java b/core/src/main/java/dev/nandi0813/practice/manager/server/WorldEnum.java similarity index 55% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/WorldEnum.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/WorldEnum.java index 0979cabbd..630ca6db2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/WorldEnum.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/WorldEnum.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Server; +package dev.nandi0813.practice.manager.server; public enum WorldEnum { LOBBY, diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundEffect.java b/core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundEffect.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundEffect.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundEffect.java index 48039a096..3856f92fa 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundEffect.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundEffect.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Server.Sound; +package dev.nandi0813.practice.manager.server.sound; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; import lombok.Getter; import org.bukkit.Location; import org.bukkit.Sound; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundManager.java b/core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundManager.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundManager.java index 48cd12869..7e5b36ba4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundManager.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Manager.Server.Sound; +package dev.nandi0813.practice.manager.server.sound; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.util.Common; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundType.java b/core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundType.java similarity index 77% rename from core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundType.java rename to core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundType.java index 5b42c7495..e81eebb66 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Server/Sound/SoundType.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/server/sound/SoundType.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Server.Sound; +package dev.nandi0813.practice.manager.server.sound; public enum SoundType { diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/PracticeSidebar.java b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/PracticeSidebar.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/PracticeSidebar.java rename to core/src/main/java/dev/nandi0813/practice/manager/sidebar/PracticeSidebar.java index d32bca0ad..4ecc57bfd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/PracticeSidebar.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/PracticeSidebar.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Manager.Sidebar; +package dev.nandi0813.practice.manager.sidebar; -import dev.nandi0813.practice.Manager.Sidebar.Adapter.SidebarAdapter; +import dev.nandi0813.practice.manager.sidebar.adapter.SidebarAdapter; import lombok.Getter; import net.kyori.adventure.text.Component; import net.megavex.scoreboardlibrary.api.sidebar.Sidebar; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/SidebarManager.java b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/SidebarManager.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/SidebarManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/sidebar/SidebarManager.java index d8a87cd10..512100d7c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/SidebarManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/SidebarManager.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice.Manager.Sidebar; - -import dev.nandi0813.practice.Manager.Backend.ConfigFile; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Sidebar.Adapter.PracticeAdapter; -import dev.nandi0813.practice.Manager.Sidebar.Adapter.SidebarAdapter; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.PermanentConfig; +package dev.nandi0813.practice.manager.sidebar; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigFile; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.sidebar.adapter.PracticeAdapter; +import dev.nandi0813.practice.manager.sidebar.adapter.SidebarAdapter; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.PermanentConfig; import lombok.Getter; import net.megavex.scoreboardlibrary.api.ScoreboardLibrary; import net.megavex.scoreboardlibrary.api.exception.NoPacketAdapterAvailableException; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/AdapterUtil.java b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/AdapterUtil.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/AdapterUtil.java rename to core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/AdapterUtil.java index 977406bb2..2b8f02fa8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/AdapterUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/AdapterUtil.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice.Manager.Sidebar.Adapter; +package dev.nandi0813.practice.manager.sidebar.adapter; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.MatchType; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA.PartyFFA; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit.PartySplit; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty.PartyVsParty; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Module.Util.ClassImport; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.MatchType; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.type.partyffa.PartyFFA; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit.PartySplit; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty.PartyVsParty; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.module.util.ClassImport; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/PracticeAdapter.java b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/PracticeAdapter.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/PracticeAdapter.java rename to core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/PracticeAdapter.java index 402298b5a..e2be0ad14 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/PracticeAdapter.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/PracticeAdapter.java @@ -1,46 +1,46 @@ -package dev.nandi0813.practice.Manager.Sidebar.Adapter; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelEvent; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Interface.DuelFight; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.LMS.LMS; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.OITC.OITC; -import dev.nandi0813.practice.Manager.Fight.Event.Events.FFA.Splegg.Splegg; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.Juggernaut.Juggernaut; -import dev.nandi0813.practice.Manager.Fight.Event.Events.OneVsAll.TnTTag.TNTTag; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.WeightClass; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Round; -import dev.nandi0813.practice.Manager.Fight.Match.Type.Duel.Duel; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PartyFFA.PartyFFA; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartySplit.PartySplit; -import dev.nandi0813.practice.Manager.Fight.Match.Type.PlayersVsPlayers.PartyVsParty.PartyVsParty; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Enum.LadderType; -import dev.nandi0813.practice.Manager.Ladder.Type.Boxing; -import dev.nandi0813.practice.Manager.Party.Party; -import dev.nandi0813.practice.Manager.Party.PartyManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Queue.Queue; -import dev.nandi0813.practice.Manager.Queue.QueueManager; -import dev.nandi0813.practice.Manager.Sidebar.SidebarManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Interface.Spectatable; -import dev.nandi0813.practice.Util.PAPIUtil; -import dev.nandi0813.practice.Util.TPSUtil; +package dev.nandi0813.practice.manager.sidebar.adapter; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelEvent; +import dev.nandi0813.practice.manager.fight.event.events.duel.interfaces.DuelFight; +import dev.nandi0813.practice.manager.fight.event.events.ffa.lms.LMS; +import dev.nandi0813.practice.manager.fight.event.events.ffa.oitc.OITC; +import dev.nandi0813.practice.manager.fight.event.events.ffa.splegg.Splegg; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.juggernaut.Juggernaut; +import dev.nandi0813.practice.manager.fight.event.events.onevsall.tnttag.TNTTag; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.Round; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.enums.WeightClass; +import dev.nandi0813.practice.manager.fight.match.type.duel.Duel; +import dev.nandi0813.practice.manager.fight.match.type.partyffa.PartyFFA; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partysplit.PartySplit; +import dev.nandi0813.practice.manager.fight.match.type.playersvsplayers.partyvsparty.PartyVsParty; +import dev.nandi0813.practice.manager.fight.match.util.MatchUtil; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.enums.LadderType; +import dev.nandi0813.practice.manager.ladder.type.Boxing; +import dev.nandi0813.practice.manager.party.Party; +import dev.nandi0813.practice.manager.party.PartyManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.manager.queue.Queue; +import dev.nandi0813.practice.manager.queue.QueueManager; +import dev.nandi0813.practice.manager.sidebar.SidebarManager; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.PAPIUtil; +import dev.nandi0813.practice.util.TPSUtil; +import dev.nandi0813.practice.util.interfaces.Spectatable; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/SidebarAdapter.java b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/SidebarAdapter.java similarity index 89% rename from core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/SidebarAdapter.java rename to core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/SidebarAdapter.java index 81d6e41f5..e7af297e9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Sidebar/Adapter/SidebarAdapter.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/SidebarAdapter.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Manager.Sidebar.Adapter; +package dev.nandi0813.practice.manager.sidebar.adapter; import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Spectator/SpectatorListener.java b/core/src/main/java/dev/nandi0813/practice/manager/spectator/SpectatorListener.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Manager/Spectator/SpectatorListener.java rename to core/src/main/java/dev/nandi0813/practice/manager/spectator/SpectatorListener.java index 654ac1ae8..ddc09e002 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Spectator/SpectatorListener.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/spectator/SpectatorListener.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Manager.Spectator; - -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.Brackets; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.Interface.Spectatable; +package dev.nandi0813.practice.manager.spectator; + +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.Brackets; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.interfaces.Spectatable; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/core/src/main/java/dev/nandi0813/practice/Manager/Spectator/SpectatorManager.java b/core/src/main/java/dev/nandi0813/practice/manager/spectator/SpectatorManager.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Manager/Spectator/SpectatorManager.java rename to core/src/main/java/dev/nandi0813/practice/manager/spectator/SpectatorManager.java index 14811191e..65f3fce11 100644 --- a/core/src/main/java/dev/nandi0813/practice/Manager/Spectator/SpectatorManager.java +++ b/core/src/main/java/dev/nandi0813/practice/manager/spectator/SpectatorManager.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Manager.Spectator; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIs.SpectatorMenuGui; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.Interface.Spectatable; -import dev.nandi0813.practice.Util.StringUtil; +package dev.nandi0813.practice.manager.spectator; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.guis.SpectatorMenuGui; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; +import dev.nandi0813.practice.util.interfaces.Spectatable; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/VersionNotSupportedException.java b/core/src/main/java/dev/nandi0813/practice/module/VersionNotSupportedException.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Module/VersionNotSupportedException.java rename to core/src/main/java/dev/nandi0813/practice/module/VersionNotSupportedException.java index 247ce0940..b01800420 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/VersionNotSupportedException.java +++ b/core/src/main/java/dev/nandi0813/practice/module/VersionNotSupportedException.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module; +package dev.nandi0813.practice.module; import dev.nandi0813.practice.ZonePractice; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ArenaCopyUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ArenaCopyUtil.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ArenaCopyUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/ArenaCopyUtil.java index 2705fd60b..594c0e3a4 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ArenaCopyUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ArenaCopyUtil.java @@ -1,19 +1,19 @@ -package dev.nandi0813.practice.Module.Interfaces; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.Arena; -import dev.nandi0813.practice.Manager.Arena.Arenas.ArenaCopy; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Arena.Util.BedLocation; -import dev.nandi0813.practice.Manager.Arena.Util.PortalLocation; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar; -import dev.nandi0813.practice.Util.*; +package dev.nandi0813.practice.module.interfaces; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.Arena; +import dev.nandi0813.practice.manager.arena.arenas.ArenaCopy; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.arena.util.BedLocation; +import dev.nandi0813.practice.manager.arena.util.PortalLocation; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.module.interfaces.actionbar.ActionBar; +import dev.nandi0813.practice.util.*; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -151,7 +151,7 @@ protected void copyNormal(Profile profile, ArenaCopy arenaCopy, Cuboid copyFrom, arenaCopy.getMainArena().setCopying(true); - dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar actionBar = null; + dev.nandi0813.practice.module.interfaces.actionbar.ActionBar actionBar = null; if (!profile.getActionBar().isLock()) { actionBar = profile.getActionBar(); actionBar.setLock(true); diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ArenaUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ArenaUtil.java similarity index 53% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ArenaUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/ArenaUtil.java index 4d5f54b69..ff871f97d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ArenaUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ArenaUtil.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; import org.bukkit.block.Block; public interface ArenaUtil { diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/BedUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/BedUtil.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/BedUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/BedUtil.java index 1ebc98250..4739f267e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/BedUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/BedUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; -import dev.nandi0813.practice.Manager.Arena.Util.BedLocation; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Match; +import dev.nandi0813.practice.manager.arena.util.BedLocation; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ChangedBlock.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ChangedBlock.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ChangedBlock.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/ChangedBlock.java index dd6aeae74..d611b2884 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ChangedBlock.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ChangedBlock.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/EntityHider.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/EntityHider.java similarity index 99% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/EntityHider.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/EntityHider.java index 1937a9242..9e4a2e6dc 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/EntityHider.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/EntityHider.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListener; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ItemCreateUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ItemCreateUtil.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ItemCreateUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/ItemCreateUtil.java index 02a67f778..cced6c985 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ItemCreateUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ItemCreateUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; import org.bukkit.Material; import org.bukkit.inventory.ItemFlag; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ItemMaterialUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ItemMaterialUtil.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ItemMaterialUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/ItemMaterialUtil.java index 664e04d75..8de676b92 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ItemMaterialUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/ItemMaterialUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; import org.bukkit.Material; import org.bukkit.OfflinePlayer; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/KitData.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/KitData.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/KitData.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/KitData.java index 2ef8c64f3..6f49eeaef 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/KitData.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/KitData.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; -import dev.nandi0813.practice.Util.ItemSerializationUtil; +import dev.nandi0813.practice.util.ItemSerializationUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.configuration.file.FileConfiguration; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/LadderUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/LadderUtil.java similarity index 86% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/LadderUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/LadderUtil.java index 31ae410a1..82214f8f9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/LadderUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/LadderUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; -import dev.nandi0813.practice.Manager.Fight.Match.Match; +import dev.nandi0813.practice.manager.fight.match.Match; import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPlaceEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/PlayerHiderInterface.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/PlayerHiderInterface.java similarity index 80% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/PlayerHiderInterface.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/PlayerHiderInterface.java index c49edfd8a..3407c1e89 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/PlayerHiderInterface.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/PlayerHiderInterface.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/PlayerUtil.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/PlayerUtil.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/PlayerUtil.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/PlayerUtil.java index cc171ad96..92865abb8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/PlayerUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/PlayerUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; import net.kyori.adventure.text.Component; import org.bukkit.Material; import org.bukkit.entity.Entity; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/StatisticListener.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/StatisticListener.java similarity index 96% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/StatisticListener.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/StatisticListener.java index b87b9be24..913cfe7c9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/StatisticListener.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/StatisticListener.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/WorldCreate.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/WorldCreate.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/WorldCreate.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/WorldCreate.java index ce9f50812..54490aeea 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/WorldCreate.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/WorldCreate.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Interfaces; +package dev.nandi0813.practice.module.interfaces; import org.bukkit.World; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ActionBar/ActionBar.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/actionbar/ActionBar.java similarity index 95% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ActionBar/ActionBar.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/actionbar/ActionBar.java index 4991104a9..c3a4e763d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ActionBar/ActionBar.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/actionbar/ActionBar.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Module.Interfaces.ActionBar; +package dev.nandi0813.practice.module.interfaces.actionbar; -import dev.nandi0813.practice.Manager.Profile.Profile; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.profile.Profile; import lombok.Getter; import lombok.Setter; import net.kyori.adventure.text.Component; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ActionBar/ActionBarRunnable.java b/core/src/main/java/dev/nandi0813/practice/module/interfaces/actionbar/ActionBarRunnable.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ActionBar/ActionBarRunnable.java rename to core/src/main/java/dev/nandi0813/practice/module/interfaces/actionbar/ActionBarRunnable.java index b543123be..84afd533b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Interfaces/ActionBar/ActionBarRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/module/interfaces/actionbar/ActionBarRunnable.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Module.Interfaces.ActionBar; +package dev.nandi0813.practice.module.interfaces.actionbar; -import dev.nandi0813.practice.Util.Interface.Runnable; +import dev.nandi0813.practice.util.interfaces.Runnable; public class ActionBarRunnable extends Runnable { diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Util/ClassImport.java b/core/src/main/java/dev/nandi0813/practice/module/util/ClassImport.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Module/Util/ClassImport.java rename to core/src/main/java/dev/nandi0813/practice/module/util/ClassImport.java index 3caf15074..266aeacf9 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Util/ClassImport.java +++ b/core/src/main/java/dev/nandi0813/practice/module/util/ClassImport.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Module.Util; - -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar; -import dev.nandi0813.practice.Module.Interfaces.ChangedBlock; -import dev.nandi0813.practice.Module.Interfaces.KitData; -import dev.nandi0813.practice.Module.VersionNotSupportedException; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice.module.util; + +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.module.VersionNotSupportedException; +import dev.nandi0813.practice.module.interfaces.ChangedBlock; +import dev.nandi0813.practice.module.interfaces.KitData; +import dev.nandi0813.practice.module.interfaces.actionbar.ActionBar; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.event.block.BlockPlaceEvent; diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Util/Classes.java b/core/src/main/java/dev/nandi0813/practice/module/util/Classes.java similarity index 84% rename from core/src/main/java/dev/nandi0813/practice/Module/Util/Classes.java rename to core/src/main/java/dev/nandi0813/practice/module/util/Classes.java index fef13b1c1..81880b83e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Util/Classes.java +++ b/core/src/main/java/dev/nandi0813/practice/module/util/Classes.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Module.Util; +package dev.nandi0813.practice.module.util; -import dev.nandi0813.practice.Module.Interfaces.*; +import dev.nandi0813.practice.module.interfaces.*; public interface Classes { diff --git a/core/src/main/java/dev/nandi0813/practice/Module/Util/VersionChecker.java b/core/src/main/java/dev/nandi0813/practice/module/util/VersionChecker.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Module/Util/VersionChecker.java rename to core/src/main/java/dev/nandi0813/practice/module/util/VersionChecker.java index 1531a1982..f35fe9399 100644 --- a/core/src/main/java/dev/nandi0813/practice/Module/Util/VersionChecker.java +++ b/core/src/main/java/dev/nandi0813/practice/module/util/VersionChecker.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Module.Util; +package dev.nandi0813.practice.module.util; import lombok.Getter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/ArmorUtil.java b/core/src/main/java/dev/nandi0813/practice/util/ArmorUtil.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Util/ArmorUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/ArmorUtil.java index b5026cca9..d461d888d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/ArmorUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/ArmorUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/BasicItem.java b/core/src/main/java/dev/nandi0813/practice/util/BasicItem.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Util/BasicItem.java rename to core/src/main/java/dev/nandi0813/practice/util/BasicItem.java index 58aca3b4d..c0e7bf74e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/BasicItem.java +++ b/core/src/main/java/dev/nandi0813/practice/util/BasicItem.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import lombok.Getter; import org.bukkit.Material; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Common.java b/core/src/main/java/dev/nandi0813/practice/util/Common.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Util/Common.java rename to core/src/main/java/dev/nandi0813/practice/util/Common.java index 47bce9c73..0744003ec 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Common.java +++ b/core/src/main/java/dev/nandi0813/practice/util/Common.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import dev.nandi0813.practice.ZonePractice; import me.clip.placeholderapi.PlaceholderAPI; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Cuboid.java b/core/src/main/java/dev/nandi0813/practice/util/Cuboid.java similarity index 99% rename from core/src/main/java/dev/nandi0813/practice/Util/Cuboid.java rename to core/src/main/java/dev/nandi0813/practice/util/Cuboid.java index 6c02d89cb..2e78ce224 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Cuboid.java +++ b/core/src/main/java/dev/nandi0813/practice/util/Cuboid.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/GoldenHead.java b/core/src/main/java/dev/nandi0813/practice/util/GoldenHead.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Util/GoldenHead.java rename to core/src/main/java/dev/nandi0813/practice/util/GoldenHead.java index 06e34def9..73730c314 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/GoldenHead.java +++ b/core/src/main/java/dev/nandi0813/practice/util/GoldenHead.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/InventoryUtil.java b/core/src/main/java/dev/nandi0813/practice/util/InventoryUtil.java similarity index 87% rename from core/src/main/java/dev/nandi0813/practice/Util/InventoryUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/InventoryUtil.java index 4abdf381a..de75215d8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/InventoryUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/InventoryUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/ItemSerializationUtil.java b/core/src/main/java/dev/nandi0813/practice/util/ItemSerializationUtil.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Util/ItemSerializationUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/ItemSerializationUtil.java index 5fbabc825..336f8500d 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/ItemSerializationUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/ItemSerializationUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.inventory.ItemStack; import org.bukkit.util.io.BukkitObjectInputStream; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/NumberUtil.java b/core/src/main/java/dev/nandi0813/practice/util/NumberUtil.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Util/NumberUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/NumberUtil.java index 30f6dc162..f4201e05b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/NumberUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/NumberUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import java.text.DecimalFormat; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/PAPIUtil.java b/core/src/main/java/dev/nandi0813/practice/util/PAPIUtil.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Util/PAPIUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/PAPIUtil.java index bfbbf4427..d03376c4b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/PAPIUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/PAPIUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import dev.nandi0813.practice.ZonePractice; import me.clip.placeholderapi.PlaceholderAPI; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/PageUtil.java b/core/src/main/java/dev/nandi0813/practice/util/PageUtil.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Util/PageUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/PageUtil.java index 29c36a78e..a62dd4ae7 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/PageUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/PageUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Pair.java b/core/src/main/java/dev/nandi0813/practice/util/Pair.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Util/Pair.java rename to core/src/main/java/dev/nandi0813/practice/util/Pair.java index dcb182f0d..1d02ea25a 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Pair.java +++ b/core/src/main/java/dev/nandi0813/practice/util/Pair.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/PermanentConfig.java b/core/src/main/java/dev/nandi0813/practice/util/PermanentConfig.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Util/PermanentConfig.java rename to core/src/main/java/dev/nandi0813/practice/util/PermanentConfig.java index cd21bd075..2a1076f25 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/PermanentConfig.java +++ b/core/src/main/java/dev/nandi0813/practice/util/PermanentConfig.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; +import dev.nandi0813.practice.manager.backend.ConfigManager; public enum PermanentConfig { ; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/SaveResource.java b/core/src/main/java/dev/nandi0813/practice/util/SaveResource.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Util/SaveResource.java rename to core/src/main/java/dev/nandi0813/practice/util/SaveResource.java index 2d5e9d0b0..61e911f0e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/SaveResource.java +++ b/core/src/main/java/dev/nandi0813/practice/util/SaveResource.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import dev.dejvokep.boostedyaml.YamlDocument; import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning; @@ -6,8 +6,8 @@ import dev.dejvokep.boostedyaml.settings.general.GeneralSettings; import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings; import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings; -import dev.nandi0813.practice.Module.Util.VersionChecker; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.module.util.VersionChecker; import org.apache.commons.io.FileUtils; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/SoftDependUtil.java b/core/src/main/java/dev/nandi0813/practice/util/SoftDependUtil.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Util/SoftDependUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/SoftDependUtil.java index 25ea3e0b6..f1513e6a8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/SoftDependUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/SoftDependUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/StartUpCallback.java b/core/src/main/java/dev/nandi0813/practice/util/StartUpCallback.java similarity index 64% rename from core/src/main/java/dev/nandi0813/practice/Util/StartUpCallback.java rename to core/src/main/java/dev/nandi0813/practice/util/StartUpCallback.java index 6efbb30c8..dc14c6352 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/StartUpCallback.java +++ b/core/src/main/java/dev/nandi0813/practice/util/StartUpCallback.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; public interface StartUpCallback { diff --git a/core/src/main/java/dev/nandi0813/practice/Util/StartUpTypes.java b/core/src/main/java/dev/nandi0813/practice/util/StartUpTypes.java similarity index 82% rename from core/src/main/java/dev/nandi0813/practice/Util/StartUpTypes.java rename to core/src/main/java/dev/nandi0813/practice/util/StartUpTypes.java index bad21dc8d..66e115346 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/StartUpTypes.java +++ b/core/src/main/java/dev/nandi0813/practice/util/StartUpTypes.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; public enum StartUpTypes { diff --git a/core/src/main/java/dev/nandi0813/practice/Util/StartUpUtil.java b/core/src/main/java/dev/nandi0813/practice/util/StartUpUtil.java similarity index 92% rename from core/src/main/java/dev/nandi0813/practice/Util/StartUpUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/StartUpUtil.java index ff34e2e1f..48d6b56ce 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/StartUpUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/StartUpUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import dev.nandi0813.practice.ZonePractice; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/StatisticUtil.java b/core/src/main/java/dev/nandi0813/practice/util/StatisticUtil.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Util/StatisticUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/StatisticUtil.java index 6910f21d9..5d20b8f65 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/StatisticUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/StatisticUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; public enum StatisticUtil { ; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/StringUtil.java b/core/src/main/java/dev/nandi0813/practice/util/StringUtil.java similarity index 98% rename from core/src/main/java/dev/nandi0813/practice/Util/StringUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/StringUtil.java index 8e484c4a8..d8d0423c8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/StringUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/StringUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; +import dev.nandi0813.practice.manager.backend.LanguageManager; import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Color; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/TPSUtil.java b/core/src/main/java/dev/nandi0813/practice/util/TPSUtil.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Util/TPSUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/TPSUtil.java index 22b0ad42d..7b261cf16 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/TPSUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/TPSUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util; +package dev.nandi0813.practice.util; import org.bukkit.Bukkit; import org.bukkit.Server; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/CooldownObject.java b/core/src/main/java/dev/nandi0813/practice/util/cooldown/CooldownObject.java similarity index 90% rename from core/src/main/java/dev/nandi0813/practice/Util/Cooldown/CooldownObject.java rename to core/src/main/java/dev/nandi0813/practice/util/cooldown/CooldownObject.java index 6e38414ca..32ac52a5b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/CooldownObject.java +++ b/core/src/main/java/dev/nandi0813/practice/util/cooldown/CooldownObject.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util.Cooldown; +package dev.nandi0813.practice.util.cooldown; public enum CooldownObject { diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/EnderpearlRunnable.java b/core/src/main/java/dev/nandi0813/practice/util/cooldown/EnderpearlRunnable.java similarity index 79% rename from core/src/main/java/dev/nandi0813/practice/Util/Cooldown/EnderpearlRunnable.java rename to core/src/main/java/dev/nandi0813/practice/util/cooldown/EnderpearlRunnable.java index 55b5fc099..c45e2141e 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/EnderpearlRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/util/cooldown/EnderpearlRunnable.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice.Util.Cooldown; +package dev.nandi0813.practice.util.cooldown; -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/FireballRunnable.java b/core/src/main/java/dev/nandi0813/practice/util/cooldown/FireballRunnable.java similarity index 74% rename from core/src/main/java/dev/nandi0813/practice/Util/Cooldown/FireballRunnable.java rename to core/src/main/java/dev/nandi0813/practice/util/cooldown/FireballRunnable.java index 87e524d48..08cc9985b 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/FireballRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/util/cooldown/FireballRunnable.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice.Util.Cooldown; +package dev.nandi0813.practice.util.cooldown; -import dev.nandi0813.practice.Manager.Fight.Event.Enum.EventStatus; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.enums.EventStatus; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/GoldenAppleRunnable.java b/core/src/main/java/dev/nandi0813/practice/util/cooldown/GoldenAppleRunnable.java similarity index 81% rename from core/src/main/java/dev/nandi0813/practice/Util/Cooldown/GoldenAppleRunnable.java rename to core/src/main/java/dev/nandi0813/practice/util/cooldown/GoldenAppleRunnable.java index b9a3e8e7f..9548733be 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/GoldenAppleRunnable.java +++ b/core/src/main/java/dev/nandi0813/practice/util/cooldown/GoldenAppleRunnable.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Util.Cooldown; +package dev.nandi0813.practice.util.cooldown; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/PlayerCooldown.java b/core/src/main/java/dev/nandi0813/practice/util/cooldown/PlayerCooldown.java similarity index 97% rename from core/src/main/java/dev/nandi0813/practice/Util/Cooldown/PlayerCooldown.java rename to core/src/main/java/dev/nandi0813/practice/util/cooldown/PlayerCooldown.java index d31dbaee9..247780bf1 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Cooldown/PlayerCooldown.java +++ b/core/src/main/java/dev/nandi0813/practice/util/cooldown/PlayerCooldown.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice.Util.Cooldown; +package dev.nandi0813.practice.util.cooldown; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/EntityHider/PlayerHider.java b/core/src/main/java/dev/nandi0813/practice/util/entityhider/PlayerHider.java similarity index 94% rename from core/src/main/java/dev/nandi0813/practice/Util/EntityHider/PlayerHider.java rename to core/src/main/java/dev/nandi0813/practice/util/entityhider/PlayerHider.java index 4668e96de..0c42306e3 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/EntityHider/PlayerHider.java +++ b/core/src/main/java/dev/nandi0813/practice/util/entityhider/PlayerHider.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice.Util.EntityHider; +package dev.nandi0813.practice.util.entityhider; import dev.nandi0813.api.Event.Spectate.Start.MatchSpectateStartEvent; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Server.ServerManager; -import dev.nandi0813.practice.Manager.Server.WorldEnum; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.server.ServerManager; +import dev.nandi0813.practice.manager.server.WorldEnum; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/FightMapChange/FightChange.java b/core/src/main/java/dev/nandi0813/practice/util/fightmapchange/FightChange.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Util/FightMapChange/FightChange.java rename to core/src/main/java/dev/nandi0813/practice/util/fightmapchange/FightChange.java index 904845df5..57f8eebc8 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/FightMapChange/FightChange.java +++ b/core/src/main/java/dev/nandi0813/practice/util/fightmapchange/FightChange.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Util.FightMapChange; +package dev.nandi0813.practice.util.fightmapchange; -import dev.nandi0813.practice.Module.Interfaces.ChangedBlock; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.module.interfaces.ChangedBlock; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; import lombok.Getter; import org.bukkit.Location; import org.bukkit.block.Block; @@ -13,7 +13,7 @@ import java.util.*; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public class FightChange { diff --git a/core/src/main/java/dev/nandi0813/practice/Util/FightMapChange/TempBlockChange.java b/core/src/main/java/dev/nandi0813/practice/util/fightmapchange/TempBlockChange.java similarity index 88% rename from core/src/main/java/dev/nandi0813/practice/Util/FightMapChange/TempBlockChange.java rename to core/src/main/java/dev/nandi0813/practice/util/fightmapchange/TempBlockChange.java index 44c19936e..cd55b43fd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/FightMapChange/TempBlockChange.java +++ b/core/src/main/java/dev/nandi0813/practice/util/fightmapchange/TempBlockChange.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice.Util.FightMapChange; +package dev.nandi0813.practice.util.fightmapchange; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Module.Interfaces.ChangedBlock; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.module.interfaces.ChangedBlock; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Interface/Runnable.java b/core/src/main/java/dev/nandi0813/practice/util/interfaces/Runnable.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Util/Interface/Runnable.java rename to core/src/main/java/dev/nandi0813/practice/util/interfaces/Runnable.java index fdd5ac6a5..b369172d2 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Interface/Runnable.java +++ b/core/src/main/java/dev/nandi0813/practice/util/interfaces/Runnable.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice.Util.Interface; +package dev.nandi0813.practice.util.interfaces; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.util.StringUtil; import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/Interface/Spectatable.java b/core/src/main/java/dev/nandi0813/practice/util/interfaces/Spectatable.java similarity index 68% rename from core/src/main/java/dev/nandi0813/practice/Util/Interface/Spectatable.java rename to core/src/main/java/dev/nandi0813/practice/util/interfaces/Spectatable.java index 643f66726..14febdf9c 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/Interface/Spectatable.java +++ b/core/src/main/java/dev/nandi0813/practice/util/interfaces/Spectatable.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Util.Interface; +package dev.nandi0813.practice.util.interfaces; -import dev.nandi0813.practice.Manager.GUI.GUIItem; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.FightMapChange.FightChange; +import dev.nandi0813.practice.manager.gui.GUIItem; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.fightmapchange.FightChange; import org.bukkit.entity.Player; import java.util.List; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/PlaceholderAPI/PlayerExpansion.java b/core/src/main/java/dev/nandi0813/practice/util/placeholderapi/PlayerExpansion.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Util/PlaceholderAPI/PlayerExpansion.java rename to core/src/main/java/dev/nandi0813/practice/util/placeholderapi/PlayerExpansion.java index b97dfcedd..fdd8f5578 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/PlaceholderAPI/PlayerExpansion.java +++ b/core/src/main/java/dev/nandi0813/practice/util/placeholderapi/PlayerExpansion.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice.Util.PlaceholderAPI; - -import dev.nandi0813.practice.Manager.Arena.ArenaManager; -import dev.nandi0813.practice.Manager.Arena.Arenas.FFAArena; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Leaderboard.Leaderboard; -import dev.nandi0813.practice.Manager.Leaderboard.LeaderboardManager; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbMainType; -import dev.nandi0813.practice.Manager.Leaderboard.Types.LbSecondaryType; -import dev.nandi0813.practice.Manager.Profile.Group.Group; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Queue.QueueManager; +package dev.nandi0813.practice.util.placeholderapi; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.ArenaManager; +import dev.nandi0813.practice.manager.arena.arenas.FFAArena; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.leaderboard.Leaderboard; +import dev.nandi0813.practice.manager.leaderboard.LeaderboardManager; +import dev.nandi0813.practice.manager.leaderboard.types.LbMainType; +import dev.nandi0813.practice.manager.leaderboard.types.LbSecondaryType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.group.Group; +import dev.nandi0813.practice.manager.queue.QueueManager; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/PlayerUtil/PlayerUtil.java b/core/src/main/java/dev/nandi0813/practice/util/playerutil/PlayerUtil.java similarity index 91% rename from core/src/main/java/dev/nandi0813/practice/Util/PlayerUtil/PlayerUtil.java rename to core/src/main/java/dev/nandi0813/practice/util/playerutil/PlayerUtil.java index 32be95f5c..83be29bfd 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/PlayerUtil/PlayerUtil.java +++ b/core/src/main/java/dev/nandi0813/practice/util/playerutil/PlayerUtil.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice.Util.PlayerUtil; +package dev.nandi0813.practice.util.playerutil; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/core/src/main/java/dev/nandi0813/practice/Util/PlayerUtil/ProfileStatData.java b/core/src/main/java/dev/nandi0813/practice/util/playerutil/ProfileStatData.java similarity index 93% rename from core/src/main/java/dev/nandi0813/practice/Util/PlayerUtil/ProfileStatData.java rename to core/src/main/java/dev/nandi0813/practice/util/playerutil/ProfileStatData.java index 2ec6d163b..83f392580 100644 --- a/core/src/main/java/dev/nandi0813/practice/Util/PlayerUtil/ProfileStatData.java +++ b/core/src/main/java/dev/nandi0813/practice/util/playerutil/ProfileStatData.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice.Util.PlayerUtil; +package dev.nandi0813.practice.util.playerutil; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Manager.Ladder.LadderManager; -import dev.nandi0813.practice.Manager.Profile.Profile; +import dev.nandi0813.practice.manager.ladder.LadderManager; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.manager.profile.Profile; import org.apache.commons.lang.StringUtils; public enum ProfileStatData { diff --git a/reset-dev.sh b/reset-dev.sh new file mode 100755 index 000000000..140f8a280 --- /dev/null +++ b/reset-dev.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +echo "🔄 Updating master branch..." +git checkout master +git pull origin master + +echo "🗑️ Deleting old dev branch..." +git branch -D dev + +echo "✨ Creating new dev branch from master..." +git checkout -b dev + +echo "🚀 Pushing new dev branch (force push)..." +git push origin dev --force + +echo "✅ Done! The dev branch is clean and in sync with master." \ No newline at end of file diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Classes.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Classes.java index d6d863a19..97542b96d 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Classes.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Classes.java @@ -1,35 +1,35 @@ package dev.nandi0813.practice_1_8_8; -import dev.nandi0813.practice.Module.Interfaces.*; import dev.nandi0813.practice.ZonePractice; -import dev.nandi0813.practice_1_8_8.Interfaces.LadderUtil; -import dev.nandi0813.practice_1_8_8.Interfaces.MatchTntListener; -import dev.nandi0813.practice_1_8_8.Interfaces.PlayerHiderUtil; -import dev.nandi0813.practice_1_8_8.Listener.ArenaListener; -import dev.nandi0813.practice_1_8_8.Listener.FFAListener; -import dev.nandi0813.practice_1_8_8.Listener.MatchListener; +import dev.nandi0813.practice.module.interfaces.*; +import dev.nandi0813.practice_1_8_8.interfaces.LadderUtil; +import dev.nandi0813.practice_1_8_8.interfaces.MatchTntListener; +import dev.nandi0813.practice_1_8_8.interfaces.PlayerHiderUtil; +import dev.nandi0813.practice_1_8_8.listener.ArenaListener; +import dev.nandi0813.practice_1_8_8.listener.FFAListener; +import dev.nandi0813.practice_1_8_8.listener.MatchListener; import lombok.Getter; import org.bukkit.Bukkit; @Getter -public class Classes implements dev.nandi0813.practice.Module.Util.Classes { +public class Classes implements dev.nandi0813.practice.module.util.Classes { - public WorldCreate worldCreate = new dev.nandi0813.practice_1_8_8.Interfaces.WorldCreate(); + public WorldCreate worldCreate = new dev.nandi0813.practice_1_8_8.interfaces.WorldCreate(); public PlayerHiderInterface playerHiderUtil = new PlayerHiderUtil(); - public ItemMaterialUtil itemMaterialUtil = new dev.nandi0813.practice_1_8_8.Interfaces.ItemMaterialUtil(); + public ItemMaterialUtil itemMaterialUtil = new dev.nandi0813.practice_1_8_8.interfaces.ItemMaterialUtil(); public LadderUtil ladderUtil = new LadderUtil(); - public ItemCreateUtil itemCreateUtil = new dev.nandi0813.practice_1_8_8.Interfaces.ItemCreateUtil(); - public PlayerUtil playerUtil = new dev.nandi0813.practice_1_8_8.Interfaces.PlayerUtil(); - public ArenaUtil arenaUtil = new dev.nandi0813.practice_1_8_8.Interfaces.ArenaUtil(); - public ArenaCopyUtil arenaCopyUtil = new dev.nandi0813.practice_1_8_8.Interfaces.ArenaCopyUtil(); - - public BedUtil bedUtil = new dev.nandi0813.practice_1_8_8.Interfaces.BedUtil(); - public EntityHider entityHider = new dev.nandi0813.practice_1_8_8.Interfaces.EntityHider(ZonePractice.getInstance(), EntityHider.Policy.BLACKLIST); - public StatisticListener statisticListener = new dev.nandi0813.practice_1_8_8.Interfaces.StatisticListener(); - - public Class changedBlockClass = dev.nandi0813.practice_1_8_8.Interfaces.ChangedBlock.class; - public Class kitDataClass = dev.nandi0813.practice_1_8_8.Interfaces.KitData.class; - public Class actionBarClass = dev.nandi0813.practice_1_8_8.Interfaces.ActionBar.class; + public ItemCreateUtil itemCreateUtil = new dev.nandi0813.practice_1_8_8.interfaces.ItemCreateUtil(); + public PlayerUtil playerUtil = new dev.nandi0813.practice_1_8_8.interfaces.PlayerUtil(); + public ArenaUtil arenaUtil = new dev.nandi0813.practice_1_8_8.interfaces.ArenaUtil(); + public ArenaCopyUtil arenaCopyUtil = new dev.nandi0813.practice_1_8_8.interfaces.ArenaCopyUtil(); + + public BedUtil bedUtil = new dev.nandi0813.practice_1_8_8.interfaces.BedUtil(); + public EntityHider entityHider = new dev.nandi0813.practice_1_8_8.interfaces.EntityHider(ZonePractice.getInstance(), EntityHider.Policy.BLACKLIST); + public StatisticListener statisticListener = new dev.nandi0813.practice_1_8_8.interfaces.StatisticListener(); + + public Class changedBlockClass = dev.nandi0813.practice_1_8_8.interfaces.ChangedBlock.class; + public Class kitDataClass = dev.nandi0813.practice_1_8_8.interfaces.KitData.class; + public Class actionBarClass = dev.nandi0813.practice_1_8_8.interfaces.ActionBar.class; public Classes() { Bukkit.getServer().getPluginManager().registerEvents(arenaCopyUtil, ZonePractice.getInstance()); diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/EPCountdownListener.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/EPCountdownListener.java index 654de895f..38043ae1b 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/EPCountdownListener.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/EPCountdownListener.java @@ -1,18 +1,18 @@ package dev.nandi0813.practice_1_8_8; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Runnable.EnderPearlRunnable; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.PermanentConfig; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.util.Runnable.EnderPearlRunnable; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.PermanentConfig; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ActionBar.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ActionBar.java similarity index 81% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ActionBar.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ActionBar.java index 8d02f1967..efa1b1b8a 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ActionBar.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ActionBar.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.StringUtil; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.minecraft.server.v1_8_R3.ChatComponentText; import net.minecraft.server.v1_8_R3.PacketPlayOutChat; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.Player; -public class ActionBar extends dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar { +public class ActionBar extends dev.nandi0813.practice.module.interfaces.actionbar.ActionBar { public ActionBar(Profile profile) { super(profile); diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ArenaCopyUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ArenaCopyUtil.java similarity index 73% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ArenaCopyUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ArenaCopyUtil.java index 6e460ad83..ac314b1d5 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ArenaCopyUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ArenaCopyUtil.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Manager.Arena.Arenas.ArenaCopy; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.manager.arena.arenas.ArenaCopy; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockState; -public class ArenaCopyUtil extends dev.nandi0813.practice.Module.Interfaces.ArenaCopyUtil { +public class ArenaCopyUtil extends dev.nandi0813.practice.module.interfaces.ArenaCopyUtil { @Override protected void copyBlock(Block oldBlock, Block newBlock) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ArenaUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ArenaUtil.java similarity index 79% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ArenaUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ArenaUtil.java index 6b1af5188..73dadc191 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ArenaUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ArenaUtil.java @@ -1,15 +1,15 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Util.BasicItem; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.BasicItem; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -public class ArenaUtil implements dev.nandi0813.practice.Module.Interfaces.ArenaUtil { +public class ArenaUtil implements dev.nandi0813.practice.module.interfaces.ArenaUtil { @Override public boolean turnsToDirt(Block block) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/BedUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/BedUtil.java similarity index 88% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/BedUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/BedUtil.java index 097a41385..a6a814d21 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/BedUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/BedUtil.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; - -import dev.nandi0813.practice.Manager.Arena.Util.BedLocation; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice_1_8_8.interfaces; + +import dev.nandi0813.practice.manager.arena.util.BedLocation; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -19,7 +19,7 @@ import java.util.Map; -public class BedUtil extends dev.nandi0813.practice.Module.Interfaces.BedUtil { +public class BedUtil extends dev.nandi0813.practice.module.interfaces.BedUtil { @Override public BedLocation getBedLocation(Block block) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ChangedBlock.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ChangedBlock.java similarity index 87% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ChangedBlock.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ChangedBlock.java index eaa2f59e2..de7a20e2e 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ChangedBlock.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ChangedBlock.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -11,7 +11,7 @@ import org.bukkit.material.Bed; import org.bukkit.material.MaterialData; -public class ChangedBlock extends dev.nandi0813.practice.Module.Interfaces.ChangedBlock { +public class ChangedBlock extends dev.nandi0813.practice.module.interfaces.ChangedBlock { private final MaterialData materialData; diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/EntityHider.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/EntityHider.java similarity index 94% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/EntityHider.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/EntityHider.java index 8ec7ccbaa..e50c3d669 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/EntityHider.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/EntityHider.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.util.Vector3d; @@ -10,7 +10,7 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; -public class EntityHider extends dev.nandi0813.practice.Module.Interfaces.EntityHider implements Listener { +public class EntityHider extends dev.nandi0813.practice.module.interfaces.EntityHider implements Listener { public EntityHider(Plugin plugin, Policy policy) { super(plugin, policy); diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ItemCreateUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ItemCreateUtil.java similarity index 94% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ItemCreateUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ItemCreateUtil.java index 559577ff5..ea2844c31 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ItemCreateUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ItemCreateUtil.java @@ -1,13 +1,13 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import java.util.List; -public class ItemCreateUtil extends dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil { +public class ItemCreateUtil extends dev.nandi0813.practice.module.interfaces.ItemCreateUtil { @Override public ItemStack createItem(String displayname, Material material, Short damage, int amount, List lore) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ItemMaterialUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ItemMaterialUtil.java similarity index 95% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ItemMaterialUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ItemMaterialUtil.java index f7e60d36a..bff5f008d 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/ItemMaterialUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/ItemMaterialUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -6,7 +6,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -public class ItemMaterialUtil implements dev.nandi0813.practice.Module.Interfaces.ItemMaterialUtil { +public class ItemMaterialUtil implements dev.nandi0813.practice.module.interfaces.ItemMaterialUtil { @Override public Material getSnowball() { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/KitData.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/KitData.java similarity index 82% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/KitData.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/KitData.java index 0811325c0..d432f5124 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/KitData.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/KitData.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; import org.bukkit.entity.Player; -public class KitData extends dev.nandi0813.practice.Module.Interfaces.KitData { +public class KitData extends dev.nandi0813.practice.module.interfaces.KitData { public KitData() { super(); } - public KitData(dev.nandi0813.practice.Module.Interfaces.KitData kitData) { + public KitData(dev.nandi0813.practice.module.interfaces.KitData kitData) { super(kitData); } diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/LadderUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/LadderUtil.java similarity index 90% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/LadderUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/LadderUtil.java index 3829f98fa..5c43be8a3 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/LadderUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/LadderUtil.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Type.FireballFight; -import dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.type.FireballFight; +import dev.nandi0813.practice.module.interfaces.ItemCreateUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.StringUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.Bukkit; @@ -25,9 +25,9 @@ import java.util.Objects; -import static dev.nandi0813.practice.Util.PermanentConfig.FIGHT_ENTITY; +import static dev.nandi0813.practice.util.PermanentConfig.FIGHT_ENTITY; -public class LadderUtil implements dev.nandi0813.practice.Module.Interfaces.LadderUtil { +public class LadderUtil implements dev.nandi0813.practice.module.interfaces.LadderUtil { @Override public void loadInventory(Player player, ItemStack[] armor, ItemStack[] inventory, ItemStack[] extra) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/MatchTntListener.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/MatchTntListener.java similarity index 84% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/MatchTntListener.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/MatchTntListener.java index a14e9bd1a..afa57ee22 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/MatchTntListener.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/MatchTntListener.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/PlayerHiderUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/PlayerHiderUtil.java similarity index 90% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/PlayerHiderUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/PlayerHiderUtil.java index 14ad35ae6..fba12d1ce 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/PlayerHiderUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/PlayerHiderUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Module.Interfaces.PlayerHiderInterface; +import dev.nandi0813.practice.module.interfaces.PlayerHiderInterface; import net.minecraft.server.v1_8_R3.EntityPlayer; import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/PlayerUtil.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/PlayerUtil.java similarity index 96% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/PlayerUtil.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/PlayerUtil.java index c293ea222..34d156ab0 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/PlayerUtil.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/PlayerUtil.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.util.StringUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.Bukkit; @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; -public class PlayerUtil implements dev.nandi0813.practice.Module.Interfaces.PlayerUtil { +public class PlayerUtil implements dev.nandi0813.practice.module.interfaces.PlayerUtil { @Override public ItemStack getPlayerMainHand(Player player) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/StatisticListener.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/StatisticListener.java similarity index 87% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/StatisticListener.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/StatisticListener.java index 04a33517b..4609a4585 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/StatisticListener.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/StatisticListener.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; - -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; +package dev.nandi0813.practice_1_8_8.interfaces; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -24,7 +24,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.scheduler.BukkitRunnable; -public class StatisticListener extends dev.nandi0813.practice.Module.Interfaces.StatisticListener implements Listener { +public class StatisticListener extends dev.nandi0813.practice.module.interfaces.StatisticListener implements Listener { @Override public void onClick(PlayerInteractEvent e) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/WorldCreate.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/WorldCreate.java similarity index 70% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/WorldCreate.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/WorldCreate.java index dff6d0005..e7636fdc1 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Interfaces/WorldCreate.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/interfaces/WorldCreate.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice_1_8_8.Interfaces; +package dev.nandi0813.practice_1_8_8.interfaces; import org.bukkit.World; import org.bukkit.WorldCreator; import org.bukkit.WorldType; -public class WorldCreate implements dev.nandi0813.practice.Module.Interfaces.WorldCreate { +public class WorldCreate implements dev.nandi0813.practice.module.interfaces.WorldCreate { @Override public World createEmptyWorld(String worldName) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/ArenaListener.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/ArenaListener.java similarity index 70% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/ArenaListener.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/ArenaListener.java index 82c5ea0b8..c060f9db1 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/ArenaListener.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/ArenaListener.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice_1_8_8.Listener; +package dev.nandi0813.practice_1_8_8.listener; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.ChunkUnloadEvent; -import static dev.nandi0813.practice.Manager.Arena.ArenaManager.LOADED_CHUNKS; -import static dev.nandi0813.practice.Manager.Arena.ArenaManager.LOAD_CHUNKS; +import static dev.nandi0813.practice.manager.arena.ArenaManager.LOADED_CHUNKS; +import static dev.nandi0813.practice.manager.arena.ArenaManager.LOAD_CHUNKS; public class ArenaListener implements Listener { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/FFAListener.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/FFAListener.java similarity index 79% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/FFAListener.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/FFAListener.java index ced802f26..7c5ccd176 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/FFAListener.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/FFAListener.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice_1_8_8.Listener; +package dev.nandi0813.practice_1_8_8.listener; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.FightUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.FightUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Arrow; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; @@ -14,7 +14,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; -public class FFAListener extends dev.nandi0813.practice.Manager.Fight.FFA.FFAListener { +public class FFAListener extends dev.nandi0813.practice.manager.fight.ffa.FFAListener { @EventHandler public void onPlayerDamage(EntityDamageEvent e) { diff --git a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/MatchListener.java b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/MatchListener.java similarity index 80% rename from spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/MatchListener.java rename to spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/MatchListener.java index 388ada7e2..c76acb5bf 100644 --- a/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/Listener/MatchListener.java +++ b/spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/MatchListener.java @@ -1,20 +1,20 @@ -package dev.nandi0813.practice_1_8_8.Listener; - -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Listener.LadderTypeListener; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Util.KnockbackUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.FightUtil; -import dev.nandi0813.practice.Manager.Fight.Util.ListenerUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Enum.KnockbackType; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +package dev.nandi0813.practice_1_8_8.listener; + +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.listener.LadderTypeListener; +import dev.nandi0813.practice.manager.fight.match.util.KnockbackUtil; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.FightUtil; +import dev.nandi0813.practice.manager.fight.util.ListenerUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.enums.KnockbackType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; import org.bukkit.entity.Arrow; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Classes.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Classes.java index ffa7cbd68..7fa281ddc 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Classes.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Classes.java @@ -1,37 +1,37 @@ package dev.nandi0813.practice_modern; -import dev.nandi0813.practice.Module.Interfaces.*; import dev.nandi0813.practice.ZonePractice; -import dev.nandi0813.practice_modern.Interfaces.MatchTntListener; -import dev.nandi0813.practice_modern.Interfaces.PlayerHiderUtil; -import dev.nandi0813.practice_modern.Listener.ArenaListener; -import dev.nandi0813.practice_modern.Listener.EPCountdownListener; -import dev.nandi0813.practice_modern.Listener.FFAListener; -import dev.nandi0813.practice_modern.Listener.MatchListener; -import dev.nandi0813.practice_modern.New.BlockExplode; -import dev.nandi0813.practice_modern.New.ItemOffHand; +import dev.nandi0813.practice.module.interfaces.*; +import dev.nandi0813.practice_modern.interfaces.MatchTntListener; +import dev.nandi0813.practice_modern.interfaces.PlayerHiderUtil; +import dev.nandi0813.practice_modern.listener.ArenaListener; +import dev.nandi0813.practice_modern.listener.EPCountdownListener; +import dev.nandi0813.practice_modern.listener.FFAListener; +import dev.nandi0813.practice_modern.listener.MatchListener; +import dev.nandi0813.practice_modern.modern_version.BlockExplode; +import dev.nandi0813.practice_modern.modern_version.ItemOffHand; import lombok.Getter; import org.bukkit.Bukkit; @Getter -public class Classes implements dev.nandi0813.practice.Module.Util.Classes { +public class Classes implements dev.nandi0813.practice.module.util.Classes { - public WorldCreate worldCreate = new dev.nandi0813.practice_modern.Interfaces.WorldCreate(); + public WorldCreate worldCreate = new dev.nandi0813.practice_modern.interfaces.WorldCreate(); public PlayerHiderInterface playerHiderUtil = new PlayerHiderUtil(); - public ItemMaterialUtil itemMaterialUtil = new dev.nandi0813.practice_modern.Interfaces.ItemMaterialUtil(); - public LadderUtil ladderUtil = new dev.nandi0813.practice_modern.Interfaces.LadderUtil(); - public ItemCreateUtil itemCreateUtil = new dev.nandi0813.practice_modern.Interfaces.ItemCreateUtil(); - public PlayerUtil playerUtil = new dev.nandi0813.practice_modern.Interfaces.PlayerUtil(); - public ArenaUtil arenaUtil = new dev.nandi0813.practice_modern.Interfaces.ArenaUtil(); - public ArenaCopyUtil arenaCopyUtil = new dev.nandi0813.practice_modern.Interfaces.ArenaCopy.ArenaCopyUtil(); - - public BedUtil bedUtil = new dev.nandi0813.practice_modern.Interfaces.BedUtil(); - public EntityHider entityHider = new dev.nandi0813.practice_modern.Interfaces.EntityHider(ZonePractice.getInstance(), EntityHider.Policy.BLACKLIST); - public StatisticListener statisticListener = new dev.nandi0813.practice_modern.Interfaces.StatisticListener(); - - public Class changedBlockClass = dev.nandi0813.practice_modern.Interfaces.ChangedBlock.class; - public Class kitDataClass = dev.nandi0813.practice_modern.Interfaces.KitData.class; - public Class actionBarClass = dev.nandi0813.practice_modern.Interfaces.ActionBar.class; + public ItemMaterialUtil itemMaterialUtil = new dev.nandi0813.practice_modern.interfaces.ItemMaterialUtil(); + public LadderUtil ladderUtil = new dev.nandi0813.practice_modern.interfaces.LadderUtil(); + public ItemCreateUtil itemCreateUtil = new dev.nandi0813.practice_modern.interfaces.ItemCreateUtil(); + public PlayerUtil playerUtil = new dev.nandi0813.practice_modern.interfaces.PlayerUtil(); + public ArenaUtil arenaUtil = new dev.nandi0813.practice_modern.interfaces.ArenaUtil(); + public ArenaCopyUtil arenaCopyUtil = new dev.nandi0813.practice_modern.interfaces.ArenaCopy.ArenaCopyUtil(); + + public BedUtil bedUtil = new dev.nandi0813.practice_modern.interfaces.BedUtil(); + public EntityHider entityHider = new dev.nandi0813.practice_modern.interfaces.EntityHider(ZonePractice.getInstance(), EntityHider.Policy.BLACKLIST); + public StatisticListener statisticListener = new dev.nandi0813.practice_modern.interfaces.StatisticListener(); + + public Class changedBlockClass = dev.nandi0813.practice_modern.interfaces.ChangedBlock.class; + public Class kitDataClass = dev.nandi0813.practice_modern.interfaces.KitData.class; + public Class actionBarClass = dev.nandi0813.practice_modern.interfaces.ActionBar.class; public Classes() { Bukkit.getServer().getPluginManager().registerEvents(arenaCopyUtil, ZonePractice.getInstance()); diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ActionBar.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ActionBar.java similarity index 73% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ActionBar.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ActionBar.java index d97c3517e..803c2238b 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ActionBar.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ActionBar.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Manager.Profile.Profile; +import dev.nandi0813.practice.manager.profile.Profile; import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; -public class ActionBar extends dev.nandi0813.practice.Module.Interfaces.ActionBar.ActionBar { +public class ActionBar extends dev.nandi0813.practice.module.interfaces.actionbar.ActionBar { public ActionBar(Profile profile) { super(profile); diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaCopy/ArenaCopyUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaCopy/ArenaCopyUtil.java similarity index 73% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaCopy/ArenaCopyUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaCopy/ArenaCopyUtil.java index affb3304e..b11fa1be5 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaCopy/ArenaCopyUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaCopy/ArenaCopyUtil.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice_modern.Interfaces.ArenaCopy; - -import dev.nandi0813.practice.Manager.Arena.Arenas.ArenaCopy; -import dev.nandi0813.practice.Manager.GUI.GUIManager; -import dev.nandi0813.practice.Manager.GUI.GUIType; -import dev.nandi0813.practice.Manager.GUI.Setup.Arena.ArenaSetupManager; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Util.Cuboid; -import dev.nandi0813.practice.Util.SoftDependUtil; +package dev.nandi0813.practice_modern.interfaces.ArenaCopy; + +import dev.nandi0813.practice.manager.arena.arenas.ArenaCopy; +import dev.nandi0813.practice.manager.gui.GUIManager; +import dev.nandi0813.practice.manager.gui.GUIType; +import dev.nandi0813.practice.manager.gui.setup.arena.ArenaSetupManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.util.Cuboid; +import dev.nandi0813.practice.util.SoftDependUtil; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockState; -public class ArenaCopyUtil extends dev.nandi0813.practice.Module.Interfaces.ArenaCopyUtil { +public class ArenaCopyUtil extends dev.nandi0813.practice.module.interfaces.ArenaCopyUtil { @Override protected void copyBlock(Block oldBlock, Block newBlock) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaCopy/FaweUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaCopy/FaweUtil.java similarity index 91% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaCopy/FaweUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaCopy/FaweUtil.java index 99e22d2bd..4e0ab77f5 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaCopy/FaweUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaCopy/FaweUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice_modern.Interfaces.ArenaCopy; +package dev.nandi0813.practice_modern.interfaces.ArenaCopy; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; @@ -8,9 +8,9 @@ import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.world.block.BlockTypes; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cuboid; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.Cuboid; import org.bukkit.Location; public enum FaweUtil { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaUtil.java similarity index 77% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaUtil.java index d8e2acea7..4fe47a05c 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ArenaUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ArenaUtil.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Manager.Arena.Arenas.Interface.BasicArena; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Normal.NormalLadder; -import dev.nandi0813.practice.Util.BasicItem; +import dev.nandi0813.practice.manager.arena.arenas.interfaces.BasicArena; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.normal.NormalLadder; +import dev.nandi0813.practice.util.BasicItem; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.block.Block; -public class ArenaUtil implements dev.nandi0813.practice.Module.Interfaces.ArenaUtil { +public class ArenaUtil implements dev.nandi0813.practice.module.interfaces.ArenaUtil { @Override public boolean turnsToDirt(Block block) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/BedUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/BedUtil.java similarity index 88% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/BedUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/BedUtil.java index 43bcd591e..bc3312c0b 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/BedUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/BedUtil.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice_modern.Interfaces; - -import dev.nandi0813.practice.Manager.Arena.Util.BedLocation; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.TeamEnum; -import dev.nandi0813.practice.Manager.Fight.Match.Interface.Team; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +package dev.nandi0813.practice_modern.interfaces; + +import dev.nandi0813.practice.manager.arena.util.BedLocation; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.enums.TeamEnum; +import dev.nandi0813.practice.manager.fight.match.interfaces.Team; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -19,7 +19,7 @@ import java.util.Map; -public class BedUtil extends dev.nandi0813.practice.Module.Interfaces.BedUtil { +public class BedUtil extends dev.nandi0813.practice.module.interfaces.BedUtil { @Override public BedLocation getBedLocation(Block block) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ChangedBlock.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ChangedBlock.java similarity index 87% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ChangedBlock.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ChangedBlock.java index 1d6aab10a..97fcbe6d4 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ChangedBlock.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ChangedBlock.java @@ -1,8 +1,8 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Module.Util.ClassImport; -import dev.nandi0813.practice.Util.Common; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.module.util.ClassImport; +import dev.nandi0813.practice.util.Common; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -11,7 +11,7 @@ import org.bukkit.block.data.type.Bed; import org.bukkit.event.block.BlockPlaceEvent; -public class ChangedBlock extends dev.nandi0813.practice.Module.Interfaces.ChangedBlock { +public class ChangedBlock extends dev.nandi0813.practice.module.interfaces.ChangedBlock { private final BlockData blockData; diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/EntityHider.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/EntityHider.java similarity index 88% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/EntityHider.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/EntityHider.java index 4df5e99ca..365fb6192 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/EntityHider.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/EntityHider.java @@ -1,11 +1,11 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; -public class EntityHider extends dev.nandi0813.practice.Module.Interfaces.EntityHider implements Listener { +public class EntityHider extends dev.nandi0813.practice.module.interfaces.EntityHider implements Listener { public EntityHider(Plugin plugin, Policy policy) { super(plugin, policy); diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ItemCreateUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ItemCreateUtil.java similarity index 95% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ItemCreateUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ItemCreateUtil.java index 1597c7ac4..967f01bdb 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ItemCreateUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ItemCreateUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.util.StringUtil; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; @@ -8,7 +8,7 @@ import java.util.List; -public class ItemCreateUtil extends dev.nandi0813.practice.Module.Interfaces.ItemCreateUtil { +public class ItemCreateUtil extends dev.nandi0813.practice.module.interfaces.ItemCreateUtil { @Override public ItemStack createItem(String displayname, Material material, Short damage, int amount, List lore) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ItemMaterialUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ItemMaterialUtil.java similarity index 95% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ItemMaterialUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ItemMaterialUtil.java index 4fe8a0c85..3ec230081 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/ItemMaterialUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/ItemMaterialUtil.java @@ -1,4 +1,4 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -6,7 +6,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -public class ItemMaterialUtil implements dev.nandi0813.practice.Module.Interfaces.ItemMaterialUtil { +public class ItemMaterialUtil implements dev.nandi0813.practice.module.interfaces.ItemMaterialUtil { @Override public Material getSnowball() { return Material.SNOWBALL; diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/KitData.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/KitData.java similarity index 84% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/KitData.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/KitData.java index 617d5ecdd..503e77fbd 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/KitData.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/KitData.java @@ -1,14 +1,14 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; import org.bukkit.entity.Player; -public class KitData extends dev.nandi0813.practice.Module.Interfaces.KitData { +public class KitData extends dev.nandi0813.practice.module.interfaces.KitData { public KitData() { super(); } - public KitData(dev.nandi0813.practice.Module.Interfaces.KitData kitData) { + public KitData(dev.nandi0813.practice.module.interfaces.KitData kitData) { super(kitData); } diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/LadderUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/LadderUtil.java similarity index 93% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/LadderUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/LadderUtil.java index d53199642..db38b26e2 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/LadderUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/LadderUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Ladder.Type.FireballFight; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.ladder.type.FireballFight; +import dev.nandi0813.practice.util.Common; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextColor; import org.bukkit.Bukkit; @@ -25,9 +25,9 @@ import java.util.Objects; -import static dev.nandi0813.practice.Util.PermanentConfig.FIGHT_ENTITY; +import static dev.nandi0813.practice.util.PermanentConfig.FIGHT_ENTITY; -public class LadderUtil implements dev.nandi0813.practice.Module.Interfaces.LadderUtil { +public class LadderUtil implements dev.nandi0813.practice.module.interfaces.LadderUtil { @Override public void loadInventory(Player player, ItemStack[] armor, ItemStack[] inventory, ItemStack[] extra) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/MatchTntListener.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/MatchTntListener.java similarity index 88% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/MatchTntListener.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/MatchTntListener.java index 8e6b82eff..c0cf4dc2f 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/MatchTntListener.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/MatchTntListener.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Objects; -import static dev.nandi0813.practice.Util.PermanentConfig.PLACED_IN_FIGHT; +import static dev.nandi0813.practice.util.PermanentConfig.PLACED_IN_FIGHT; public class MatchTntListener implements Listener { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/PlayerHiderUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/PlayerHiderUtil.java similarity index 90% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/PlayerHiderUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/PlayerHiderUtil.java index 99c3d586e..81d11b795 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/PlayerHiderUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/PlayerHiderUtil.java @@ -1,9 +1,9 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoUpdate; -import dev.nandi0813.practice.Module.Interfaces.PlayerHiderInterface; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.module.interfaces.PlayerHiderInterface; import org.bukkit.entity.Player; public class PlayerHiderUtil implements PlayerHiderInterface { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/PlayerUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/PlayerUtil.java similarity index 96% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/PlayerUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/PlayerUtil.java index 9ed4dbbb7..a597c83f0 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/PlayerUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/PlayerUtil.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; -import dev.nandi0813.practice.Util.StringUtil; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.util.StringUtil; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -public class PlayerUtil implements dev.nandi0813.practice.Module.Interfaces.PlayerUtil { +public class PlayerUtil implements dev.nandi0813.practice.module.interfaces.PlayerUtil { @Override public ItemStack getPlayerMainHand(Player player) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/StatisticListener.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/StatisticListener.java similarity index 88% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/StatisticListener.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/StatisticListener.java index bad26e9ba..87333f6d3 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/StatisticListener.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/StatisticListener.java @@ -1,18 +1,18 @@ -package dev.nandi0813.practice_modern.Interfaces; - -import dev.nandi0813.practice.Manager.Backend.ConfigManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Ladder.Type.Boxing; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Module.Util.ClassImport; +package dev.nandi0813.practice_modern.interfaces; + import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.ConfigManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.ladder.type.Boxing; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -29,7 +29,7 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; -public class StatisticListener extends dev.nandi0813.practice.Module.Interfaces.StatisticListener implements Listener { +public class StatisticListener extends dev.nandi0813.practice.module.interfaces.StatisticListener implements Listener { private boolean CUSTOM_COOLDOWN_ENABLED; private boolean ONLY_SWORD; diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/WorldCreate.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/WorldCreate.java similarity index 76% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/WorldCreate.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/WorldCreate.java index 12d3b1d0b..49d04feac 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Interfaces/WorldCreate.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/interfaces/WorldCreate.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice_modern.Interfaces; +package dev.nandi0813.practice_modern.interfaces; import org.bukkit.World; import org.bukkit.WorldCreator; import org.bukkit.WorldType; -public class WorldCreate implements dev.nandi0813.practice.Module.Interfaces.WorldCreate { +public class WorldCreate implements dev.nandi0813.practice.module.interfaces.WorldCreate { @Override public World createEmptyWorld(String worldName) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/ArenaListener.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/ArenaListener.java similarity index 79% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/ArenaListener.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/ArenaListener.java index ed87255ad..22cef921a 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/ArenaListener.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/ArenaListener.java @@ -1,16 +1,16 @@ -package dev.nandi0813.practice_modern.Listener; +package dev.nandi0813.practice_modern.listener; -import dev.nandi0813.practice.Manager.Arena.Util.ArenaWorldUtil; -import dev.nandi0813.practice.Manager.Server.ServerManager; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.arena.util.ArenaWorldUtil; +import dev.nandi0813.practice.manager.server.ServerManager; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.ChunkUnloadEvent; import org.bukkit.event.world.WorldUnloadEvent; -import static dev.nandi0813.practice.Manager.Arena.ArenaManager.LOADED_CHUNKS; -import static dev.nandi0813.practice.Manager.Arena.ArenaManager.LOAD_CHUNKS; +import static dev.nandi0813.practice.manager.arena.ArenaManager.LOADED_CHUNKS; +import static dev.nandi0813.practice.manager.arena.ArenaManager.LOAD_CHUNKS; public class ArenaListener implements Listener { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/EPCountdownListener.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/EPCountdownListener.java similarity index 77% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/EPCountdownListener.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/EPCountdownListener.java index c870b3943..1943c711d 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/EPCountdownListener.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/EPCountdownListener.java @@ -1,17 +1,17 @@ -package dev.nandi0813.practice_modern.Listener; +package dev.nandi0813.practice_modern.listener; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Util.Runnable.EnderPearlRunnable; -import dev.nandi0813.practice.Util.Common; -import dev.nandi0813.practice.Util.Cooldown.CooldownObject; -import dev.nandi0813.practice.Util.Cooldown.PlayerCooldown; -import dev.nandi0813.practice.Util.PermanentConfig; -import dev.nandi0813.practice.Util.StringUtil; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.util.Runnable.EnderPearlRunnable; +import dev.nandi0813.practice.util.Common; +import dev.nandi0813.practice.util.PermanentConfig; +import dev.nandi0813.practice.util.StringUtil; +import dev.nandi0813.practice.util.cooldown.CooldownObject; +import dev.nandi0813.practice.util.cooldown.PlayerCooldown; import org.bukkit.entity.EnderPearl; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/FFAListener.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/FFAListener.java similarity index 76% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/FFAListener.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/FFAListener.java index 87bf4dc2e..14a3706b3 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/FFAListener.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/FFAListener.java @@ -1,12 +1,12 @@ -package dev.nandi0813.practice_modern.Listener; - -import dev.nandi0813.practice.Manager.Fight.FFA.FFA.FFA; -import dev.nandi0813.practice.Manager.Fight.FFA.FFAManager; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.FightUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +package dev.nandi0813.practice_modern.listener; + +import dev.nandi0813.practice.manager.fight.ffa.FFAManager; +import dev.nandi0813.practice.manager.fight.ffa.game.FFA; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.FightUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.damage.DamageSource; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; @@ -16,7 +16,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.PlayerDeathEvent; -public class FFAListener extends dev.nandi0813.practice.Manager.Fight.FFA.FFAListener { +public class FFAListener extends dev.nandi0813.practice.manager.fight.ffa.FFAListener { @EventHandler public void onPlayerDeath(PlayerDeathEvent e) { @@ -36,7 +36,7 @@ public void onPlayerDeath(PlayerDeathEvent e) { killer = FightUtil.getKiller(damageEntity); } - DeathCause cause = dev.nandi0813.practice_modern.Listener.FightUtil.convert(damageSource.getDamageType()); + DeathCause cause = dev.nandi0813.practice_modern.listener.FightUtil.convert(damageSource.getDamageType()); ffa.killPlayer(player, killer, cause.getMessage().replaceAll("%killer%", killer != null ? killer.getName() : "Unknown")); if (killer != null) { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/FightUtil.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/FightUtil.java similarity index 93% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/FightUtil.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/FightUtil.java index ec066fb35..ebc0cfbbf 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/FightUtil.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/FightUtil.java @@ -1,6 +1,6 @@ -package dev.nandi0813.practice_modern.Listener; +package dev.nandi0813.practice_modern.listener; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.DeathCause; import org.bukkit.damage.DamageType; public enum FightUtil { diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/MatchListener.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/MatchListener.java similarity index 83% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/MatchListener.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/MatchListener.java index b812a9e52..0bd260434 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/Listener/MatchListener.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/listener/MatchListener.java @@ -1,29 +1,29 @@ -package dev.nandi0813.practice_modern.Listener; +package dev.nandi0813.practice_modern.listener; import com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent; -import dev.nandi0813.practice.Manager.Backend.LanguageManager; -import dev.nandi0813.practice.Manager.Fight.Event.EventManager; -import dev.nandi0813.practice.Manager.Fight.Event.Events.Duel.Brackets.Brackets; -import dev.nandi0813.practice.Manager.Fight.Event.Interface.Event; -import dev.nandi0813.practice.Manager.Fight.Match.Enum.RoundStatus; -import dev.nandi0813.practice.Manager.Fight.Match.Listener.LadderTypeListener; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Fight.Match.Util.KnockbackUtil; -import dev.nandi0813.practice.Manager.Fight.Match.Util.MatchFightPlayer; -import dev.nandi0813.practice.Manager.Fight.Match.Util.TeamUtil; -import dev.nandi0813.practice.Manager.Fight.Util.DeathCause; -import dev.nandi0813.practice.Manager.Fight.Util.FightUtil; -import dev.nandi0813.practice.Manager.Fight.Util.ListenerUtil; -import dev.nandi0813.practice.Manager.Fight.Util.Stats.Statistic; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Enum.KnockbackType; -import dev.nandi0813.practice.Manager.Profile.Enum.ProfileStatus; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; -import dev.nandi0813.practice.Manager.Spectator.SpectatorManager; -import dev.nandi0813.practice.Util.Common; import dev.nandi0813.practice.ZonePractice; +import dev.nandi0813.practice.manager.backend.LanguageManager; +import dev.nandi0813.practice.manager.fight.event.EventManager; +import dev.nandi0813.practice.manager.fight.event.events.duel.brackets.Brackets; +import dev.nandi0813.practice.manager.fight.event.interfaces.Event; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.fight.match.enums.RoundStatus; +import dev.nandi0813.practice.manager.fight.match.listener.LadderTypeListener; +import dev.nandi0813.practice.manager.fight.match.util.KnockbackUtil; +import dev.nandi0813.practice.manager.fight.match.util.MatchFightPlayer; +import dev.nandi0813.practice.manager.fight.match.util.TeamUtil; +import dev.nandi0813.practice.manager.fight.util.DeathCause; +import dev.nandi0813.practice.manager.fight.util.FightUtil; +import dev.nandi0813.practice.manager.fight.util.ListenerUtil; +import dev.nandi0813.practice.manager.fight.util.Stats.Statistic; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.manager.ladder.enums.KnockbackType; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.enums.ProfileStatus; +import dev.nandi0813.practice.manager.spectator.SpectatorManager; +import dev.nandi0813.practice.util.Common; import org.bukkit.Bukkit; import org.bukkit.damage.DamageSource; import org.bukkit.entity.*; @@ -81,7 +81,7 @@ public void onPlayerDeath(PlayerDeathEvent e) { killer = null; } - DeathCause cause = dev.nandi0813.practice_modern.Listener.FightUtil.convert(damageSource.getDamageType()); + DeathCause cause = dev.nandi0813.practice_modern.listener.FightUtil.convert(damageSource.getDamageType()); Bukkit.getScheduler().runTaskLater(ZonePractice.getInstance(), () -> match.killPlayer(player, killer, cause.getMessage().replaceAll("%killer%", killer != null ? killer.getName() : "Unknown")), 1L); diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/New/BlockExplode.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/modern_version/BlockExplode.java similarity index 74% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/New/BlockExplode.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/modern_version/BlockExplode.java index ca9bb9495..1fbe12486 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/New/BlockExplode.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/modern_version/BlockExplode.java @@ -1,10 +1,10 @@ -package dev.nandi0813.practice_modern.New; +package dev.nandi0813.practice_modern.modern_version; -import dev.nandi0813.practice.Manager.Fight.Match.Match; -import dev.nandi0813.practice.Manager.Fight.Match.MatchManager; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Interface.LadderHandle; -import dev.nandi0813.practice.Manager.Ladder.Abstraction.Ladder; -import dev.nandi0813.practice.Module.Util.ClassImport; +import dev.nandi0813.practice.manager.fight.match.Match; +import dev.nandi0813.practice.manager.fight.match.MatchManager; +import dev.nandi0813.practice.manager.ladder.abstraction.Ladder; +import dev.nandi0813.practice.manager.ladder.abstraction.interfaces.LadderHandle; +import dev.nandi0813.practice.module.util.ClassImport; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; diff --git a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/New/ItemOffHand.java b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/modern_version/ItemOffHand.java similarity index 78% rename from spigot_modern/src/main/java/dev/nandi0813/practice_modern/New/ItemOffHand.java rename to spigot_modern/src/main/java/dev/nandi0813/practice_modern/modern_version/ItemOffHand.java index 8608fd2ca..49d27981d 100644 --- a/spigot_modern/src/main/java/dev/nandi0813/practice_modern/New/ItemOffHand.java +++ b/spigot_modern/src/main/java/dev/nandi0813/practice_modern/modern_version/ItemOffHand.java @@ -1,7 +1,7 @@ -package dev.nandi0813.practice_modern.New; +package dev.nandi0813.practice_modern.modern_version; -import dev.nandi0813.practice.Manager.Profile.Profile; -import dev.nandi0813.practice.Manager.Profile.ProfileManager; +import dev.nandi0813.practice.manager.profile.Profile; +import dev.nandi0813.practice.manager.profile.ProfileManager; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener;