diff --git a/SkyBlock.iml b/SkyBlock.iml
deleted file mode 100644
index 03418ee4..00000000
--- a/SkyBlock.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
- SPIGOT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0c5fa89a..848add38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,55 +1,6 @@
-
- com.songoda
- Skyblock
- 4.0.0
- 32
-
- clean package
-
-
- 3.6.1
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.8
-
-
-
-
-
- resources
- true
-
-
- src
-
-
-
- private
- http://repo.songoda.com/repository/private
-
-
-
-
- be.maximvdw
- placeholderapi
- 2.5.1
-
-
- me.clip
- placeholderapi
- LATEST
-
-
- net.milkbowl
- vault
- LATEST
-
-
- org.spigotmc
- spigot
- 1.13.2
-
-
+
+ 4.0.0
+ com.songoda
+ SkyBlock
+ 32
\ No newline at end of file
diff --git a/src/me/goodandevil/skyblock/SkyBlock.java b/src/main/java/me/goodandevil/skyblock/SkyBlock.java
similarity index 96%
rename from src/me/goodandevil/skyblock/SkyBlock.java
rename to src/main/java/me/goodandevil/skyblock/SkyBlock.java
index 8f8b519b..6e40ea32 100644
--- a/src/me/goodandevil/skyblock/SkyBlock.java
+++ b/src/main/java/me/goodandevil/skyblock/SkyBlock.java
@@ -52,7 +52,7 @@ import me.goodandevil.skyblock.world.generator.VoidGenerator;
public class SkyBlock extends JavaPlugin {
private static SkyBlock instance;
-
+
private FileManager fileManager;
private WorldManager worldManager;
private VisitManager visitManager;
@@ -73,15 +73,11 @@ public class SkyBlock extends JavaPlugin {
private LeaderboardManager leaderboardManager;
private MessageManager messageManager;
private EconomyManager economyManager;
-
+
@Override
public void onEnable() {
instance = this;
-
- if (!isEnable()) {
- return;
- }
-
+
fileManager = new FileManager(this);
worldManager = new WorldManager(this);
visitManager = new VisitManager(this);
@@ -90,33 +86,33 @@ public class SkyBlock extends JavaPlugin {
upgradeManager = new UpgradeManager(this);
creationManager = new CreationManager(this);
playerDataManager = new PlayerDataManager(this);
-
+
if (fileManager.getConfig(new File(getDataFolder(), "config.yml")).getFileConfiguration().getBoolean("Island.Scoreboard.Enable")) {
scoreboardManager = new ScoreboardManager(this);
}
-
+
inviteManager = new InviteManager(this);
biomeManager = new BiomeManager(this);
levellingManager = new LevellingManager(this);
commandManager = new CommandManager(this);
structureManager = new StructureManager(this);
soundManager = new SoundManager(this);
-
+
if (fileManager.getConfig(new File(getDataFolder(), "config.yml")).getFileConfiguration().getBoolean("Island.Generator.Enable")) {
generatorManager = new GeneratorManager(this);
}
-
+
placeholderManager = new PlaceholderManager(this);
placeholderManager.registerPlaceholders();
-
+
leaderboardManager = new LeaderboardManager(this);
messageManager = new MessageManager(this);
economyManager = new EconomyManager();
-
+
new PlaytimeTask(playerDataManager, islandManager).runTaskTimerAsynchronously(this, 0L, 20L);
new VisitTask(playerDataManager).runTaskTimerAsynchronously(this, 0L, 20L);
new ConfirmationTask(playerDataManager).runTaskTimerAsynchronously(this, 0L, 20L);
-
+
PluginManager pluginManager = getServer().getPluginManager();
pluginManager.registerEvents(new Join(this), this);
pluginManager.registerEvents(new Quit(this), this);
@@ -134,136 +130,132 @@ public class SkyBlock extends JavaPlugin {
pluginManager.registerEvents(new Respawn(this), this);
pluginManager.registerEvents(new Chat(this), this);
pluginManager.registerEvents(new Spawner(this), this);
-
+
pluginManager.registerEvents(new Rollback(), this);
-
+
pluginManager.registerEvents(new me.goodandevil.skyblock.menus.admin.Levelling(), this);
pluginManager.registerEvents(new me.goodandevil.skyblock.menus.admin.Creator(), this);
pluginManager.registerEvents(new me.goodandevil.skyblock.menus.admin.Settings(), this);
pluginManager.registerEvents(new Generator(), this);
}
-
+
@Override
public void onDisable() {
if (this.levellingManager != null) {
this.levellingManager.onDisable();
}
-
+
if (this.islandManager != null) {
this.islandManager.onDisable();
}
-
+
if (this.visitManager != null) {
this.visitManager.onDisable();
}
-
+
if (this.banManager != null) {
this.banManager.onDisable();
}
-
+
if (this.biomeManager != null) {
this.biomeManager.onDisable();
}
-
+
if (this.creationManager != null) {
this.creationManager.onDisable();
}
-
+
if (this.playerDataManager != null) {
this.playerDataManager.onDisable();
}
}
-
+
public static SkyBlock getInstance() {
return instance;
}
-
+
public FileManager getFileManager() {
return fileManager;
}
-
+
public WorldManager getWorldManager() {
return worldManager;
}
-
+
public VisitManager getVisitManager() {
return visitManager;
}
-
+
public BanManager getBanManager() {
return banManager;
}
-
+
public IslandManager getIslandManager() {
return islandManager;
}
-
+
public UpgradeManager getUpgradeManager() {
return upgradeManager;
}
-
+
public CreationManager getCreationManager() {
return creationManager;
}
-
+
public PlayerDataManager getPlayerDataManager() {
return playerDataManager;
}
-
+
public ScoreboardManager getScoreboardManager() {
return scoreboardManager;
}
-
+
public InviteManager getInviteManager() {
return inviteManager;
}
-
+
public BiomeManager getBiomeManager() {
return biomeManager;
}
-
+
public LevellingManager getLevellingManager() {
return levellingManager;
}
-
+
public CommandManager getCommandManager() {
return commandManager;
}
-
+
public StructureManager getStructureManager() {
return structureManager;
}
-
+
public SoundManager getSoundManager() {
return soundManager;
}
-
+
public GeneratorManager getGeneratorManager() {
return generatorManager;
}
-
+
public PlaceholderManager getPlaceholderManager() {
return placeholderManager;
}
-
+
public LeaderboardManager getLeaderboardManager() {
return leaderboardManager;
}
-
+
public MessageManager getMessageManager() {
return messageManager;
}
-
+
public EconomyManager getEconomyManager() {
return economyManager;
}
-
- public boolean isEnable() {
- return false;
+
+ @Override
+ public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
+ return new VoidGenerator();
}
-
- @Override
- public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
- return new VoidGenerator();
- }
}
diff --git a/src/me/goodandevil/skyblock/ban/Ban.java b/src/main/java/me/goodandevil/skyblock/ban/Ban.java
similarity index 100%
rename from src/me/goodandevil/skyblock/ban/Ban.java
rename to src/main/java/me/goodandevil/skyblock/ban/Ban.java
diff --git a/src/me/goodandevil/skyblock/ban/BanManager.java b/src/main/java/me/goodandevil/skyblock/ban/BanManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/ban/BanManager.java
rename to src/main/java/me/goodandevil/skyblock/ban/BanManager.java
diff --git a/src/me/goodandevil/skyblock/biome/Biome.java b/src/main/java/me/goodandevil/skyblock/biome/Biome.java
similarity index 100%
rename from src/me/goodandevil/skyblock/biome/Biome.java
rename to src/main/java/me/goodandevil/skyblock/biome/Biome.java
diff --git a/src/me/goodandevil/skyblock/biome/BiomeManager.java b/src/main/java/me/goodandevil/skyblock/biome/BiomeManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/biome/BiomeManager.java
rename to src/main/java/me/goodandevil/skyblock/biome/BiomeManager.java
diff --git a/src/me/goodandevil/skyblock/biome/BiomeTask.java b/src/main/java/me/goodandevil/skyblock/biome/BiomeTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/biome/BiomeTask.java
rename to src/main/java/me/goodandevil/skyblock/biome/BiomeTask.java
diff --git a/src/me/goodandevil/skyblock/command/CommandManager.java b/src/main/java/me/goodandevil/skyblock/command/CommandManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/CommandManager.java
rename to src/main/java/me/goodandevil/skyblock/command/CommandManager.java
diff --git a/src/me/goodandevil/skyblock/command/SubCommand.java b/src/main/java/me/goodandevil/skyblock/command/SubCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/SubCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/SubCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/AcceptCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/AcceptCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/AcceptCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/AcceptCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/BanCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/BanCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/BanCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/BanCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/BansCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/BansCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/BansCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/BansCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/BiomeCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/BiomeCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/BiomeCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/BiomeCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/CancelCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/CancelCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/CancelCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/CancelCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/ChatCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/ChatCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/ChatCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/ChatCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/CloseCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/CloseCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/CloseCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/CloseCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/ConfirmCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/ConfirmCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/ConfirmCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/ConfirmCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/ControlPanelCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/ControlPanelCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/ControlPanelCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/ControlPanelCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/CreateCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/CreateCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/CreateCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/CreateCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/CurrentCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/CurrentCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/CurrentCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/CurrentCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/DeleteCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/DeleteCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/DeleteCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/DeleteCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/DemoteCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/DemoteCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/DemoteCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/DemoteCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/DenyCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/DenyCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/DenyCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/DenyCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/InformationCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/InformationCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/InformationCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/InformationCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/InviteCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/InviteCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/InviteCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/InviteCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/KickAllCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/KickAllCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/KickAllCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/KickAllCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/KickCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/KickCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/KickCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/KickCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/LeaderboardCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/LeaderboardCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/LeaderboardCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/LeaderboardCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/LeaveCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/LeaveCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/LeaveCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/LeaveCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/LevelCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/LevelCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/LevelCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/LevelCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/MembersCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/MembersCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/MembersCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/MembersCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/OpenCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/OpenCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/OpenCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/OpenCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/OwnerCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/OwnerCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/OwnerCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/OwnerCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/PromoteCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/PromoteCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/PromoteCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/PromoteCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/PublicCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/PublicCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/PublicCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/PublicCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/RollbackCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/RollbackCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/RollbackCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/RollbackCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/SetSpawnCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/SetSpawnCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/SetSpawnCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/SetSpawnCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/SettingsCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/SettingsCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/SettingsCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/SettingsCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/TeleportCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/TeleportCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/TeleportCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/TeleportCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/UnbanCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/UnbanCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/UnbanCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/UnbanCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/UpgradeCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/UpgradeCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/UpgradeCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/UpgradeCommand.java
diff --git a/src/main/java/me/goodandevil/skyblock/command/commands/VisitCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/VisitCommand.java
new file mode 100644
index 00000000..71b4243c
--- /dev/null
+++ b/src/main/java/me/goodandevil/skyblock/command/commands/VisitCommand.java
@@ -0,0 +1,78 @@
+package me.goodandevil.skyblock.command.commands;
+
+import java.io.File;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import me.goodandevil.skyblock.SkyBlock;
+import me.goodandevil.skyblock.command.CommandManager;
+import me.goodandevil.skyblock.command.SubCommand;
+import me.goodandevil.skyblock.command.CommandManager.Type;
+import me.goodandevil.skyblock.menus.Visit;
+import me.goodandevil.skyblock.message.MessageManager;
+import me.goodandevil.skyblock.playerdata.PlayerData;
+import me.goodandevil.skyblock.sound.SoundManager;
+import me.goodandevil.skyblock.utils.version.Sounds;
+
+public class VisitCommand extends SubCommand {
+
+ private final SkyBlock skyblock;
+ private String info;
+
+ public VisitCommand(SkyBlock skyblock) {
+ this.skyblock = skyblock;
+ }
+
+ @Override
+ public void onCommand(Player player, String[] args) {
+ MessageManager messageManager = skyblock.getMessageManager();
+ SoundManager soundManager = skyblock.getSoundManager();
+
+ if (args.length == 0) {
+ PlayerData playerData = skyblock.getPlayerDataManager().getPlayerData(player);
+ playerData.setType(Visit.Type.Default);
+ playerData.setSort(Visit.Sort.Default);
+
+ Visit.getInstance().open(player, (Visit.Type) playerData.getType(), (Visit.Sort) playerData.getSort());
+ soundManager.playSound(player, Sounds.CHEST_OPEN.bukkitSound(), 1.0F, 1.0F);
+ } else if (args.length == 1) {
+ Bukkit.getServer().getScheduler().runTask(skyblock, new Runnable() {
+ @Override
+ public void run() {
+ Bukkit.getServer().dispatchCommand(player, "island teleport " + args[0]);
+ }
+ });
+ } else {
+ messageManager.sendMessage(player, skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")).getFileConfiguration().getString("Command.Island.Visit.Invalid.Message"));
+ soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
+ }
+ }
+
+ @Override
+ public String getName() {
+ return "visit";
+ }
+
+ @Override
+ public String getInfo() {
+ return info;
+ }
+
+ @Override
+ public SubCommand setInfo(String info) {
+ this.info = info;
+
+ return this;
+ }
+
+ @Override
+ public String[] getAliases() {
+ return new String[0];
+ }
+
+ @Override
+ public Type getType() {
+ return CommandManager.Type.Default;
+ }
+}
diff --git a/src/me/goodandevil/skyblock/command/commands/VisitorsCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/VisitorsCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/VisitorsCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/VisitorsCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/VoteCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/VoteCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/VoteCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/VoteCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/WeatherCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/WeatherCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/WeatherCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/WeatherCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/CreateCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/CreateCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/CreateCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/CreateCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/DeleteCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/DeleteCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/DeleteCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/DeleteCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/GeneratorCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/GeneratorCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/GeneratorCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/GeneratorCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/LevelCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/LevelCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/LevelCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/LevelCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/OwnerCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/OwnerCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/OwnerCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/OwnerCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/ReloadCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/ReloadCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/ReloadCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/ReloadCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/SetSizeCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/SetSizeCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/SetSizeCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/SetSizeCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/SetSpawnCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/SetSpawnCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/SetSpawnCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/SetSpawnCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/SettingsCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/SettingsCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/SettingsCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/SettingsCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/StructureCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/StructureCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/StructureCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/StructureCommand.java
diff --git a/src/me/goodandevil/skyblock/command/commands/admin/UpgradeCommand.java b/src/main/java/me/goodandevil/skyblock/command/commands/admin/UpgradeCommand.java
similarity index 100%
rename from src/me/goodandevil/skyblock/command/commands/admin/UpgradeCommand.java
rename to src/main/java/me/goodandevil/skyblock/command/commands/admin/UpgradeCommand.java
diff --git a/src/me/goodandevil/skyblock/config/FileChecker.java b/src/main/java/me/goodandevil/skyblock/config/FileChecker.java
similarity index 100%
rename from src/me/goodandevil/skyblock/config/FileChecker.java
rename to src/main/java/me/goodandevil/skyblock/config/FileChecker.java
diff --git a/src/me/goodandevil/skyblock/config/FileManager.java b/src/main/java/me/goodandevil/skyblock/config/FileManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/config/FileManager.java
rename to src/main/java/me/goodandevil/skyblock/config/FileManager.java
diff --git a/src/me/goodandevil/skyblock/confirmation/Confirmation.java b/src/main/java/me/goodandevil/skyblock/confirmation/Confirmation.java
similarity index 100%
rename from src/me/goodandevil/skyblock/confirmation/Confirmation.java
rename to src/main/java/me/goodandevil/skyblock/confirmation/Confirmation.java
diff --git a/src/me/goodandevil/skyblock/confirmation/ConfirmationTask.java b/src/main/java/me/goodandevil/skyblock/confirmation/ConfirmationTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/confirmation/ConfirmationTask.java
rename to src/main/java/me/goodandevil/skyblock/confirmation/ConfirmationTask.java
diff --git a/src/me/goodandevil/skyblock/creation/Creation.java b/src/main/java/me/goodandevil/skyblock/creation/Creation.java
similarity index 100%
rename from src/me/goodandevil/skyblock/creation/Creation.java
rename to src/main/java/me/goodandevil/skyblock/creation/Creation.java
diff --git a/src/me/goodandevil/skyblock/creation/CreationManager.java b/src/main/java/me/goodandevil/skyblock/creation/CreationManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/creation/CreationManager.java
rename to src/main/java/me/goodandevil/skyblock/creation/CreationManager.java
diff --git a/src/me/goodandevil/skyblock/creation/CreationTask.java b/src/main/java/me/goodandevil/skyblock/creation/CreationTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/creation/CreationTask.java
rename to src/main/java/me/goodandevil/skyblock/creation/CreationTask.java
diff --git a/src/me/goodandevil/skyblock/economy/EconomyManager.java b/src/main/java/me/goodandevil/skyblock/economy/EconomyManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/economy/EconomyManager.java
rename to src/main/java/me/goodandevil/skyblock/economy/EconomyManager.java
diff --git a/src/me/goodandevil/skyblock/events/IslandBanEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandBanEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandBanEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandBanEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandBiomeChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandBiomeChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandBiomeChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandBiomeChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandChatEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandChatEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandChatEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandChatEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandChatSwitchEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandChatSwitchEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandChatSwitchEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandChatSwitchEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandCreateEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandCreateEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandCreateEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandCreateEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandDeleteEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandDeleteEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandDeleteEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandDeleteEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandEnterEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandEnterEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandEnterEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandEnterEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandExitEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandExitEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandExitEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandExitEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandInviteEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandInviteEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandInviteEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandInviteEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandJoinEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandJoinEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandJoinEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandJoinEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandKickEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandKickEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandKickEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandKickEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandLeaveEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandLeaveEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandLeaveEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandLeaveEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandLevelChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandLevelChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandLevelChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandLevelChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandLoadEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandLoadEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandLoadEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandLoadEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandLocationChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandLocationChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandLocationChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandLocationChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandMessageChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandMessageChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandMessageChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandMessageChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandOpenEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandOpenEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandOpenEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandOpenEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandOwnershipTransferEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandOwnershipTransferEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandOwnershipTransferEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandOwnershipTransferEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandPasswordChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandPasswordChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandPasswordChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandPasswordChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandRoleChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandRoleChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandRoleChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandRoleChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandSwitchEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandSwitchEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandSwitchEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandSwitchEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandUnbanEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandUnbanEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandUnbanEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandUnbanEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandUnloadEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandUnloadEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandUnloadEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandUnloadEvent.java
diff --git a/src/me/goodandevil/skyblock/events/IslandWeatherChangeEvent.java b/src/main/java/me/goodandevil/skyblock/events/IslandWeatherChangeEvent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/events/IslandWeatherChangeEvent.java
rename to src/main/java/me/goodandevil/skyblock/events/IslandWeatherChangeEvent.java
diff --git a/src/me/goodandevil/skyblock/generator/Generator.java b/src/main/java/me/goodandevil/skyblock/generator/Generator.java
similarity index 100%
rename from src/me/goodandevil/skyblock/generator/Generator.java
rename to src/main/java/me/goodandevil/skyblock/generator/Generator.java
diff --git a/src/me/goodandevil/skyblock/generator/GeneratorLocation.java b/src/main/java/me/goodandevil/skyblock/generator/GeneratorLocation.java
similarity index 100%
rename from src/me/goodandevil/skyblock/generator/GeneratorLocation.java
rename to src/main/java/me/goodandevil/skyblock/generator/GeneratorLocation.java
diff --git a/src/me/goodandevil/skyblock/generator/GeneratorManager.java b/src/main/java/me/goodandevil/skyblock/generator/GeneratorManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/generator/GeneratorManager.java
rename to src/main/java/me/goodandevil/skyblock/generator/GeneratorManager.java
diff --git a/src/me/goodandevil/skyblock/generator/GeneratorMaterial.java b/src/main/java/me/goodandevil/skyblock/generator/GeneratorMaterial.java
similarity index 100%
rename from src/me/goodandevil/skyblock/generator/GeneratorMaterial.java
rename to src/main/java/me/goodandevil/skyblock/generator/GeneratorMaterial.java
diff --git a/src/me/goodandevil/skyblock/invite/Invite.java b/src/main/java/me/goodandevil/skyblock/invite/Invite.java
similarity index 100%
rename from src/me/goodandevil/skyblock/invite/Invite.java
rename to src/main/java/me/goodandevil/skyblock/invite/Invite.java
diff --git a/src/me/goodandevil/skyblock/invite/InviteManager.java b/src/main/java/me/goodandevil/skyblock/invite/InviteManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/invite/InviteManager.java
rename to src/main/java/me/goodandevil/skyblock/invite/InviteManager.java
diff --git a/src/me/goodandevil/skyblock/invite/InviteTask.java b/src/main/java/me/goodandevil/skyblock/invite/InviteTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/invite/InviteTask.java
rename to src/main/java/me/goodandevil/skyblock/invite/InviteTask.java
diff --git a/src/me/goodandevil/skyblock/island/Island.java b/src/main/java/me/goodandevil/skyblock/island/Island.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Island.java
rename to src/main/java/me/goodandevil/skyblock/island/Island.java
diff --git a/src/me/goodandevil/skyblock/island/IslandLocation.java b/src/main/java/me/goodandevil/skyblock/island/IslandLocation.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/IslandLocation.java
rename to src/main/java/me/goodandevil/skyblock/island/IslandLocation.java
diff --git a/src/me/goodandevil/skyblock/island/IslandManager.java b/src/main/java/me/goodandevil/skyblock/island/IslandManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/IslandManager.java
rename to src/main/java/me/goodandevil/skyblock/island/IslandManager.java
diff --git a/src/me/goodandevil/skyblock/island/Islands.java b/src/main/java/me/goodandevil/skyblock/island/Islands.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Islands.java
rename to src/main/java/me/goodandevil/skyblock/island/Islands.java
diff --git a/src/me/goodandevil/skyblock/island/Level.java b/src/main/java/me/goodandevil/skyblock/island/Level.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Level.java
rename to src/main/java/me/goodandevil/skyblock/island/Level.java
diff --git a/src/me/goodandevil/skyblock/island/Location.java b/src/main/java/me/goodandevil/skyblock/island/Location.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Location.java
rename to src/main/java/me/goodandevil/skyblock/island/Location.java
diff --git a/src/me/goodandevil/skyblock/island/Message.java b/src/main/java/me/goodandevil/skyblock/island/Message.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Message.java
rename to src/main/java/me/goodandevil/skyblock/island/Message.java
diff --git a/src/me/goodandevil/skyblock/island/Role.java b/src/main/java/me/goodandevil/skyblock/island/Role.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Role.java
rename to src/main/java/me/goodandevil/skyblock/island/Role.java
diff --git a/src/me/goodandevil/skyblock/island/Setting.java b/src/main/java/me/goodandevil/skyblock/island/Setting.java
similarity index 100%
rename from src/me/goodandevil/skyblock/island/Setting.java
rename to src/main/java/me/goodandevil/skyblock/island/Setting.java
diff --git a/src/me/goodandevil/skyblock/leaderboard/Leaderboard.java b/src/main/java/me/goodandevil/skyblock/leaderboard/Leaderboard.java
similarity index 100%
rename from src/me/goodandevil/skyblock/leaderboard/Leaderboard.java
rename to src/main/java/me/goodandevil/skyblock/leaderboard/Leaderboard.java
diff --git a/src/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java b/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java
rename to src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java
diff --git a/src/me/goodandevil/skyblock/leaderboard/LeaderboardPlayer.java b/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardPlayer.java
similarity index 100%
rename from src/me/goodandevil/skyblock/leaderboard/LeaderboardPlayer.java
rename to src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardPlayer.java
diff --git a/src/me/goodandevil/skyblock/leaderboard/LeaderboardTask.java b/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/leaderboard/LeaderboardTask.java
rename to src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardTask.java
diff --git a/src/me/goodandevil/skyblock/levelling/Chunk.java b/src/main/java/me/goodandevil/skyblock/levelling/Chunk.java
similarity index 100%
rename from src/me/goodandevil/skyblock/levelling/Chunk.java
rename to src/main/java/me/goodandevil/skyblock/levelling/Chunk.java
diff --git a/src/me/goodandevil/skyblock/levelling/Levelling.java b/src/main/java/me/goodandevil/skyblock/levelling/Levelling.java
similarity index 100%
rename from src/me/goodandevil/skyblock/levelling/Levelling.java
rename to src/main/java/me/goodandevil/skyblock/levelling/Levelling.java
diff --git a/src/me/goodandevil/skyblock/levelling/LevellingManager.java b/src/main/java/me/goodandevil/skyblock/levelling/LevellingManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/levelling/LevellingManager.java
rename to src/main/java/me/goodandevil/skyblock/levelling/LevellingManager.java
diff --git a/src/me/goodandevil/skyblock/levelling/LevellingTask.java b/src/main/java/me/goodandevil/skyblock/levelling/LevellingTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/levelling/LevellingTask.java
rename to src/main/java/me/goodandevil/skyblock/levelling/LevellingTask.java
diff --git a/src/me/goodandevil/skyblock/levelling/Material.java b/src/main/java/me/goodandevil/skyblock/levelling/Material.java
similarity index 100%
rename from src/me/goodandevil/skyblock/levelling/Material.java
rename to src/main/java/me/goodandevil/skyblock/levelling/Material.java
diff --git a/src/me/goodandevil/skyblock/listeners/Block.java b/src/main/java/me/goodandevil/skyblock/listeners/Block.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Block.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Block.java
diff --git a/src/me/goodandevil/skyblock/listeners/Bucket.java b/src/main/java/me/goodandevil/skyblock/listeners/Bucket.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Bucket.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Bucket.java
diff --git a/src/me/goodandevil/skyblock/listeners/Chat.java b/src/main/java/me/goodandevil/skyblock/listeners/Chat.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Chat.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Chat.java
diff --git a/src/me/goodandevil/skyblock/listeners/Death.java b/src/main/java/me/goodandevil/skyblock/listeners/Death.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Death.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Death.java
diff --git a/src/me/goodandevil/skyblock/listeners/Entity.java b/src/main/java/me/goodandevil/skyblock/listeners/Entity.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Entity.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Entity.java
diff --git a/src/me/goodandevil/skyblock/listeners/Interact.java b/src/main/java/me/goodandevil/skyblock/listeners/Interact.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Interact.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Interact.java
diff --git a/src/me/goodandevil/skyblock/listeners/Inventory.java b/src/main/java/me/goodandevil/skyblock/listeners/Inventory.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Inventory.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Inventory.java
diff --git a/src/me/goodandevil/skyblock/listeners/Item.java b/src/main/java/me/goodandevil/skyblock/listeners/Item.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Item.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Item.java
diff --git a/src/me/goodandevil/skyblock/listeners/Join.java b/src/main/java/me/goodandevil/skyblock/listeners/Join.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Join.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Join.java
diff --git a/src/me/goodandevil/skyblock/listeners/Move.java b/src/main/java/me/goodandevil/skyblock/listeners/Move.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Move.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Move.java
diff --git a/src/me/goodandevil/skyblock/listeners/Portal.java b/src/main/java/me/goodandevil/skyblock/listeners/Portal.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Portal.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Portal.java
diff --git a/src/me/goodandevil/skyblock/listeners/Projectile.java b/src/main/java/me/goodandevil/skyblock/listeners/Projectile.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Projectile.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Projectile.java
diff --git a/src/me/goodandevil/skyblock/listeners/Quit.java b/src/main/java/me/goodandevil/skyblock/listeners/Quit.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Quit.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Quit.java
diff --git a/src/me/goodandevil/skyblock/listeners/Respawn.java b/src/main/java/me/goodandevil/skyblock/listeners/Respawn.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Respawn.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Respawn.java
diff --git a/src/me/goodandevil/skyblock/listeners/Spawner.java b/src/main/java/me/goodandevil/skyblock/listeners/Spawner.java
similarity index 81%
rename from src/me/goodandevil/skyblock/listeners/Spawner.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Spawner.java
index ddbaa857..c5890b91 100644
--- a/src/me/goodandevil/skyblock/listeners/Spawner.java
+++ b/src/main/java/me/goodandevil/skyblock/listeners/Spawner.java
@@ -51,11 +51,20 @@ public class Spawner implements Listener {
spawner.setMaxSpawnDelay(400);
} else {
try {
- Field TileEntityMobSpawnerField = spawner.getClass().getDeclaredField("spawner");
- TileEntityMobSpawnerField.setAccessible(true);
- Object TileEntityMobSpawner = TileEntityMobSpawnerField.get(spawner);
- Object MobSpawner = TileEntityMobSpawner.getClass().getMethod("getSpawner").invoke(TileEntityMobSpawner);
-
+ Object MobSpawner = null;
+
+ try {
+ Field TileEntityMobSpawnerField = spawner.getClass().getDeclaredField("spawner");
+ TileEntityMobSpawnerField.setAccessible(true);
+ Object TileEntityMobSpawner = TileEntityMobSpawnerField.get(spawner);
+ MobSpawner = TileEntityMobSpawner.getClass().getMethod("getSpawner").invoke(TileEntityMobSpawner);
+ } catch (NoSuchFieldException e) {
+ Field snapshotField = spawner.getClass().getSuperclass().getDeclaredField("snapshot");
+ snapshotField.setAccessible(true);
+ Object snapshot = snapshotField.get(spawner);
+ MobSpawner = snapshot.getClass().getMethod("getSpawner").invoke(snapshot);
+ }
+
int spawnDelay = (int) MobSpawner.getClass().getSuperclass().getField("spawnDelay").get(MobSpawner);
if (spawnDelay == 20) {
diff --git a/src/me/goodandevil/skyblock/listeners/Teleport.java b/src/main/java/me/goodandevil/skyblock/listeners/Teleport.java
similarity index 100%
rename from src/me/goodandevil/skyblock/listeners/Teleport.java
rename to src/main/java/me/goodandevil/skyblock/listeners/Teleport.java
diff --git a/src/me/goodandevil/skyblock/menus/Bans.java b/src/main/java/me/goodandevil/skyblock/menus/Bans.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Bans.java
rename to src/main/java/me/goodandevil/skyblock/menus/Bans.java
diff --git a/src/me/goodandevil/skyblock/menus/Biome.java b/src/main/java/me/goodandevil/skyblock/menus/Biome.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Biome.java
rename to src/main/java/me/goodandevil/skyblock/menus/Biome.java
diff --git a/src/me/goodandevil/skyblock/menus/ControlPanel.java b/src/main/java/me/goodandevil/skyblock/menus/ControlPanel.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/ControlPanel.java
rename to src/main/java/me/goodandevil/skyblock/menus/ControlPanel.java
diff --git a/src/me/goodandevil/skyblock/menus/Creator.java b/src/main/java/me/goodandevil/skyblock/menus/Creator.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Creator.java
rename to src/main/java/me/goodandevil/skyblock/menus/Creator.java
diff --git a/src/me/goodandevil/skyblock/menus/Information.java b/src/main/java/me/goodandevil/skyblock/menus/Information.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Information.java
rename to src/main/java/me/goodandevil/skyblock/menus/Information.java
diff --git a/src/me/goodandevil/skyblock/menus/Leaderboard.java b/src/main/java/me/goodandevil/skyblock/menus/Leaderboard.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Leaderboard.java
rename to src/main/java/me/goodandevil/skyblock/menus/Leaderboard.java
diff --git a/src/me/goodandevil/skyblock/menus/Levelling.java b/src/main/java/me/goodandevil/skyblock/menus/Levelling.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Levelling.java
rename to src/main/java/me/goodandevil/skyblock/menus/Levelling.java
diff --git a/src/me/goodandevil/skyblock/menus/Members.java b/src/main/java/me/goodandevil/skyblock/menus/Members.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Members.java
rename to src/main/java/me/goodandevil/skyblock/menus/Members.java
diff --git a/src/me/goodandevil/skyblock/menus/Ownership.java b/src/main/java/me/goodandevil/skyblock/menus/Ownership.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Ownership.java
rename to src/main/java/me/goodandevil/skyblock/menus/Ownership.java
diff --git a/src/me/goodandevil/skyblock/menus/Rollback.java b/src/main/java/me/goodandevil/skyblock/menus/Rollback.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Rollback.java
rename to src/main/java/me/goodandevil/skyblock/menus/Rollback.java
diff --git a/src/me/goodandevil/skyblock/menus/Settings.java b/src/main/java/me/goodandevil/skyblock/menus/Settings.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Settings.java
rename to src/main/java/me/goodandevil/skyblock/menus/Settings.java
diff --git a/src/me/goodandevil/skyblock/menus/Upgrade.java b/src/main/java/me/goodandevil/skyblock/menus/Upgrade.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Upgrade.java
rename to src/main/java/me/goodandevil/skyblock/menus/Upgrade.java
diff --git a/src/me/goodandevil/skyblock/menus/Visit.java b/src/main/java/me/goodandevil/skyblock/menus/Visit.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Visit.java
rename to src/main/java/me/goodandevil/skyblock/menus/Visit.java
diff --git a/src/me/goodandevil/skyblock/menus/Visitors.java b/src/main/java/me/goodandevil/skyblock/menus/Visitors.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Visitors.java
rename to src/main/java/me/goodandevil/skyblock/menus/Visitors.java
diff --git a/src/me/goodandevil/skyblock/menus/Weather.java b/src/main/java/me/goodandevil/skyblock/menus/Weather.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/Weather.java
rename to src/main/java/me/goodandevil/skyblock/menus/Weather.java
diff --git a/src/me/goodandevil/skyblock/menus/admin/Creator.java b/src/main/java/me/goodandevil/skyblock/menus/admin/Creator.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/admin/Creator.java
rename to src/main/java/me/goodandevil/skyblock/menus/admin/Creator.java
diff --git a/src/me/goodandevil/skyblock/menus/admin/Generator.java b/src/main/java/me/goodandevil/skyblock/menus/admin/Generator.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/admin/Generator.java
rename to src/main/java/me/goodandevil/skyblock/menus/admin/Generator.java
diff --git a/src/me/goodandevil/skyblock/menus/admin/Levelling.java b/src/main/java/me/goodandevil/skyblock/menus/admin/Levelling.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/admin/Levelling.java
rename to src/main/java/me/goodandevil/skyblock/menus/admin/Levelling.java
diff --git a/src/me/goodandevil/skyblock/menus/admin/Settings.java b/src/main/java/me/goodandevil/skyblock/menus/admin/Settings.java
similarity index 100%
rename from src/me/goodandevil/skyblock/menus/admin/Settings.java
rename to src/main/java/me/goodandevil/skyblock/menus/admin/Settings.java
diff --git a/src/me/goodandevil/skyblock/menus/admin/Upgrade.java b/src/main/java/me/goodandevil/skyblock/menus/admin/Upgrade.java
similarity index 95%
rename from src/me/goodandevil/skyblock/menus/admin/Upgrade.java
rename to src/main/java/me/goodandevil/skyblock/menus/admin/Upgrade.java
index 029e822f..ebd5b307 100644
--- a/src/me/goodandevil/skyblock/menus/admin/Upgrade.java
+++ b/src/main/java/me/goodandevil/skyblock/menus/admin/Upgrade.java
@@ -146,7 +146,7 @@ public class Upgrade {
if (playerDataManager.hasPlayerData(player) && playerDataManager.getPlayerData(player) != null) {
if (!(event1.getName().matches("[0-9]+") || event1.getName().matches("([0-9]*)\\.([0-9]{2}$)"))) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Numerical.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Numerical.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event1.setWillClose(false);
@@ -299,7 +299,7 @@ public class Upgrade {
List upgrades = upgradeManager.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Size);
if (upgrades != null && upgrades.size() >= 5) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Limit.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Limit.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event.setWillClose(false);
@@ -314,7 +314,7 @@ public class Upgrade {
if (event1.getSlot() == AnvilGUI.AnvilSlot.OUTPUT) {
if (playerDataManager.hasPlayerData(player) && playerDataManager.getPlayerData(player) != null) {
if (!event1.getName().matches("[0-9]+")) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Numerical.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Numerical.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event1.setWillClose(false);
@@ -325,7 +325,7 @@ public class Upgrade {
List upgrades = upgradeManager.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Size);
if (upgrades != null && upgrades.size() >= 5) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Limit.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Limit.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@@ -342,7 +342,7 @@ public class Upgrade {
int size = Integer.valueOf(event1.getName());
if (size > 1000) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Size.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Size.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event.setWillClose(false);
@@ -350,7 +350,7 @@ public class Upgrade {
return;
} else if (upgradeManager.hasUpgrade(me.goodandevil.skyblock.upgrade.Upgrade.Type.Size, size)) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Exist.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Exist.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event1.setWillClose(false);
@@ -417,7 +417,7 @@ public class Upgrade {
if (playerDataManager.hasPlayerData(player) && playerDataManager.getPlayerData(player) != null) {
if (!event1.getName().matches("[0-9]+")) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Numerical.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Numerical.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event1.setWillClose(false);
@@ -425,7 +425,7 @@ public class Upgrade {
return;
} else if (upgradeManager.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Size).get(tier) == null) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Selected.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Selected.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
@@ -441,7 +441,7 @@ public class Upgrade {
int size = Integer.valueOf(event1.getName());
if (size > 1000) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Size.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Size.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event.setWillClose(false);
@@ -449,7 +449,7 @@ public class Upgrade {
return;
} else if (upgradeManager.hasUpgrade(me.goodandevil.skyblock.upgrade.Upgrade.Type.Size, size)) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Exist.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Exist.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event.setWillClose(false);
@@ -509,7 +509,7 @@ public class Upgrade {
if (playerDataManager.hasPlayerData(player) && playerDataManager.getPlayerData(player) != null) {
if (!(event1.getName().matches("[0-9]+") || event1.getName().matches("([0-9]*)\\.([0-9]{2}$)"))) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Numerical.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Numerical.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
event1.setWillClose(false);
@@ -517,7 +517,7 @@ public class Upgrade {
return;
} else if (upgradeManager.getUpgrades(me.goodandevil.skyblock.upgrade.Upgrade.Type.Size).get(tier) == null) {
- player.sendMessage(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Island.Admin.Upgrade.Tier.Selected.Message")));
+ messageManager.sendMessage(player, configLoad.getString("Island.Admin.Upgrade.Tier.Selected.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(skyblock, new Runnable() {
diff --git a/src/me/goodandevil/skyblock/message/MessageManager.java b/src/main/java/me/goodandevil/skyblock/message/MessageManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/message/MessageManager.java
rename to src/main/java/me/goodandevil/skyblock/message/MessageManager.java
diff --git a/src/me/goodandevil/skyblock/placeholder/EZPlaceholder.java b/src/main/java/me/goodandevil/skyblock/placeholder/EZPlaceholder.java
similarity index 100%
rename from src/me/goodandevil/skyblock/placeholder/EZPlaceholder.java
rename to src/main/java/me/goodandevil/skyblock/placeholder/EZPlaceholder.java
diff --git a/src/me/goodandevil/skyblock/placeholder/MVdWPlaceholder.java b/src/main/java/me/goodandevil/skyblock/placeholder/MVdWPlaceholder.java
similarity index 100%
rename from src/me/goodandevil/skyblock/placeholder/MVdWPlaceholder.java
rename to src/main/java/me/goodandevil/skyblock/placeholder/MVdWPlaceholder.java
diff --git a/src/me/goodandevil/skyblock/placeholder/PlaceholderManager.java b/src/main/java/me/goodandevil/skyblock/placeholder/PlaceholderManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/placeholder/PlaceholderManager.java
rename to src/main/java/me/goodandevil/skyblock/placeholder/PlaceholderManager.java
diff --git a/src/me/goodandevil/skyblock/playerdata/PlayerData.java b/src/main/java/me/goodandevil/skyblock/playerdata/PlayerData.java
similarity index 100%
rename from src/me/goodandevil/skyblock/playerdata/PlayerData.java
rename to src/main/java/me/goodandevil/skyblock/playerdata/PlayerData.java
diff --git a/src/me/goodandevil/skyblock/playerdata/PlayerDataManager.java b/src/main/java/me/goodandevil/skyblock/playerdata/PlayerDataManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/playerdata/PlayerDataManager.java
rename to src/main/java/me/goodandevil/skyblock/playerdata/PlayerDataManager.java
diff --git a/src/me/goodandevil/skyblock/playtime/PlaytimeTask.java b/src/main/java/me/goodandevil/skyblock/playtime/PlaytimeTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/playtime/PlaytimeTask.java
rename to src/main/java/me/goodandevil/skyblock/playtime/PlaytimeTask.java
diff --git a/src/me/goodandevil/skyblock/scoreboard/Scoreboard.java b/src/main/java/me/goodandevil/skyblock/scoreboard/Scoreboard.java
similarity index 100%
rename from src/me/goodandevil/skyblock/scoreboard/Scoreboard.java
rename to src/main/java/me/goodandevil/skyblock/scoreboard/Scoreboard.java
diff --git a/src/me/goodandevil/skyblock/scoreboard/ScoreboardManager.java b/src/main/java/me/goodandevil/skyblock/scoreboard/ScoreboardManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/scoreboard/ScoreboardManager.java
rename to src/main/java/me/goodandevil/skyblock/scoreboard/ScoreboardManager.java
diff --git a/src/me/goodandevil/skyblock/sound/SoundManager.java b/src/main/java/me/goodandevil/skyblock/sound/SoundManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/sound/SoundManager.java
rename to src/main/java/me/goodandevil/skyblock/sound/SoundManager.java
diff --git a/src/me/goodandevil/skyblock/structure/Structure.java b/src/main/java/me/goodandevil/skyblock/structure/Structure.java
similarity index 100%
rename from src/me/goodandevil/skyblock/structure/Structure.java
rename to src/main/java/me/goodandevil/skyblock/structure/Structure.java
diff --git a/src/me/goodandevil/skyblock/structure/StructureManager.java b/src/main/java/me/goodandevil/skyblock/structure/StructureManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/structure/StructureManager.java
rename to src/main/java/me/goodandevil/skyblock/structure/StructureManager.java
diff --git a/src/me/goodandevil/skyblock/upgrade/Upgrade.java b/src/main/java/me/goodandevil/skyblock/upgrade/Upgrade.java
similarity index 100%
rename from src/me/goodandevil/skyblock/upgrade/Upgrade.java
rename to src/main/java/me/goodandevil/skyblock/upgrade/Upgrade.java
diff --git a/src/me/goodandevil/skyblock/upgrade/UpgradeManager.java b/src/main/java/me/goodandevil/skyblock/upgrade/UpgradeManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/upgrade/UpgradeManager.java
rename to src/main/java/me/goodandevil/skyblock/upgrade/UpgradeManager.java
diff --git a/src/me/goodandevil/skyblock/utils/AnvilGUI.java b/src/main/java/me/goodandevil/skyblock/utils/AnvilGUI.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/AnvilGUI.java
rename to src/main/java/me/goodandevil/skyblock/utils/AnvilGUI.java
diff --git a/src/me/goodandevil/skyblock/utils/ChatComponent.java b/src/main/java/me/goodandevil/skyblock/utils/ChatComponent.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/ChatComponent.java
rename to src/main/java/me/goodandevil/skyblock/utils/ChatComponent.java
diff --git a/src/me/goodandevil/skyblock/utils/GZipUtil.java b/src/main/java/me/goodandevil/skyblock/utils/GZipUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/GZipUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/GZipUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/NumberUtil.java b/src/main/java/me/goodandevil/skyblock/utils/NumberUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/NumberUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/NumberUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/OfflinePlayer.java b/src/main/java/me/goodandevil/skyblock/utils/OfflinePlayer.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/OfflinePlayer.java
rename to src/main/java/me/goodandevil/skyblock/utils/OfflinePlayer.java
diff --git a/src/me/goodandevil/skyblock/utils/StringUtil.java b/src/main/java/me/goodandevil/skyblock/utils/StringUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/StringUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/StringUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/item/InventoryUtil.java b/src/main/java/me/goodandevil/skyblock/utils/item/InventoryUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/item/InventoryUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/item/InventoryUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/item/ItemStackUtil.java b/src/main/java/me/goodandevil/skyblock/utils/item/ItemStackUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/item/ItemStackUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/item/ItemStackUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/item/MaterialUtil.java b/src/main/java/me/goodandevil/skyblock/utils/item/MaterialUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/item/MaterialUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/item/MaterialUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/item/SkullUtil.java b/src/main/java/me/goodandevil/skyblock/utils/item/SkullUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/item/SkullUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/item/SkullUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/item/nInventoryUtil.java b/src/main/java/me/goodandevil/skyblock/utils/item/nInventoryUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/item/nInventoryUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/item/nInventoryUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/math/VectorUtil.java b/src/main/java/me/goodandevil/skyblock/utils/math/VectorUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/math/VectorUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/math/VectorUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/structure/Area.java b/src/main/java/me/goodandevil/skyblock/utils/structure/Area.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/structure/Area.java
rename to src/main/java/me/goodandevil/skyblock/utils/structure/Area.java
diff --git a/src/me/goodandevil/skyblock/utils/structure/Location.java b/src/main/java/me/goodandevil/skyblock/utils/structure/Location.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/structure/Location.java
rename to src/main/java/me/goodandevil/skyblock/utils/structure/Location.java
diff --git a/src/me/goodandevil/skyblock/utils/structure/SelectionLocation.java b/src/main/java/me/goodandevil/skyblock/utils/structure/SelectionLocation.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/structure/SelectionLocation.java
rename to src/main/java/me/goodandevil/skyblock/utils/structure/SelectionLocation.java
diff --git a/src/me/goodandevil/skyblock/utils/structure/Storage.java b/src/main/java/me/goodandevil/skyblock/utils/structure/Storage.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/structure/Storage.java
rename to src/main/java/me/goodandevil/skyblock/utils/structure/Storage.java
diff --git a/src/me/goodandevil/skyblock/utils/structure/Structure.java b/src/main/java/me/goodandevil/skyblock/utils/structure/Structure.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/structure/Structure.java
rename to src/main/java/me/goodandevil/skyblock/utils/structure/Structure.java
diff --git a/src/me/goodandevil/skyblock/utils/structure/StructureUtil.java b/src/main/java/me/goodandevil/skyblock/utils/structure/StructureUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/structure/StructureUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/structure/StructureUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/version/Biomes.java b/src/main/java/me/goodandevil/skyblock/utils/version/Biomes.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/version/Biomes.java
rename to src/main/java/me/goodandevil/skyblock/utils/version/Biomes.java
diff --git a/src/me/goodandevil/skyblock/utils/version/Materials.java b/src/main/java/me/goodandevil/skyblock/utils/version/Materials.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/version/Materials.java
rename to src/main/java/me/goodandevil/skyblock/utils/version/Materials.java
diff --git a/src/me/goodandevil/skyblock/utils/version/NMSUtil.java b/src/main/java/me/goodandevil/skyblock/utils/version/NMSUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/version/NMSUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/version/NMSUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/version/Sounds.java b/src/main/java/me/goodandevil/skyblock/utils/version/Sounds.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/version/Sounds.java
rename to src/main/java/me/goodandevil/skyblock/utils/version/Sounds.java
diff --git a/src/me/goodandevil/skyblock/utils/world/LocationUtil.java b/src/main/java/me/goodandevil/skyblock/utils/world/LocationUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/LocationUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/LocationUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/world/WorldBorder.java b/src/main/java/me/goodandevil/skyblock/utils/world/WorldBorder.java
similarity index 95%
rename from src/me/goodandevil/skyblock/utils/world/WorldBorder.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/WorldBorder.java
index f2714a57..2c23e989 100644
--- a/src/me/goodandevil/skyblock/utils/world/WorldBorder.java
+++ b/src/main/java/me/goodandevil/skyblock/utils/world/WorldBorder.java
@@ -18,16 +18,16 @@ public final class WorldBorder {
try {
packetPlayOutWorldBorder = NMSUtil.getNMSClass("PacketPlayOutWorldBorder");
- if (NMSUtil.getVersionNumber() < 9) {
- packetPlayOutWorldBorderEnumClass = packetPlayOutWorldBorder.getDeclaredClasses()[1];
- } else {
+ if (NMSUtil.getVersionNumber() > 10) {
packetPlayOutWorldBorderEnumClass = packetPlayOutWorldBorder.getDeclaredClasses()[0];
+ } else {
+ packetPlayOutWorldBorderEnumClass = packetPlayOutWorldBorder.getDeclaredClasses()[1];
}
worldBorderClass = NMSUtil.getNMSClass("WorldBorder");
craftWorldClass = NMSUtil.getCraftClass("CraftWorld");
- packetPlayOutWorldBorderConstructor = packetPlayOutWorldBorder.getConstructor(worldBorderClass,packetPlayOutWorldBorderEnumClass);
+ packetPlayOutWorldBorderConstructor = packetPlayOutWorldBorder.getConstructor(worldBorderClass, packetPlayOutWorldBorderEnumClass);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/me/goodandevil/skyblock/utils/world/block/BlockData.java b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockData.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/block/BlockData.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/block/BlockData.java
diff --git a/src/me/goodandevil/skyblock/utils/world/block/BlockDataType.java b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockDataType.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/block/BlockDataType.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/block/BlockDataType.java
diff --git a/src/me/goodandevil/skyblock/utils/world/block/BlockDegreesType.java b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockDegreesType.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/block/BlockDegreesType.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/block/BlockDegreesType.java
diff --git a/src/me/goodandevil/skyblock/utils/world/block/BlockStateType.java b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockStateType.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/block/BlockStateType.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/block/BlockStateType.java
diff --git a/src/me/goodandevil/skyblock/utils/world/block/BlockUtil.java b/src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/block/BlockUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/block/BlockUtil.java
diff --git a/src/me/goodandevil/skyblock/utils/world/entity/EntityData.java b/src/main/java/me/goodandevil/skyblock/utils/world/entity/EntityData.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/entity/EntityData.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/entity/EntityData.java
diff --git a/src/me/goodandevil/skyblock/utils/world/entity/EntityUtil.java b/src/main/java/me/goodandevil/skyblock/utils/world/entity/EntityUtil.java
similarity index 100%
rename from src/me/goodandevil/skyblock/utils/world/entity/EntityUtil.java
rename to src/main/java/me/goodandevil/skyblock/utils/world/entity/EntityUtil.java
diff --git a/src/me/goodandevil/skyblock/visit/Visit.java b/src/main/java/me/goodandevil/skyblock/visit/Visit.java
similarity index 100%
rename from src/me/goodandevil/skyblock/visit/Visit.java
rename to src/main/java/me/goodandevil/skyblock/visit/Visit.java
diff --git a/src/me/goodandevil/skyblock/visit/VisitManager.java b/src/main/java/me/goodandevil/skyblock/visit/VisitManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/visit/VisitManager.java
rename to src/main/java/me/goodandevil/skyblock/visit/VisitManager.java
diff --git a/src/me/goodandevil/skyblock/visit/VisitTask.java b/src/main/java/me/goodandevil/skyblock/visit/VisitTask.java
similarity index 100%
rename from src/me/goodandevil/skyblock/visit/VisitTask.java
rename to src/main/java/me/goodandevil/skyblock/visit/VisitTask.java
diff --git a/src/me/goodandevil/skyblock/world/WorldManager.java b/src/main/java/me/goodandevil/skyblock/world/WorldManager.java
similarity index 100%
rename from src/me/goodandevil/skyblock/world/WorldManager.java
rename to src/main/java/me/goodandevil/skyblock/world/WorldManager.java
diff --git a/src/me/goodandevil/skyblock/world/generator/VoidGenerator.java b/src/main/java/me/goodandevil/skyblock/world/generator/VoidGenerator.java
similarity index 100%
rename from src/me/goodandevil/skyblock/world/generator/VoidGenerator.java
rename to src/main/java/me/goodandevil/skyblock/world/generator/VoidGenerator.java
diff --git a/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from config.yml
rename to src/main/resources/config.yml
diff --git a/generators.yml b/src/main/resources/generators.yml
similarity index 100%
rename from generators.yml
rename to src/main/resources/generators.yml
diff --git a/language.yml b/src/main/resources/language.yml
similarity index 99%
rename from language.yml
rename to src/main/resources/language.yml
index 0459a07a..b36af91d 100644
--- a/language.yml
+++ b/src/main/resources/language.yml
@@ -539,6 +539,8 @@ Command:
Visit:
Info:
Message: "&f&oOpens a menu of public Islands to Visit."
+ Invalid:
+ Message: "&bSkyBlock &8| &cError&8: &eInvalid: /island visit []"
Open:
Info:
Message: "&f&oOpens your Island to Visitors."
diff --git a/levelling.yml b/src/main/resources/levelling.yml
similarity index 100%
rename from levelling.yml
rename to src/main/resources/levelling.yml
diff --git a/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from plugin.yml
rename to src/main/resources/plugin.yml
diff --git a/settings.yml b/src/main/resources/settings.yml
similarity index 100%
rename from settings.yml
rename to src/main/resources/settings.yml
diff --git a/structures.yml b/src/main/resources/structures.yml
similarity index 100%
rename from structures.yml
rename to src/main/resources/structures.yml
diff --git a/structures/default.structure b/src/main/resources/structures/default.structure
similarity index 100%
rename from structures/default.structure
rename to src/main/resources/structures/default.structure
diff --git a/upgrades.yml b/src/main/resources/upgrades.yml
similarity index 100%
rename from upgrades.yml
rename to src/main/resources/upgrades.yml
diff --git a/src/me/goodandevil/skyblock/command/commands/VisitCommand.java b/src/me/goodandevil/skyblock/command/commands/VisitCommand.java
deleted file mode 100644
index 6b01cbc0..00000000
--- a/src/me/goodandevil/skyblock/command/commands/VisitCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package me.goodandevil.skyblock.command.commands;
-
-import org.bukkit.entity.Player;
-
-import me.goodandevil.skyblock.SkyBlock;
-import me.goodandevil.skyblock.command.CommandManager;
-import me.goodandevil.skyblock.command.SubCommand;
-import me.goodandevil.skyblock.command.CommandManager.Type;
-import me.goodandevil.skyblock.menus.Visit;
-import me.goodandevil.skyblock.playerdata.PlayerData;
-import me.goodandevil.skyblock.utils.version.Sounds;
-
-public class VisitCommand extends SubCommand {
-
- private final SkyBlock skyblock;
- private String info;
-
- public VisitCommand(SkyBlock skyblock) {
- this.skyblock = skyblock;
- }
-
- @Override
- public void onCommand(Player player, String[] args) {
- PlayerData playerData = skyblock.getPlayerDataManager().getPlayerData(player);
- playerData.setType(Visit.Type.Default);
- playerData.setSort(Visit.Sort.Default);
-
- Visit.getInstance().open(player, (Visit.Type) playerData.getType(), (Visit.Sort) playerData.getSort());
- skyblock.getSoundManager().playSound(player, Sounds.CHEST_OPEN.bukkitSound(), 1.0F, 1.0F);
- }
-
- @Override
- public String getName() {
- return "visit";
- }
-
- @Override
- public String getInfo() {
- return info;
- }
-
- @Override
- public SubCommand setInfo(String info) {
- this.info = info;
-
- return this;
- }
-
- @Override
- public String[] getAliases() {
- return new String[0];
- }
-
- @Override
- public Type getType() {
- return CommandManager.Type.Default;
- }
-}