diff --git a/README.md b/README.md index 6390eaae2..7c1aa2edb 100755 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ BSkyBlock ========== [![Build Status](https://travis-ci.org/tastybento/bskyblock.svg?branch=master)](https://travis-ci.org/tastybento/bskyblock) -A Skyblock Bukkit plugin for Minecraft derived from ASkyBlock! +A Skyblock Bukkit plugin for Minecraft derived from BSkyBlock! This is a survival game where the player starts with an island in the sky. Bugs and Feature requests ========================= -File bug and feature requests here: https://github.com/tastybento/ASkyBlock-Bugs-N-Features/issues +File bug and feature requests here: https://github.com/tastybento/BSkyBlock-Bugs-N-Features/issues Note for developers diff --git a/plugin.yml b/plugin.yml index 1d9e384a3..b2a202933 100755 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ -name: ASkyBlock -main: us.tastybento.askyblock.ASkyBlock +name: BSkyBlock +main: us.tastybento.askyblock.BSkyBlock version: ${version} authors: [Tastybento, Poslovitch] diff --git a/pom.xml b/pom.xml index 1901abcbd..7841c87bc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ jar 0.0.1 BSkyBlock - The next generation of ASkyBlock + The next generation of BSkyBlock UTF-8 @@ -54,8 +54,8 @@ maven-compiler-plugin 3.5 - 1.7 - 1.7 + 1.8 + 1.8 diff --git a/src/main/us/tastybento/askyblock/BSkyBlock.java b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java similarity index 88% rename from src/main/us/tastybento/askyblock/BSkyBlock.java rename to src/main/java/us/tastybento/bskyblock/BSkyBlock.java index 0050ab2a9..5f6281803 100755 --- a/src/main/us/tastybento/askyblock/BSkyBlock.java +++ b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock; +package us.tastybento.bskyblock; import java.util.HashMap; import java.util.UUID; @@ -7,21 +7,21 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import us.tastybento.askyblock.config.ASBLocale; -import us.tastybento.askyblock.config.Settings; -import us.tastybento.askyblock.database.ASBDatabase; -import us.tastybento.askyblock.database.IslandsManager; -import us.tastybento.askyblock.database.OfflineHistoryMessages; -import us.tastybento.askyblock.database.PlayersManager; -import us.tastybento.askyblock.util.VaultHelper; +import us.tastybento.bskyblock.config.ASBLocale; +import us.tastybento.bskyblock.config.Settings; +import us.tastybento.bskyblock.database.ASBDatabase; +import us.tastybento.bskyblock.database.IslandsManager; +import us.tastybento.bskyblock.database.OfflineHistoryMessages; +import us.tastybento.bskyblock.database.PlayersManager; +import us.tastybento.bskyblock.util.VaultHelper; /** - * Main ASkyBlock class - provides an island minigame in the sky + * Main BSkyBlock class - provides an island minigame in the sky * @author Tastybento * @author Poslovitch */ -public class ASkyBlock extends JavaPlugin{ - private static ASkyBlock plugin; +public class BSkyBlock extends JavaPlugin{ + private static BSkyBlock plugin; private HashMap locales = new HashMap(); @@ -122,10 +122,10 @@ public class ASkyBlock extends JavaPlugin{ } /** - * Returns ASkyBlock object instance - * @return ASkyBlock instance + * Returns BSkyBlock object instance + * @return BSkyBlock instance */ - public static ASkyBlock getInstance(){ + public static BSkyBlock getInstance(){ return plugin; } diff --git a/src/main/us/tastybento/askyblock/Metrics.java b/src/main/java/us/tastybento/bskyblock/Metrics.java similarity index 99% rename from src/main/us/tastybento/askyblock/Metrics.java rename to src/main/java/us/tastybento/bskyblock/Metrics.java index adf696613..499f5c738 100755 --- a/src/main/us/tastybento/askyblock/Metrics.java +++ b/src/main/java/us/tastybento/bskyblock/Metrics.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock; +package us.tastybento.bskyblock; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/us/tastybento/askyblock/api/events/acid/EntityDamageByAcidEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/acid/EntityDamageByAcidEvent.java similarity index 94% rename from src/main/us/tastybento/askyblock/api/events/acid/EntityDamageByAcidEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/acid/EntityDamageByAcidEvent.java index 2a4074bfe..227a17cbe 100755 --- a/src/main/us/tastybento/askyblock/api/events/acid/EntityDamageByAcidEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/acid/EntityDamageByAcidEvent.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.api.events.acid; +package us.tastybento.bskyblock.api.events.acid; import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * Fired when an entity (player and items excluded) receives damage from acid diff --git a/src/main/us/tastybento/askyblock/api/events/acid/ItemDestroyByAcidEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/acid/ItemDestroyByAcidEvent.java similarity index 92% rename from src/main/us/tastybento/askyblock/api/events/acid/ItemDestroyByAcidEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/acid/ItemDestroyByAcidEvent.java index 59f2778e8..f276acb68 100755 --- a/src/main/us/tastybento/askyblock/api/events/acid/ItemDestroyByAcidEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/acid/ItemDestroyByAcidEvent.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.api.events.acid; +package us.tastybento.bskyblock.api.events.acid; import org.bukkit.entity.Item; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * Fired when an item (on the ground) gets destroyed by acid diff --git a/src/main/us/tastybento/askyblock/api/events/acid/ItemFillWithAcidEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/acid/ItemFillWithAcidEvent.java similarity index 93% rename from src/main/us/tastybento/askyblock/api/events/acid/ItemFillWithAcidEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/acid/ItemFillWithAcidEvent.java index 47ba767fa..34981d188 100755 --- a/src/main/us/tastybento/askyblock/api/events/acid/ItemFillWithAcidEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/acid/ItemFillWithAcidEvent.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.api.events.acid; +package us.tastybento.bskyblock.api.events.acid; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; @@ -6,7 +6,7 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * Fired when an ItemStack (water bottle or bucket) is filled with acid diff --git a/src/main/us/tastybento/askyblock/api/events/acid/PlayerDamageByAcidEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/acid/PlayerDamageByAcidEvent.java similarity index 95% rename from src/main/us/tastybento/askyblock/api/events/acid/PlayerDamageByAcidEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/acid/PlayerDamageByAcidEvent.java index 2213c2be8..309399938 100755 --- a/src/main/us/tastybento/askyblock/api/events/acid/PlayerDamageByAcidEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/acid/PlayerDamageByAcidEvent.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.api.events.acid; +package us.tastybento.bskyblock.api.events.acid; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * Fired when a player receives damage from acid diff --git a/src/main/us/tastybento/askyblock/api/events/acid/PlayerDrinkAcidEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/acid/PlayerDrinkAcidEvent.java similarity index 92% rename from src/main/us/tastybento/askyblock/api/events/acid/PlayerDrinkAcidEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/acid/PlayerDrinkAcidEvent.java index 655832b4c..f2932a352 100755 --- a/src/main/us/tastybento/askyblock/api/events/acid/PlayerDrinkAcidEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/acid/PlayerDrinkAcidEvent.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.api.events.acid; +package us.tastybento.bskyblock.api.events.acid; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * Fired when a player drinks acid and... DIES diff --git a/src/main/us/tastybento/askyblock/api/events/island/IslandLockEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/island/IslandLockEvent.java similarity index 90% rename from src/main/us/tastybento/askyblock/api/events/island/IslandLockEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/island/IslandLockEvent.java index a9fab8d5d..bb32f9927 100755 --- a/src/main/us/tastybento/askyblock/api/events/island/IslandLockEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/island/IslandLockEvent.java @@ -1,10 +1,10 @@ -package us.tastybento.askyblock.api.events.island; +package us.tastybento.bskyblock.api.events.island; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * This event is fired when an island is going to be locked. diff --git a/src/main/us/tastybento/askyblock/api/events/island/IslandUnlockEvent.java b/src/main/java/us/tastybento/bskyblock/api/events/island/IslandUnlockEvent.java similarity index 90% rename from src/main/us/tastybento/askyblock/api/events/island/IslandUnlockEvent.java rename to src/main/java/us/tastybento/bskyblock/api/events/island/IslandUnlockEvent.java index 416fe5052..78a51758d 100755 --- a/src/main/us/tastybento/askyblock/api/events/island/IslandUnlockEvent.java +++ b/src/main/java/us/tastybento/bskyblock/api/events/island/IslandUnlockEvent.java @@ -1,10 +1,10 @@ -package us.tastybento.askyblock.api.events.island; +package us.tastybento.bskyblock.api.events.island; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Island; /** * This event is fired when an island is going to be unlocked. diff --git a/src/main/us/tastybento/askyblock/commands/ASBCommand.java b/src/main/java/us/tastybento/bskyblock/commands/ASBCommand.java similarity index 97% rename from src/main/us/tastybento/askyblock/commands/ASBCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/ASBCommand.java index 0bc876e32..9cc80aaff 100755 --- a/src/main/us/tastybento/askyblock/commands/ASBCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/ASBCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.commands; +package us.tastybento.bskyblock.commands; import java.util.ArrayList; import java.util.Arrays; @@ -12,8 +12,8 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.util.Util; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.util.Util; /** * Abstract class that handles commands and tabs. It makes the commands code modular @@ -24,7 +24,7 @@ import us.tastybento.askyblock.util.Util; public abstract class ASBCommand implements CommandExecutor, TabCompleter{ private Map arguments; - protected ASBCommand(ASkyBlock plugin){ + protected ASBCommand(BSkyBlock plugin){ arguments = new HashMap(); // Automatically register the help argument diff --git a/src/main/us/tastybento/askyblock/commands/AdminCommand.java b/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java similarity index 81% rename from src/main/us/tastybento/askyblock/commands/AdminCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java index bdd1846d0..f71b5d58c 100755 --- a/src/main/us/tastybento/askyblock/commands/AdminCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java @@ -1,12 +1,12 @@ -package us.tastybento.askyblock.commands; +package us.tastybento.bskyblock.commands; import org.bukkit.command.CommandSender; -import us.tastybento.askyblock.ASkyBlock; +import us.tastybento.bskyblock.BSkyBlock; public class AdminCommand extends ASBCommand{ - public AdminCommand(ASkyBlock plugin) { + public AdminCommand(BSkyBlock plugin) { super(plugin); // TODO Auto-generated constructor stub } diff --git a/src/main/us/tastybento/askyblock/commands/IslandCommand.java b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java similarity index 99% rename from src/main/us/tastybento/askyblock/commands/IslandCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java index 4c57dec1a..f17dd075a 100755 --- a/src/main/us/tastybento/askyblock/commands/IslandCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.commands; +package us.tastybento.bskyblock.commands; import java.util.List; @@ -6,11 +6,11 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.config.Settings; -import us.tastybento.askyblock.database.objects.Island; -import us.tastybento.askyblock.util.Util; -import us.tastybento.askyblock.util.VaultHelper; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.config.Settings; +import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.util.Util; +import us.tastybento.bskyblock.util.VaultHelper; /** * "/island" command @@ -19,9 +19,9 @@ import us.tastybento.askyblock.util.VaultHelper; * @author Poslovitch */ public class IslandCommand extends ASBCommand{ - private ASkyBlock plugin; + private BSkyBlock plugin; - public IslandCommand(ASkyBlock plugin) { + public IslandCommand(BSkyBlock plugin) { super(plugin); this.plugin = plugin; } diff --git a/src/main/us/tastybento/askyblock/commands/NotSetup.java b/src/main/java/us/tastybento/bskyblock/commands/NotSetup.java similarity index 89% rename from src/main/us/tastybento/askyblock/commands/NotSetup.java rename to src/main/java/us/tastybento/bskyblock/commands/NotSetup.java index 45545234d..0fa5ac1d4 100755 --- a/src/main/us/tastybento/askyblock/commands/NotSetup.java +++ b/src/main/java/us/tastybento/bskyblock/commands/NotSetup.java @@ -1,12 +1,12 @@ -package us.tastybento.askyblock.commands; +package us.tastybento.bskyblock.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.util.Util; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.util.Util; /** * This class runs when the config file is not set up enough, or is unsafe. @@ -20,7 +20,7 @@ public class NotSetup implements CommandExecutor{ DISTANCE, GENERATOR, WORLD_NAME, OUTDATED; } - private ASkyBlock plugin; + private BSkyBlock plugin; private Reason reason; /** @@ -28,7 +28,7 @@ public class NotSetup implements CommandExecutor{ * * @param reason */ - public NotSetup(ASkyBlock plugin, Reason reason){ + public NotSetup(BSkyBlock plugin, Reason reason){ this.reason = reason; } diff --git a/src/main/us/tastybento/askyblock/config/ASBLocale.java b/src/main/java/us/tastybento/bskyblock/config/ASBLocale.java similarity index 97% rename from src/main/us/tastybento/askyblock/config/ASBLocale.java rename to src/main/java/us/tastybento/bskyblock/config/ASBLocale.java index f7dc2c3db..3a359b2e7 100755 --- a/src/main/us/tastybento/askyblock/config/ASBLocale.java +++ b/src/main/java/us/tastybento/bskyblock/config/ASBLocale.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.config; +package us.tastybento.bskyblock.config; import java.io.File; import java.util.Locale; @@ -7,7 +7,7 @@ import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import us.tastybento.askyblock.ASkyBlock; +import us.tastybento.bskyblock.BSkyBlock; /** * Contains all the texts sent to players @@ -17,7 +17,7 @@ import us.tastybento.askyblock.ASkyBlock; */ public class ASBLocale { - private ASkyBlock plugin; + private BSkyBlock plugin; private String localeID; private FileConfiguration locale = null; @@ -29,7 +29,7 @@ public class ASBLocale { * @param plugin * @param localeName - name of the yaml file that will be used */ - public ASBLocale(ASkyBlock plugin, String localeID){ + public ASBLocale(BSkyBlock plugin, String localeID){ this.plugin = plugin; this.localeID = localeID; getLocale(localeID); diff --git a/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java b/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java new file mode 100755 index 000000000..fdbdc64cf --- /dev/null +++ b/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java @@ -0,0 +1,5 @@ +package us.tastybento.bskyblock.config; + +public class PluginConfig { + +} diff --git a/src/main/us/tastybento/askyblock/config/Settings.java b/src/main/java/us/tastybento/bskyblock/config/Settings.java similarity index 82% rename from src/main/us/tastybento/askyblock/config/Settings.java rename to src/main/java/us/tastybento/bskyblock/config/Settings.java index 498ddd5fa..478a42f79 100755 --- a/src/main/us/tastybento/askyblock/config/Settings.java +++ b/src/main/java/us/tastybento/bskyblock/config/Settings.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.config; +package us.tastybento.bskyblock.config; import java.util.HashMap; import java.util.List; -import us.tastybento.askyblock.database.ASBDatabase.DatabaseType; -import us.tastybento.askyblock.database.OfflineHistoryMessages.HistoryMessageType; -import us.tastybento.askyblock.database.objects.Island.SettingsFlag; +import us.tastybento.bskyblock.database.ASBDatabase.DatabaseType; +import us.tastybento.bskyblock.database.OfflineHistoryMessages.HistoryMessageType; +import us.tastybento.bskyblock.database.objects.Island.SettingsFlag; /** * All the plugin settings are here diff --git a/src/main/us/tastybento/askyblock/database/ASBDatabase.java b/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java similarity index 73% rename from src/main/us/tastybento/askyblock/database/ASBDatabase.java rename to src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java index 4fb5ff3ff..298e478ab 100755 --- a/src/main/us/tastybento/askyblock/database/ASBDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java @@ -1,15 +1,15 @@ -package us.tastybento.askyblock.database; +package us.tastybento.bskyblock.database; import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.askyblock.config.Settings; -import us.tastybento.askyblock.database.flatfile.FlatFileDatabase; -import us.tastybento.askyblock.database.mysql.MySQLDatabase; -import us.tastybento.askyblock.database.objects.Island; -import us.tastybento.askyblock.database.objects.Player; -import us.tastybento.askyblock.database.sqlite.SQLiteDatabase; +import us.tastybento.bskyblock.config.Settings; +import us.tastybento.bskyblock.database.flatfile.FlatFileDatabase; +import us.tastybento.bskyblock.database.mysql.MySQLDatabase; +import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Player; +import us.tastybento.bskyblock.database.sqlite.SQLiteDatabase; public abstract class ASBDatabase { diff --git a/src/main/us/tastybento/askyblock/database/IslandsManager.java b/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java similarity index 90% rename from src/main/us/tastybento/askyblock/database/IslandsManager.java rename to src/main/java/us/tastybento/bskyblock/database/IslandsManager.java index 4c3604a71..0edb71da6 100755 --- a/src/main/us/tastybento/askyblock/database/IslandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/IslandsManager.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.database; +package us.tastybento.bskyblock.database; import java.util.HashMap; import java.util.Map.Entry; @@ -6,12 +6,12 @@ import java.util.UUID; import org.bukkit.Location; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.database.objects.Island; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.database.objects.Island; public class IslandsManager { - private ASkyBlock plugin; + private BSkyBlock plugin; private ASBDatabase database; private HashMap islands; @@ -20,7 +20,7 @@ public class IslandsManager { // Metrics data private int metrics_createdcount = 0; - public IslandsManager(ASkyBlock plugin){ + public IslandsManager(BSkyBlock plugin){ this.plugin = plugin; database = ASBDatabase.getDatabase(); islands = new HashMap(); diff --git a/src/main/us/tastybento/askyblock/database/OfflineHistoryMessages.java b/src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java similarity index 93% rename from src/main/us/tastybento/askyblock/database/OfflineHistoryMessages.java rename to src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java index db9329843..1248e8289 100755 --- a/src/main/us/tastybento/askyblock/database/OfflineHistoryMessages.java +++ b/src/main/java/us/tastybento/bskyblock/database/OfflineHistoryMessages.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.database; +package us.tastybento.bskyblock.database; import java.util.ArrayList; import java.util.Arrays; @@ -8,8 +8,8 @@ import java.util.UUID; import org.bukkit.entity.Player; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.config.Settings; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.config.Settings; /** * Handles offline messaging to players and teams @@ -17,13 +17,13 @@ import us.tastybento.askyblock.config.Settings; * @author Tastybento */ public class OfflineHistoryMessages { - private ASkyBlock plugin; + private BSkyBlock plugin; private ASBDatabase database; // Offline Messages private HashMap> messages; - public OfflineHistoryMessages(ASkyBlock plugin){ + public OfflineHistoryMessages(BSkyBlock plugin){ this.plugin = plugin; database = ASBDatabase.getDatabase(); messages = new HashMap>(); diff --git a/src/main/us/tastybento/askyblock/database/PlayersManager.java b/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java similarity index 84% rename from src/main/us/tastybento/askyblock/database/PlayersManager.java rename to src/main/java/us/tastybento/bskyblock/database/PlayersManager.java index 1eff47468..7d47ecf54 100755 --- a/src/main/us/tastybento/askyblock/database/PlayersManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java @@ -1,20 +1,20 @@ -package us.tastybento.askyblock.database; +package us.tastybento.bskyblock.database; import java.util.HashMap; import java.util.Map.Entry; import java.util.UUID; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.database.objects.Player; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.database.objects.Player; public class PlayersManager{ - private ASkyBlock plugin; + private BSkyBlock plugin; private ASBDatabase database; private HashMap players; - public PlayersManager(ASkyBlock plugin){ + public PlayersManager(BSkyBlock plugin){ this.plugin = plugin; database = ASBDatabase.getDatabase(); players = new HashMap(); diff --git a/src/main/us/tastybento/askyblock/database/flatfile/FlatFileDatabase.java b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java similarity index 81% rename from src/main/us/tastybento/askyblock/database/flatfile/FlatFileDatabase.java rename to src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java index 755918646..ae527ab94 100755 --- a/src/main/us/tastybento/askyblock/database/flatfile/FlatFileDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java @@ -1,12 +1,12 @@ -package us.tastybento.askyblock.database.flatfile; +package us.tastybento.bskyblock.database.flatfile; import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.askyblock.database.ASBDatabase; -import us.tastybento.askyblock.database.objects.Island; -import us.tastybento.askyblock.database.objects.Player; +import us.tastybento.bskyblock.database.ASBDatabase; +import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Player; public class FlatFileDatabase extends ASBDatabase{ diff --git a/src/main/us/tastybento/askyblock/database/mysql/MySQLDatabase.java b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java similarity index 81% rename from src/main/us/tastybento/askyblock/database/mysql/MySQLDatabase.java rename to src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java index 932126a05..be945f04b 100755 --- a/src/main/us/tastybento/askyblock/database/mysql/MySQLDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java @@ -1,12 +1,12 @@ -package us.tastybento.askyblock.database.mysql; +package us.tastybento.bskyblock.database.mysql; import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.askyblock.database.ASBDatabase; -import us.tastybento.askyblock.database.objects.Island; -import us.tastybento.askyblock.database.objects.Player; +import us.tastybento.bskyblock.database.ASBDatabase; +import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Player; public class MySQLDatabase extends ASBDatabase{ diff --git a/src/main/us/tastybento/askyblock/database/objects/Island.java b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java similarity index 97% rename from src/main/us/tastybento/askyblock/database/objects/Island.java rename to src/main/java/us/tastybento/bskyblock/database/objects/Island.java index 507082857..00d4307cd 100755 --- a/src/main/us/tastybento/askyblock/database/objects/Island.java +++ b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.database.objects; +package us.tastybento.bskyblock.database.objects; import java.util.HashMap; import java.util.List; @@ -6,10 +6,10 @@ import java.util.UUID; import org.bukkit.Location; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.api.events.island.IslandLockEvent; -import us.tastybento.askyblock.api.events.island.IslandUnlockEvent; -import us.tastybento.askyblock.config.Settings; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.api.events.island.IslandLockEvent; +import us.tastybento.bskyblock.api.events.island.IslandUnlockEvent; +import us.tastybento.bskyblock.config.Settings; /** * Stores all the info about an island @@ -19,7 +19,7 @@ import us.tastybento.askyblock.config.Settings; * @author Poslovitch */ public class Island { - private ASkyBlock plugin; + private BSkyBlock plugin; //// Island //// // The center of the island itself @@ -56,7 +56,7 @@ public class Island { //// Protection //// private HashMap flags = new HashMap(); - public Island(ASkyBlock plugin, int x, int z, UUID owner){ + public Island(BSkyBlock plugin, int x, int z, UUID owner){ } diff --git a/src/main/us/tastybento/askyblock/database/objects/Player.java b/src/main/java/us/tastybento/bskyblock/database/objects/Player.java similarity index 97% rename from src/main/us/tastybento/askyblock/database/objects/Player.java rename to src/main/java/us/tastybento/bskyblock/database/objects/Player.java index 265225036..8c304de84 100755 --- a/src/main/us/tastybento/askyblock/database/objects/Player.java +++ b/src/main/java/us/tastybento/bskyblock/database/objects/Player.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.database.objects; +package us.tastybento.bskyblock.database.objects; import java.util.HashMap; import java.util.UUID; import org.bukkit.Location; -import us.tastybento.askyblock.config.Settings; +import us.tastybento.bskyblock.config.Settings; /** * Tracks info on the player, recognized by his UUID diff --git a/src/main/us/tastybento/askyblock/database/sqlite/SQLiteDatabase.java b/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java similarity index 81% rename from src/main/us/tastybento/askyblock/database/sqlite/SQLiteDatabase.java rename to src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java index 51f9d6918..783a38519 100755 --- a/src/main/us/tastybento/askyblock/database/sqlite/SQLiteDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java @@ -1,12 +1,12 @@ -package us.tastybento.askyblock.database.sqlite; +package us.tastybento.bskyblock.database.sqlite; import java.util.HashMap; import java.util.List; import java.util.UUID; -import us.tastybento.askyblock.database.ASBDatabase; -import us.tastybento.askyblock.database.objects.Island; -import us.tastybento.askyblock.database.objects.Player; +import us.tastybento.bskyblock.database.ASBDatabase; +import us.tastybento.bskyblock.database.objects.Island; +import us.tastybento.bskyblock.database.objects.Player; public class SQLiteDatabase extends ASBDatabase{ diff --git a/src/main/us/tastybento/askyblock/util/FileLister.java b/src/main/java/us/tastybento/bskyblock/util/FileLister.java similarity index 75% rename from src/main/us/tastybento/askyblock/util/FileLister.java rename to src/main/java/us/tastybento/bskyblock/util/FileLister.java index ec5660759..04382964d 100755 --- a/src/main/us/tastybento/askyblock/util/FileLister.java +++ b/src/main/java/us/tastybento/bskyblock/util/FileLister.java @@ -1,19 +1,19 @@ -package us.tastybento.askyblock.util; +package us.tastybento.bskyblock.util; import java.io.File; import java.util.ArrayList; import java.util.List; -import us.tastybento.askyblock.ASkyBlock; +import us.tastybento.bskyblock.BSkyBlock; /** * @author Tastybento * @author Poslovitch */ public class FileLister{ - private ASkyBlock plugin; + private BSkyBlock plugin; - public FileLister(ASkyBlock plugin){ + public FileLister(BSkyBlock plugin){ this.plugin = plugin; } diff --git a/src/main/us/tastybento/askyblock/util/Util.java b/src/main/java/us/tastybento/bskyblock/util/Util.java similarity index 91% rename from src/main/us/tastybento/askyblock/util/Util.java rename to src/main/java/us/tastybento/bskyblock/util/Util.java index bd16c5167..26dd439d7 100755 --- a/src/main/us/tastybento/askyblock/util/Util.java +++ b/src/main/java/us/tastybento/bskyblock/util/Util.java @@ -1,12 +1,12 @@ -package us.tastybento.askyblock.util; +package us.tastybento.bskyblock.util; import java.lang.reflect.InvocationTargetException; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import us.tastybento.askyblock.ASkyBlock; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * A set of utility methods @@ -15,7 +15,7 @@ import us.tastybento.askyblock.util.nms.NMSAbstraction; * @author Poslovitch */ public class Util { - private static ASkyBlock plugin = ASkyBlock.getInstance(); + private static BSkyBlock plugin = BSkyBlock.getInstance(); public static void sendMessage(CommandSender sender, String message){ if (!ChatColor.stripColor(message).trim().isEmpty()) { diff --git a/src/main/us/tastybento/askyblock/util/VaultHelper.java b/src/main/java/us/tastybento/bskyblock/util/VaultHelper.java similarity index 93% rename from src/main/us/tastybento/askyblock/util/VaultHelper.java rename to src/main/java/us/tastybento/bskyblock/util/VaultHelper.java index c567d42e8..aed87690d 100755 --- a/src/main/us/tastybento/askyblock/util/VaultHelper.java +++ b/src/main/java/us/tastybento/bskyblock/util/VaultHelper.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.util; +package us.tastybento.bskyblock.util; import org.bukkit.World; import org.bukkit.entity.Player; @@ -6,7 +6,7 @@ import org.bukkit.plugin.RegisteredServiceProvider; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; -import us.tastybento.askyblock.ASkyBlock; +import us.tastybento.bskyblock.BSkyBlock; /** * Helper class for Vault Economy and Permissions @@ -23,7 +23,7 @@ public class VaultHelper { * * @return true if successful */ - public static boolean setupEconomy(ASkyBlock plugin) { + public static boolean setupEconomy(BSkyBlock plugin) { RegisteredServiceProvider economyProvider = plugin.getServer().getServicesManager() .getRegistration(Economy.class); if (economyProvider != null) { @@ -37,7 +37,7 @@ public class VaultHelper { * * @return true if successful */ - public static boolean setupPermissions(ASkyBlock plugin) { + public static boolean setupPermissions(BSkyBlock plugin) { RegisteredServiceProvider permissionProvider = plugin.getServer().getServicesManager() .getRegistration(Permission.class); if (permissionProvider != null) { diff --git a/src/main/us/tastybento/askyblock/util/nms/NMSAbstraction.java b/src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java similarity index 85% rename from src/main/us/tastybento/askyblock/util/nms/NMSAbstraction.java rename to src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java index e7d48dd29..0a6fd2501 100755 --- a/src/main/us/tastybento/askyblock/util/nms/NMSAbstraction.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java @@ -1,4 +1,4 @@ -package us.tastybento.askyblock.util.nms; +package us.tastybento.bskyblock.util.nms; import org.bukkit.entity.Player; diff --git a/src/main/us/tastybento/askyblock/util/nms/fallback/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java similarity index 83% rename from src/main/us/tastybento/askyblock/util/nms/fallback/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java index 8e25964c5..7a4c31960 100755 --- a/src/main/us/tastybento/askyblock/util/nms/fallback/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java @@ -1,11 +1,11 @@ -package us.tastybento.askyblock.util.nms.fallback; +package us.tastybento.bskyblock.util.nms.fallback; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** - * A fallback NMS Handler when the NMS version is not supported by ASkyBlock + * A fallback NMS Handler when the NMS version is not supported by BSkyBlock * * @author Tastybento * @author Poslovitch diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_10_R1/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_10_R1/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_10_R1/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_10_R1/NMSHandler.java index 03d2a55ff..3687183cf 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_10_R1/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_10_R1/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_10_R1; +package us.tastybento.bskyblock.util.nms.v1_10_R1; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_10_R1 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_11_R1/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_11_R1/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_11_R1/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_11_R1/NMSHandler.java index f68b11b21..d50b31844 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_11_R1/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_11_R1/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_11_R1; +package us.tastybento.bskyblock.util.nms.v1_11_R1; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_11_R1 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_12_R1/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_12_R1/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java index 46c7aeeee..9c64c6369 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_12_R1/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_12_R1; +package us.tastybento.bskyblock.util.nms.v1_12_R1; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_12_R1 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_7_R3/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_7_R3/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_7_R3/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_7_R3/NMSHandler.java index dda906850..2bb94e7be 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_7_R3/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_7_R3/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_7_R3; +package us.tastybento.bskyblock.util.nms.v1_7_R3; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_7_R3 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_7_R4/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_7_R4/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_7_R4/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_7_R4/NMSHandler.java index 0156bc40e..135c841e0 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_7_R4/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_7_R4/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_7_R4; +package us.tastybento.bskyblock.util.nms.v1_7_R4; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_7_R4 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_8_R1/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R1/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_8_R1/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R1/NMSHandler.java index feb955b22..a2f9fcd00 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_8_R1/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R1/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_8_R1; +package us.tastybento.bskyblock.util.nms.v1_8_R1; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_8_R1 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_8_R2/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R2/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_8_R2/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R2/NMSHandler.java index 5c54ec144..c4d51d632 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_8_R2/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R2/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_8_R2; +package us.tastybento.bskyblock.util.nms.v1_8_R2; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_8_R2 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_8_R3/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R3/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_8_R3/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R3/NMSHandler.java index 8ba278fad..30c4b787c 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_8_R3/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_8_R3/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_8_R3; +package us.tastybento.bskyblock.util.nms.v1_8_R3; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_8_R3 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_9_R1/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_9_R1/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_9_R1/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_9_R1/NMSHandler.java index ab236820f..e9202bc3d 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_9_R1/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_9_R1/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_9_R1; +package us.tastybento.bskyblock.util.nms.v1_9_R1; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_9_R1 diff --git a/src/main/us/tastybento/askyblock/util/nms/v1_9_R2/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_9_R2/NMSHandler.java similarity index 84% rename from src/main/us/tastybento/askyblock/util/nms/v1_9_R2/NMSHandler.java rename to src/main/java/us/tastybento/bskyblock/util/nms/v1_9_R2/NMSHandler.java index 6e3d98acc..b05b63d65 100755 --- a/src/main/us/tastybento/askyblock/util/nms/v1_9_R2/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_9_R2/NMSHandler.java @@ -1,8 +1,8 @@ -package us.tastybento.askyblock.util.nms.v1_9_R2; +package us.tastybento.bskyblock.util.nms.v1_9_R2; import org.bukkit.entity.Player; -import us.tastybento.askyblock.util.nms.NMSAbstraction; +import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** * NMS Handler for v1_9_R2 diff --git a/src/main/us/tastybento/askyblock/config/PluginConfig.java b/src/main/us/tastybento/askyblock/config/PluginConfig.java deleted file mode 100755 index 5225e8dd0..000000000 --- a/src/main/us/tastybento/askyblock/config/PluginConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -package us.tastybento.askyblock.config; - -public class PluginConfig { - -}