Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 18:26:08 +01:00
Code Issues Projects Releases Wiki Activity

Move everything from com.songoda to com.craftaro package

Browse Source
This commit is contained in:
Christian Koop 2023-08-15 18:52:43 +02:00
parent f47354980b
commit 2caf39d49e
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
418 changed files with 2876 additions and 2897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@ -43,18 +43,18 @@
<relocations> <relocations>
<relocation> <relocation>
<pattern>com.songoda.core</pattern> <pattern>com.craftaro.core</pattern>
<shadedPattern>com.songoda.skyblock.core</shadedPattern> <shadedPattern>com.craftaro.skyblock.core</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>io.papermc.lib</pattern> <pattern>io.papermc.lib</pattern>
<shadedPattern>com.songoda.skyblock.third_party.io.papermc.lib</shadedPattern> <shadedPattern>com.craftaro.skyblock.third_party.io.papermc.lib</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.eatthepath.uuid</pattern> <pattern>com.eatthepath.uuid</pattern>
<shadedPattern>com.songoda.skyblock.third_party.com.eatthepath.uuid</shadedPattern> <shadedPattern>com.craftaro.skyblock.third_party.com.eatthepath.uuid</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
@ -68,6 +68,14 @@
<exclude>LICENSE.**</exclude> <exclude>LICENSE.**</exclude>
</excludes> </excludes>
</filter> </filter>
<filter>
<artifact>com.craftaro:CraftaroCore</artifact>
<excludeDefaults>false</excludeDefaults>
<includes>
<include>**/nms/v*/**</include>
</includes>
</filter>
</filters> </filters>
</configuration> </configuration>
</execution> </execution>

128
src/main/java/com/songoda/skyblock/SkyBlock.java → src/main/java/com/craftaro/skyblock/SkyBlock.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock; package com.craftaro.skyblock;
import com.craftaro.core.SongodaCore; import com.craftaro.core.SongodaCore;
import com.craftaro.core.SongodaPlugin; import com.craftaro.core.SongodaPlugin;
@ -9,68 +9,68 @@ import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.hooks.HologramManager; import com.craftaro.core.hooks.HologramManager;
import com.craftaro.core.hooks.LogManager; import com.craftaro.core.hooks.LogManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.skyblock.api.SkyBlockAPI; import com.craftaro.skyblock.api.SkyBlockAPI;
import com.songoda.skyblock.ban.BanManager; import com.craftaro.skyblock.ban.BanManager;
import com.songoda.skyblock.bank.BankManager; import com.craftaro.skyblock.bank.BankManager;
import com.songoda.skyblock.biome.BiomeManager; import com.craftaro.skyblock.biome.BiomeManager;
import com.songoda.skyblock.challenge.FabledChallenge; import com.craftaro.skyblock.challenge.FabledChallenge;
import com.songoda.skyblock.command.CommandManager; import com.craftaro.skyblock.command.CommandManager;
import com.songoda.skyblock.command.commands.SkyBlockCommand; import com.craftaro.skyblock.command.commands.SkyBlockCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.confirmation.ConfirmationTask; import com.craftaro.skyblock.confirmation.ConfirmationTask;
import com.songoda.skyblock.cooldown.CooldownManager; import com.craftaro.skyblock.cooldown.CooldownManager;
import com.songoda.skyblock.economy.EconomyManager; import com.craftaro.skyblock.economy.EconomyManager;
import com.songoda.skyblock.generator.GeneratorManager; import com.craftaro.skyblock.generator.GeneratorManager;
import com.songoda.skyblock.invite.InviteManager; import com.craftaro.skyblock.invite.InviteManager;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.island.reward.RewardManager; import com.craftaro.skyblock.island.reward.RewardManager;
import com.songoda.skyblock.leaderboard.LeaderboardManager; import com.craftaro.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.levelling.IslandLevelManager; import com.craftaro.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.LimitationInstanceHandler; import com.craftaro.skyblock.limit.LimitationInstanceHandler;
import com.songoda.skyblock.listeners.BlockListeners; import com.craftaro.skyblock.listeners.BlockListeners;
import com.songoda.skyblock.listeners.BucketListeners; import com.craftaro.skyblock.listeners.BucketListeners;
import com.songoda.skyblock.listeners.ChatListeners; import com.craftaro.skyblock.listeners.ChatListeners;
import com.songoda.skyblock.listeners.DeathListeners; import com.craftaro.skyblock.listeners.DeathListeners;
import com.songoda.skyblock.listeners.EntityListeners; import com.craftaro.skyblock.listeners.EntityListeners;
import com.songoda.skyblock.listeners.FallBreakListeners; import com.craftaro.skyblock.listeners.FallBreakListeners;
import com.songoda.skyblock.listeners.FoodListeners; import com.craftaro.skyblock.listeners.FoodListeners;
import com.songoda.skyblock.listeners.GrowListeners; import com.craftaro.skyblock.listeners.GrowListeners;
import com.songoda.skyblock.listeners.InteractListeners; import com.craftaro.skyblock.listeners.InteractListeners;
import com.songoda.skyblock.listeners.InventoryListeners; import com.craftaro.skyblock.listeners.InventoryListeners;
import com.songoda.skyblock.listeners.ItemListeners; import com.craftaro.skyblock.listeners.ItemListeners;
import com.songoda.skyblock.listeners.JoinListeners; import com.craftaro.skyblock.listeners.JoinListeners;
import com.songoda.skyblock.listeners.MoveListeners; import com.craftaro.skyblock.listeners.MoveListeners;
import com.songoda.skyblock.listeners.PistonListeners; import com.craftaro.skyblock.listeners.PistonListeners;
import com.songoda.skyblock.listeners.PortalListeners; import com.craftaro.skyblock.listeners.PortalListeners;
import com.songoda.skyblock.listeners.ProjectileListeners; import com.craftaro.skyblock.listeners.ProjectileListeners;
import com.songoda.skyblock.listeners.QuitListeners; import com.craftaro.skyblock.listeners.QuitListeners;
import com.songoda.skyblock.listeners.RespawnListeners; import com.craftaro.skyblock.listeners.RespawnListeners;
import com.songoda.skyblock.listeners.SpawnerListeners; import com.craftaro.skyblock.listeners.SpawnerListeners;
import com.songoda.skyblock.listeners.SpongeListeners; import com.craftaro.skyblock.listeners.SpongeListeners;
import com.songoda.skyblock.listeners.TeleportListeners; import com.craftaro.skyblock.listeners.TeleportListeners;
import com.songoda.skyblock.listeners.WorldListeners; import com.craftaro.skyblock.listeners.WorldListeners;
import com.songoda.skyblock.listeners.hooks.EpicSpawners; import com.craftaro.skyblock.listeners.hooks.EpicSpawners;
import com.songoda.skyblock.listeners.hooks.UltimateStacker; import com.craftaro.skyblock.listeners.hooks.UltimateStacker;
import com.songoda.skyblock.localization.LocalizationManager; import com.craftaro.skyblock.localization.LocalizationManager;
import com.songoda.skyblock.menus.admin.Creator; import com.craftaro.skyblock.menus.admin.Creator;
import com.songoda.skyblock.menus.admin.Generator; import com.craftaro.skyblock.menus.admin.Generator;
import com.songoda.skyblock.menus.admin.Levelling; import com.craftaro.skyblock.menus.admin.Levelling;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.permission.PermissionManager; import com.craftaro.skyblock.permission.PermissionManager;
import com.songoda.skyblock.placeholder.PlaceholderManager; import com.craftaro.skyblock.placeholder.PlaceholderManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.playtime.PlaytimeTask; import com.craftaro.skyblock.playtime.PlaytimeTask;
import com.songoda.skyblock.scoreboard.ScoreboardManager; import com.craftaro.skyblock.scoreboard.ScoreboardManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.stackable.StackableManager; import com.craftaro.skyblock.stackable.StackableManager;
import com.songoda.skyblock.structure.StructureManager; import com.craftaro.skyblock.structure.StructureManager;
import com.songoda.skyblock.tasks.HologramTask; import com.craftaro.skyblock.tasks.HologramTask;
import com.songoda.skyblock.tasks.MobNetherWaterTask; import com.craftaro.skyblock.tasks.MobNetherWaterTask;
import com.songoda.skyblock.upgrade.UpgradeManager; import com.craftaro.skyblock.upgrade.UpgradeManager;
import com.songoda.skyblock.usercache.UserCacheManager; import com.craftaro.skyblock.usercache.UserCacheManager;
import com.songoda.skyblock.visit.VisitManager; import com.craftaro.skyblock.visit.VisitManager;
import com.songoda.skyblock.visit.VisitTask; import com.craftaro.skyblock.visit.VisitTask;
import com.songoda.skyblock.world.WorldManager; import com.craftaro.skyblock.world.WorldManager;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -97,7 +97,7 @@ public class SkyBlock extends SongodaPlugin {
private InviteManager inviteManager; private InviteManager inviteManager;
private BiomeManager biomeManager; private BiomeManager biomeManager;
private IslandLevelManager levellingManager; private IslandLevelManager levellingManager;
private com.songoda.skyblock.economy.EconomyManager economyManager; private EconomyManager economyManager;
private CommandManager commandManager; private CommandManager commandManager;
private StructureManager structureManager; private StructureManager structureManager;
private StackableManager stackableManager; private StackableManager stackableManager;

12
src/main/java/com/songoda/skyblock/api/SkyBlockAPI.java → src/main/java/com/craftaro/skyblock/api/SkyBlockAPI.java
View File

@ -1,10 +1,10 @@
package com.songoda.skyblock.api; package com.craftaro.skyblock.api;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.api.biome.BiomeManager; import com.craftaro.skyblock.api.biome.BiomeManager;
import com.songoda.skyblock.api.island.IslandManager; import com.craftaro.skyblock.api.island.IslandManager;
import com.songoda.skyblock.api.levelling.LevellingManager; import com.craftaro.skyblock.api.levelling.LevellingManager;
import com.songoda.skyblock.api.structure.StructureManager; import com.craftaro.skyblock.api.structure.StructureManager;
public class SkyBlockAPI { public class SkyBlockAPI {
private static SkyBlock implementation; private static SkyBlock implementation;

4
src/main/java/com/songoda/skyblock/api/ban/Ban.java → src/main/java/com/craftaro/skyblock/api/ban/Ban.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.ban; package com.craftaro.skyblock.api.ban;
import com.craftaro.skyblock.api.island.Island;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.api.island.Island;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;

8
src/main/java/com/songoda/skyblock/api/bank/TransactionLog.java → src/main/java/com/craftaro/skyblock/api/bank/TransactionLog.java
View File

@ -1,8 +1,8 @@
package com.songoda.skyblock.api.bank; package com.craftaro.skyblock.api.bank;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.bank.BankManager; import com.craftaro.skyblock.bank.BankManager;
import com.songoda.skyblock.bank.Transaction; import com.craftaro.skyblock.bank.Transaction;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
src/main/java/com/songoda/skyblock/api/biome/BiomeManager.java → src/main/java/com/craftaro/skyblock/api/biome/BiomeManager.java
View File

@ -1,15 +1,15 @@
package com.songoda.skyblock.api.biome; package com.craftaro.skyblock.api.biome;
import com.craftaro.core.compatibility.CompatibleBiome; import com.craftaro.core.compatibility.CompatibleBiome;
import com.craftaro.skyblock.api.island.Island;
import com.craftaro.skyblock.island.IslandWorld;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.api.island.Island;
import com.songoda.skyblock.island.IslandWorld;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
public class BiomeManager { public class BiomeManager {
private final com.songoda.skyblock.biome.BiomeManager biomeManager; private final com.craftaro.skyblock.biome.BiomeManager biomeManager;
public BiomeManager(com.songoda.skyblock.biome.BiomeManager biomeManager) { public BiomeManager(com.craftaro.skyblock.biome.BiomeManager biomeManager) {
this.biomeManager = biomeManager; this.biomeManager = biomeManager;
} }

4
src/main/java/com/songoda/skyblock/api/event/island/IslandBanEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandBanEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandBiomeChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandBiomeChangeEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandCreateEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandCreateEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandDeleteEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandDeleteEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.Event; import org.bukkit.event.Event;
public abstract class IslandEvent extends Event { public abstract class IslandEvent extends Event {

6
src/main/java/com/songoda/skyblock/api/event/island/IslandInviteEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandInviteEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.invite.IslandInvitation; import com.craftaro.skyblock.api.invite.IslandInvitation;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandKickEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandKickEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandRole; import com.craftaro.skyblock.api.island.IslandRole;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandLevelChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandLevelChangeEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandLevel; import com.craftaro.skyblock.api.island.IslandLevel;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandLoadEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandLoadEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandLocationChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandLocationChangeEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandLocation; import com.craftaro.skyblock.api.island.IslandLocation;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandMessageChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandMessageChangeEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandMessage; import com.craftaro.skyblock.api.island.IslandMessage;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandOpenEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandOpenEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandOwnershipTransferEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandOwnershipTransferEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandPasswordChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandPasswordChangeEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandRoleChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandRoleChangeEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandRole; import com.craftaro.skyblock.api.island.IslandRole;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandStatusChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandStatusChangeEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandStatus; import com.craftaro.skyblock.api.island.IslandStatus;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandUnbanEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandUnbanEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandUnloadEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandUnloadEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
src/main/java/com/songoda/skyblock/api/event/island/IslandUpgradeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandUpgradeEvent.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import com.songoda.skyblock.api.island.IslandUpgrade; import com.craftaro.skyblock.api.island.IslandUpgrade;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/island/IslandWeatherChangeEvent.java → src/main/java/com/craftaro/skyblock/api/event/island/IslandWeatherChangeEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.island; package com.craftaro.skyblock.api.event.island;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.WeatherType; import org.bukkit.WeatherType;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandChatEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandChatEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandChatSwitchEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandChatSwitchEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandEnterEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandEnterEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandExitEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandExitEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandJoinEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandJoinEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandLeaveEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandLeaveEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerIslandSwitchEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerIslandSwitchEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerVoteEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerVoteEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

4
src/main/java/com/songoda/skyblock/api/event/player/PlayerVoteRemoveEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerVoteRemoveEvent.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import com.songoda.skyblock.api.island.Island; import com.craftaro.skyblock.api.island.Island;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
src/main/java/com/songoda/skyblock/api/event/player/PlayerWithdrawMoneyEvent.java → src/main/java/com/craftaro/skyblock/api/event/player/PlayerWithdrawMoneyEvent.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.event.player; package com.craftaro.skyblock.api.event.player;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;

2
src/main/java/com/songoda/skyblock/api/invite/IslandInvitation.java → src/main/java/com/craftaro/skyblock/api/invite/IslandInvitation.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.invite; package com.craftaro.skyblock.api.invite;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

28
src/main/java/com/songoda/skyblock/api/island/Island.java → src/main/java/com/craftaro/skyblock/api/island/Island.java
View File

@ -1,13 +1,13 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
import com.craftaro.skyblock.api.SkyBlockAPI;
import com.craftaro.skyblock.api.ban.Ban;
import com.craftaro.skyblock.api.utils.APIUtil;
import com.craftaro.skyblock.api.visit.Visit;
import com.craftaro.skyblock.island.IslandCoop;
import com.craftaro.skyblock.island.IslandPermission;
import com.craftaro.skyblock.island.IslandStatus;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.api.SkyBlockAPI;
import com.songoda.skyblock.api.ban.Ban;
import com.songoda.skyblock.api.utils.APIUtil;
import com.songoda.skyblock.api.visit.Visit;
import com.songoda.skyblock.island.IslandCoop;
import com.songoda.skyblock.island.IslandPermission;
import com.songoda.skyblock.island.IslandStatus;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.WeatherType; import org.bukkit.WeatherType;
@ -21,10 +21,10 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
public class Island { public class Island {
private com.songoda.skyblock.island.Island handle; private com.craftaro.skyblock.island.Island handle;
private OfflinePlayer player; private OfflinePlayer player;
public Island(com.songoda.skyblock.island.Island handle, OfflinePlayer player) { public Island(com.craftaro.skyblock.island.Island handle, OfflinePlayer player) {
this.handle = handle; this.handle = handle;
this.player = player; this.player = player;
} }
@ -260,7 +260,7 @@ public class Island {
public IslandRole getRole(OfflinePlayer player) { public IslandRole getRole(OfflinePlayer player) {
Preconditions.checkArgument(player != null, "Cannot get role for null player"); Preconditions.checkArgument(player != null, "Cannot get role for null player");
for (com.songoda.skyblock.island.IslandRole role : com.songoda.skyblock.island.IslandRole.values()) { for (com.craftaro.skyblock.island.IslandRole role : com.craftaro.skyblock.island.IslandRole.values()) {
if (this.handle.hasRole(role, player.getUniqueId())) { if (this.handle.hasRole(role, player.getUniqueId())) {
return APIUtil.fromImplementation(role); return APIUtil.fromImplementation(role);
} }
@ -376,12 +376,12 @@ public class Island {
*/ */
@Deprecated @Deprecated
public boolean isOpen() { public boolean isOpen() {
return this.handle.getStatus() == IslandStatus.OPEN; return this.handle.getStatus() == com.craftaro.skyblock.island.IslandStatus.OPEN;
} }
@Deprecated @Deprecated
public void setOpen(boolean open) { public void setOpen(boolean open) {
this.handle.setStatus(open ? IslandStatus.OPEN : IslandStatus.CLOSED); this.handle.setStatus(open ? com.craftaro.skyblock.island.IslandStatus.OPEN : IslandStatus.CLOSED);
} }
/** /**
@ -488,7 +488,7 @@ public class Island {
/** /**
* @return Implementation for the Island * @return Implementation for the Island
*/ */
public com.songoda.skyblock.island.Island getIsland() { public com.craftaro.skyblock.island.Island getIsland() {
return this.handle; return this.handle;
} }

2
src/main/java/com/songoda/skyblock/api/island/IslandBorderColor.java → src/main/java/com/craftaro/skyblock/api/island/IslandBorderColor.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandBorderColor { public enum IslandBorderColor {
BLUE, GREEN, RED BLUE, GREEN, RED

2
src/main/java/com/songoda/skyblock/api/island/IslandEnvironment.java → src/main/java/com/craftaro/skyblock/api/island/IslandEnvironment.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandEnvironment { public enum IslandEnvironment {
ISLAND, VISITOR, MAIN ISLAND, VISITOR, MAIN

8
src/main/java/com/songoda/skyblock/api/island/IslandLevel.java → src/main/java/com/craftaro/skyblock/api/island/IslandLevel.java
View File

@ -1,9 +1,9 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.skyblock.SkyBlock;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.SkyBlock;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -67,7 +67,7 @@ public class IslandLevel {
Preconditions.checkArgument(material != null, "Cannot get material amount to null material"); Preconditions.checkArgument(material != null, "Cannot get material amount to null material");
XMaterial materials = CompatibleMaterial.getMaterial(material.name()).get(); XMaterial materials = CompatibleMaterial.getMaterial(material.name()).get();
com.songoda.skyblock.island.IslandLevel level = this.handle.getIsland().getLevel(); com.craftaro.skyblock.island.IslandLevel level = this.handle.getIsland().getLevel();
if (level.getMaterials().containsKey(materials.name())) { if (level.getMaterials().containsKey(materials.name())) {
return level.getMaterials().get(materials.name()); return level.getMaterials().get(materials.name());
@ -84,7 +84,7 @@ public class IslandLevel {
XMaterial materials = CompatibleMaterial.getMaterial(material.name()).get(); XMaterial materials = CompatibleMaterial.getMaterial(material.name()).get();
//TODO: data support //TODO: data support
com.songoda.skyblock.island.IslandLevel level = this.handle.getIsland().getLevel(); com.craftaro.skyblock.island.IslandLevel level = this.handle.getIsland().getLevel();
if (level.getMaterials().containsKey(materials.name())) { if (level.getMaterials().containsKey(materials.name())) {
return level.getMaterials().get(materials.name()); return level.getMaterials().get(materials.name());

2
src/main/java/com/songoda/skyblock/api/island/IslandLocation.java → src/main/java/com/craftaro/skyblock/api/island/IslandLocation.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;

26
src/main/java/com/songoda/skyblock/api/island/IslandManager.java → src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
View File

@ -1,10 +1,10 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.api.structure.Structure;
import com.craftaro.skyblock.api.utils.APIUtil;
import com.craftaro.skyblock.permission.PermissionManager;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.api.structure.Structure;
import com.songoda.skyblock.api.utils.APIUtil;
import com.songoda.skyblock.permission.PermissionManager;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -15,10 +15,10 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
public class IslandManager { public class IslandManager {
private final com.songoda.skyblock.island.IslandManager islandManager; private final com.craftaro.skyblock.island.IslandManager islandManager;
private final PermissionManager permissionManager; private final PermissionManager permissionManager;
public IslandManager(com.songoda.skyblock.island.IslandManager islandManager) { public IslandManager(com.craftaro.skyblock.island.IslandManager islandManager) {
this.islandManager = islandManager; this.islandManager = islandManager;
this.permissionManager = SkyBlock.getPlugin(SkyBlock.class).getPermissionManager(); this.permissionManager = SkyBlock.getPlugin(SkyBlock.class).getPermissionManager();
} }
@ -28,7 +28,7 @@ public class IslandManager {
*/ */
public static boolean hasIsland(OfflinePlayer player) { public static boolean hasIsland(OfflinePlayer player) {
Preconditions.checkArgument(player != null, "Cannot check island to null player"); Preconditions.checkArgument(player != null, "Cannot check island to null player");
return new com.songoda.skyblock.utils.player.OfflinePlayer(player.getUniqueId()).getOwner() != null; return new com.craftaro.skyblock.utils.player.OfflinePlayer(player.getUniqueId()).getOwner() != null;
} }
/** /**
@ -189,7 +189,7 @@ public class IslandManager {
Preconditions.checkArgument(structure != null, "Cannot create island to null structure"); Preconditions.checkArgument(structure != null, "Cannot create island to null structure");
if (!hasIsland(player)) { if (!hasIsland(player)) {
return this.islandManager.createIsland(player, (com.songoda.skyblock.structure.Structure) structure); return this.islandManager.createIsland(player, (com.craftaro.skyblock.structure.Structure) structure);
} }
return false; return false;
@ -260,7 +260,7 @@ public class IslandManager {
public Island getIslandAtLocation(Location location) { public Island getIslandAtLocation(Location location) {
Preconditions.checkArgument(location != null, "Cannot get island to null location"); Preconditions.checkArgument(location != null, "Cannot get island to null location");
com.songoda.skyblock.island.Island island = this.islandManager.getIslandAtLocation(location); com.craftaro.skyblock.island.Island island = this.islandManager.getIslandAtLocation(location);
if (island != null) { if (island != null) {
return island.getAPIWrapper(); return island.getAPIWrapper();
@ -288,7 +288,7 @@ public class IslandManager {
public Island getIslandPlayerAt(Player player) { public Island getIslandPlayerAt(Player player) {
Preconditions.checkArgument(player != null, "Cannot get Island to null player"); Preconditions.checkArgument(player != null, "Cannot get Island to null player");
com.songoda.skyblock.island.Island island = this.islandManager.getIslandPlayerAt(player); com.craftaro.skyblock.island.Island island = this.islandManager.getIslandPlayerAt(player);
if (island != null) { if (island != null) {
return island.getAPIWrapper(); return island.getAPIWrapper();
@ -319,7 +319,7 @@ public class IslandManager {
public Island getIsland(OfflinePlayer player) { public Island getIsland(OfflinePlayer player) {
Preconditions.checkArgument(player != null, "Cannot get island to null player"); Preconditions.checkArgument(player != null, "Cannot get island to null player");
com.songoda.skyblock.island.Island island = this.islandManager.getIsland(player); com.craftaro.skyblock.island.Island island = this.islandManager.getIsland(player);
if (island != null) { if (island != null) {
return island.getAPIWrapper(); return island.getAPIWrapper();
@ -338,7 +338,7 @@ public class IslandManager {
public Island getIslandByUUID(UUID islandUUID) { public Island getIslandByUUID(UUID islandUUID) {
Preconditions.checkArgument(islandUUID != null, "Cannot get island with a null UUID"); Preconditions.checkArgument(islandUUID != null, "Cannot get island with a null UUID");
com.songoda.skyblock.island.Island island = this.islandManager.getIslandByUUID(islandUUID); com.craftaro.skyblock.island.Island island = this.islandManager.getIslandByUUID(islandUUID);
return island != null ? island.getAPIWrapper() : null; return island != null ? island.getAPIWrapper() : null;
} }

2
src/main/java/com/songoda/skyblock/api/island/IslandMessage.java → src/main/java/com/craftaro/skyblock/api/island/IslandMessage.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandMessage { public enum IslandMessage {
WELCOME, SIGNATURE, SIGN WELCOME, SIGNATURE, SIGN

2
src/main/java/com/songoda/skyblock/api/island/IslandRole.java → src/main/java/com/craftaro/skyblock/api/island/IslandRole.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandRole { public enum IslandRole {
COOP, VISITOR, MEMBER, OPERATOR, OWNER COOP, VISITOR, MEMBER, OPERATOR, OWNER

2
src/main/java/com/songoda/skyblock/api/island/IslandStatus.java → src/main/java/com/craftaro/skyblock/api/island/IslandStatus.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandStatus { public enum IslandStatus {
OPEN, CLOSED, WHITELISTED OPEN, CLOSED, WHITELISTED

2
src/main/java/com/songoda/skyblock/api/island/IslandUpgrade.java → src/main/java/com/craftaro/skyblock/api/island/IslandUpgrade.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandUpgrade { public enum IslandUpgrade {
CROP, SPAWNER, FLY, DROPS, SIZE, SPEED, JUMP CROP, SPAWNER, FLY, DROPS, SIZE, SPEED, JUMP

2
src/main/java/com/songoda/skyblock/api/island/IslandWorld.java → src/main/java/com/craftaro/skyblock/api/island/IslandWorld.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.island; package com.craftaro.skyblock.api.island;
public enum IslandWorld { public enum IslandWorld {
OVERWORLD, NETHER, END OVERWORLD, NETHER, END

10
src/main/java/com/songoda/skyblock/api/levelling/LevellingManager.java → src/main/java/com/craftaro/skyblock/api/levelling/LevellingManager.java
View File

@ -1,11 +1,11 @@
package com.songoda.skyblock.api.levelling; package com.craftaro.skyblock.api.levelling;
import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.skyblock.api.island.Island;
import com.craftaro.skyblock.levelling.IslandLevelManager;
import com.craftaro.skyblock.levelling.calculator.Calculator;
import com.craftaro.skyblock.levelling.calculator.CalculatorRegistry;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.api.island.Island;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.levelling.calculator.Calculator;
import com.songoda.skyblock.levelling.calculator.CalculatorRegistry;
import org.bukkit.Material; import org.bukkit.Material;
public class LevellingManager { public class LevellingManager {

2
src/main/java/com/songoda/skyblock/api/structure/Structure.java → src/main/java/com/craftaro/skyblock/api/structure/Structure.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.api.structure; package com.craftaro.skyblock.api.structure;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;

6
src/main/java/com/songoda/skyblock/api/structure/StructureManager.java → src/main/java/com/craftaro/skyblock/api/structure/StructureManager.java
View File

@ -1,12 +1,12 @@
package com.songoda.skyblock.api.structure; package com.craftaro.skyblock.api.structure;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class StructureManager { public class StructureManager {
private final com.songoda.skyblock.structure.StructureManager structureManager; private final com.craftaro.skyblock.structure.StructureManager structureManager;
public StructureManager(com.songoda.skyblock.structure.StructureManager structureManager) { public StructureManager(com.craftaro.skyblock.structure.StructureManager structureManager) {
this.structureManager = structureManager; this.structureManager = structureManager;
} }

128
src/main/java/com/songoda/skyblock/api/utils/APIUtil.java → src/main/java/com/craftaro/skyblock/api/utils/APIUtil.java
View File

@ -1,30 +1,30 @@
package com.songoda.skyblock.api.utils; package com.craftaro.skyblock.api.utils;
import com.craftaro.core.world.SWorldBorder; import com.craftaro.core.world.SWorldBorder;
import com.songoda.skyblock.api.island.IslandBorderColor; import com.craftaro.skyblock.api.island.IslandBorderColor;
import com.songoda.skyblock.api.island.IslandEnvironment; import com.craftaro.skyblock.api.island.IslandUpgrade;
import com.songoda.skyblock.api.island.IslandMessage; import com.craftaro.skyblock.api.island.IslandWorld;
import com.songoda.skyblock.api.island.IslandRole; import com.craftaro.skyblock.island.IslandEnvironment;
import com.songoda.skyblock.api.island.IslandStatus; import com.craftaro.skyblock.island.IslandMessage;
import com.songoda.skyblock.api.island.IslandUpgrade; import com.craftaro.skyblock.island.IslandRole;
import com.songoda.skyblock.api.island.IslandWorld; import com.craftaro.skyblock.island.IslandStatus;
import com.songoda.skyblock.upgrade.Upgrade; import com.craftaro.skyblock.upgrade.Upgrade;
public final class APIUtil { public final class APIUtil {
public static com.songoda.skyblock.island.IslandWorld toImplementation(IslandWorld world) { public static com.craftaro.skyblock.island.IslandWorld toImplementation(IslandWorld world) {
switch (world) { switch (world) {
case NETHER: case NETHER:
return com.songoda.skyblock.island.IslandWorld.NETHER; return com.craftaro.skyblock.island.IslandWorld.NETHER;
case OVERWORLD: case OVERWORLD:
return com.songoda.skyblock.island.IslandWorld.NORMAL; return com.craftaro.skyblock.island.IslandWorld.NORMAL;
case END: case END:
return com.songoda.skyblock.island.IslandWorld.END; return com.craftaro.skyblock.island.IslandWorld.END;
} }
return null; return null;
} }
public static IslandWorld fromImplementation(com.songoda.skyblock.island.IslandWorld world) { public static IslandWorld fromImplementation(com.craftaro.skyblock.island.IslandWorld world) {
switch (world) { switch (world) {
case NETHER: case NETHER:
return IslandWorld.NETHER; return IslandWorld.NETHER;
@ -37,20 +37,7 @@ public final class APIUtil {
return null; return null;
} }
public static com.songoda.skyblock.island.IslandEnvironment toImplementation(IslandEnvironment environment) { public static IslandEnvironment toImplementation(com.craftaro.skyblock.api.island.IslandEnvironment environment) {
switch (environment) {
case ISLAND:
return com.songoda.skyblock.island.IslandEnvironment.ISLAND;
case MAIN:
return com.songoda.skyblock.island.IslandEnvironment.MAIN;
case VISITOR:
return com.songoda.skyblock.island.IslandEnvironment.VISITOR;
}
return null;
}
public static IslandEnvironment fromImplementation(com.songoda.skyblock.island.IslandEnvironment environment) {
switch (environment) { switch (environment) {
case ISLAND: case ISLAND:
return IslandEnvironment.ISLAND; return IslandEnvironment.ISLAND;
@ -63,20 +50,20 @@ public final class APIUtil {
return null; return null;
} }
public static com.songoda.skyblock.island.IslandStatus toImplementation(IslandStatus status) { public static com.craftaro.skyblock.api.island.IslandEnvironment fromImplementation(IslandEnvironment environment) {
switch (status) { switch (environment) {
case OPEN: case ISLAND:
return com.songoda.skyblock.island.IslandStatus.OPEN; return com.craftaro.skyblock.api.island.IslandEnvironment.ISLAND;
case CLOSED: case MAIN:
return com.songoda.skyblock.island.IslandStatus.CLOSED; return com.craftaro.skyblock.api.island.IslandEnvironment.MAIN;
case WHITELISTED: case VISITOR:
return com.songoda.skyblock.island.IslandStatus.WHITELISTED; return com.craftaro.skyblock.api.island.IslandEnvironment.VISITOR;
} }
return null; return null;
} }
public static IslandStatus fromImplementation(com.songoda.skyblock.island.IslandStatus status) { public static IslandStatus toImplementation(com.craftaro.skyblock.api.island.IslandStatus status) {
switch (status) { switch (status) {
case OPEN: case OPEN:
return IslandStatus.OPEN; return IslandStatus.OPEN;
@ -89,24 +76,20 @@ public final class APIUtil {
return null; return null;
} }
public static com.songoda.skyblock.island.IslandRole toImplementation(IslandRole role) { public static com.craftaro.skyblock.api.island.IslandStatus fromImplementation(IslandStatus status) {
switch (role) { switch (status) {
case VISITOR: case OPEN:
return com.songoda.skyblock.island.IslandRole.VISITOR; return com.craftaro.skyblock.api.island.IslandStatus.OPEN;
case COOP: case CLOSED:
return com.songoda.skyblock.island.IslandRole.COOP; return com.craftaro.skyblock.api.island.IslandStatus.CLOSED;
case MEMBER: case WHITELISTED:
return com.songoda.skyblock.island.IslandRole.MEMBER; return com.craftaro.skyblock.api.island.IslandStatus.WHITELISTED;
case OPERATOR:
return com.songoda.skyblock.island.IslandRole.OPERATOR;
case OWNER:
return com.songoda.skyblock.island.IslandRole.OWNER;
} }
return null; return null;
} }
public static IslandRole fromImplementation(com.songoda.skyblock.island.IslandRole role) { public static IslandRole toImplementation(com.craftaro.skyblock.api.island.IslandRole role) {
switch (role) { switch (role) {
case VISITOR: case VISITOR:
return IslandRole.VISITOR; return IslandRole.VISITOR;
@ -123,6 +106,23 @@ public final class APIUtil {
return null; return null;
} }
public static com.craftaro.skyblock.api.island.IslandRole fromImplementation(IslandRole role) {
switch (role) {
case VISITOR:
return com.craftaro.skyblock.api.island.IslandRole.VISITOR;
case COOP:
return com.craftaro.skyblock.api.island.IslandRole.COOP;
case MEMBER:
return com.craftaro.skyblock.api.island.IslandRole.MEMBER;
case OPERATOR:
return com.craftaro.skyblock.api.island.IslandRole.OPERATOR;
case OWNER:
return com.craftaro.skyblock.api.island.IslandRole.OWNER;
}
return null;
}
public static Upgrade.Type toImplementation(IslandUpgrade upgrade) { public static Upgrade.Type toImplementation(IslandUpgrade upgrade) {
switch (upgrade) { switch (upgrade) {
case CROP: case CROP:
@ -165,20 +165,7 @@ public final class APIUtil {
return null; return null;
} }
public static com.songoda.skyblock.island.IslandMessage toImplementation(IslandMessage message) { public static IslandMessage toImplementation(com.craftaro.skyblock.api.island.IslandMessage message) {
switch (message) {
case SIGN:
return com.songoda.skyblock.island.IslandMessage.SIGN;
case SIGNATURE:
return com.songoda.skyblock.island.IslandMessage.SIGNATURE;
case WELCOME:
return com.songoda.skyblock.island.IslandMessage.WELCOME;
}
return null;
}
public static IslandMessage fromImplementation(com.songoda.skyblock.island.IslandMessage message) {
switch (message) { switch (message) {
case SIGN: case SIGN:
return IslandMessage.SIGN; return IslandMessage.SIGN;
@ -191,6 +178,19 @@ public final class APIUtil {
return null; return null;
} }
public static com.craftaro.skyblock.api.island.IslandMessage fromImplementation(IslandMessage message) {
switch (message) {
case SIGN:
return com.craftaro.skyblock.api.island.IslandMessage.SIGN;
case SIGNATURE:
return com.craftaro.skyblock.api.island.IslandMessage.SIGNATURE;
case WELCOME:
return com.craftaro.skyblock.api.island.IslandMessage.WELCOME;
}
return null;
}
public static SWorldBorder.Color toImplementation(IslandBorderColor color) { public static SWorldBorder.Color toImplementation(IslandBorderColor color) {
switch (color) { switch (color) {
case BLUE: case BLUE:

4
src/main/java/com/songoda/skyblock/api/visit/Visit.java → src/main/java/com/craftaro/skyblock/api/visit/Visit.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.api.visit; package com.craftaro.skyblock.api.visit;
import com.craftaro.skyblock.api.island.Island;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.songoda.skyblock.api.island.Island;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;

12
src/main/java/com/songoda/skyblock/ban/Ban.java → src/main/java/com/craftaro/skyblock/ban/Ban.java
View File

@ -1,10 +1,10 @@
package com.songoda.skyblock.ban; package com.craftaro.skyblock.ban;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.api.event.island.IslandBanEvent;
import com.craftaro.skyblock.api.event.island.IslandUnbanEvent;
import com.craftaro.skyblock.config.FileManager;
import com.eatthepath.uuid.FastUUID; import com.eatthepath.uuid.FastUUID;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.api.event.island.IslandBanEvent;
import com.songoda.skyblock.api.event.island.IslandUnbanEvent;
import com.songoda.skyblock.config.FileManager.Config;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
@ -103,7 +103,7 @@ public class Ban {
public void save() { public void save() {
SkyBlock plugin = SkyBlock.getPlugin(SkyBlock.class); SkyBlock plugin = SkyBlock.getPlugin(SkyBlock.class);
Config config = plugin.getFileManager().getConfig(new File( FileManager.Config config = plugin.getFileManager().getConfig(new File(
new File(plugin.getDataFolder(), "ban-data"), this.islandOwnerUUID.toString() + ".yml")); new File(plugin.getDataFolder(), "ban-data"), this.islandOwnerUUID.toString() + ".yml"));
try { try {

14
src/main/java/com/songoda/skyblock/ban/BanManager.java → src/main/java/com/craftaro/skyblock/ban/BanManager.java
View File

@ -1,13 +1,13 @@
package com.songoda.skyblock.ban; package com.craftaro.skyblock.ban;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.config.FileManager;
import com.craftaro.skyblock.island.Island;
import com.craftaro.skyblock.message.MessageManager;
import com.craftaro.skyblock.sound.SoundManager;
import com.craftaro.skyblock.utils.world.LocationUtil;
import com.eatthepath.uuid.FastUUID; import com.eatthepath.uuid.FastUUID;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.config.FileManager;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.world.LocationUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

8
src/main/java/com/songoda/skyblock/bank/BankManager.java → src/main/java/com/craftaro/skyblock/bank/BankManager.java
View File

@ -1,10 +1,10 @@
package com.songoda.skyblock.bank; package com.craftaro.skyblock.bank;
import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.hooks.EconomyManager;
import com.craftaro.core.hooks.economies.Economy; import com.craftaro.core.hooks.economies.Economy;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
src/main/java/com/songoda/skyblock/bank/Transaction.java → src/main/java/com/craftaro/skyblock/bank/Transaction.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.bank; package com.craftaro.skyblock.bank;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;

12
src/main/java/com/songoda/skyblock/biome/BiomeManager.java → src/main/java/com/craftaro/skyblock/biome/BiomeManager.java
View File

@ -1,11 +1,11 @@
package com.songoda.skyblock.biome; package com.craftaro.skyblock.biome;
import com.craftaro.core.compatibility.CompatibleBiome; import com.craftaro.core.compatibility.CompatibleBiome;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.blockscanner.ChunkLoader; import com.craftaro.skyblock.blockscanner.ChunkLoader;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandEnvironment; import com.craftaro.skyblock.island.IslandEnvironment;
import com.songoda.skyblock.island.IslandWorld; import com.craftaro.skyblock.island.IslandWorld;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
src/main/java/com/songoda/skyblock/blockscanner/BlockInfo.java → src/main/java/com/craftaro/skyblock/blockscanner/BlockInfo.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.blockscanner; package com.craftaro.skyblock.blockscanner;
import org.bukkit.World; import org.bukkit.World;

10
src/main/java/com/songoda/skyblock/blockscanner/BlockScanner.java → src/main/java/com/craftaro/skyblock/blockscanner/BlockScanner.java
View File

@ -1,13 +1,13 @@
package com.songoda.skyblock.blockscanner; package com.craftaro.skyblock.blockscanner;
import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.island.Island;
import com.craftaro.skyblock.island.IslandEnvironment;
import com.craftaro.skyblock.world.WorldManager;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandEnvironment;
import com.songoda.skyblock.world.WorldManager;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChunkSnapshot; import org.bukkit.ChunkSnapshot;

2
src/main/java/com/songoda/skyblock/blockscanner/CachedChunk.java → src/main/java/com/craftaro/skyblock/blockscanner/CachedChunk.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.blockscanner; package com.craftaro.skyblock.blockscanner;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

10
src/main/java/com/songoda/skyblock/blockscanner/ChunkLoader.java → src/main/java/com/craftaro/skyblock/blockscanner/ChunkLoader.java
View File

@ -1,9 +1,9 @@
package com.songoda.skyblock.blockscanner; package com.craftaro.skyblock.blockscanner;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandEnvironment; import com.craftaro.skyblock.island.IslandEnvironment;
import com.songoda.skyblock.island.IslandWorld; import com.craftaro.skyblock.island.IslandWorld;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;

2
src/main/java/com/songoda/skyblock/blockscanner/LocationBounds.java → src/main/java/com/craftaro/skyblock/blockscanner/LocationBounds.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.blockscanner; package com.craftaro.skyblock.blockscanner;
public class LocationBounds { public class LocationBounds {
private final int minX, minZ, maxX, maxZ; private final int minX, minZ, maxX, maxZ;

2
src/main/java/com/songoda/skyblock/blockscanner/MaterialIDHelper.java → src/main/java/com/craftaro/skyblock/blockscanner/MaterialIDHelper.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.blockscanner; package com.craftaro.skyblock.blockscanner;
import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.compatibility.ServerVersion;
import org.bukkit.Material; import org.bukkit.Material;

16
src/main/java/com/songoda/skyblock/challenge/FabledChallenge.java → src/main/java/com/craftaro/skyblock/challenge/FabledChallenge.java
View File

@ -1,12 +1,12 @@
package com.songoda.skyblock.challenge; package com.craftaro.skyblock.challenge;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.challenge.challenge.ChallengeCategory; import com.craftaro.skyblock.challenge.challenge.ChallengeCategory;
import com.songoda.skyblock.challenge.challenge.ChallengeManager; import com.craftaro.skyblock.challenge.challenge.ChallengeManager;
import com.songoda.skyblock.challenge.defaultinv.DefaultInventory; import com.craftaro.skyblock.challenge.defaultinv.DefaultInventory;
import com.songoda.skyblock.challenge.inventory.InventoryManager; import com.craftaro.skyblock.challenge.inventory.InventoryManager;
import com.songoda.skyblock.challenge.inventory.inv.ChallengeInventory; import com.craftaro.skyblock.challenge.inventory.inv.ChallengeInventory;
import com.songoda.skyblock.challenge.player.PlayerManager; import com.craftaro.skyblock.challenge.player.PlayerManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
src/main/java/com/songoda/skyblock/challenge/challenge/Challenge.java → src/main/java/com/craftaro/skyblock/challenge/challenge/Challenge.java
View File

@ -1,12 +1,12 @@
package com.songoda.skyblock.challenge.challenge; package com.craftaro.skyblock.challenge.challenge;
import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.hooks.economies.Economy; import com.craftaro.core.hooks.economies.Economy;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.bank.BankManager; import com.craftaro.skyblock.bank.BankManager;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;

2
src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeCategory.java → src/main/java/com/craftaro/skyblock/challenge/challenge/ChallengeCategory.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.challenge.challenge; package com.craftaro.skyblock.challenge.challenge;
import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;

4
src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeManager.java → src/main/java/com/craftaro/skyblock/challenge/challenge/ChallengeManager.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.challenge.challenge; package com.craftaro.skyblock.challenge.challenge;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;

4
src/main/java/com/songoda/skyblock/challenge/challenge/ItemChallenge.java → src/main/java/com/craftaro/skyblock/challenge/challenge/ItemChallenge.java
View File

@ -1,7 +1,7 @@
package com.songoda.skyblock.challenge.challenge; package com.craftaro.skyblock.challenge.challenge;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;

2
src/main/java/com/songoda/skyblock/challenge/challenge/Peer.java → src/main/java/com/craftaro/skyblock/challenge/challenge/Peer.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.challenge.challenge; package com.craftaro.skyblock.challenge.challenge;
public class Peer<E, F> { public class Peer<E, F> {
private final E key; private final E key;

4
src/main/java/com/songoda/skyblock/challenge/defaultinv/DefaultInventory.java → src/main/java/com/craftaro/skyblock/challenge/defaultinv/DefaultInventory.java
View File

@ -1,8 +1,8 @@
package com.songoda.skyblock.challenge.defaultinv; package com.craftaro.skyblock.challenge.defaultinv;
import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleMaterial;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;

2
src/main/java/com/songoda/skyblock/challenge/defaultinv/Item.java → src/main/java/com/craftaro/skyblock/challenge/defaultinv/Item.java
View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.challenge.defaultinv; package com.craftaro.skyblock.challenge.defaultinv;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
src/main/java/com/songoda/skyblock/challenge/inventory/ClickableItem.java → src/main/java/com/craftaro/skyblock/challenge/inventory/ClickableItem.java
View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package com.songoda.skyblock.challenge.inventory; package com.craftaro.skyblock.challenge.inventory;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
src/main/java/com/songoda/skyblock/challenge/inventory/Inventory.java → src/main/java/com/craftaro/skyblock/challenge/inventory/Inventory.java
View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package com.songoda.skyblock.challenge.inventory; package com.craftaro.skyblock.challenge.inventory;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
src/main/java/com/songoda/skyblock/challenge/inventory/InventoryManager.java → src/main/java/com/craftaro/skyblock/challenge/inventory/InventoryManager.java
View File

@ -1,9 +1,9 @@
/** /**
* *
*/ */
package com.songoda.skyblock.challenge.inventory; package com.craftaro.skyblock.challenge.inventory;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

2
src/main/java/com/songoda/skyblock/challenge/inventory/InventoryProvider.java → src/main/java/com/craftaro/skyblock/challenge/inventory/InventoryProvider.java
View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package com.songoda.skyblock.challenge.inventory; package com.craftaro.skyblock.challenge.inventory;
import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryCloseEvent;

20
src/main/java/com/songoda/skyblock/challenge/inventory/inv/ChallengeInventory.java → src/main/java/com/craftaro/skyblock/challenge/inventory/inv/ChallengeInventory.java
View File

@ -1,15 +1,15 @@
package com.songoda.skyblock.challenge.inventory.inv; package com.craftaro.skyblock.challenge.inventory.inv;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.challenge.FabledChallenge; import com.craftaro.skyblock.challenge.FabledChallenge;
import com.songoda.skyblock.challenge.challenge.Challenge; import com.craftaro.skyblock.challenge.challenge.Challenge;
import com.songoda.skyblock.challenge.challenge.ChallengeCategory; import com.craftaro.skyblock.challenge.challenge.ChallengeCategory;
import com.songoda.skyblock.challenge.challenge.ItemChallenge; import com.craftaro.skyblock.challenge.challenge.ItemChallenge;
import com.songoda.skyblock.challenge.defaultinv.DefaultInventory; import com.craftaro.skyblock.challenge.defaultinv.DefaultInventory;
import com.songoda.skyblock.challenge.defaultinv.Item; import com.craftaro.skyblock.challenge.defaultinv.Item;
import com.songoda.skyblock.challenge.inventory.ClickableItem; import com.craftaro.skyblock.challenge.inventory.ClickableItem;
import com.songoda.skyblock.challenge.inventory.Inventory; import com.craftaro.skyblock.challenge.inventory.Inventory;
import com.songoda.skyblock.challenge.inventory.InventoryProvider; import com.craftaro.skyblock.challenge.inventory.InventoryProvider;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
src/main/java/com/songoda/skyblock/challenge/player/PlayerChallenge.java → src/main/java/com/craftaro/skyblock/challenge/player/PlayerChallenge.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.challenge.player; package com.craftaro.skyblock.challenge.player;
import com.songoda.skyblock.challenge.challenge.Challenge; import com.craftaro.skyblock.challenge.challenge.Challenge;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;

27
src/main/java/com/songoda/skyblock/challenge/player/PlayerManager.java → src/main/java/com/craftaro/skyblock/challenge/player/PlayerManager.java
View File

@ -1,13 +1,12 @@
package com.songoda.skyblock.challenge.player; package com.craftaro.skyblock.challenge.player;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.challenge.challenge.Challenge;
import com.craftaro.skyblock.challenge.challenge.ChallengeCategory;
import com.craftaro.skyblock.challenge.challenge.Peer;
import com.craftaro.skyblock.config.FileManager;
import com.craftaro.skyblock.island.Island;
import com.eatthepath.uuid.FastUUID; import com.eatthepath.uuid.FastUUID;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.challenge.challenge.Challenge;
import com.songoda.skyblock.challenge.challenge.Challenge.Type;
import com.songoda.skyblock.challenge.challenge.ChallengeCategory;
import com.songoda.skyblock.challenge.challenge.Peer;
import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
@ -67,7 +66,7 @@ public class PlayerManager {
uuid = is.getOwnerUUID(); uuid = is.getOwnerUUID();
} }
} }
Config config = this.plugin.getFileManager().getConfig(new File(this.playersDirectory, FastUUID.toString(uuid) + ".yml")); FileManager.Config config = this.plugin.getFileManager().getConfig(new File(this.playersDirectory, FastUUID.toString(uuid) + ".yml"));
FileConfiguration fileConfig = config.getFileConfiguration(); FileConfiguration fileConfig = config.getFileConfiguration();
HashMap<Challenge, Integer> challenges = new HashMap<>(); HashMap<Challenge, Integer> challenges = new HashMap<>();
ConfigurationSection section = fileConfig.getConfigurationSection("challenges"); ConfigurationSection section = fileConfig.getConfigurationSection("challenges");
@ -151,7 +150,7 @@ public class PlayerManager {
return false; return false;
} }
// Check if player has required items // Check if player has required items
for (Peer<Type, Object> peer : c.getRequires()) { for (Peer<Challenge.Type, Object> peer : c.getRequires()) {
if (!peer.getKey().has(p, peer.getValue())) { if (!peer.getKey().has(p, peer.getValue())) {
return false; return false;
} }
@ -182,10 +181,10 @@ public class PlayerManager {
done.put(c, count + 1); done.put(c, count + 1);
addChallenge(uuid, c); addChallenge(uuid, c);
// Take items // Take items
for (Peer<Type, Object> peer : c.getRequires()) { for (Peer<Challenge.Type, Object> peer : c.getRequires()) {
peer.getKey().executeRequire(p, peer.getValue()); peer.getKey().executeRequire(p, peer.getValue());
} }
for (Peer<Type, Object> peer : c.getRewards()) { for (Peer<Challenge.Type, Object> peer : c.getRewards()) {
peer.getKey().executeReward(p, peer.getValue()); peer.getKey().executeReward(p, peer.getValue());
} }
// Ok, send message // Ok, send message
@ -205,7 +204,7 @@ public class PlayerManager {
uuid = is.getOwnerUUID(); uuid = is.getOwnerUUID();
} }
} }
Config config = this.plugin.getFileManager().getConfig(new File(this.playersDirectory, FastUUID.toString(uuid) + ".yml")); FileManager.Config config = this.plugin.getFileManager().getConfig(new File(this.playersDirectory, FastUUID.toString(uuid) + ".yml"));
FileConfiguration fileConfig = config.getFileConfiguration(); FileConfiguration fileConfig = config.getFileConfiguration();
int ccId = c.getCategory().getId(); int ccId = c.getCategory().getId();
int cId = c.getId(); int cId = c.getId();
@ -243,7 +242,7 @@ public class PlayerManager {
} }
// Not connected, check in file // Not connected, check in file
Config config = this.plugin.getFileManager().getConfig(new File(this.playersDirectory, FileManager.Config config = this.plugin.getFileManager().getConfig(new File(this.playersDirectory,
FastUUID.toString(uuid) + ".yml")); FastUUID.toString(uuid) + ".yml"));
FileConfiguration fileConfig = config.getFileConfiguration(); FileConfiguration fileConfig = config.getFileConfiguration();
int ccId = c.getCategory().getId(); int ccId = c.getCategory().getId();

166
src/main/java/com/songoda/skyblock/command/CommandManager.java → src/main/java/com/craftaro/skyblock/command/CommandManager.java
View File

@ -1,74 +1,74 @@
package com.songoda.skyblock.command; package com.craftaro.skyblock.command;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.commands.admin.AddUpgradeCommand; import com.craftaro.skyblock.command.commands.admin.AddUpgradeCommand;
import com.songoda.skyblock.command.commands.admin.AdminBank; import com.craftaro.skyblock.command.commands.admin.AdminBank;
import com.songoda.skyblock.command.commands.admin.ChatSpyCommand; import com.craftaro.skyblock.command.commands.admin.ChatSpyCommand;
import com.songoda.skyblock.command.commands.admin.GeneratorCommand; import com.craftaro.skyblock.command.commands.admin.CreateCommand;
import com.songoda.skyblock.command.commands.admin.LevelScanCommand; import com.craftaro.skyblock.command.commands.admin.DeleteCommand;
import com.songoda.skyblock.command.commands.admin.ProxyCommand; import com.craftaro.skyblock.command.commands.admin.GeneratorCommand;
import com.songoda.skyblock.command.commands.admin.RefreshHologramsCommand; import com.craftaro.skyblock.command.commands.admin.LevelCommand;
import com.songoda.skyblock.command.commands.admin.ReloadCommand; import com.craftaro.skyblock.command.commands.admin.LevelScanCommand;
import com.songoda.skyblock.command.commands.admin.RemoveHologramCommand; import com.craftaro.skyblock.command.commands.admin.OwnerCommand;
import com.songoda.skyblock.command.commands.admin.RemoveUpgradeCommand; import com.craftaro.skyblock.command.commands.admin.ProxyCommand;
import com.songoda.skyblock.command.commands.admin.SetAlwaysLoadedCommand; import com.craftaro.skyblock.command.commands.admin.RefreshHologramsCommand;
import com.songoda.skyblock.command.commands.admin.SetBiomeCommand; import com.craftaro.skyblock.command.commands.admin.ReloadCommand;
import com.songoda.skyblock.command.commands.admin.SetHologramCommand; import com.craftaro.skyblock.command.commands.admin.RemoveHologramCommand;
import com.songoda.skyblock.command.commands.admin.SetMaxMembers; import com.craftaro.skyblock.command.commands.admin.RemoveUpgradeCommand;
import com.songoda.skyblock.command.commands.admin.SetSizeCommand; import com.craftaro.skyblock.command.commands.admin.SetAlwaysLoadedCommand;
import com.songoda.skyblock.command.commands.admin.StackableCommand; import com.craftaro.skyblock.command.commands.admin.SetBiomeCommand;
import com.songoda.skyblock.command.commands.admin.StructureCommand; import com.craftaro.skyblock.command.commands.admin.SetHologramCommand;
import com.songoda.skyblock.command.commands.admin.UpdateAllIslandsCommand; import com.craftaro.skyblock.command.commands.admin.SetMaxMembers;
import com.songoda.skyblock.command.commands.island.AcceptCommand; import com.craftaro.skyblock.command.commands.admin.SetSizeCommand;
import com.songoda.skyblock.command.commands.island.BanCommand; import com.craftaro.skyblock.command.commands.admin.SetSpawnCommand;
import com.songoda.skyblock.command.commands.island.BankCommand; import com.craftaro.skyblock.command.commands.admin.SettingsCommand;
import com.songoda.skyblock.command.commands.island.BansCommand; import com.craftaro.skyblock.command.commands.admin.StackableCommand;
import com.songoda.skyblock.command.commands.island.BiomeCommand; import com.craftaro.skyblock.command.commands.admin.StructureCommand;
import com.songoda.skyblock.command.commands.island.BorderCommand; import com.craftaro.skyblock.command.commands.admin.UpdateAllIslandsCommand;
import com.songoda.skyblock.command.commands.island.CancelCommand; import com.craftaro.skyblock.command.commands.admin.UpgradeCommand;
import com.songoda.skyblock.command.commands.island.ChallengeCommand; import com.craftaro.skyblock.command.commands.island.AcceptCommand;
import com.songoda.skyblock.command.commands.island.ChatCommand; import com.craftaro.skyblock.command.commands.island.BanCommand;
import com.songoda.skyblock.command.commands.island.CloseCommand; import com.craftaro.skyblock.command.commands.island.BankCommand;
import com.songoda.skyblock.command.commands.island.ConfirmCommand; import com.craftaro.skyblock.command.commands.island.BansCommand;
import com.songoda.skyblock.command.commands.island.ControlPanelCommand; import com.craftaro.skyblock.command.commands.island.BiomeCommand;
import com.songoda.skyblock.command.commands.island.CoopCommand; import com.craftaro.skyblock.command.commands.island.BorderCommand;
import com.songoda.skyblock.command.commands.island.CreateCommand; import com.craftaro.skyblock.command.commands.island.CancelCommand;
import com.songoda.skyblock.command.commands.island.CurrentCommand; import com.craftaro.skyblock.command.commands.island.ChallengeCommand;
import com.songoda.skyblock.command.commands.island.DeleteCommand; import com.craftaro.skyblock.command.commands.island.ChatCommand;
import com.songoda.skyblock.command.commands.island.DemoteCommand; import com.craftaro.skyblock.command.commands.island.CloseCommand;
import com.songoda.skyblock.command.commands.island.DenyCommand; import com.craftaro.skyblock.command.commands.island.ConfirmCommand;
import com.songoda.skyblock.command.commands.island.InformationCommand; import com.craftaro.skyblock.command.commands.island.ControlPanelCommand;
import com.songoda.skyblock.command.commands.island.InviteCommand; import com.craftaro.skyblock.command.commands.island.CoopCommand;
import com.songoda.skyblock.command.commands.island.KickAllCommand; import com.craftaro.skyblock.command.commands.island.CurrentCommand;
import com.songoda.skyblock.command.commands.island.KickCommand; import com.craftaro.skyblock.command.commands.island.DemoteCommand;
import com.songoda.skyblock.command.commands.island.LeaderboardCommand; import com.craftaro.skyblock.command.commands.island.DenyCommand;
import com.songoda.skyblock.command.commands.island.LeaveCommand; import com.craftaro.skyblock.command.commands.island.InformationCommand;
import com.songoda.skyblock.command.commands.island.LevelCommand; import com.craftaro.skyblock.command.commands.island.InviteCommand;
import com.songoda.skyblock.command.commands.island.MembersCommand; import com.craftaro.skyblock.command.commands.island.KickAllCommand;
import com.songoda.skyblock.command.commands.island.OpenCommand; import com.craftaro.skyblock.command.commands.island.KickCommand;
import com.songoda.skyblock.command.commands.island.OwnerCommand; import com.craftaro.skyblock.command.commands.island.LeaderboardCommand;
import com.songoda.skyblock.command.commands.island.PreviewCommand; import com.craftaro.skyblock.command.commands.island.LeaveCommand;
import com.songoda.skyblock.command.commands.island.PromoteCommand; import com.craftaro.skyblock.command.commands.island.MembersCommand;
import com.songoda.skyblock.command.commands.island.PublicCommand; import com.craftaro.skyblock.command.commands.island.OpenCommand;
import com.songoda.skyblock.command.commands.island.ScoreboardCommand; import com.craftaro.skyblock.command.commands.island.PreviewCommand;
import com.songoda.skyblock.command.commands.island.SetSpawnCommand; import com.craftaro.skyblock.command.commands.island.PromoteCommand;
import com.songoda.skyblock.command.commands.island.SettingsCommand; import com.craftaro.skyblock.command.commands.island.PublicCommand;
import com.songoda.skyblock.command.commands.island.TeleportCommand; import com.craftaro.skyblock.command.commands.island.ScoreboardCommand;
import com.songoda.skyblock.command.commands.island.UnbanCommand; import com.craftaro.skyblock.command.commands.island.TeleportCommand;
import com.songoda.skyblock.command.commands.island.UnlockCommand; import com.craftaro.skyblock.command.commands.island.UnbanCommand;
import com.songoda.skyblock.command.commands.island.UpgradeCommand; import com.craftaro.skyblock.command.commands.island.UnlockCommand;
import com.songoda.skyblock.command.commands.island.ValueCommand; import com.craftaro.skyblock.command.commands.island.ValueCommand;
import com.songoda.skyblock.command.commands.island.VisitCommand; import com.craftaro.skyblock.command.commands.island.VisitCommand;
import com.songoda.skyblock.command.commands.island.VisitorsCommand; import com.craftaro.skyblock.command.commands.island.VisitorsCommand;
import com.songoda.skyblock.command.commands.island.VoteCommand; import com.craftaro.skyblock.command.commands.island.VoteCommand;
import com.songoda.skyblock.command.commands.island.WeatherCommand; import com.craftaro.skyblock.command.commands.island.WeatherCommand;
import com.songoda.skyblock.command.commands.island.WhitelistCommand; import com.craftaro.skyblock.command.commands.island.WhitelistCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.ChatComponent; import com.craftaro.skyblock.utils.ChatComponent;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent;
@ -121,9 +121,9 @@ public class CommandManager implements CommandExecutor, TabCompleter {
new ConfirmCommand(this.plugin), new ConfirmCommand(this.plugin),
new ControlPanelCommand(this.plugin), new ControlPanelCommand(this.plugin),
new CoopCommand(this.plugin), new CoopCommand(this.plugin),
new CreateCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.CreateCommand(this.plugin),
new CurrentCommand(this.plugin), new CurrentCommand(this.plugin),
new DeleteCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.DeleteCommand(this.plugin),
new DemoteCommand(this.plugin), new DemoteCommand(this.plugin),
new DenyCommand(this.plugin), new DenyCommand(this.plugin),
new InformationCommand(this.plugin), new InformationCommand(this.plugin),
@ -132,19 +132,19 @@ public class CommandManager implements CommandExecutor, TabCompleter {
new KickCommand(this.plugin), new KickCommand(this.plugin),
new LeaderboardCommand(this.plugin), new LeaderboardCommand(this.plugin),
new LeaveCommand(this.plugin), new LeaveCommand(this.plugin),
new LevelCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.LevelCommand(this.plugin),
new MembersCommand(this.plugin), new MembersCommand(this.plugin),
new OpenCommand(this.plugin), new OpenCommand(this.plugin),
new OwnerCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.OwnerCommand(this.plugin),
new PreviewCommand(this.plugin), new PreviewCommand(this.plugin),
new PromoteCommand(this.plugin), new PromoteCommand(this.plugin),
new PublicCommand(this.plugin), new PublicCommand(this.plugin),
new SetSpawnCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.SetSpawnCommand(this.plugin),
new SettingsCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.SettingsCommand(this.plugin),
new TeleportCommand(this.plugin), new TeleportCommand(this.plugin),
new UnbanCommand(this.plugin), new UnbanCommand(this.plugin),
new UnlockCommand(this.plugin), new UnlockCommand(this.plugin),
new UpgradeCommand(this.plugin), new com.craftaro.skyblock.command.commands.island.UpgradeCommand(this.plugin),
new ValueCommand(this.plugin), new ValueCommand(this.plugin),
new VisitCommand(this.plugin), new VisitCommand(this.plugin),
new VisitorsCommand(this.plugin), new VisitorsCommand(this.plugin),
@ -156,12 +156,12 @@ public class CommandManager implements CommandExecutor, TabCompleter {
this.adminCommands = Arrays.asList( this.adminCommands = Arrays.asList(
new AddUpgradeCommand(this.plugin), new AddUpgradeCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.CreateCommand(this.plugin), new CreateCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.DeleteCommand(this.plugin), new DeleteCommand(this.plugin),
new GeneratorCommand(this.plugin), new GeneratorCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.LevelCommand(this.plugin), new LevelCommand(this.plugin),
new LevelScanCommand(this.plugin), new LevelScanCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.OwnerCommand(this.plugin), new OwnerCommand(this.plugin),
new RefreshHologramsCommand(this.plugin), new RefreshHologramsCommand(this.plugin),
new ReloadCommand(this.plugin), new ReloadCommand(this.plugin),
new RemoveHologramCommand(this.plugin), new RemoveHologramCommand(this.plugin),
@ -171,10 +171,10 @@ public class CommandManager implements CommandExecutor, TabCompleter {
new ProxyCommand(this.plugin), new ProxyCommand(this.plugin),
new SetHologramCommand(this.plugin), new SetHologramCommand(this.plugin),
new SetSizeCommand(this.plugin), new SetSizeCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.SetSpawnCommand(this.plugin), new SetSpawnCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.SettingsCommand(this.plugin), new SettingsCommand(this.plugin),
new StructureCommand(this.plugin), new StructureCommand(this.plugin),
new com.songoda.skyblock.command.commands.admin.UpgradeCommand(this.plugin), new UpgradeCommand(this.plugin),
new StackableCommand(this.plugin), new StackableCommand(this.plugin),
new AdminBank(this.plugin), new AdminBank(this.plugin),
new SetMaxMembers(this.plugin), new SetMaxMembers(this.plugin),

4
src/main/java/com/songoda/skyblock/command/SubCommand.java → src/main/java/com/craftaro/skyblock/command/SubCommand.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.command; package com.craftaro.skyblock.command;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permissible;

4
src/main/java/com/songoda/skyblock/command/commands/SkyBlockCommand.java → src/main/java/com/craftaro/skyblock/command/commands/SkyBlockCommand.java
View File

@ -1,6 +1,6 @@
package com.songoda.skyblock.command.commands; package com.craftaro.skyblock.command.commands;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

24
src/main/java/com/songoda/skyblock/command/commands/admin/AddUpgradeCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/AddUpgradeCommand.java
View File

@ -1,18 +1,18 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.command.SubCommand;
import com.craftaro.skyblock.config.FileManager;
import com.craftaro.skyblock.config.FileManager.Config;
import com.craftaro.skyblock.island.Island;
import com.craftaro.skyblock.island.IslandManager;
import com.craftaro.skyblock.message.MessageManager;
import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.craftaro.skyblock.sound.SoundManager;
import com.craftaro.skyblock.upgrade.Upgrade;
import com.craftaro.skyblock.utils.player.OfflinePlayer;
import com.eatthepath.uuid.FastUUID; import com.eatthepath.uuid.FastUUID;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager;
import com.songoda.skyblock.upgrade.Upgrade;
import com.songoda.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

22
src/main/java/com/songoda/skyblock/command/commands/admin/AdminBank.java → src/main/java/com/craftaro/skyblock/command/commands/admin/AdminBank.java
View File

@ -1,18 +1,18 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.hooks.EconomyManager;
import com.craftaro.core.hooks.economies.Economy; import com.craftaro.core.hooks.economies.Economy;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.gui.bank.GuiBank; import com.craftaro.skyblock.gui.bank.GuiBank;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;

22
src/main/java/com/songoda/skyblock/command/commands/admin/ChatSpyCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/ChatSpyCommand.java
View File

@ -1,16 +1,16 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerData; import com.craftaro.skyblock.playerdata.PlayerData;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

12
src/main/java/com/songoda/skyblock/command/commands/admin/CreateCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/CreateCommand.java
View File

@ -1,11 +1,11 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.menus.admin.Creator; import com.craftaro.skyblock.menus.admin.Creator;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

24
src/main/java/com/songoda/skyblock/command/commands/admin/DeleteCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/DeleteCommand.java
View File

@ -1,17 +1,17 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandRole; import com.craftaro.skyblock.island.IslandRole;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import com.songoda.skyblock.utils.world.LocationUtil; import com.craftaro.skyblock.utils.world.LocationUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;

18
src/main/java/com/songoda/skyblock/command/commands/admin/GeneratorCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/GeneratorCommand.java
View File

@ -1,14 +1,14 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.menus.admin.Generator; import com.craftaro.skyblock.menus.admin.Generator;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
src/main/java/com/songoda/skyblock/command/commands/admin/LevelCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/LevelCommand.java
View File

@ -1,10 +1,10 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.menus.admin.Levelling; import com.craftaro.skyblock.menus.admin.Levelling;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

18
src/main/java/com/songoda/skyblock/command/commands/admin/LevelScanCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/LevelScanCommand.java
View File

@ -1,14 +1,14 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.levelling.IslandLevelManager; import com.craftaro.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

18
src/main/java/com/songoda/skyblock/command/commands/admin/OwnerCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/OwnerCommand.java
View File

@ -1,14 +1,14 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

18
src/main/java/com/songoda/skyblock/command/commands/admin/ProxyCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/ProxyCommand.java
View File

@ -1,14 +1,14 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

16
src/main/java/com/songoda/skyblock/command/commands/admin/RefreshHologramsCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/RefreshHologramsCommand.java
View File

@ -1,13 +1,13 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.leaderboard.LeaderboardManager; import com.craftaro.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

28
src/main/java/com/songoda/skyblock/command/commands/admin/ReloadCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/ReloadCommand.java
View File

@ -1,19 +1,19 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.generator.GeneratorManager; import com.craftaro.skyblock.generator.GeneratorManager;
import com.songoda.skyblock.island.reward.RewardManager; import com.craftaro.skyblock.island.reward.RewardManager;
import com.songoda.skyblock.leaderboard.LeaderboardManager; import com.craftaro.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.levelling.IslandLevelManager; import com.craftaro.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.LimitationInstanceHandler; import com.craftaro.skyblock.limit.LimitationInstanceHandler;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.scoreboard.ScoreboardManager; import com.craftaro.skyblock.scoreboard.ScoreboardManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.item.MenuClickRegistry; import com.craftaro.skyblock.utils.item.MenuClickRegistry;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

20
src/main/java/com/songoda/skyblock/command/commands/admin/RemoveHologramCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/RemoveHologramCommand.java
View File

@ -1,15 +1,15 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.hologram.Hologram; import com.craftaro.skyblock.hologram.Hologram;
import com.songoda.skyblock.hologram.HologramType; import com.craftaro.skyblock.hologram.HologramType;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.tasks.HologramTask; import com.craftaro.skyblock.tasks.HologramTask;
import org.apache.commons.lang.WordUtils; import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

24
src/main/java/com/songoda/skyblock/command/commands/admin/RemoveUpgradeCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/RemoveUpgradeCommand.java
View File

@ -1,17 +1,17 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.upgrade.Upgrade; import com.craftaro.skyblock.upgrade.Upgrade;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

22
src/main/java/com/songoda/skyblock/command/commands/admin/SetAlwaysLoadedCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/SetAlwaysLoadedCommand.java
View File

@ -1,16 +1,16 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

28
src/main/java/com/songoda/skyblock/command/commands/admin/SetBiomeCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/SetBiomeCommand.java
View File

@ -1,20 +1,20 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.compatibility.CompatibleBiome; import com.craftaro.core.compatibility.CompatibleBiome;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.biome.BiomeManager; import com.craftaro.skyblock.biome.BiomeManager;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.songoda.skyblock.island.IslandManager; import com.craftaro.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandWorld; import com.craftaro.skyblock.island.IslandWorld;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.utils.StringUtil; import com.craftaro.skyblock.utils.StringUtil;
import com.songoda.skyblock.utils.player.OfflinePlayer; import com.craftaro.skyblock.utils.player.OfflinePlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

20
src/main/java/com/songoda/skyblock/command/commands/admin/SetHologramCommand.java → src/main/java/com/craftaro/skyblock/command/commands/admin/SetHologramCommand.java
View File

@ -1,15 +1,15 @@
package com.songoda.skyblock.command.commands.admin; package com.craftaro.skyblock.command.commands.admin;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
import com.songoda.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.songoda.skyblock.command.SubCommand; import com.craftaro.skyblock.command.SubCommand;
import com.songoda.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.songoda.skyblock.config.FileManager.Config; import com.craftaro.skyblock.config.FileManager.Config;
import com.songoda.skyblock.hologram.Hologram; import com.craftaro.skyblock.hologram.Hologram;
import com.songoda.skyblock.hologram.HologramType; import com.craftaro.skyblock.hologram.HologramType;
import com.songoda.skyblock.message.MessageManager; import com.craftaro.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager; import com.craftaro.skyblock.sound.SoundManager;
import com.songoda.skyblock.tasks.HologramTask; import com.craftaro.skyblock.tasks.HologramTask;
import org.apache.commons.lang.WordUtils; import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;

Some files were not shown because too many files have changed in this diff Show More