diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index dfe0770..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 4788b4b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,113 +0,0 @@
-# User-specific stuff
-.idea/
-
-*.iml
-*.ipr
-*.iws
-
-# IntelliJ
-out/
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-target/
-
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-.flattened-pom.xml
-
-# Common working directory
-run/
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/discord.xml b/.idea/discord.xml
deleted file mode 100644
index 30bab2a..0000000
--- a/.idea/discord.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index aa00ffa..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index edc3e56..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml
deleted file mode 100644
index 1da2fef..0000000
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_mongo_java_driver_3_12_10.xml b/.idea/libraries/Maven__org_mongodb_mongo_java_driver_3_12_10.xml
deleted file mode 100644
index 3fbdf3a..0000000
--- a/.idea/libraries/Maven__org_mongodb_mongo_java_driver_3_12_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml
deleted file mode 100644
index 138abdc..0000000
--- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 8de0497..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 30f9b89..7375774 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,10 +23,207 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -43,7 +240,15 @@
+
+
+
+
-
\ No newline at end of file
diff --git a/BedWars.iml b/BedWars.iml
deleted file mode 100644
index f570be0..0000000
--- a/BedWars.iml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
- SPIGOT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index 41306ff..0000000
--- a/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## BedWars [](https://github.com/Lucanius69/KnockbackFFA)
- BedWars Plugin Made By Lucanius & Trixkz
-
- For Tilly.RIP
-
- If you have any issues, message Luca / Logan on discord (lucA#0999 / LoganM#3465)
-
-#### Commands
- * /arena [Permission: bedwars.admin]
- * /level [Permission: bedwars.admin]
- * /setspawn [Permission: bedwars.admin]
- * /xp [Permission: bedwars.admin]
- * /party
-
-#### PlaceholderAPI
- * %bedwars_kills%
- * %bedwars_deaths%
- * %bedwars_xp%
- * %bedwars_level%
- * %bedwars_wins%
- * %bedwars_losses%
- * %bedwars_gamesplayed%
- * %bedwars_bedsdestroyed%
diff --git a/pom.xml b/pom.xml
index e266c31..075cbc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- rip.tilly
+ com.loganmagnan
BedWars
1.0
jar
diff --git a/src/main/java/rip/tilly/bedwars/BedWars.java b/src/main/java/com/loganmagnan/bedwars/BedWars.java
similarity index 75%
rename from src/main/java/rip/tilly/bedwars/BedWars.java
rename to src/main/java/com/loganmagnan/bedwars/BedWars.java
index 9970f67..263c6dd 100644
--- a/src/main/java/rip/tilly/bedwars/BedWars.java
+++ b/src/main/java/com/loganmagnan/bedwars/BedWars.java
@@ -1,5 +1,12 @@
-package rip.tilly.bedwars;
+package com.loganmagnan.bedwars;
+import com.loganmagnan.bedwars.listeners.*;
+import com.loganmagnan.bedwars.listeners.game.*;
+import com.loganmagnan.bedwars.managers.GameManager;
+import com.loganmagnan.bedwars.managers.arena.ArenaManager;
+import com.loganmagnan.bedwars.managers.queue.QueueManager;
+import com.loganmagnan.bedwars.providers.scoreboard.ScoreboardProvider;
+import com.loganmagnan.bedwars.utils.menusystem.PlayerMenuUtil;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
@@ -8,37 +15,25 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
-import rip.tilly.bedwars.customitems.bridgeegg.BridgeEggListener;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.listeners.*;
-import rip.tilly.bedwars.listeners.game.*;
-import rip.tilly.bedwars.managers.CommandManager;
-import rip.tilly.bedwars.managers.GameManager;
-import rip.tilly.bedwars.managers.PlayerDataManager;
-import rip.tilly.bedwars.managers.SpawnManager;
-import rip.tilly.bedwars.managers.arena.ArenaManager;
-import rip.tilly.bedwars.managers.arena.chunk.ChunkClearingManager;
-import rip.tilly.bedwars.managers.arena.chunk.ChunkManager;
-import rip.tilly.bedwars.managers.hotbar.HotbarManager;
-import rip.tilly.bedwars.managers.mongo.MongoManager;
-import rip.tilly.bedwars.managers.party.PartyManager;
-import rip.tilly.bedwars.managers.queue.QueueManager;
-import rip.tilly.bedwars.providers.placeholderapi.PlaceholderAPIProvider;
-import rip.tilly.bedwars.providers.scoreboard.ScoreboardProvider;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.aether.Aether;
-import rip.tilly.bedwars.utils.config.file.Config;
-import rip.tilly.bedwars.utils.menusystem.PlayerMenuUtil;
-
+import com.loganmagnan.bedwars.customitems.bridgeegg.BridgeEggListener;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.managers.CommandManager;
+import com.loganmagnan.bedwars.managers.PlayerDataManager;
+import com.loganmagnan.bedwars.managers.SpawnManager;
+import com.loganmagnan.bedwars.managers.arena.chunk.ChunkClearingManager;
+import com.loganmagnan.bedwars.managers.arena.chunk.ChunkManager;
+import com.loganmagnan.bedwars.managers.hotbar.HotbarManager;
+import com.loganmagnan.bedwars.managers.mongo.MongoManager;
+import com.loganmagnan.bedwars.managers.party.PartyManager;
+import com.loganmagnan.bedwars.providers.placeholderapi.PlaceholderAPIProvider;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.aether.Aether;
+import com.loganmagnan.bedwars.utils.config.file.Config;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-/**
- * Created by Lucanius & Trixkz
- * Project: BedWars
- */
@Getter
public final class BedWars extends JavaPlugin {
@@ -49,12 +44,12 @@ public final class BedWars extends JavaPlugin {
private MongoManager mongoManager;
private ChunkClearingManager chunkClearingManager;
private PlayerDataManager playerDataManager;
- private SpawnManager spawnManager;
private ArenaManager arenaManager;
+ private GameManager gameManager;
+ private SpawnManager spawnManager;
private ChunkManager chunkManager;
private HotbarManager hotbarManager;
private CommandManager commandManager;
- private GameManager gameManager;
private PartyManager partyManager;
private QueueManager queueManager;
@@ -70,8 +65,8 @@ public final class BedWars extends JavaPlugin {
this.arenasConfig = new Config("arenas", this);
Bukkit.getConsoleSender().sendMessage("------------------------------------------------");
- Bukkit.getConsoleSender().sendMessage(CC.translate("&dBedWars &8- &av" + getDescription().getVersion()));
- Bukkit.getConsoleSender().sendMessage(CC.translate("&7Made on &dTilly RIP &7by &eTrixkz &7& &eLucanius"));
+ Bukkit.getConsoleSender().sendMessage(CC.translate("&dzBedWars &8- &av" + this.getDescription().getVersion()));
+ Bukkit.getConsoleSender().sendMessage(CC.translate("&7Made by &eLoganM Development"));
Bukkit.getConsoleSender().sendMessage("------------------------------------------------");
this.loadManagers();
@@ -123,12 +118,12 @@ public final class BedWars extends JavaPlugin {
this.mongoManager = new MongoManager();
this.chunkClearingManager = new ChunkClearingManager();
this.playerDataManager = new PlayerDataManager();
- this.spawnManager = new SpawnManager();
this.arenaManager = new ArenaManager();
+ this.gameManager = new GameManager();
+ this.spawnManager = new SpawnManager();
this.chunkManager = new ChunkManager();
this.hotbarManager = new HotbarManager();
this.commandManager = new CommandManager();
- this.gameManager = new GameManager();
this.partyManager = new PartyManager();
this.queueManager = new QueueManager();
}
@@ -143,7 +138,7 @@ public final class BedWars extends JavaPlugin {
}
private void loadRunnables() {
- new Aether(this, new ScoreboardProvider());
+ // new Aether(this, new ScoreboardProvider());
}
public PlayerMenuUtil getPlayerMenuUtil(Player player) {
diff --git a/src/main/java/rip/tilly/bedwars/commands/BaseCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/BaseCommand.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/commands/BaseCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/BaseCommand.java
index 0b17b4a..56ccaff 100644
--- a/src/main/java/rip/tilly/bedwars/commands/BaseCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/BaseCommand.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.commands;
+package com.loganmagnan.bedwars.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/ArenaCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/ArenaCommand.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/commands/arena/ArenaCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/ArenaCommand.java
index 201f3fa..efe2338 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/ArenaCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/ArenaCommand.java
@@ -1,14 +1,13 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.menus.arena.ArenaManageMenu;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.menus.arena.ArenaManagerMenu;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.menusystem.menu.UpgradesMenu;
+import com.loganmagnan.bedwars.game.arena.Arena;
public class ArenaCommand implements CommandExecutor {
@@ -168,7 +167,7 @@ public class ArenaCommand implements CommandExecutor {
return true;
}
- new ArenaManagerMenu().openMenu(player);
+ new ArenaManageMenu().openMenu(player);
break;
case "generate":
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/CreateCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/CreateCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/arena/CreateCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/CreateCommand.java
index 0d7d626..d906d96 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/CreateCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/CreateCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/EnableAndDisableCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/EnableAndDisableCommand.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/commands/arena/EnableAndDisableCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/EnableAndDisableCommand.java
index 5b09d19..012650e 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/EnableAndDisableCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/EnableAndDisableCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/GenerateCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/GenerateCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/arena/GenerateCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/GenerateCommand.java
index 793f806..2a12b43 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/GenerateCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/GenerateCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.runnables.ArenaCommandRunnable;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.runnables.ArenaCommandRunnable;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/InfoCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/InfoCommand.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/commands/arena/InfoCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/InfoCommand.java
index a648b68..6f5f02a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/InfoCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/InfoCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/RemoveCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/RemoveCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/arena/RemoveCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/RemoveCommand.java
index 09b3a16..bc4101d 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/RemoveCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/RemoveCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetACommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetACommand.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetACommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetACommand.java
index fbb1bb1..65fddcb 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetACommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetACommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetBCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetBCommand.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetBCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetBCommand.java
index 0bceb30..9f861c5 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetBCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetBCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetBuildMaxCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetBuildMaxCommand.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetBuildMaxCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetBuildMaxCommand.java
index 9836af3..f5b86ec 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetBuildMaxCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetBuildMaxCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetDeadZoneCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetDeadZoneCommand.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetDeadZoneCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetDeadZoneCommand.java
index 4123ab8..8de4640 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetDeadZoneCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetDeadZoneCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetDiamondGeneratorCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetDiamondGeneratorCommand.java
similarity index 88%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetDiamondGeneratorCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetDiamondGeneratorCommand.java
index eedf9b8..575beba 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetDiamondGeneratorCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetDiamondGeneratorCommand.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetEmeraldGeneratorCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetEmeraldGeneratorCommand.java
similarity index 88%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetEmeraldGeneratorCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetEmeraldGeneratorCommand.java
index aac73ef..9d304d9 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetEmeraldGeneratorCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetEmeraldGeneratorCommand.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetIconCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetIconCommand.java
similarity index 87%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetIconCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetIconCommand.java
index 3996aaa..4487486 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetIconCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetIconCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetMaxCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetMaxCommand.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetMaxCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetMaxCommand.java
index 63d9225..5af15b9 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetMaxCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetMaxCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetMinCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetMinCommand.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetMinCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetMinCommand.java
index cdb0544..dff8b86 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetMinCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetMinCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMaxCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAMaxCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMaxCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAMaxCommand.java
index 57fc052..67cd10a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMaxCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAMaxCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMinCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAMinCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMinCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAMinCommand.java
index 40ee1cd..d1dc4d3 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAMinCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAMinCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAShopCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAShopCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAShopCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAShopCommand.java
index 97355b5..c90a3f9 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAShopCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAShopCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAUpgradesCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAUpgradesCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAUpgradesCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAUpgradesCommand.java
index 8dce16c..a60f05a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamAUpgradesCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamAUpgradesCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMaxCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBMaxCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMaxCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBMaxCommand.java
index a713007..c63e1ae 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMaxCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBMaxCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMinCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBMinCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMinCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBMinCommand.java
index 35dd12c..907ce19 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBMinCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBMinCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBShopCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBShopCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBShopCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBShopCommand.java
index 276c196..a048f8f 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBShopCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBShopCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBUpgradesCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBUpgradesCommand.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBUpgradesCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBUpgradesCommand.java
index 6ec64c6..84c88f0 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamBUpgradesCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamBUpgradesCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamGeneratorCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamGeneratorCommand.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/commands/arena/SetTeamGeneratorCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamGeneratorCommand.java
index 934677e..a94031a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/arena/SetTeamGeneratorCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/arena/SetTeamGeneratorCommand.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.commands.arena;
+package com.loganmagnan.bedwars.commands.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/level/AddCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/level/AddCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/level/AddCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/level/AddCommand.java
index ea32f8f..133c8b5 100644
--- a/src/main/java/rip/tilly/bedwars/commands/level/AddCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/level/AddCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.level;
+package com.loganmagnan.bedwars.commands.level;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/level/LevelCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/level/LevelCommand.java
similarity index 91%
rename from src/main/java/rip/tilly/bedwars/commands/level/LevelCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/level/LevelCommand.java
index bb8bb09..780036f 100644
--- a/src/main/java/rip/tilly/bedwars/commands/level/LevelCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/level/LevelCommand.java
@@ -1,11 +1,11 @@
-package rip.tilly.bedwars.commands.level;
+package com.loganmagnan.bedwars.commands.level;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.utils.CC;
public class LevelCommand implements CommandExecutor {
diff --git a/src/main/java/rip/tilly/bedwars/commands/level/RemoveCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/level/RemoveCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/level/RemoveCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/level/RemoveCommand.java
index ed62563..fb845b0 100644
--- a/src/main/java/rip/tilly/bedwars/commands/level/RemoveCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/level/RemoveCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.level;
+package com.loganmagnan.bedwars.commands.level;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/level/SetCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/level/SetCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/level/SetCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/level/SetCommand.java
index 622f7a0..132a9d0 100644
--- a/src/main/java/rip/tilly/bedwars/commands/level/SetCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/level/SetCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.level;
+package com.loganmagnan.bedwars.commands.level;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/AcceptCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/AcceptCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/party/AcceptCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/AcceptCommand.java
index da86f32..19f2e4e 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/AcceptCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/AcceptCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/ChatCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/ChatCommand.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/commands/party/ChatCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/ChatCommand.java
index f063e72..3537e84 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/ChatCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/ChatCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.managers.party.Party;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.managers.party.Party;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/CreateCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/CreateCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/party/CreateCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/CreateCommand.java
index dfaae0d..1855a72 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/CreateCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/CreateCommand.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/InfoCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/InfoCommand.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/commands/party/InfoCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/InfoCommand.java
index a17b023..82444aa 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/InfoCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/InfoCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
@@ -18,7 +18,7 @@ public class InfoCommand extends BaseCommand {
@Override
public void executeAs(CommandSender sender, Command cmd, String label, String[] args) {
Player player = (Player) sender;
-
+
if (this.main.getPartyManager().getParty(player.getUniqueId()) == null) {
player.sendMessage(CC.translate("&cYou are not in a party!"));
return;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/InviteCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/InviteCommand.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/commands/party/InviteCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/InviteCommand.java
index 9d8bd61..b284542 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/InviteCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/InviteCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/JoinCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/JoinCommand.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/commands/party/JoinCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/JoinCommand.java
index 420bed4..f596e1a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/JoinCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/JoinCommand.java
@@ -1,11 +1,11 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/LeaveCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/LeaveCommand.java
similarity index 79%
rename from src/main/java/rip/tilly/bedwars/commands/party/LeaveCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/LeaveCommand.java
index 485464e..e36c957 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/LeaveCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/LeaveCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/PartyCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/PartyCommand.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/commands/party/PartyCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/PartyCommand.java
index 2df1625..0e2d254 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/PartyCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/PartyCommand.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CC;
public class PartyCommand implements CommandExecutor {
diff --git a/src/main/java/rip/tilly/bedwars/commands/party/RemoveCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/party/RemoveCommand.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/commands/party/RemoveCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/party/RemoveCommand.java
index b5bee17..0524072 100644
--- a/src/main/java/rip/tilly/bedwars/commands/party/RemoveCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/party/RemoveCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.party;
+package com.loganmagnan.bedwars.commands.party;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.managers.party.Party;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.managers.party.Party;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/setspawn/MaxCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/MaxCommand.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/commands/setspawn/MaxCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/setspawn/MaxCommand.java
index d185db2..717432e 100644
--- a/src/main/java/rip/tilly/bedwars/commands/setspawn/MaxCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/MaxCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.setspawn;
+package com.loganmagnan.bedwars.commands.setspawn;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.utils.CustomLocation;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/setspawn/MinCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/MinCommand.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/commands/setspawn/MinCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/setspawn/MinCommand.java
index 32d7356..7211a52 100644
--- a/src/main/java/rip/tilly/bedwars/commands/setspawn/MinCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/MinCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.setspawn;
+package com.loganmagnan.bedwars.commands.setspawn;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.utils.CustomLocation;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/setspawn/SetSpawnCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/SetSpawnCommand.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/commands/setspawn/SetSpawnCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/setspawn/SetSpawnCommand.java
index b32bcc0..2817fe8 100644
--- a/src/main/java/rip/tilly/bedwars/commands/setspawn/SetSpawnCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/SetSpawnCommand.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.commands.setspawn;
+package com.loganmagnan.bedwars.commands.setspawn;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.utils.CC;
public class SetSpawnCommand implements CommandExecutor {
diff --git a/src/main/java/rip/tilly/bedwars/commands/setspawn/SpawnCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/SpawnCommand.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/commands/setspawn/SpawnCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/setspawn/SpawnCommand.java
index 5692b5c..b3c7e3d 100644
--- a/src/main/java/rip/tilly/bedwars/commands/setspawn/SpawnCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/setspawn/SpawnCommand.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.commands.setspawn;
+package com.loganmagnan.bedwars.commands.setspawn;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.utils.CustomLocation;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/spectate/SpectateCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/spectate/SpectateCommand.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/commands/spectate/SpectateCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/spectate/SpectateCommand.java
index 23429c0..c3167a9 100644
--- a/src/main/java/rip/tilly/bedwars/commands/spectate/SpectateCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/spectate/SpectateCommand.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.commands.spectate;
+package com.loganmagnan.bedwars.commands.spectate;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.Game;
public class SpectateCommand implements CommandExecutor {
diff --git a/src/main/java/rip/tilly/bedwars/commands/toggle/PartyChatCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/toggle/PartyChatCommand.java
similarity index 79%
rename from src/main/java/rip/tilly/bedwars/commands/toggle/PartyChatCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/toggle/PartyChatCommand.java
index 280e8b5..acc39fc 100644
--- a/src/main/java/rip/tilly/bedwars/commands/toggle/PartyChatCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/toggle/PartyChatCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.toggle;
+package com.loganmagnan.bedwars.commands.toggle;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerSettings;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerSettings;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/toggle/ScoreboardCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/toggle/ScoreboardCommand.java
similarity index 79%
rename from src/main/java/rip/tilly/bedwars/commands/toggle/ScoreboardCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/toggle/ScoreboardCommand.java
index 9fe7103..3890ad3 100644
--- a/src/main/java/rip/tilly/bedwars/commands/toggle/ScoreboardCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/toggle/ScoreboardCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.toggle;
+package com.loganmagnan.bedwars.commands.toggle;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerSettings;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerSettings;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/toggle/ToggleCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/toggle/ToggleCommand.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/commands/toggle/ToggleCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/toggle/ToggleCommand.java
index 808a05d..ce58e76 100644
--- a/src/main/java/rip/tilly/bedwars/commands/toggle/ToggleCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/toggle/ToggleCommand.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.commands.toggle;
+package com.loganmagnan.bedwars.commands.toggle;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.utils.CC;
public class ToggleCommand implements CommandExecutor {
diff --git a/src/main/java/rip/tilly/bedwars/commands/xp/AddCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/xp/AddCommand.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/commands/xp/AddCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/xp/AddCommand.java
index 3ce8ef2..fa2fb6a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/xp/AddCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/xp/AddCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.xp;
+package com.loganmagnan.bedwars.commands.xp;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/xp/RemoveCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/xp/RemoveCommand.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/commands/xp/RemoveCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/xp/RemoveCommand.java
index 7a2cfe2..7ce9f0a 100644
--- a/src/main/java/rip/tilly/bedwars/commands/xp/RemoveCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/xp/RemoveCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.xp;
+package com.loganmagnan.bedwars.commands.xp;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/xp/SetCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/xp/SetCommand.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/commands/xp/SetCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/xp/SetCommand.java
index ccc98a9..c8881a7 100644
--- a/src/main/java/rip/tilly/bedwars/commands/xp/SetCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/xp/SetCommand.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.commands.xp;
+package com.loganmagnan.bedwars.commands.xp;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.BaseCommand;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.BaseCommand;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/commands/xp/XpCommand.java b/src/main/java/com/loganmagnan/bedwars/commands/xp/XpCommand.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/commands/xp/XpCommand.java
rename to src/main/java/com/loganmagnan/bedwars/commands/xp/XpCommand.java
index 060713e..89139d9 100644
--- a/src/main/java/rip/tilly/bedwars/commands/xp/XpCommand.java
+++ b/src/main/java/com/loganmagnan/bedwars/commands/xp/XpCommand.java
@@ -1,11 +1,11 @@
-package rip.tilly.bedwars.commands.xp;
+package com.loganmagnan.bedwars.commands.xp;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.utils.CC;
public class XpCommand implements CommandExecutor {
diff --git a/src/main/java/rip/tilly/bedwars/customitems/bridgeegg/BridgeEggListener.java b/src/main/java/com/loganmagnan/bedwars/customitems/bridgeegg/BridgeEggListener.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/customitems/bridgeegg/BridgeEggListener.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/bridgeegg/BridgeEggListener.java
index 493de50..1536c9e 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/bridgeegg/BridgeEggListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/bridgeegg/BridgeEggListener.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.customitems.bridgeegg;
+package com.loganmagnan.bedwars.customitems.bridgeegg;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import org.bukkit.entity.Egg;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
+import com.loganmagnan.bedwars.game.Game;
import java.util.Collections;
import java.util.HashMap;
diff --git a/src/main/java/rip/tilly/bedwars/customitems/bridgeegg/BridgeEggRunnable.java b/src/main/java/com/loganmagnan/bedwars/customitems/bridgeegg/BridgeEggRunnable.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/customitems/bridgeegg/BridgeEggRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/bridgeegg/BridgeEggRunnable.java
index 7be0e33..8673bc8 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/bridgeegg/BridgeEggRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/bridgeegg/BridgeEggRunnable.java
@@ -1,5 +1,7 @@
-package rip.tilly.bedwars.customitems.bridgeegg;
+package com.loganmagnan.bedwars.customitems.bridgeegg;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import lombok.Getter;
import org.bukkit.Effect;
import org.bukkit.Location;
@@ -9,9 +11,7 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Egg;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
+import com.loganmagnan.bedwars.game.Game;
@Getter
@SuppressWarnings("WeakerAccess")
diff --git a/src/main/java/rip/tilly/bedwars/customitems/popuptower/PlaceTower.java b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/PlaceTower.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/customitems/popuptower/PlaceTower.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/popuptower/PlaceTower.java
index 2d320e1..c0aa6ed 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/popuptower/PlaceTower.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/PlaceTower.java
@@ -1,15 +1,15 @@
-package rip.tilly.bedwars.customitems.popuptower;
+package com.loganmagnan.bedwars.customitems.popuptower;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
+import com.loganmagnan.bedwars.game.Game;
public class PlaceTower {
- private final BedWars plugin = BedWars.getInstance();
+ private BedWars plugin = BedWars.getInstance();
public PlaceTower(Block block, String xyz, PlayerTeam playerTeam, Player player, boolean ladder, int ladderData) {
int x = Integer.parseInt(xyz.split(", ")[0]);
diff --git a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerEast.java b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerEast.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerEast.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerEast.java
index 366e791..e17bc0b 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerEast.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerEast.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.customitems.popuptower.types;
+package com.loganmagnan.bedwars.customitems.popuptower.types;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -8,9 +11,6 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitTask;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerNorth.java b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerNorth.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerNorth.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerNorth.java
index f168a68..c25b999 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerNorth.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerNorth.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.customitems.popuptower.types;
+package com.loganmagnan.bedwars.customitems.popuptower.types;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -8,9 +11,6 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitTask;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerSouth.java b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerSouth.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerSouth.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerSouth.java
index 34f35b8..b3f74d3 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerSouth.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerSouth.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.customitems.popuptower.types;
+package com.loganmagnan.bedwars.customitems.popuptower.types;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -8,9 +11,6 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitTask;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerWest.java b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerWest.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerWest.java
rename to src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerWest.java
index 073385c..8dd6baf 100644
--- a/src/main/java/rip/tilly/bedwars/customitems/popuptower/types/TowerWest.java
+++ b/src/main/java/com/loganmagnan/bedwars/customitems/popuptower/types/TowerWest.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.customitems.popuptower.types;
+package com.loganmagnan.bedwars.customitems.popuptower.types;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -8,9 +11,6 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitTask;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/events/GameEndEvent.java b/src/main/java/com/loganmagnan/bedwars/events/GameEndEvent.java
similarity index 73%
rename from src/main/java/rip/tilly/bedwars/events/GameEndEvent.java
rename to src/main/java/com/loganmagnan/bedwars/events/GameEndEvent.java
index 8ed636e..8f951dd 100644
--- a/src/main/java/rip/tilly/bedwars/events/GameEndEvent.java
+++ b/src/main/java/com/loganmagnan/bedwars/events/GameEndEvent.java
@@ -1,8 +1,8 @@
-package rip.tilly.bedwars.events;
+package com.loganmagnan.bedwars.events;
+import com.loganmagnan.bedwars.game.GameTeam;
import lombok.Getter;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.game.Game;
@Getter
public class GameEndEvent extends GameEvent {
diff --git a/src/main/java/rip/tilly/bedwars/events/GameEvent.java b/src/main/java/com/loganmagnan/bedwars/events/GameEvent.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/events/GameEvent.java
rename to src/main/java/com/loganmagnan/bedwars/events/GameEvent.java
index 09a7a57..590fb17 100644
--- a/src/main/java/rip/tilly/bedwars/events/GameEvent.java
+++ b/src/main/java/com/loganmagnan/bedwars/events/GameEvent.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.events;
+package com.loganmagnan.bedwars.events;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
-import rip.tilly.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.Game;
@Getter
@RequiredArgsConstructor
diff --git a/src/main/java/rip/tilly/bedwars/events/GameStartEvent.java b/src/main/java/com/loganmagnan/bedwars/events/GameStartEvent.java
similarity index 59%
rename from src/main/java/rip/tilly/bedwars/events/GameStartEvent.java
rename to src/main/java/com/loganmagnan/bedwars/events/GameStartEvent.java
index 458f07e..1c0bbbd 100644
--- a/src/main/java/rip/tilly/bedwars/events/GameStartEvent.java
+++ b/src/main/java/com/loganmagnan/bedwars/events/GameStartEvent.java
@@ -1,6 +1,6 @@
-package rip.tilly.bedwars.events;
+package com.loganmagnan.bedwars.events;
-import rip.tilly.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.Game;
public class GameStartEvent extends GameEvent {
diff --git a/src/main/java/rip/tilly/bedwars/events/PlayerKillEvent.java b/src/main/java/com/loganmagnan/bedwars/events/PlayerKillEvent.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/events/PlayerKillEvent.java
rename to src/main/java/com/loganmagnan/bedwars/events/PlayerKillEvent.java
index 63088bb..444201b 100644
--- a/src/main/java/rip/tilly/bedwars/events/PlayerKillEvent.java
+++ b/src/main/java/com/loganmagnan/bedwars/events/PlayerKillEvent.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.events;
+package com.loganmagnan.bedwars.events;
import lombok.Getter;
import org.bukkit.entity.Player;
diff --git a/src/main/java/rip/tilly/bedwars/game/Game.java b/src/main/java/com/loganmagnan/bedwars/game/Game.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/game/Game.java
rename to src/main/java/com/loganmagnan/bedwars/game/Game.java
index 30dcce2..b382b45 100644
--- a/src/main/java/rip/tilly/bedwars/game/Game.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/Game.java
@@ -1,5 +1,14 @@
-package rip.tilly.bedwars.game;
+package com.loganmagnan.bedwars.game;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.generators.Generator;
+import com.loganmagnan.bedwars.generators.GeneratorTier;
+import com.loganmagnan.bedwars.generators.GeneratorType;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.utils.TimeUtils;
import io.netty.util.internal.ConcurrentSet;
import lombok.Getter;
import lombok.Setter;
@@ -12,15 +21,7 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Villager;
import org.bukkit.inventory.ItemStack;
import org.github.paperspigot.Title;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.generators.Generator;
-import rip.tilly.bedwars.generators.GeneratorTier;
-import rip.tilly.bedwars.generators.GeneratorType;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
-import rip.tilly.bedwars.utils.TimeUtils;
+
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -37,9 +38,9 @@ public class Game {
private final Set runnables = new HashSet<>();
private final Set droppedItems = new ConcurrentSet<>();
- private final List teams;
private final Arena arena;
private final GameType gameType;
+ private final List teams;
private final UUID gameId = UUID.randomUUID();
diff --git a/src/main/java/rip/tilly/bedwars/game/GameRequest.java b/src/main/java/com/loganmagnan/bedwars/game/GameRequest.java
similarity index 76%
rename from src/main/java/rip/tilly/bedwars/game/GameRequest.java
rename to src/main/java/com/loganmagnan/bedwars/game/GameRequest.java
index 2e217c5..e922db4 100644
--- a/src/main/java/rip/tilly/bedwars/game/GameRequest.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/GameRequest.java
@@ -1,8 +1,8 @@
-package rip.tilly.bedwars.game;
+package com.loganmagnan.bedwars.game;
+import com.loganmagnan.bedwars.game.arena.Arena;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import rip.tilly.bedwars.game.arena.Arena;
import java.util.UUID;
diff --git a/src/main/java/rip/tilly/bedwars/game/GameState.java b/src/main/java/com/loganmagnan/bedwars/game/GameState.java
similarity index 52%
rename from src/main/java/rip/tilly/bedwars/game/GameState.java
rename to src/main/java/com/loganmagnan/bedwars/game/GameState.java
index c02b2fc..ef45f3a 100644
--- a/src/main/java/rip/tilly/bedwars/game/GameState.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/GameState.java
@@ -1,8 +1,8 @@
-package rip.tilly.bedwars.game;
+package com.loganmagnan.bedwars.game;
public enum GameState {
STARTING,
FIGHTING,
- ENDING
+ ENDING;
}
diff --git a/src/main/java/rip/tilly/bedwars/game/GameTeam.java b/src/main/java/com/loganmagnan/bedwars/game/GameTeam.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/game/GameTeam.java
rename to src/main/java/com/loganmagnan/bedwars/game/GameTeam.java
index 426aba4..27f68de 100644
--- a/src/main/java/rip/tilly/bedwars/game/GameTeam.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/GameTeam.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.game;
+package com.loganmagnan.bedwars.game;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/game/GameType.java b/src/main/java/com/loganmagnan/bedwars/game/GameType.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/game/GameType.java
rename to src/main/java/com/loganmagnan/bedwars/game/GameType.java
index 96cb2bc..61d02f8 100644
--- a/src/main/java/rip/tilly/bedwars/game/GameType.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/GameType.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.game;
+package com.loganmagnan.bedwars.game;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/rip/tilly/bedwars/game/arena/Arena.java b/src/main/java/com/loganmagnan/bedwars/game/arena/Arena.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/game/arena/Arena.java
rename to src/main/java/com/loganmagnan/bedwars/game/arena/Arena.java
index a0ea7d5..96d7eae 100644
--- a/src/main/java/rip/tilly/bedwars/game/arena/Arena.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/arena/Arena.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.game.arena;
+package com.loganmagnan.bedwars.game.arena;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import rip.tilly.bedwars.utils.CustomLocation;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/game/arena/CopiedArena.java b/src/main/java/com/loganmagnan/bedwars/game/arena/CopiedArena.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/game/arena/CopiedArena.java
rename to src/main/java/com/loganmagnan/bedwars/game/arena/CopiedArena.java
index 6c44d8d..e4b0c66 100644
--- a/src/main/java/rip/tilly/bedwars/game/arena/CopiedArena.java
+++ b/src/main/java/com/loganmagnan/bedwars/game/arena/CopiedArena.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.game.arena;
+package com.loganmagnan.bedwars.game.arena;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import java.util.ArrayList;
import java.util.List;
@@ -36,5 +36,4 @@ public class CopiedArena {
private List teamGenerators = new ArrayList<>();
private List diamondGenerators = new ArrayList<>();
private List emeraldGenerators = new ArrayList<>();
-
}
diff --git a/src/main/java/rip/tilly/bedwars/generators/Generator.java b/src/main/java/com/loganmagnan/bedwars/generators/Generator.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/generators/Generator.java
rename to src/main/java/com/loganmagnan/bedwars/generators/Generator.java
index 91752ce..eff9ab0 100644
--- a/src/main/java/rip/tilly/bedwars/generators/Generator.java
+++ b/src/main/java/com/loganmagnan/bedwars/generators/Generator.java
@@ -1,15 +1,14 @@
-package rip.tilly.bedwars.generators;
+package com.loganmagnan.bedwars.generators;
-import org.bukkit.Bukkit;
+import com.loganmagnan.bedwars.BedWars;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.ArmorStand;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitTask;
import org.bukkit.util.EulerAngle;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.utils.CC;
public class Generator {
diff --git a/src/main/java/rip/tilly/bedwars/generators/GeneratorTier.java b/src/main/java/com/loganmagnan/bedwars/generators/GeneratorTier.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/generators/GeneratorTier.java
rename to src/main/java/com/loganmagnan/bedwars/generators/GeneratorTier.java
index 8dca031..ba76f39 100644
--- a/src/main/java/rip/tilly/bedwars/generators/GeneratorTier.java
+++ b/src/main/java/com/loganmagnan/bedwars/generators/GeneratorTier.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.generators;
+package com.loganmagnan.bedwars.generators;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/generators/GeneratorType.java b/src/main/java/com/loganmagnan/bedwars/generators/GeneratorType.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/generators/GeneratorType.java
rename to src/main/java/com/loganmagnan/bedwars/generators/GeneratorType.java
index c8adf9d..4904af8 100644
--- a/src/main/java/rip/tilly/bedwars/generators/GeneratorType.java
+++ b/src/main/java/com/loganmagnan/bedwars/generators/GeneratorType.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.generators;
+package com.loganmagnan.bedwars.generators;
public enum GeneratorType {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/ButtonListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/ButtonListener.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/listeners/ButtonListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/ButtonListener.java
index 208ab69..87666e8 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/ButtonListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/ButtonListener.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.listeners;
+package com.loganmagnan.bedwars.listeners;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -9,9 +12,6 @@ import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
public class ButtonListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/InteractListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/InteractListener.java
similarity index 88%
rename from src/main/java/rip/tilly/bedwars/listeners/InteractListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/InteractListener.java
index 489a3d6..464b1e7 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/InteractListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/InteractListener.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.listeners;
+package com.loganmagnan.bedwars.listeners;
+import com.loganmagnan.bedwars.menus.settings.SettingsMenu;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Material;
@@ -14,14 +17,11 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.TrapDoor;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
-import rip.tilly.bedwars.menus.queue.PlayAGameMenu;
-import rip.tilly.bedwars.menus.settings.SettingsMenu;
-import rip.tilly.bedwars.menus.shop.blocks.BlocksMenu;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.menusystem.menu.UpgradesMenu;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
+import com.loganmagnan.bedwars.menus.queue.PlayAGameMenu;
+import com.loganmagnan.bedwars.menus.shop.blocks.BlocksMenu;
+import com.loganmagnan.bedwars.utils.menusystem.menu.UpgradesMenu;
public class InteractListener implements Listener {
@@ -29,18 +29,24 @@ public class InteractListener implements Listener {
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event) {
+ Player player = event.getPlayer();
+
+ PlayerData playerData = this.plugin.getPlayerDataManager().getPlayerData(player.getUniqueId());
+
+ if (playerData.getPlayerState() == PlayerState.PLAYING) {
+ return;
+ }
+
+ if (player.getGameMode() == GameMode.CREATIVE) {
+ return;
+ }
+
if (event.getAction() == Action.PHYSICAL && event.getClickedBlock().getType() == Material.SOIL) {
event.setCancelled(true);
return;
}
- if ((event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR)) {
- return;
- }
-
- Player player = event.getPlayer();
-
- if (player.getGameMode() == GameMode.CREATIVE) {
+ if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
return;
}
@@ -59,16 +65,13 @@ public class InteractListener implements Listener {
}
ItemStack itemStack = player.getItemInHand();
+
if (!event.hasItem() || itemStack == null) {
return;
}
- PlayerData playerData = this.plugin.getPlayerDataManager().getPlayerData(player.getUniqueId());
- if (playerData.getPlayerState() == PlayerState.PLAYING) {
- return;
- }
+ HotbarItem hotbarItem = HotbarItem.getItemByItemStack(itemStack);
- HotbarItem hotbarItem = HotbarItem.getItemByItemStack(player.getItemInHand());
if (hotbarItem == null) {
return;
}
@@ -95,7 +98,7 @@ public class InteractListener implements Listener {
break;
case COSMETICS_MENU:
- new BlocksMenu().openMenu(player);
+// new BlocksMenu().openMenu(player);
// open cosmetics menu
break;
case PREFERENCES_MENU:
diff --git a/src/main/java/rip/tilly/bedwars/listeners/MenuListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/MenuListener.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/listeners/MenuListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/MenuListener.java
index 0f72b40..5ac8991 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/MenuListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/MenuListener.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.listeners;
+package com.loganmagnan.bedwars.listeners;
+import com.loganmagnan.bedwars.utils.menusystem.Menu;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.InventoryHolder;
-import rip.tilly.bedwars.utils.menusystem.Menu;
public class MenuListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/PartyChatListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/PartyChatListener.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/listeners/PartyChatListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/PartyChatListener.java
index 684c0f7..8b81949 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/PartyChatListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/PartyChatListener.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.listeners;
+package com.loganmagnan.bedwars.listeners;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.managers.party.Party;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerSettings;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.managers.party.Party;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerSettings;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CC;
public class PartyChatListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/PlayerDataListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/PlayerDataListener.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/listeners/PlayerDataListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/PlayerDataListener.java
index d2d49ee..cd511fb 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/PlayerDataListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/PlayerDataListener.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.listeners;
+package com.loganmagnan.bedwars.listeners;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.*;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
public class PlayerDataListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java b/src/main/java/com/loganmagnan/bedwars/listeners/RandomListeners.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/RandomListeners.java
index 4f9687c..7694db6 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/RandomListeners.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.listeners;
+package com.loganmagnan.bedwars.listeners;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
import org.bukkit.GameMode;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
@@ -13,9 +16,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerToggleFlightEvent;
import org.bukkit.event.weather.WeatherChangeEvent;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
public class RandomListeners implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/DamageListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/game/DamageListener.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/listeners/game/DamageListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/game/DamageListener.java
index 76790d9..e55c6fd 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/DamageListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/game/DamageListener.java
@@ -1,5 +1,12 @@
-package rip.tilly.bedwars.listeners.game;
+package com.loganmagnan.bedwars.listeners.game;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.events.PlayerKillEvent;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameState;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.CC;
import org.bukkit.Location;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
@@ -8,13 +15,6 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.events.PlayerKillEvent;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameState;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.CC;
public class DamageListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/GameEndListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/game/GameEndListener.java
similarity index 80%
rename from src/main/java/rip/tilly/bedwars/listeners/game/GameEndListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/game/GameEndListener.java
index 3a53278..18be374 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/GameEndListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/game/GameEndListener.java
@@ -1,19 +1,19 @@
-package rip.tilly.bedwars.listeners.game;
+package com.loganmagnan.bedwars.listeners.game;
+import com.loganmagnan.bedwars.game.GameTeam;
import org.bukkit.entity.Entity;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.github.paperspigot.Title;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.events.GameEndEvent;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameState;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.generators.Generator;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.events.GameEndEvent;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameState;
+import com.loganmagnan.bedwars.generators.Generator;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
public class GameEndListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/game/GameStartListener.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/game/GameStartListener.java
index 589e037..3055ffe 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/game/GameStartListener.java
@@ -1,21 +1,21 @@
-package rip.tilly.bedwars.listeners.game;
+package com.loganmagnan.bedwars.listeners.game;
+import com.loganmagnan.bedwars.events.GameStartEvent;
+import com.loganmagnan.bedwars.runnables.GameRunnable;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.events.GameStartEvent;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.generators.Generator;
-import rip.tilly.bedwars.generators.GeneratorType;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.runnables.GameRunnable;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
-import rip.tilly.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.generators.Generator;
+import com.loganmagnan.bedwars.generators.GeneratorType;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
import java.util.HashSet;
import java.util.Set;
@@ -105,6 +105,6 @@ public class GameStartListener implements Listener {
}
}
- new GameRunnable(game).runTaskTimer(this.plugin, 20, 20);
+ new GameRunnable(game).runTaskTimer(this.plugin, 20L, 20L);
}
}
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/MovementListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/game/MovementListener.java
similarity index 88%
rename from src/main/java/rip/tilly/bedwars/listeners/game/MovementListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/game/MovementListener.java
index ecf4e1f..84089f2 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/MovementListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/game/MovementListener.java
@@ -1,5 +1,9 @@
-package rip.tilly.bedwars.listeners.game;
+package com.loganmagnan.bedwars.listeners.game;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@@ -8,16 +12,11 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.events.PlayerKillEvent;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameState;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.upgrades.Upgrade;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.LocationUtils;
+import com.loganmagnan.bedwars.events.PlayerKillEvent;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameState;
+import com.loganmagnan.bedwars.upgrades.Upgrade;
+import com.loganmagnan.bedwars.utils.CC;
public class MovementListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/PlayerKillListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/game/PlayerKillListener.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/listeners/game/PlayerKillListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/game/PlayerKillListener.java
index 0309182..1c99fdb 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/PlayerKillListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/game/PlayerKillListener.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.listeners.game;
+package com.loganmagnan.bedwars.listeners.game;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
+import com.loganmagnan.bedwars.runnables.RespawnRunnable;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.events.PlayerKillEvent;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
-import rip.tilly.bedwars.runnables.RespawnRunnable;
+import com.loganmagnan.bedwars.events.PlayerKillEvent;
+import com.loganmagnan.bedwars.game.Game;
public class PlayerKillListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/game/WorldListener.java b/src/main/java/com/loganmagnan/bedwars/listeners/game/WorldListener.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/listeners/game/WorldListener.java
rename to src/main/java/com/loganmagnan/bedwars/listeners/game/WorldListener.java
index f845149..d9b26ff 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/game/WorldListener.java
+++ b/src/main/java/com/loganmagnan/bedwars/listeners/game/WorldListener.java
@@ -1,5 +1,15 @@
-package rip.tilly.bedwars.listeners.game;
+package com.loganmagnan.bedwars.listeners.game;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.customitems.popuptower.types.TowerEast;
+import com.loganmagnan.bedwars.customitems.popuptower.types.TowerNorth;
+import com.loganmagnan.bedwars.customitems.popuptower.types.TowerSouth;
+import com.loganmagnan.bedwars.customitems.popuptower.types.TowerWest;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameState;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
@@ -13,16 +23,6 @@ import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.customitems.popuptower.types.TowerEast;
-import rip.tilly.bedwars.customitems.popuptower.types.TowerNorth;
-import rip.tilly.bedwars.customitems.popuptower.types.TowerSouth;
-import rip.tilly.bedwars.customitems.popuptower.types.TowerWest;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameState;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
public class WorldListener implements Listener {
diff --git a/src/main/java/rip/tilly/bedwars/managers/CommandManager.java b/src/main/java/com/loganmagnan/bedwars/managers/CommandManager.java
similarity index 62%
rename from src/main/java/rip/tilly/bedwars/managers/CommandManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/CommandManager.java
index be181c1..34d6743 100644
--- a/src/main/java/rip/tilly/bedwars/managers/CommandManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/CommandManager.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.managers;
+package com.loganmagnan.bedwars.managers;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.commands.arena.ArenaCommand;
-import rip.tilly.bedwars.commands.level.LevelCommand;
-import rip.tilly.bedwars.commands.party.PartyCommand;
-import rip.tilly.bedwars.commands.setspawn.SetSpawnCommand;
-import rip.tilly.bedwars.commands.spectate.SpectateCommand;
-import rip.tilly.bedwars.commands.toggle.ToggleCommand;
-import rip.tilly.bedwars.commands.xp.XpCommand;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.commands.party.PartyCommand;
+import com.loganmagnan.bedwars.commands.arena.ArenaCommand;
+import com.loganmagnan.bedwars.commands.level.LevelCommand;
+import com.loganmagnan.bedwars.commands.setspawn.SetSpawnCommand;
+import com.loganmagnan.bedwars.commands.spectate.SpectateCommand;
+import com.loganmagnan.bedwars.commands.toggle.ToggleCommand;
+import com.loganmagnan.bedwars.commands.xp.XpCommand;
public class CommandManager {
diff --git a/src/main/java/rip/tilly/bedwars/managers/GameManager.java b/src/main/java/com/loganmagnan/bedwars/managers/GameManager.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/managers/GameManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/GameManager.java
index ab44b79..2bf69d2 100644
--- a/src/main/java/rip/tilly/bedwars/managers/GameManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/GameManager.java
@@ -1,5 +1,7 @@
-package rip.tilly.bedwars.managers;
+package com.loganmagnan.bedwars.managers;
+import com.loganmagnan.bedwars.events.GameStartEvent;
+import com.loganmagnan.bedwars.game.*;
import lombok.Getter;
import org.bukkit.Color;
import org.bukkit.Material;
@@ -9,20 +11,18 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.events.GameEndEvent;
-import rip.tilly.bedwars.events.GameStartEvent;
-import rip.tilly.bedwars.game.*;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
-import rip.tilly.bedwars.upgrades.Upgrade;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
-import rip.tilly.bedwars.utils.TtlHashMap;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.events.GameEndEvent;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
+import com.loganmagnan.bedwars.upgrades.Upgrade;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.utils.TtlHashMap;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/rip/tilly/bedwars/managers/PlayerDataManager.java b/src/main/java/com/loganmagnan/bedwars/managers/PlayerDataManager.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/managers/PlayerDataManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/PlayerDataManager.java
index 1da6602..219b1d0 100644
--- a/src/main/java/rip/tilly/bedwars/managers/PlayerDataManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/PlayerDataManager.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.managers;
+package com.loganmagnan.bedwars.managers;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.UpdateOptions;
import lombok.Getter;
import org.bson.Document;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.PlayerUtil;
import java.util.Collection;
import java.util.HashMap;
diff --git a/src/main/java/rip/tilly/bedwars/managers/SpawnManager.java b/src/main/java/com/loganmagnan/bedwars/managers/SpawnManager.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/managers/SpawnManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/SpawnManager.java
index 18bfb32..61457fd 100644
--- a/src/main/java/rip/tilly/bedwars/managers/SpawnManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/SpawnManager.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.managers;
+package com.loganmagnan.bedwars.managers;
+import com.loganmagnan.bedwars.BedWars;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CustomLocation;
@Getter
@Setter
diff --git a/src/main/java/rip/tilly/bedwars/managers/arena/ArenaManager.java b/src/main/java/com/loganmagnan/bedwars/managers/arena/ArenaManager.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/managers/arena/ArenaManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/arena/ArenaManager.java
index acbc25a..19266f9 100644
--- a/src/main/java/rip/tilly/bedwars/managers/arena/ArenaManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/arena/ArenaManager.java
@@ -1,15 +1,15 @@
-package rip.tilly.bedwars.managers.arena;
+package com.loganmagnan.bedwars.managers.arena;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.utils.CustomLocation;
-import rip.tilly.bedwars.utils.config.file.Config;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.utils.config.file.Config;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/ChunkClearingManager.java b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/ChunkClearingManager.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/managers/arena/chunk/ChunkClearingManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/ChunkClearingManager.java
index 400e383..2915a33 100644
--- a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/ChunkClearingManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/ChunkClearingManager.java
@@ -1,15 +1,15 @@
-package rip.tilly.bedwars.managers.arena.chunk;
+package com.loganmagnan.bedwars.managers.arena.chunk;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.managers.arena.chunk.data.BedWarsChunk;
+import com.loganmagnan.bedwars.managers.arena.chunk.data.BedWarsChunkData;
+import com.loganmagnan.bedwars.managers.arena.chunk.data.BedWarsNMSUtil;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.cuboid.Cuboid;
import net.minecraft.server.v1_8_R3.Chunk;
import net.minecraft.server.v1_8_R3.ChunkSection;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R3.CraftChunk;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.managers.arena.chunk.data.BedWarsChunk;
-import rip.tilly.bedwars.managers.arena.chunk.data.BedWarsChunkData;
-import rip.tilly.bedwars.managers.arena.chunk.data.BedWarsNMSUtil;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.cuboid.Cuboid;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/ChunkManager.java b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/ChunkManager.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/managers/arena/chunk/ChunkManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/ChunkManager.java
index 573cf74..585f2cf 100644
--- a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/ChunkManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/ChunkManager.java
@@ -1,11 +1,11 @@
-package rip.tilly.bedwars.managers.arena.chunk;
+package com.loganmagnan.bedwars.managers.arena.chunk;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import org.bukkit.Chunk;
import org.bukkit.scheduler.BukkitRunnable;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.utils.CustomLocation;
public class ChunkManager {
diff --git a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsChunk.java b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsChunk.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsChunk.java
rename to src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsChunk.java
index 049040c..7728dcc 100644
--- a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsChunk.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsChunk.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.managers.arena.chunk.data;
+package com.loganmagnan.bedwars.managers.arena.chunk.data;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsChunkData.java b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsChunkData.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsChunkData.java
rename to src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsChunkData.java
index e0ab90a..da063df 100644
--- a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsChunkData.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsChunkData.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.managers.arena.chunk.data;
+package com.loganmagnan.bedwars.managers.arena.chunk.data;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsNMSUtil.java b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsNMSUtil.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsNMSUtil.java
rename to src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsNMSUtil.java
index 305d8b6..ae29f01 100644
--- a/src/main/java/rip/tilly/bedwars/managers/arena/chunk/data/BedWarsNMSUtil.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/arena/chunk/data/BedWarsNMSUtil.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.managers.arena.chunk.data;
+package com.loganmagnan.bedwars.managers.arena.chunk.data;
import lombok.SneakyThrows;
import net.minecraft.server.v1_8_R3.Chunk;
diff --git a/src/main/java/rip/tilly/bedwars/managers/hotbar/HotbarManager.java b/src/main/java/com/loganmagnan/bedwars/managers/hotbar/HotbarManager.java
similarity index 78%
rename from src/main/java/rip/tilly/bedwars/managers/hotbar/HotbarManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/hotbar/HotbarManager.java
index 5db90ed..d93b217 100644
--- a/src/main/java/rip/tilly/bedwars/managers/hotbar/HotbarManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/hotbar/HotbarManager.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.managers.hotbar;
+package com.loganmagnan.bedwars.managers.hotbar;
+import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
import lombok.Getter;
import org.bukkit.Material;
-import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemUtil;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemUtil;
import java.util.ArrayList;
import java.util.List;
@@ -27,27 +27,27 @@ public class HotbarManager {
private void loadSpawnItems() {
spawnItems.add(new HotbarItem(
ItemUtil.createUnbreakableItem(
- Material.IRON_SWORD, CC.translate("&e&l» &dPlay A Game &e&l«"), 1, (short) 0
+ Material.IRON_SWORD, CC.translate("&7&l» &bPlay A Game &7&l«"), 1, (short) 0
), 0, true, "QUEUE_MENU")
);
spawnItems.add(new HotbarItem(
ItemUtil.createUnbreakableItem(
- Material.NAME_TAG, CC.translate("&e&l» &dCreate Party &e&l«"), 1, (short) 0
+ Material.NAME_TAG, CC.translate("&7&l» &bCreate Party &7&l«"), 1, (short) 0
), 1, true, "CREATE_PARTY")
);
spawnItems.add(new HotbarItem(
ItemUtil.createUnbreakableItem(
- Material.EMERALD, CC.translate("&e&l» &dCosmetics &e&l«"), 1, (short) 0
+ Material.EMERALD, CC.translate("&7&l» &bCosmetics &7&l«"), 1, (short) 0
), 4, true, "COSMETICS_MENU")
);
spawnItems.add(new HotbarItem(
ItemUtil.createUnbreakableItem(
- Material.BOOK, CC.translate("&e&l» &dHotbar Preference &e&l«"), 1, (short) 0
+ Material.BOOK, CC.translate("&7&l» &bHotBar Preferences &7&l«"), 1, (short) 0
), 7, true, "PREFERENCES_MENU")
);
spawnItems.add(new HotbarItem(
ItemUtil.createUnbreakableItem(
- Material.WATCH, CC.translate("&e&l» &dSettings &e&l«"), 1, (short) 0
+ Material.WATCH, CC.translate("&7&l» &bSettings &7&l«"), 1, (short) 0
), 8, true, "SETTINGS_MENU")
);
}
@@ -55,7 +55,7 @@ public class HotbarManager {
private void loadQueueItems() {
queueItems.add(new HotbarItem(
ItemUtil.createUnbreakableItem(
- Material.INK_SACK, CC.translate("&e&l» &cLeave Queue &e&l«"), 1, (short) 1
+ Material.INK_SACK, CC.translate("&7&l» &cLeave Queue &7&l«"), 1, (short) 1
), 8, true, "LEAVE_QUEUE")
);
}
diff --git a/src/main/java/rip/tilly/bedwars/managers/hotbar/impl/ActionType.java b/src/main/java/com/loganmagnan/bedwars/managers/hotbar/impl/ActionType.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/managers/hotbar/impl/ActionType.java
rename to src/main/java/com/loganmagnan/bedwars/managers/hotbar/impl/ActionType.java
index 078cba1..9d28e6f 100644
--- a/src/main/java/rip/tilly/bedwars/managers/hotbar/impl/ActionType.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/hotbar/impl/ActionType.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.managers.hotbar.impl;
+package com.loganmagnan.bedwars.managers.hotbar.impl;
public enum ActionType {
diff --git a/src/main/java/rip/tilly/bedwars/managers/hotbar/impl/HotbarItem.java b/src/main/java/com/loganmagnan/bedwars/managers/hotbar/impl/HotbarItem.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/managers/hotbar/impl/HotbarItem.java
rename to src/main/java/com/loganmagnan/bedwars/managers/hotbar/impl/HotbarItem.java
index 7580931..423d5c2 100644
--- a/src/main/java/rip/tilly/bedwars/managers/hotbar/impl/HotbarItem.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/hotbar/impl/HotbarItem.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.managers.hotbar.impl;
+package com.loganmagnan.bedwars.managers.hotbar.impl;
import com.google.common.collect.Lists;
import lombok.Getter;
diff --git a/src/main/java/com/loganmagnan/bedwars/managers/mongo/MongoManager.java b/src/main/java/com/loganmagnan/bedwars/managers/mongo/MongoManager.java
new file mode 100644
index 0000000..93281e1
--- /dev/null
+++ b/src/main/java/com/loganmagnan/bedwars/managers/mongo/MongoManager.java
@@ -0,0 +1,115 @@
+package com.loganmagnan.bedwars.managers.mongo;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.config.file.Config;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
+import lombok.Getter;
+import org.bson.Document;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Getter
+public class MongoManager {
+
+ private final BedWars plugin = BedWars.getInstance();
+ private final MongoManager instance;
+
+ private final FileConfiguration config = this.plugin.getMainConfig().getConfig();
+
+ private MongoClient mongoClient;
+ private MongoDatabase mongoDatabase;
+
+ private final boolean uriMode = config.getBoolean("MONGO.URI-MODE");
+ private final String host = config.getString("MONGO.NORMAL.HOST");
+ private final int port = config.getInt("MONGO.NORMAL.PORT");
+ private final String database = config.getString("MONGO.NORMAL.DATABASE");
+ private final boolean auth = config.getBoolean("MONGO.NORMAL.AUTH.ENABLED");
+ private final String user = config.getString("MONGO.NORMAL.AUTH.USERNAME");
+ private final String password = config.getString("MONGO.NORMAL.AUTH.PASSWORD");
+ private final String authDatabase = config.getString("MONGO.NORMAL.AUTH.AUTH-DATABASE");
+ private final String uriString = config.getString("MONGO.URI.CONNECTION-STRING");
+ private final String uriDatabase = config.getString("MONGO.URI.DATABASE-NAME");
+
+ private boolean connected;
+
+ private MongoCollection players;
+
+ private Gson gson = new Gson();
+
+ private Type type = (new TypeToken>() {
+
+ }).getType();
+
+ public MongoManager() {
+ instance = this;
+ try {
+ if (this.uriMode) {
+ MongoClientURI mongoClientURI = new MongoClientURI(this.uriString);
+
+ MongoClient mongoClient = new MongoClient(mongoClientURI);
+ mongoClient.getDatabase(this.uriDatabase);
+ mongoDatabase = mongoClient.getDatabase(this.uriDatabase);
+ } else {
+ if (auth) {
+ final MongoCredential credential = MongoCredential.createCredential(user, authDatabase, password.toCharArray());
+ mongoClient = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential));
+ } else {
+ mongoClient = new MongoClient(host, port);
+ }
+
+ mongoDatabase = mongoClient.getDatabase(database);
+ }
+ connected = true;
+ Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &aSuccessfully connected to the database!"));
+ this.players = this.mongoDatabase.getCollection("players");
+ } catch (Exception exception) {
+ connected = false;
+ Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &cFailed to connect to the database!"));
+ exception.printStackTrace();
+ Bukkit.getPluginManager().disablePlugin(this.plugin);
+ Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &cDisabling BedWars..."));
+ }
+ }
+
+ public void disconnect() {
+ if (this.mongoClient != null) {
+ this.mongoClient.close();
+ this.connected = false;
+ Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &aSuccessfully disconnected from the database!"));
+ }
+ }
+
+ public List getAllDocuments(MongoCollection mongoCollection) {
+ List documents = new ArrayList();
+
+ FindIterable findIterable = mongoCollection.find();
+
+ MongoCursor mongoCursor = findIterable.iterator();
+
+ try {
+ while (mongoCursor.hasNext()) {
+ documents.add(mongoCursor.next());
+ }
+ } finally {
+ mongoCursor.close();
+ }
+
+ return documents;
+ }
+}
diff --git a/src/main/java/rip/tilly/bedwars/managers/party/Party.java b/src/main/java/com/loganmagnan/bedwars/managers/party/Party.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/managers/party/Party.java
rename to src/main/java/com/loganmagnan/bedwars/managers/party/Party.java
index 48c0d56..236498b 100644
--- a/src/main/java/rip/tilly/bedwars/managers/party/Party.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/party/Party.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.managers.party;
+package com.loganmagnan.bedwars.managers.party;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/src/main/java/rip/tilly/bedwars/managers/party/PartyManager.java b/src/main/java/com/loganmagnan/bedwars/managers/party/PartyManager.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/managers/party/PartyManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/party/PartyManager.java
index 1d1a909..a2626e1 100644
--- a/src/main/java/rip/tilly/bedwars/managers/party/PartyManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/party/PartyManager.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.managers.party;
+package com.loganmagnan.bedwars.managers.party;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.Clickable;
+import com.loganmagnan.bedwars.utils.TtlHashMap;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.Clickable;
-import rip.tilly.bedwars.utils.TtlHashMap;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/managers/queue/QueueEntry.java b/src/main/java/com/loganmagnan/bedwars/managers/queue/QueueEntry.java
similarity index 63%
rename from src/main/java/rip/tilly/bedwars/managers/queue/QueueEntry.java
rename to src/main/java/com/loganmagnan/bedwars/managers/queue/QueueEntry.java
index 53b4732..df62809 100644
--- a/src/main/java/rip/tilly/bedwars/managers/queue/QueueEntry.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/queue/QueueEntry.java
@@ -1,8 +1,8 @@
-package rip.tilly.bedwars.managers.queue;
+package com.loganmagnan.bedwars.managers.queue;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import rip.tilly.bedwars.game.GameType;
+import com.loganmagnan.bedwars.game.GameType;
@Getter
@RequiredArgsConstructor
diff --git a/src/main/java/rip/tilly/bedwars/managers/queue/QueueManager.java b/src/main/java/com/loganmagnan/bedwars/managers/queue/QueueManager.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/managers/queue/QueueManager.java
rename to src/main/java/com/loganmagnan/bedwars/managers/queue/QueueManager.java
index cba370e..3e9f386 100644
--- a/src/main/java/rip/tilly/bedwars/managers/queue/QueueManager.java
+++ b/src/main/java/com/loganmagnan/bedwars/managers/queue/QueueManager.java
@@ -1,17 +1,17 @@
-package rip.tilly.bedwars.managers.queue;
+package com.loganmagnan.bedwars.managers.queue;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.game.GameType;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.playerdata.PlayerTeam;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.game.GameType;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.playerdata.PlayerTeam;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/rip/tilly/bedwars/menus/arena/ArenaCopyMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaCopyMenu.java
similarity index 62%
rename from src/main/java/rip/tilly/bedwars/menus/arena/ArenaCopyMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaCopyMenu.java
index 4173c13..e057d3b 100644
--- a/src/main/java/rip/tilly/bedwars/menus/arena/ArenaCopyMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaCopyMenu.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.menus.arena;
+package com.loganmagnan.bedwars.menus.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import lombok.AllArgsConstructor;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.menus.arena.buttons.ArenaCopyButton;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.menus.arena.buttons.ArenaCopyButton;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/menus/arena/ArenaGenerationMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaGenerationMenu.java
similarity index 68%
rename from src/main/java/rip/tilly/bedwars/menus/arena/ArenaGenerationMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaGenerationMenu.java
index 547cb19..c31abcd 100644
--- a/src/main/java/rip/tilly/bedwars/menus/arena/ArenaGenerationMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaGenerationMenu.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.menus.arena;
+package com.loganmagnan.bedwars.menus.arena;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.menus.arena.buttons.ArenaGenerateButton;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.menus.arena.buttons.ArenaGenerateButton;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/menus/arena/ArenaManagerMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaManageMenu.java
similarity index 68%
rename from src/main/java/rip/tilly/bedwars/menus/arena/ArenaManagerMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaManageMenu.java
index e67f0dc..313b8ed 100644
--- a/src/main/java/rip/tilly/bedwars/menus/arena/ArenaManagerMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/arena/ArenaManageMenu.java
@@ -1,19 +1,19 @@
-package rip.tilly.bedwars.menus.arena;
+package com.loganmagnan.bedwars.menus.arena;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.utils.menu.Button;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.menus.arena.buttons.ArenaButton;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.pagination.PageButton;
-import rip.tilly.bedwars.utils.menu.pagination.PaginatedMenu;
+import com.loganmagnan.bedwars.menus.arena.buttons.ArenaButton;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.pagination.PageButton;
+import com.loganmagnan.bedwars.utils.menu.pagination.PaginatedMenu;
import java.util.HashMap;
import java.util.Map;
-public class ArenaManagerMenu extends PaginatedMenu {
+public class ArenaManageMenu extends PaginatedMenu {
private final BedWars plugin = BedWars.getInstance();
diff --git a/src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaButton.java b/src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaButton.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaButton.java
index 4a48872..9ac3d8d 100644
--- a/src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaButton.java
@@ -1,18 +1,18 @@
-package rip.tilly.bedwars.menus.arena.buttons;
+package com.loganmagnan.bedwars.menus.arena.buttons;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.menus.arena.ArenaCopyMenu;
+import com.loganmagnan.bedwars.menus.arena.ArenaGenerationMenu;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.menus.arena.ArenaCopyMenu;
-import rip.tilly.bedwars.menus.arena.ArenaGenerationMenu;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaCopyButton.java b/src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaCopyButton.java
similarity index 79%
rename from src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaCopyButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaCopyButton.java
index 24f6a0b..e7fe8c0 100644
--- a/src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaCopyButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaCopyButton.java
@@ -1,17 +1,17 @@
-package rip.tilly.bedwars.menus.arena.buttons;
+package com.loganmagnan.bedwars.menus.arena.buttons;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.runnables.ArenaCopyRemovalRunnable;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.runnables.ArenaCopyRemovalRunnable;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaGenerateButton.java b/src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaGenerateButton.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaGenerateButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaGenerateButton.java
index 1467e37..ea52c88 100644
--- a/src/main/java/rip/tilly/bedwars/menus/arena/buttons/ArenaGenerateButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/arena/buttons/ArenaGenerateButton.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.menus.arena.buttons;
+package com.loganmagnan.bedwars.menus.arena.buttons;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/menus/queue/PlayAGameMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/queue/PlayAGameMenu.java
similarity index 87%
rename from src/main/java/rip/tilly/bedwars/menus/queue/PlayAGameMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/queue/PlayAGameMenu.java
index a2a0800..b5a4291 100644
--- a/src/main/java/rip/tilly/bedwars/menus/queue/PlayAGameMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/queue/PlayAGameMenu.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.menus.queue;
+package com.loganmagnan.bedwars.menus.queue;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.GameType;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.GameType;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/main/java/rip/tilly/bedwars/menus/settings/SettingsMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/settings/SettingsMenu.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/menus/settings/SettingsMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/settings/SettingsMenu.java
index 9a1ef28..e6666b4 100644
--- a/src/main/java/rip/tilly/bedwars/menus/settings/SettingsMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/settings/SettingsMenu.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.menus.settings;
+package com.loganmagnan.bedwars.menus.settings;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerSettings;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerSettings;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import java.util.*;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/ShopButton.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/ShopButton.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/menus/shop/ShopButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/ShopButton.java
index 70c7545..68a9d62 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/ShopButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/ShopButton.java
@@ -1,17 +1,17 @@
-package rip.tilly.bedwars.menus.shop;
+package com.loganmagnan.bedwars.menus.shop;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
-import rip.tilly.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/ShopType.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/ShopType.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/menus/shop/ShopType.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/ShopType.java
index 2a63211..60b3827 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/ShopType.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/ShopType.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.menus.shop;
+package com.loganmagnan.bedwars.menus.shop;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/ShopTypeButton.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/ShopTypeButton.java
similarity index 81%
rename from src/main/java/rip/tilly/bedwars/menus/shop/ShopTypeButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/ShopTypeButton.java
index 5d2773d..85ab35c 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/ShopTypeButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/ShopTypeButton.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.menus.shop;
+package com.loganmagnan.bedwars.menus.shop;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.menus.shop.armor.ArmorMenu;
-import rip.tilly.bedwars.menus.shop.blocks.BlocksMenu;
-import rip.tilly.bedwars.menus.shop.utilities.UtilityMenu;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.menus.shop.armor.ArmorMenu;
+import com.loganmagnan.bedwars.menus.shop.blocks.BlocksMenu;
+import com.loganmagnan.bedwars.menus.shop.utilities.UtilityMenu;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/armor/ArmorButton.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/armor/ArmorButton.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/menus/shop/armor/ArmorButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/armor/ArmorButton.java
index 6c8cc3f..6725765 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/armor/ArmorButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/armor/ArmorButton.java
@@ -1,19 +1,19 @@
-package rip.tilly.bedwars.menus.shop.armor;
+package com.loganmagnan.bedwars.menus.shop.armor;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.currentgame.ArmorType;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.currentgame.ArmorType;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
-import rip.tilly.bedwars.utils.menu.Button;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/armor/ArmorMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/armor/ArmorMenu.java
similarity index 77%
rename from src/main/java/rip/tilly/bedwars/menus/shop/armor/ArmorMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/armor/ArmorMenu.java
index 3533a97..00a26dc 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/armor/ArmorMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/armor/ArmorMenu.java
@@ -1,15 +1,15 @@
-package rip.tilly.bedwars.menus.shop.armor;
+package com.loganmagnan.bedwars.menus.shop.armor;
+import com.loganmagnan.bedwars.menus.shop.ShopType;
+import com.loganmagnan.bedwars.menus.shop.ShopTypeButton;
+import com.loganmagnan.bedwars.playerdata.currentgame.ArmorType;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.menus.shop.ShopType;
-import rip.tilly.bedwars.menus.shop.ShopTypeButton;
-import rip.tilly.bedwars.playerdata.currentgame.ArmorType;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/blocks/BlocksMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/blocks/BlocksMenu.java
similarity index 82%
rename from src/main/java/rip/tilly/bedwars/menus/shop/blocks/BlocksMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/blocks/BlocksMenu.java
index 613bbfe..8cb616d 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/blocks/BlocksMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/blocks/BlocksMenu.java
@@ -1,15 +1,15 @@
-package rip.tilly.bedwars.menus.shop.blocks;
+package com.loganmagnan.bedwars.menus.shop.blocks;
+import com.loganmagnan.bedwars.menus.shop.ShopButton;
+import com.loganmagnan.bedwars.menus.shop.ShopType;
+import com.loganmagnan.bedwars.menus.shop.ShopTypeButton;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.menus.shop.ShopButton;
-import rip.tilly.bedwars.menus.shop.ShopType;
-import rip.tilly.bedwars.menus.shop.ShopTypeButton;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/tools/ShearsButton.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/tools/ShearsButton.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/menus/shop/tools/ShearsButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/tools/ShearsButton.java
index f3b4c9b..552ec10 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/tools/ShearsButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/tools/ShearsButton.java
@@ -1,16 +1,16 @@
-package rip.tilly.bedwars.menus.shop.tools;
+package com.loganmagnan.bedwars.menus.shop.tools;
+import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
-import rip.tilly.bedwars.utils.menu.Button;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/tools/ToolsMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/tools/ToolsMenu.java
similarity index 72%
rename from src/main/java/rip/tilly/bedwars/menus/shop/tools/ToolsMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/tools/ToolsMenu.java
index 682aea1..241e129 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/tools/ToolsMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/tools/ToolsMenu.java
@@ -1,17 +1,18 @@
-package rip.tilly.bedwars.menus.shop.tools;
+package com.loganmagnan.bedwars.menus.shop.tools;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.menus.shop.ShopType;
+import com.loganmagnan.bedwars.menus.shop.ShopTypeButton;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.menus.shop.ShopType;
-import rip.tilly.bedwars.menus.shop.ShopTypeButton;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/utilities/UtilityButton.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/utilities/UtilityButton.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/menus/shop/utilities/UtilityButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/utilities/UtilityButton.java
index f74433f..ea9094e 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/utilities/UtilityButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/utilities/UtilityButton.java
@@ -1,17 +1,17 @@
-package rip.tilly.bedwars.menus.shop.utilities;
+package com.loganmagnan.bedwars.menus.shop.utilities;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
-import rip.tilly.bedwars.utils.menu.Button;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/utilities/UtilityMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/utilities/UtilityMenu.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/menus/shop/utilities/UtilityMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/utilities/UtilityMenu.java
index 6bff6a3..50732bc 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/utilities/UtilityMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/utilities/UtilityMenu.java
@@ -1,15 +1,16 @@
-package rip.tilly.bedwars.menus.shop.utilities;
+package com.loganmagnan.bedwars.menus.shop.utilities;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.menus.shop.ShopType;
+import com.loganmagnan.bedwars.menus.shop.ShopTypeButton;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.menus.shop.ShopType;
-import rip.tilly.bedwars.menus.shop.ShopTypeButton;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/weapons/WeaponsButton.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/weapons/WeaponsButton.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/menus/shop/weapons/WeaponsButton.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/weapons/WeaponsButton.java
index fa1759b..ff48e1a 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/weapons/WeaponsButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/weapons/WeaponsButton.java
@@ -1,17 +1,17 @@
-package rip.tilly.bedwars.menus.shop.weapons;
+package com.loganmagnan.bedwars.menus.shop.weapons;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
-import rip.tilly.bedwars.utils.menu.Button;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/menus/shop/weapons/WeaponsMenu.java b/src/main/java/com/loganmagnan/bedwars/menus/shop/weapons/WeaponsMenu.java
similarity index 80%
rename from src/main/java/rip/tilly/bedwars/menus/shop/weapons/WeaponsMenu.java
rename to src/main/java/com/loganmagnan/bedwars/menus/shop/weapons/WeaponsMenu.java
index 12cb89c..fdfdb96 100644
--- a/src/main/java/rip/tilly/bedwars/menus/shop/weapons/WeaponsMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/menus/shop/weapons/WeaponsMenu.java
@@ -1,15 +1,16 @@
-package rip.tilly.bedwars.menus.shop.weapons;
+package com.loganmagnan.bedwars.menus.shop.weapons;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.menus.shop.ShopType;
+import com.loganmagnan.bedwars.menus.shop.ShopTypeButton;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.menus.shop.ShopType;
-import rip.tilly.bedwars.menus.shop.ShopTypeButton;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/PlayerData.java b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerData.java
similarity index 84%
rename from src/main/java/rip/tilly/bedwars/playerdata/PlayerData.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/PlayerData.java
index 9a26a1b..83d4a34 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/PlayerData.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerData.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.playerdata;
+package com.loganmagnan.bedwars.playerdata;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.managers.PlayerDataManager;
-import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.managers.PlayerDataManager;
+import com.loganmagnan.bedwars.playerdata.currentgame.PlayerCurrentGameData;
+import com.loganmagnan.bedwars.utils.CC;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
@@ -29,12 +29,12 @@ public class PlayerData {
private UUID currentGameId;
private int teamId;
- private int kills;
- private int deaths;
- private double xp;
private int level;
+ private double xp;
private int wins;
private int losses;
+ private int kills;
+ private int deaths;
private int gamesPlayed;
private int bedsDestroyed;
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/PlayerSettings.java b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerSettings.java
similarity index 77%
rename from src/main/java/rip/tilly/bedwars/playerdata/PlayerSettings.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/PlayerSettings.java
index c087b96..cc86999 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/PlayerSettings.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerSettings.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.playerdata;
+package com.loganmagnan.bedwars.playerdata;
import lombok.Data;
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/PlayerState.java b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerState.java
similarity index 68%
rename from src/main/java/rip/tilly/bedwars/playerdata/PlayerState.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/PlayerState.java
index 364fc1f..628b39d 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/PlayerState.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerState.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.playerdata;
+package com.loganmagnan.bedwars.playerdata;
public enum PlayerState {
SPAWN,
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/PlayerTeam.java b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerTeam.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/playerdata/PlayerTeam.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/PlayerTeam.java
index acfcfd5..77d46d4 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/PlayerTeam.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/PlayerTeam.java
@@ -1,9 +1,9 @@
-package rip.tilly.bedwars.playerdata;
+package com.loganmagnan.bedwars.playerdata;
import lombok.Getter;
import org.bukkit.ChatColor;
import org.bukkit.Color;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/ArmorType.java b/src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/ArmorType.java
similarity index 57%
rename from src/main/java/rip/tilly/bedwars/playerdata/currentgame/ArmorType.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/ArmorType.java
index ed68391..128c023 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/ArmorType.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/ArmorType.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.playerdata.currentgame;
+package com.loganmagnan.bedwars.playerdata.currentgame;
public enum ArmorType {
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java b/src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/PlayerCurrentGameData.java
similarity index 74%
rename from src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/PlayerCurrentGameData.java
index 69467c8..290daac 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/PlayerCurrentGameData.java
@@ -1,7 +1,7 @@
-package rip.tilly.bedwars.playerdata.currentgame;
+package com.loganmagnan.bedwars.playerdata.currentgame;
import lombok.Data;
-import rip.tilly.bedwars.BedWars;
+import com.loganmagnan.bedwars.BedWars;
@Data
public class PlayerCurrentGameData {
diff --git a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/TeamUpgrades.java b/src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/TeamUpgrades.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/playerdata/currentgame/TeamUpgrades.java
rename to src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/TeamUpgrades.java
index e778e08..36689a3 100644
--- a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/TeamUpgrades.java
+++ b/src/main/java/com/loganmagnan/bedwars/playerdata/currentgame/TeamUpgrades.java
@@ -1,5 +1,8 @@
-package rip.tilly.bedwars.playerdata.currentgame;
+package com.loganmagnan.bedwars.playerdata.currentgame;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
import lombok.Data;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
@@ -7,15 +10,12 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.generators.GeneratorTier;
-import rip.tilly.bedwars.generators.GeneratorType;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.upgrades.Upgrade;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.generators.GeneratorTier;
+import com.loganmagnan.bedwars.generators.GeneratorType;
+import com.loganmagnan.bedwars.upgrades.Upgrade;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
import java.util.*;
diff --git a/src/main/java/rip/tilly/bedwars/providers/placeholderapi/PlaceholderAPIProvider.java b/src/main/java/com/loganmagnan/bedwars/providers/placeholderapi/PlaceholderAPIProvider.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/providers/placeholderapi/PlaceholderAPIProvider.java
rename to src/main/java/com/loganmagnan/bedwars/providers/placeholderapi/PlaceholderAPIProvider.java
index 4f8a092..62cbd74 100644
--- a/src/main/java/rip/tilly/bedwars/providers/placeholderapi/PlaceholderAPIProvider.java
+++ b/src/main/java/com/loganmagnan/bedwars/providers/placeholderapi/PlaceholderAPIProvider.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.providers.placeholderapi;
+package com.loganmagnan.bedwars.providers.placeholderapi;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.playerdata.PlayerData;
public class PlaceholderAPIProvider extends PlaceholderExpansion {
diff --git a/src/main/java/rip/tilly/bedwars/providers/scoreboard/ScoreboardProvider.java b/src/main/java/com/loganmagnan/bedwars/providers/scoreboard/ScoreboardProvider.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/providers/scoreboard/ScoreboardProvider.java
rename to src/main/java/com/loganmagnan/bedwars/providers/scoreboard/ScoreboardProvider.java
index f3ec464..9b6e78f 100644
--- a/src/main/java/rip/tilly/bedwars/providers/scoreboard/ScoreboardProvider.java
+++ b/src/main/java/com/loganmagnan/bedwars/providers/scoreboard/ScoreboardProvider.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.providers.scoreboard;
+package com.loganmagnan.bedwars.providers.scoreboard;
import me.clip.placeholderapi.PlaceholderAPI;
import org.apache.commons.lang3.StringEscapeUtils;
@@ -9,18 +9,18 @@ import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.Team;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.managers.party.Party;
-import rip.tilly.bedwars.managers.queue.QueueEntry;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.TimeUtils;
-import rip.tilly.bedwars.utils.aether.scoreboard.Board;
-import rip.tilly.bedwars.utils.aether.scoreboard.BoardAdapter;
-import rip.tilly.bedwars.utils.aether.scoreboard.cooldown.BoardCooldown;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.managers.party.Party;
+import com.loganmagnan.bedwars.managers.queue.QueueEntry;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.TimeUtils;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.Board;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.BoardAdapter;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.cooldown.BoardCooldown;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +34,7 @@ public class ScoreboardProvider implements BoardAdapter {
@Override
public String getTitle(Player player) {
- return CC.translate("&d&lBedWars");
+ return CC.translate("&b&lLoganM &7| &fBed Wars");
}
@Override
@@ -204,7 +204,7 @@ public class ScoreboardProvider implements BoardAdapter {
lines.add("&8" + finishedProgress + "&7" + leftOverProgress + " &7(" + ((int) (playerData.getXp() * 100)) + "%&7)");
lines.add(" ");
- lines.add("&dtilly.rip");
+ lines.add("&7&odev.loganmagnan.com");
lines.add(CC.scoreboardBar);
return CC.translate(lines);
@@ -239,7 +239,7 @@ public class ScoreboardProvider implements BoardAdapter {
lines.add("&fKills: &d" + playerData.getCurrentGameData().getGameKills());
lines.add("&fBeds Destroyed: &d" + playerData.getCurrentGameData().getGameBedsDestroyed());
lines.add(" ");
- lines.add("&dtilly.rip");
+ lines.add("&7&odev.loganmagnan.com");
lines.add(CC.scoreboardBar);
return CC.translate(lines);
@@ -278,7 +278,7 @@ public class ScoreboardProvider implements BoardAdapter {
lines.add(opposingTeam.getPlayerTeam().getChatColor() + (teamBplayers.size() > 0 ? teamBplayers.get(0).getName() : "None"));
lines.add(" ");
- lines.add("&dtilly.rip");
+ lines.add("&7&odev.loganmagnan.com");
lines.add(CC.scoreboardBar);
return CC.translate(lines);
diff --git a/src/main/java/rip/tilly/bedwars/runnables/ArenaCommandRunnable.java b/src/main/java/com/loganmagnan/bedwars/runnables/ArenaCommandRunnable.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/runnables/ArenaCommandRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/runnables/ArenaCommandRunnable.java
index 1460326..bbbee88 100644
--- a/src/main/java/rip/tilly/bedwars/runnables/ArenaCommandRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/runnables/ArenaCommandRunnable.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.runnables;
+package com.loganmagnan.bedwars.runnables;
+import com.loganmagnan.bedwars.BedWars;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
-import rip.tilly.bedwars.utils.CustomLocation;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.utils.CustomLocation;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/runnables/ArenaCopyRemovalRunnable.java b/src/main/java/com/loganmagnan/bedwars/runnables/ArenaCopyRemovalRunnable.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/runnables/ArenaCopyRemovalRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/runnables/ArenaCopyRemovalRunnable.java
index 20aafeb..a270359 100644
--- a/src/main/java/rip/tilly/bedwars/runnables/ArenaCopyRemovalRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/runnables/ArenaCopyRemovalRunnable.java
@@ -1,7 +1,8 @@
-package rip.tilly.bedwars.runnables;
+package com.loganmagnan.bedwars.runnables;
import com.boydti.fawe.util.EditSessionBuilder;
import com.boydti.fawe.util.TaskManager;
+import com.loganmagnan.bedwars.BedWars;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector;
@@ -9,9 +10,8 @@ import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.regions.CuboidRegion;
import org.bukkit.scheduler.BukkitRunnable;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
-import rip.tilly.bedwars.game.arena.CopiedArena;
+import com.loganmagnan.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.CopiedArena;
public class ArenaCopyRemovalRunnable extends BukkitRunnable {
diff --git a/src/main/java/rip/tilly/bedwars/runnables/BlockPlaceRunnable.java b/src/main/java/com/loganmagnan/bedwars/runnables/BlockPlaceRunnable.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/runnables/BlockPlaceRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/runnables/BlockPlaceRunnable.java
index 8f1c344..00a8053 100644
--- a/src/main/java/rip/tilly/bedwars/runnables/BlockPlaceRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/runnables/BlockPlaceRunnable.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.runnables;
+package com.loganmagnan.bedwars.runnables;
import com.boydti.fawe.util.EditSessionBuilder;
import com.boydti.fawe.util.TaskManager;
diff --git a/src/main/java/rip/tilly/bedwars/runnables/DuplicateArenaRunnable.java b/src/main/java/com/loganmagnan/bedwars/runnables/DuplicateArenaRunnable.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/runnables/DuplicateArenaRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/runnables/DuplicateArenaRunnable.java
index 4cf639e..a5777b0 100644
--- a/src/main/java/rip/tilly/bedwars/runnables/DuplicateArenaRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/runnables/DuplicateArenaRunnable.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.runnables;
+package com.loganmagnan.bedwars.runnables;
+import com.loganmagnan.bedwars.BedWars;
import lombok.Getter;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.scheduler.BukkitRunnable;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.arena.Arena;
+import com.loganmagnan.bedwars.game.arena.Arena;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/runnables/GameRunnable.java b/src/main/java/com/loganmagnan/bedwars/runnables/GameRunnable.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/runnables/GameRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/runnables/GameRunnable.java
index e14dca5..120be4c 100644
--- a/src/main/java/rip/tilly/bedwars/runnables/GameRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/runnables/GameRunnable.java
@@ -1,11 +1,11 @@
-package rip.tilly.bedwars.runnables;
+package com.loganmagnan.bedwars.runnables;
import org.bukkit.Sound;
import org.bukkit.entity.Entity;
import org.bukkit.scheduler.BukkitRunnable;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameState;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.game.GameState;
public class GameRunnable extends BukkitRunnable {
diff --git a/src/main/java/rip/tilly/bedwars/runnables/RespawnRunnable.java b/src/main/java/com/loganmagnan/bedwars/runnables/RespawnRunnable.java
similarity index 90%
rename from src/main/java/rip/tilly/bedwars/runnables/RespawnRunnable.java
rename to src/main/java/com/loganmagnan/bedwars/runnables/RespawnRunnable.java
index f4abe1c..f599240 100644
--- a/src/main/java/rip/tilly/bedwars/runnables/RespawnRunnable.java
+++ b/src/main/java/com/loganmagnan/bedwars/runnables/RespawnRunnable.java
@@ -1,5 +1,6 @@
-package rip.tilly.bedwars.runnables;
+package com.loganmagnan.bedwars.runnables;
+import com.loganmagnan.bedwars.game.GameTeam;
import lombok.AllArgsConstructor;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
@@ -9,14 +10,13 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import org.github.paperspigot.Title;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.PlayerState;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
-import rip.tilly.bedwars.upgrades.Upgrade;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.PlayerState;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
+import com.loganmagnan.bedwars.upgrades.Upgrade;
+import com.loganmagnan.bedwars.utils.CC;
@AllArgsConstructor
public class RespawnRunnable extends BukkitRunnable {
diff --git a/src/main/java/rip/tilly/bedwars/upgrades/AxeTier.java b/src/main/java/com/loganmagnan/bedwars/upgrades/AxeTier.java
similarity index 59%
rename from src/main/java/rip/tilly/bedwars/upgrades/AxeTier.java
rename to src/main/java/com/loganmagnan/bedwars/upgrades/AxeTier.java
index dea77eb..c402db8 100644
--- a/src/main/java/rip/tilly/bedwars/upgrades/AxeTier.java
+++ b/src/main/java/com/loganmagnan/bedwars/upgrades/AxeTier.java
@@ -1,11 +1,4 @@
-package rip.tilly.bedwars.upgrades;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.utils.ItemBuilder;
+package com.loganmagnan.bedwars.upgrades;
//@Getter
//@RequiredArgsConstructor
diff --git a/src/main/java/rip/tilly/bedwars/upgrades/Upgrade.java b/src/main/java/com/loganmagnan/bedwars/upgrades/Upgrade.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/upgrades/Upgrade.java
rename to src/main/java/com/loganmagnan/bedwars/upgrades/Upgrade.java
index bfa9311..008fdd0 100644
--- a/src/main/java/rip/tilly/bedwars/upgrades/Upgrade.java
+++ b/src/main/java/com/loganmagnan/bedwars/upgrades/Upgrade.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.upgrades;
+package com.loganmagnan.bedwars.upgrades;
public enum Upgrade {
diff --git a/src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java b/src/main/java/com/loganmagnan/bedwars/upgrades/UpgradeItem.java
similarity index 92%
rename from src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java
rename to src/main/java/com/loganmagnan/bedwars/upgrades/UpgradeItem.java
index 05172cc..828de57 100644
--- a/src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java
+++ b/src/main/java/com/loganmagnan/bedwars/upgrades/UpgradeItem.java
@@ -1,14 +1,14 @@
-package rip.tilly.bedwars.upgrades;
+package com.loganmagnan.bedwars.upgrades;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.PlayerUtil;
+import com.loganmagnan.bedwars.game.Game;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.PlayerUtil;
import java.util.Arrays;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/utils/CC.java b/src/main/java/com/loganmagnan/bedwars/utils/CC.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/CC.java
rename to src/main/java/com/loganmagnan/bedwars/utils/CC.java
index a032604..857d505 100644
--- a/src/main/java/rip/tilly/bedwars/utils/CC.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/CC.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import org.bukkit.ChatColor;
diff --git a/src/main/java/rip/tilly/bedwars/utils/Clickable.java b/src/main/java/com/loganmagnan/bedwars/utils/Clickable.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/Clickable.java
rename to src/main/java/com/loganmagnan/bedwars/utils/Clickable.java
index 9a0b446..68e409f 100644
--- a/src/main/java/rip/tilly/bedwars/utils/Clickable.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/Clickable.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import lombok.NoArgsConstructor;
import net.md_5.bungee.api.chat.ClickEvent;
diff --git a/src/main/java/rip/tilly/bedwars/utils/CustomLocation.java b/src/main/java/com/loganmagnan/bedwars/utils/CustomLocation.java
similarity index 99%
rename from src/main/java/rip/tilly/bedwars/utils/CustomLocation.java
rename to src/main/java/com/loganmagnan/bedwars/utils/CustomLocation.java
index f5b6169..d18c518 100644
--- a/src/main/java/rip/tilly/bedwars/utils/CustomLocation.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/CustomLocation.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/src/main/java/rip/tilly/bedwars/utils/ItemBuilder.java b/src/main/java/com/loganmagnan/bedwars/utils/ItemBuilder.java
similarity index 99%
rename from src/main/java/rip/tilly/bedwars/utils/ItemBuilder.java
rename to src/main/java/com/loganmagnan/bedwars/utils/ItemBuilder.java
index 6f70061..a9afeaf 100644
--- a/src/main/java/rip/tilly/bedwars/utils/ItemBuilder.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/ItemBuilder.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
diff --git a/src/main/java/rip/tilly/bedwars/utils/ItemUtil.java b/src/main/java/com/loganmagnan/bedwars/utils/ItemUtil.java
similarity index 99%
rename from src/main/java/rip/tilly/bedwars/utils/ItemUtil.java
rename to src/main/java/com/loganmagnan/bedwars/utils/ItemUtil.java
index ca4fabb..17f670e 100644
--- a/src/main/java/rip/tilly/bedwars/utils/ItemUtil.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/ItemUtil.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
diff --git a/src/main/java/rip/tilly/bedwars/utils/LocationUtils.java b/src/main/java/com/loganmagnan/bedwars/utils/LocationUtils.java
similarity index 95%
rename from src/main/java/rip/tilly/bedwars/utils/LocationUtils.java
rename to src/main/java/com/loganmagnan/bedwars/utils/LocationUtils.java
index c11bfd7..968687e 100644
--- a/src/main/java/rip/tilly/bedwars/utils/LocationUtils.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/LocationUtils.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import org.bukkit.Location;
import org.bukkit.block.Block;
diff --git a/src/main/java/rip/tilly/bedwars/utils/PlayerUtil.java b/src/main/java/com/loganmagnan/bedwars/utils/PlayerUtil.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/PlayerUtil.java
rename to src/main/java/com/loganmagnan/bedwars/utils/PlayerUtil.java
index aed7f6e..a28dd6c 100644
--- a/src/main/java/rip/tilly/bedwars/utils/PlayerUtil.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/PlayerUtil.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import org.bukkit.GameMode;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
diff --git a/src/main/java/rip/tilly/bedwars/utils/TimeUtils.java b/src/main/java/com/loganmagnan/bedwars/utils/TimeUtils.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/TimeUtils.java
rename to src/main/java/com/loganmagnan/bedwars/utils/TimeUtils.java
index d024e50..bf37ea7 100644
--- a/src/main/java/rip/tilly/bedwars/utils/TimeUtils.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/TimeUtils.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/rip/tilly/bedwars/utils/TtlHandler.java b/src/main/java/com/loganmagnan/bedwars/utils/TtlHandler.java
similarity index 72%
rename from src/main/java/rip/tilly/bedwars/utils/TtlHandler.java
rename to src/main/java/com/loganmagnan/bedwars/utils/TtlHandler.java
index 1333ed5..24b5e21 100644
--- a/src/main/java/rip/tilly/bedwars/utils/TtlHandler.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/TtlHandler.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
public interface TtlHandler {
diff --git a/src/main/java/rip/tilly/bedwars/utils/TtlHashMap.java b/src/main/java/com/loganmagnan/bedwars/utils/TtlHashMap.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/utils/TtlHashMap.java
rename to src/main/java/com/loganmagnan/bedwars/utils/TtlHashMap.java
index 2c4ac9c..cb166bb 100644
--- a/src/main/java/rip/tilly/bedwars/utils/TtlHashMap.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/TtlHashMap.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils;
+package com.loganmagnan.bedwars.utils;
import org.bukkit.Bukkit;
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/Aether.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/Aether.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/utils/aether/Aether.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/Aether.java
index de2961a..c319d9c 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/Aether.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/Aether.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.aether;
+package com.loganmagnan.bedwars.utils.aether;
import lombok.Getter;
import org.bukkit.Bukkit;
@@ -15,18 +15,16 @@ import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Score;
import org.bukkit.scoreboard.Scoreboard;
-import rip.tilly.bedwars.utils.aether.event.BoardCreateEvent;
-import rip.tilly.bedwars.utils.aether.scoreboard.Board;
-import rip.tilly.bedwars.utils.aether.scoreboard.BoardAdapter;
-import rip.tilly.bedwars.utils.aether.scoreboard.BoardEntry;
+import com.loganmagnan.bedwars.utils.aether.event.BoardCreateEvent;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.Board;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.BoardAdapter;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.BoardEntry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import static rip.tilly.bedwars.utils.aether.AetherOptions.defaultOptions;
-
public class Aether implements Listener {
@Getter
@@ -45,11 +43,11 @@ public class Aether implements Listener {
}
public Aether(JavaPlugin plugin, BoardAdapter adapter) {
- this(plugin, adapter, defaultOptions());
+ this(plugin, adapter, AetherOptions.defaultOptions());
}
public Aether(JavaPlugin plugin) {
- this(plugin, null, defaultOptions());
+ this(plugin, null, AetherOptions.defaultOptions());
}
private void run() {
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/AetherOptions.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/AetherOptions.java
similarity index 88%
rename from src/main/java/rip/tilly/bedwars/utils/aether/AetherOptions.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/AetherOptions.java
index 3a5167c..0b8b140 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/AetherOptions.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/AetherOptions.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.aether;
+package com.loganmagnan.bedwars.utils.aether;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/event/BoardCreateEvent.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/event/BoardCreateEvent.java
similarity index 83%
rename from src/main/java/rip/tilly/bedwars/utils/aether/event/BoardCreateEvent.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/event/BoardCreateEvent.java
index 2c81cc6..8decfa1 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/event/BoardCreateEvent.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/event/BoardCreateEvent.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.utils.aether.event;
+package com.loganmagnan.bedwars.utils.aether.event;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.Board;
import lombok.Getter;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
-import rip.tilly.bedwars.utils.aether.scoreboard.Board;
public class BoardCreateEvent extends Event {
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/Board.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/Board.java
similarity index 93%
rename from src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/Board.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/Board.java
index 4fa5015..4016148 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/Board.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/Board.java
@@ -1,5 +1,7 @@
-package rip.tilly.bedwars.utils.aether.scoreboard;
+package com.loganmagnan.bedwars.utils.aether.scoreboard;
+import com.loganmagnan.bedwars.utils.aether.Aether;
+import com.loganmagnan.bedwars.utils.aether.AetherOptions;
import io.netty.util.internal.ConcurrentSet;
import lombok.Getter;
import org.bukkit.Bukkit;
@@ -8,9 +10,7 @@ import org.bukkit.entity.Player;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Scoreboard;
-import rip.tilly.bedwars.utils.aether.Aether;
-import rip.tilly.bedwars.utils.aether.AetherOptions;
-import rip.tilly.bedwars.utils.aether.scoreboard.cooldown.BoardCooldown;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.cooldown.BoardCooldown;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/BoardAdapter.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/BoardAdapter.java
similarity index 71%
rename from src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/BoardAdapter.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/BoardAdapter.java
index 1ee19d6..db2922d 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/BoardAdapter.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/BoardAdapter.java
@@ -1,8 +1,8 @@
-package rip.tilly.bedwars.utils.aether.scoreboard;
+package com.loganmagnan.bedwars.utils.aether.scoreboard;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.Scoreboard;
-import rip.tilly.bedwars.utils.aether.scoreboard.cooldown.BoardCooldown;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.cooldown.BoardCooldown;
import java.util.List;
import java.util.Set;
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/BoardEntry.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/BoardEntry.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/BoardEntry.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/BoardEntry.java
index 8e96a82..3bb4bf3 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/BoardEntry.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/BoardEntry.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.aether.scoreboard;
+package com.loganmagnan.bedwars.utils.aether.scoreboard;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/cooldown/BoardCooldown.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/cooldown/BoardCooldown.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/cooldown/BoardCooldown.java
rename to src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/cooldown/BoardCooldown.java
index c51c659..44592d0 100644
--- a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/cooldown/BoardCooldown.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/cooldown/BoardCooldown.java
@@ -1,8 +1,8 @@
-package rip.tilly.bedwars.utils.aether.scoreboard.cooldown;
+package com.loganmagnan.bedwars.utils.aether.scoreboard.cooldown;
+import com.loganmagnan.bedwars.utils.aether.scoreboard.Board;
import lombok.Getter;
import org.apache.commons.lang.time.DurationFormatUtils;
-import rip.tilly.bedwars.utils.aether.scoreboard.Board;
import java.text.DecimalFormat;
diff --git a/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/cooldown/BoardFormat.java b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/cooldown/BoardFormat.java
new file mode 100644
index 0000000..17cceea
--- /dev/null
+++ b/src/main/java/com/loganmagnan/bedwars/utils/aether/scoreboard/cooldown/BoardFormat.java
@@ -0,0 +1,5 @@
+package com.loganmagnan.bedwars.utils.aether.scoreboard.cooldown;
+
+public enum BoardFormat {
+ SECONDS, MINUTES, HOURS
+}
diff --git a/src/main/java/rip/tilly/bedwars/utils/config/ConfigCursor.java b/src/main/java/com/loganmagnan/bedwars/utils/config/ConfigCursor.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/utils/config/ConfigCursor.java
rename to src/main/java/com/loganmagnan/bedwars/utils/config/ConfigCursor.java
index 4c0f083..3be914e 100644
--- a/src/main/java/rip/tilly/bedwars/utils/config/ConfigCursor.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/config/ConfigCursor.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.config;
+package com.loganmagnan.bedwars.utils.config;
import org.bukkit.Bukkit;
import org.bukkit.World;
diff --git a/src/main/java/rip/tilly/bedwars/utils/config/FileConfig.java b/src/main/java/com/loganmagnan/bedwars/utils/config/FileConfig.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/utils/config/FileConfig.java
rename to src/main/java/com/loganmagnan/bedwars/utils/config/FileConfig.java
index ba74ae0..f8e5244 100644
--- a/src/main/java/rip/tilly/bedwars/utils/config/FileConfig.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/config/FileConfig.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.config;
+package com.loganmagnan.bedwars.utils.config;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
diff --git a/src/main/java/rip/tilly/bedwars/utils/config/file/Config.java b/src/main/java/com/loganmagnan/bedwars/utils/config/file/Config.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/utils/config/file/Config.java
rename to src/main/java/com/loganmagnan/bedwars/utils/config/file/Config.java
index d5656ff..6d70567 100644
--- a/src/main/java/rip/tilly/bedwars/utils/config/file/Config.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/config/file/Config.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.config.file;
+package com.loganmagnan.bedwars.utils.config.file;
import lombok.Getter;
import org.bukkit.configuration.file.FileConfiguration;
diff --git a/src/main/java/rip/tilly/bedwars/utils/config/file/ConfigFile.java b/src/main/java/com/loganmagnan/bedwars/utils/config/file/ConfigFile.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/utils/config/file/ConfigFile.java
rename to src/main/java/com/loganmagnan/bedwars/utils/config/file/ConfigFile.java
index 407a055..2c7739f 100644
--- a/src/main/java/rip/tilly/bedwars/utils/config/file/ConfigFile.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/config/file/ConfigFile.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.config.file;
+package com.loganmagnan.bedwars.utils.config.file;
import lombok.Getter;
import org.bukkit.ChatColor;
diff --git a/src/main/java/rip/tilly/bedwars/utils/cuboid/Cuboid.java b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/Cuboid.java
similarity index 99%
rename from src/main/java/rip/tilly/bedwars/utils/cuboid/Cuboid.java
rename to src/main/java/com/loganmagnan/bedwars/utils/cuboid/Cuboid.java
index d9d7dc6..ba0fbe7 100644
--- a/src/main/java/rip/tilly/bedwars/utils/cuboid/Cuboid.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/Cuboid.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.cuboid;
+package com.loganmagnan.bedwars.utils.cuboid;
import com.google.common.base.Preconditions;
import org.bukkit.*;
diff --git a/src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidBlockIterator.java b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidBlockIterator.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidBlockIterator.java
rename to src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidBlockIterator.java
index 5db95bd..72dddd6 100644
--- a/src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidBlockIterator.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidBlockIterator.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.cuboid;
+package com.loganmagnan.bedwars.utils.cuboid;
import org.bukkit.World;
import org.bukkit.block.Block;
diff --git a/src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidDirection.java b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidDirection.java
similarity index 95%
rename from src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidDirection.java
rename to src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidDirection.java
index e99ac6f..5940604 100644
--- a/src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidDirection.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidDirection.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.cuboid;
+package com.loganmagnan.bedwars.utils.cuboid;
public enum CuboidDirection {
diff --git a/src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidLocationIterator.java b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidLocationIterator.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidLocationIterator.java
rename to src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidLocationIterator.java
index 33aed75..cd54afe 100644
--- a/src/main/java/rip/tilly/bedwars/utils/cuboid/CuboidLocationIterator.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/cuboid/CuboidLocationIterator.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.cuboid;
+package com.loganmagnan.bedwars.utils.cuboid;
import org.bukkit.Location;
import org.bukkit.World;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/Button.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/Button.java
similarity index 97%
rename from src/main/java/rip/tilly/bedwars/utils/menu/Button.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/Button.java
index 256fb3a..84189fc 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/Button.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/Button.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.menu;
+package com.loganmagnan.bedwars.utils.menu;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Material;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/Menu.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/Menu.java
similarity index 98%
rename from src/main/java/rip/tilly/bedwars/utils/menu/Menu.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/Menu.java
index 6a8694d..9d7a8d8 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/Menu.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/Menu.java
@@ -1,5 +1,6 @@
-package rip.tilly.bedwars.utils.menu;
+package com.loganmagnan.bedwars.utils.menu;
+import com.loganmagnan.bedwars.BedWars;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.Bukkit;
@@ -9,7 +10,6 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitTask;
-import rip.tilly.bedwars.BedWars;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/buttons/BackButton.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/buttons/BackButton.java
similarity index 76%
rename from src/main/java/rip/tilly/bedwars/utils/menu/buttons/BackButton.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/buttons/BackButton.java
index 1a9db18..d91977f 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/buttons/BackButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/buttons/BackButton.java
@@ -1,13 +1,13 @@
-package rip.tilly.bedwars.utils.menu.buttons;
+package com.loganmagnan.bedwars.utils.menu.buttons;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/buttons/DisplayButton.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/buttons/DisplayButton.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/utils/menu/buttons/DisplayButton.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/buttons/DisplayButton.java
index dcf911e..43e33f5 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/buttons/DisplayButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/buttons/DisplayButton.java
@@ -1,5 +1,6 @@
-package rip.tilly.bedwars.utils.menu.buttons;
+package com.loganmagnan.bedwars.utils.menu.buttons;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@@ -7,7 +8,6 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.utils.menu.Button;
@AllArgsConstructor @Getter @Setter
public class DisplayButton extends Button {
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/JumpToPageButton.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/JumpToPageButton.java
similarity index 86%
rename from src/main/java/rip/tilly/bedwars/utils/menu/pagination/JumpToPageButton.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/JumpToPageButton.java
index b16a159..6fce04b 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/JumpToPageButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/JumpToPageButton.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.utils.menu.pagination;
+package com.loganmagnan.bedwars.utils.menu.pagination;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/PageButton.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/PageButton.java
similarity index 89%
rename from src/main/java/rip/tilly/bedwars/utils/menu/pagination/PageButton.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/PageButton.java
index bb92cc3..2e5ca49 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/PageButton.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/PageButton.java
@@ -1,12 +1,12 @@
-package rip.tilly.bedwars.utils.menu.pagination;
+package com.loganmagnan.bedwars.utils.menu.pagination;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
import lombok.AllArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/PaginatedMenu.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/PaginatedMenu.java
similarity index 95%
rename from src/main/java/rip/tilly/bedwars/utils/menu/pagination/PaginatedMenu.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/PaginatedMenu.java
index 631c29e..7acd1c7 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/PaginatedMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/PaginatedMenu.java
@@ -1,10 +1,10 @@
-package rip.tilly.bedwars.utils.menu.pagination;
+package com.loganmagnan.bedwars.utils.menu.pagination;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
import lombok.Getter;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/ViewAllPagesMenu.java b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/ViewAllPagesMenu.java
similarity index 77%
rename from src/main/java/rip/tilly/bedwars/utils/menu/pagination/ViewAllPagesMenu.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/ViewAllPagesMenu.java
index 45383d3..064a382 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menu/pagination/ViewAllPagesMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menu/pagination/ViewAllPagesMenu.java
@@ -1,15 +1,15 @@
-package rip.tilly.bedwars.utils.menu.pagination;
+package com.loganmagnan.bedwars.utils.menu.pagination;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.menu.Button;
+import com.loganmagnan.bedwars.utils.menu.Menu;
+import com.loganmagnan.bedwars.utils.menu.buttons.BackButton;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.ItemBuilder;
-import rip.tilly.bedwars.utils.menu.Button;
-import rip.tilly.bedwars.utils.menu.Menu;
-import rip.tilly.bedwars.utils.menu.buttons.BackButton;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menusystem/Menu.java b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/Menu.java
similarity index 94%
rename from src/main/java/rip/tilly/bedwars/utils/menusystem/Menu.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menusystem/Menu.java
index 5ced7ac..ce90aeb 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menusystem/Menu.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/Menu.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.menusystem;
+package com.loganmagnan.bedwars.utils.menusystem;
import org.bukkit.Bukkit;
import org.bukkit.Material;
@@ -8,7 +8,7 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
-import rip.tilly.bedwars.utils.ItemBuilder;
+import com.loganmagnan.bedwars.utils.ItemBuilder;
import java.util.Arrays;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menusystem/PaginatedMenu.java b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/PaginatedMenu.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/utils/menusystem/PaginatedMenu.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menusystem/PaginatedMenu.java
index 17cbf26..75ae1c2 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menusystem/PaginatedMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/PaginatedMenu.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.menusystem;
+package com.loganmagnan.bedwars.utils.menusystem;
import org.bukkit.ChatColor;
import org.bukkit.Material;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menusystem/PlayerMenuUtil.java b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/PlayerMenuUtil.java
similarity index 85%
rename from src/main/java/rip/tilly/bedwars/utils/menusystem/PlayerMenuUtil.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menusystem/PlayerMenuUtil.java
index 7ab2bf0..ad6d0f5 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menusystem/PlayerMenuUtil.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/PlayerMenuUtil.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.utils.menusystem;
+package com.loganmagnan.bedwars.utils.menusystem;
import org.bukkit.entity.Player;
diff --git a/src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/menu/UpgradesMenu.java
similarity index 87%
rename from src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java
rename to src/main/java/com/loganmagnan/bedwars/utils/menusystem/menu/UpgradesMenu.java
index 066babc..e466d39 100644
--- a/src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java
+++ b/src/main/java/com/loganmagnan/bedwars/utils/menusystem/menu/UpgradesMenu.java
@@ -1,18 +1,18 @@
-package rip.tilly.bedwars.utils.menusystem.menu;
+package com.loganmagnan.bedwars.utils.menusystem.menu;
+import com.loganmagnan.bedwars.BedWars;
+import com.loganmagnan.bedwars.game.GameTeam;
+import com.loganmagnan.bedwars.playerdata.PlayerData;
+import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
+import com.loganmagnan.bedwars.upgrades.Upgrade;
+import com.loganmagnan.bedwars.upgrades.UpgradeItem;
+import com.loganmagnan.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.menusystem.Menu;
+import com.loganmagnan.bedwars.utils.menusystem.PlayerMenuUtil;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.game.Game;
-import rip.tilly.bedwars.game.GameTeam;
-import rip.tilly.bedwars.playerdata.PlayerData;
-import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
-import rip.tilly.bedwars.upgrades.Upgrade;
-import rip.tilly.bedwars.upgrades.UpgradeItem;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.menusystem.Menu;
-import rip.tilly.bedwars.utils.menusystem.PlayerMenuUtil;
+import com.loganmagnan.bedwars.game.Game;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/rip/tilly/bedwars/villager/CustomVillager.java b/src/main/java/com/loganmagnan/bedwars/villager/CustomVillager.java
similarity index 96%
rename from src/main/java/rip/tilly/bedwars/villager/CustomVillager.java
rename to src/main/java/com/loganmagnan/bedwars/villager/CustomVillager.java
index 449b014..0e3ab40 100644
--- a/src/main/java/rip/tilly/bedwars/villager/CustomVillager.java
+++ b/src/main/java/com/loganmagnan/bedwars/villager/CustomVillager.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.villager;
+package com.loganmagnan.bedwars.villager;
import net.minecraft.server.v1_8_R3.EntityTypes;
import net.minecraft.server.v1_8_R3.EntityVillager;
@@ -7,7 +7,7 @@ import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
import org.bukkit.event.entity.CreatureSpawnEvent;
-import rip.tilly.bedwars.utils.CC;
+import com.loganmagnan.bedwars.utils.CC;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/src/main/java/rip/tilly/bedwars/villager/VillagerCallable.java b/src/main/java/com/loganmagnan/bedwars/villager/VillagerCallable.java
similarity index 77%
rename from src/main/java/rip/tilly/bedwars/villager/VillagerCallable.java
rename to src/main/java/com/loganmagnan/bedwars/villager/VillagerCallable.java
index bafd515..48028ed 100644
--- a/src/main/java/rip/tilly/bedwars/villager/VillagerCallable.java
+++ b/src/main/java/com/loganmagnan/bedwars/villager/VillagerCallable.java
@@ -1,4 +1,4 @@
-package rip.tilly.bedwars.villager;
+package com.loganmagnan.bedwars.villager;
import org.bukkit.Location;
diff --git a/src/main/java/rip/tilly/bedwars/managers/mongo/MongoManager.java b/src/main/java/rip/tilly/bedwars/managers/mongo/MongoManager.java
deleted file mode 100644
index 5a668fd..0000000
--- a/src/main/java/rip/tilly/bedwars/managers/mongo/MongoManager.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package rip.tilly.bedwars.managers.mongo;
-
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import lombok.Getter;
-import org.bson.Document;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import rip.tilly.bedwars.BedWars;
-import rip.tilly.bedwars.utils.CC;
-import rip.tilly.bedwars.utils.config.file.Config;
-
-import java.util.Collections;
-
-@Getter
-public class MongoManager {
-
- private final MongoManager instance;
- private final BedWars plugin = BedWars.getInstance();
-
- private final Config configFile = this.plugin.getMainConfig();
- private final FileConfiguration fileConfig = configFile.getConfig();
- private final ConfigurationSection config = fileConfig.getConfigurationSection("MONGO");
-
- private MongoClient mongoClient;
- private MongoDatabase mongoDatabase;
-
- private final String host = config.getString("HOST");
- private final int port = config.getInt("PORT");
- private final String database = config.getString("DATABASE");
- private final boolean auth = config.getBoolean("AUTH.ENABLED");
- private final String user = config.getString("AUTH.USERNAME");
- private final String password = config.getString("AUTH.PASSWORD");
- private final String authDatabase = config.getString("AUTH.AUTH-DATABASE");
-
- private boolean connected;
-
- private MongoCollection players;
-
- public MongoManager() {
- instance = this;
- try {
- if (auth) {
- final MongoCredential credential = MongoCredential.createCredential(user, authDatabase, password.toCharArray());
- mongoClient = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential));
- } else {
- mongoClient = new MongoClient(host, port);
- }
- connected = true;
- mongoDatabase = mongoClient.getDatabase(database);
- Bukkit.getConsoleSender().sendMessage(CC.translate("&d[BedWars] &aSuccessfully connected to the database!"));
- this.players = this.mongoDatabase.getCollection("players");
- } catch (Exception exception) {
- connected = false;
- Bukkit.getConsoleSender().sendMessage(CC.translate("&d[BedWars] &cFailed to connect to the database!"));
- exception.printStackTrace();
- Bukkit.getPluginManager().disablePlugin(this.plugin);
- Bukkit.getConsoleSender().sendMessage(CC.translate("&b[BedWars] &cDisabling BedWars..."));
- }
- }
-
- public void disconnect() {
- if (this.mongoClient != null) {
- this.mongoClient.close();
- this.connected = false;
- Bukkit.getConsoleSender().sendMessage(CC.translate("&d[BedWars] &aSuccessfully disconnected from the database!"));
- }
- }
-}
diff --git a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/cooldown/BoardFormat.java b/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/cooldown/BoardFormat.java
deleted file mode 100644
index 52f9004..0000000
--- a/src/main/java/rip/tilly/bedwars/utils/aether/scoreboard/cooldown/BoardFormat.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rip.tilly.bedwars.utils.aether.scoreboard.cooldown;
-
-public enum BoardFormat {
- SECONDS, MINUTES, HOURS
-}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 439b71b..c4ff015 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,9 +1,14 @@
MONGO:
- HOST: "127.0.0.1"
- PORT: 27017
- DATABASE: "bedwars"
- AUTH:
- ENABLED: false
- USERNAME: "user"
- PASSWORD: "pass"
- AUTH-DATABASE: "admin"
\ No newline at end of file
+ URI-MODE: true
+ NORMAL:
+ HOST: "127.0.0.1"
+ PORT: 27017
+ DATABASE: ""
+ AUTH:
+ ENABLED: false
+ USERNAME: "user"
+ PASSWORD: "pass"
+ AUTH-DATABASE: "admin"
+ URI:
+ CONNECTION-STRING: ""
+ DATABASE-NAME: ""
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 173b0c7..2f6610e 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,10 +1,6 @@
name: BedWars
version: 1.0
-main: rip.tilly.bedwars.BedWars
-authors:
- - Lucanius
- - Trixkz
-
+main: com.loganmagnan.bedwars.BedWars
commands:
setspawn:
level: