Renamed source package to prevent conflict

With towny. (I FINALLY JOINED THE buttondevteam ARMADA)

plugin.yml

@@ -1,4 +1,4 @@
-main: alisolarflare.AliPresents
+main: buttondevteam.AliPresents
 name: AliPresents
 version: 2.0.2
 

src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java

@@ -1,22 +0,0 @@
-package alisolarflare.components.creativeboundaries;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.architecture.Component;
-import alisolarflare.components.creativeboundaries.commands.Cbgm0;
-import alisolarflare.components.creativeboundaries.commands.Cbgm1;
-import alisolarflare.components.creativeboundaries.commands.SetForceBoundaries;
-import alisolarflare.components.creativeboundaries.listeners.PlotChangeListener;
-
-
-public class CreativeBoundariesComponent extends Component{
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new Cbgm1());
-		registerCommand(plugin, new Cbgm0());
-		registerCommand(plugin, new SetForceBoundaries());
-		registerListener(plugin, new PlotChangeListener());
-		//registerListener(plugin, new ItemRestrictionListener(this));
-	}
-	
-}

src/alisolarflare/components/gpowers/GPowerComponent.java

@@ -1,23 +0,0 @@
-package alisolarflare.components.gpowers;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.architecture.Component;
-import alisolarflare.components.gpowers.commands.GPower;
-import alisolarflare.components.gpowers.enchant.EnchantingLoop;
-import alisolarflare.components.gpowers.powerstate.PowerDown;
-import alisolarflare.components.gpowers.powerstate.PowerUp;
-
-public class GPowerComponent extends Component {
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new GPower());
-		registerCommand(plugin, new PowerUp());
-		registerCommand(plugin, new PowerDown());
-
-		registerListener(plugin, new EnchantingLoop(plugin));
-
-	}
-
-}

src/alisolarflare/components/magic/MagicComponent.java

@@ -1,20 +0,0 @@
-package alisolarflare.components.magic;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.architecture.Component;
-import alisolarflare.components.magic.tricks.AliArrowListener;
-import alisolarflare.components.magic.tricks.BoomBowDeathListener;
-import alisolarflare.components.magic.tricks.BoomBowListener;
-import alisolarflare.components.magic.tricks.CannonBowListener;
-
-public class MagicComponent extends Component{
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerListener(plugin, new AliArrowListener(plugin));
-		registerListener(plugin, new BoomBowDeathListener());
-		registerListener(plugin, new BoomBowListener(plugin));
-		registerListener(plugin, new CannonBowListener(plugin));
-	}
-}

src/buttondevteam/alipresents/AliPresents.java

@@ -1,4 +1,4 @@
-package alisolarflare;
+package buttondevteam.alipresents;
 
 import java.util.logging.Logger;
 
@@ -6,16 +6,16 @@ import org.bukkit.plugin.PluginDescriptionFile;
 //import alisolarflare.links.AliLinkSubPlug;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.alilinks.AliLinkComponent;
+import buttondevteam.alipresents.components.alilinks.AliLinkComponent;
-import alisolarflare.components.bankchest.BankChestComponent;
+import buttondevteam.alipresents.components.bankchest.BankChestComponent;
-import alisolarflare.components.cashmob.CashMobComponent;
+import buttondevteam.alipresents.components.cashmob.CashMobComponent;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesComponent;
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
-import alisolarflare.components.fruit.FruitComponent;
+import buttondevteam.alipresents.components.fruit.FruitComponent;
-import alisolarflare.components.gpowers.GPowerComponent;
+import buttondevteam.alipresents.components.gpowers.GPowerComponent;
-import alisolarflare.components.insurance.InsuranceComponent;
+import buttondevteam.alipresents.components.insurance.InsuranceComponent;
-import alisolarflare.components.magic.MagicComponent;
+import buttondevteam.alipresents.components.magic.MagicComponent;
-import alisolarflare.components.spawn.SpawnComponent;
+import buttondevteam.alipresents.components.spawn.SpawnComponent;
 
 public class AliPresents extends JavaPlugin{
 	public void onEnable(){

src/buttondevteam/alipresents/architecture/Component.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture;
+package buttondevteam.alipresents.architecture;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.Listener;

src/buttondevteam/alipresents/architecture/commands/BaseCommand.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands;
+package buttondevteam.alipresents.architecture.commands;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 

src/buttondevteam/alipresents/architecture/commands/ModCommand.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands;
+package buttondevteam.alipresents.architecture.commands;
 
 public abstract class ModCommand extends PlayerCommand{
 

src/buttondevteam/alipresents/architecture/commands/PlayerCommand.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands;
+package buttondevteam.alipresents.architecture.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/buttondevteam/alipresents/architecture/commands/subcommands/ModSubCommand.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands.subcommands;
+package buttondevteam.alipresents.architecture.commands.subcommands;
 
 public abstract class ModSubCommand extends SubCommand{
 	@Override

src/buttondevteam/alipresents/architecture/commands/subcommands/PlayerSubCommand.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands.subcommands;
+package buttondevteam.alipresents.architecture.commands.subcommands;
 
 public abstract class PlayerSubCommand extends SubCommand{
 	@Override

src/buttondevteam/alipresents/architecture/commands/subcommands/SubCommand.java

@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands.subcommands;
+package buttondevteam.alipresents.architecture.commands.subcommands;
 
 import org.bukkit.entity.Player;
 

src/buttondevteam/alipresents/components/alilinks/AliLinkAPI.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.alilinks;
+package buttondevteam.alipresents.components.alilinks;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.alilinks.entities.Link;
+import buttondevteam.alipresents.components.alilinks.entities.Link;
 
 public class AliLinkAPI {
 	private static List<Link> linkList;

src/buttondevteam/alipresents/components/alilinks/AliLinkComponent.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.alilinks;
+package buttondevteam.alipresents.components.alilinks;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
-import alisolarflare.components.alilinks.commands.AliLink;
+import buttondevteam.alipresents.components.alilinks.commands.AliLink;
 
 public class AliLinkComponent extends Component {
 	@Override

src/buttondevteam/alipresents/components/alilinks/commands/AliLink.java

@@ -1,10 +1,10 @@
-package alisolarflare.components.alilinks.commands;
+package buttondevteam.alipresents.components.alilinks.commands;
 
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.alilinks.AliLinkAPI;
+import buttondevteam.alipresents.components.alilinks.AliLinkAPI;
 
 public class AliLink extends PlayerCommand{
 	private JavaPlugin plugin;

src/buttondevteam/alipresents/components/alilinks/entities/Link.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.alilinks.entities;
+package buttondevteam.alipresents.components.alilinks.entities;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.alilinks.tasks.UnpressTask;
+import buttondevteam.alipresents.components.alilinks.tasks.UnpressTask;
 
 public class Link{
 	

src/buttondevteam/alipresents/components/alilinks/tasks/UnpressTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.alilinks.tasks;
+package buttondevteam.alipresents.components.alilinks.tasks;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.bankchest;
+package buttondevteam.alipresents.components.bankchest;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class BankChestComponent extends Component {
 

src/buttondevteam/alipresents/components/bankchest/BankChestListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.bankchest;
+package buttondevteam.alipresents.components.bankchest;
 
 import org.bukkit.event.Listener;
 

src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.bankchest;
+package buttondevteam.alipresents.components.bankchest;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
 
 public class CreateBankChest extends ModCommand {
 

src/buttondevteam/alipresents/components/cashmob/CashMobComponent.java

@@ -1,11 +1,11 @@
-package alisolarflare.components.cashmob;
+package buttondevteam.alipresents.components.cashmob;
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.earth2me.essentials.Essentials;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class CashMobComponent extends Component{
 

src/buttondevteam/alipresents/components/cashmob/MobKillListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.cashmob;
+package buttondevteam.alipresents.components.cashmob;
 
 import java.math.BigDecimal;
 

src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesAPI.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.creativeboundaries;
+package buttondevteam.alipresents.components.creativeboundaries;
 
 import java.util.ArrayList;
 import java.util.List;

src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesComponent.java

@@ -0,0 +1,22 @@
+package buttondevteam.alipresents.components.creativeboundaries;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.creativeboundaries.commands.Cbgm0;
+import buttondevteam.alipresents.components.creativeboundaries.commands.Cbgm1;
+import buttondevteam.alipresents.components.creativeboundaries.commands.SetForceBoundaries;
+import buttondevteam.alipresents.components.creativeboundaries.listeners.PlotChangeListener;
+
+
+public class CreativeBoundariesComponent extends Component{
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new Cbgm1());
+		registerCommand(plugin, new Cbgm0());
+		registerCommand(plugin, new SetForceBoundaries());
+		registerListener(plugin, new PlotChangeListener());
+		//registerListener(plugin, new ItemRestrictionListener(this));
+	}
+	
+}

src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.creativeboundaries.commands;
+package buttondevteam.alipresents.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class Cbgm0 extends PlayerCommand{
 	@Override

src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.creativeboundaries.commands;
+package buttondevteam.alipresents.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class Cbgm1 extends PlayerCommand {
 	@Override

src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.creativeboundaries.commands;
+package buttondevteam.alipresents.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class SetForceBoundaries extends ModCommand{
 	@Override

src/buttondevteam/alipresents/components/creativeboundaries/listeners/PlotChangeListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.creativeboundaries.listeners;
+package buttondevteam.alipresents.components.creativeboundaries.listeners;
 
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -12,7 +12,7 @@ import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownBlock;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
 
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class PlotChangeListener implements Listener{
 	@EventHandler

src/buttondevteam/alipresents/components/flaircolouring/FlairColouringAPI.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring;
+package buttondevteam.alipresents.components.flaircolouring;
 
 import org.bukkit.DyeColor;
 

src/buttondevteam/alipresents/components/flaircolouring/FlairColouringComponent.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring;
+package buttondevteam.alipresents.components.flaircolouring;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,14 +12,14 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import com.earth2me.essentials.Essentials;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
-import alisolarflare.components.flaircolouring.letterdyes.GetLetterDye;
+import buttondevteam.alipresents.components.flaircolouring.letterdyes.GetLetterDye;
-import alisolarflare.components.flaircolouring.letterdyes.LetterDye;
+import buttondevteam.alipresents.components.flaircolouring.letterdyes.LetterDye;
-import alisolarflare.components.flaircolouring.letterdyes.LetterDyeListener;
+import buttondevteam.alipresents.components.flaircolouring.letterdyes.LetterDyeListener;
-import alisolarflare.components.flaircolouring.portals.FlairMe;
+import buttondevteam.alipresents.components.flaircolouring.portals.FlairMe;
-import alisolarflare.components.flaircolouring.portals.PlayerProximityLoop;
+import buttondevteam.alipresents.components.flaircolouring.portals.PlayerProximityLoop;
-import alisolarflare.components.flaircolouring.portals.PortalListener;
+import buttondevteam.alipresents.components.flaircolouring.portals.PortalListener;
-import alisolarflare.components.flaircolouring.portals.SetProximityLocation;
+import buttondevteam.alipresents.components.flaircolouring.portals.SetProximityLocation;
 
 public class FlairColouringComponent extends Component {
 	public List<Player> playersToBeFlaired = new ArrayList<Player>();

src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.flaircolouring.letterdyes;
+package buttondevteam.alipresents.components.flaircolouring.letterdyes;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
 
 public class GetLetterDye extends PlayerCommand{
 	@Override

src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDye.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.letterdyes;
+package buttondevteam.alipresents.components.flaircolouring.letterdyes;
 
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;

src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDyeListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.letterdyes;
+package buttondevteam.alipresents.components.flaircolouring.letterdyes;
 
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
@@ -12,7 +12,7 @@ import org.bukkit.material.Dye;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 
-import alisolarflare.components.flaircolouring.FlairColouringAPI;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringAPI;
 
 public class LetterDyeListener implements Listener{
 	private Essentials essentials;

src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
 
 public class FlairMe extends PlayerCommand {
 

src/buttondevteam/alipresents/components/flaircolouring/portals/PlayerProximityLoop.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
 
 public class PlayerProximityLoop extends BukkitRunnable implements Listener{
 	private static JavaPlugin plugin;

src/buttondevteam/alipresents/components/flaircolouring/portals/PortalListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
@@ -13,8 +13,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import com.earth2me.essentials.Essentials;
 
-import alisolarflare.components.flaircolouring.FlairColouringAPI;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringAPI;
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
 
 public class PortalListener implements Listener{
 	public JavaPlugin plugin;

src/buttondevteam/alipresents/components/flaircolouring/portals/SetProximityLocation.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
 
 public class SetProximityLocation extends ModCommand{
 

src/buttondevteam/alipresents/components/fruit/FruitComponent.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.fruit;
+package buttondevteam.alipresents.components.fruit;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class FruitComponent extends Component{
 

src/buttondevteam/alipresents/components/fruit/GrassBreakListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.fruit;
+package buttondevteam.alipresents.components.fruit;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java

@@ -0,0 +1,23 @@
+package buttondevteam.alipresents.components.gpowers;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.gpowers.commands.GPower;
+import buttondevteam.alipresents.components.gpowers.enchant.EnchantingLoop;
+import buttondevteam.alipresents.components.gpowers.powerstate.PowerDown;
+import buttondevteam.alipresents.components.gpowers.powerstate.PowerUp;
+
+public class GPowerComponent extends Component {
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new GPower());
+		registerCommand(plugin, new PowerUp());
+		registerCommand(plugin, new PowerDown());
+
+		registerListener(plugin, new EnchantingLoop(plugin));
+
+	}
+
+}

src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers;
+package buttondevteam.alipresents.components.gpowers;
 
 import java.util.UUID;
 

src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers.api;
+package buttondevteam.alipresents.components.gpowers.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import alisolarflare.components.gpowers.PoweredPlayer;
+import buttondevteam.alipresents.components.gpowers.PoweredPlayer;
 
 public class GPowerAPI{
 	public static final int defaultPowerLength = 300;

src/buttondevteam/alipresents/components/gpowers/commands/GPower.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.commands;
+package buttondevteam.alipresents.components.gpowers.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class GPower extends PlayerCommand {
 	@Override

src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers.enchant;
+package buttondevteam.alipresents.components.gpowers.enchant;
 
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class EnchantingLoop extends BukkitRunnable implements Listener{
 	private Server server;

src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.powerstate;
+package buttondevteam.alipresents.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class PowerAll extends ModCommand{
 	@Override

src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.powerstate;
+package buttondevteam.alipresents.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class PowerDown extends PlayerCommand {
 	@Override

src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.powerstate;
+package buttondevteam.alipresents.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class PowerUp extends PlayerCommand {
 	@Override

src/buttondevteam/alipresents/components/insurance/Insurance.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import java.util.Arrays;
 import java.util.List;

src/buttondevteam/alipresents/components/insurance/InsuranceComponent.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class InsuranceComponent extends Component {
 

src/buttondevteam/alipresents/components/insurance/getInsurance.java

@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsurance extends ModCommand {
 	private final int defaultAmount = 1;

src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java

@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsuranceBar extends ModCommand {
 

src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java

@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsuranceBlock extends ModCommand {
 

src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java

@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsuranceNugget extends ModCommand {
 

src/buttondevteam/alipresents/components/magic/MagicComponent.java

@@ -0,0 +1,20 @@
+package buttondevteam.alipresents.components.magic;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.magic.tricks.AliArrowListener;
+import buttondevteam.alipresents.components.magic.tricks.BoomBowDeathListener;
+import buttondevteam.alipresents.components.magic.tricks.BoomBowListener;
+import buttondevteam.alipresents.components.magic.tricks.CannonBowListener;
+
+public class MagicComponent extends Component{
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerListener(plugin, new AliArrowListener(plugin));
+		registerListener(plugin, new BoomBowDeathListener());
+		registerListener(plugin, new BoomBowListener(plugin));
+		registerListener(plugin, new CannonBowListener(plugin));
+	}
+}

src/buttondevteam/alipresents/components/magic/tricks/AliArrowListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EntityType;

src/buttondevteam/alipresents/components/magic/tricks/AliArrowTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.Particle;
 import org.bukkit.entity.Arrow;

src/buttondevteam/alipresents/components/magic/tricks/BoomBowDeathListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/buttondevteam/alipresents/components/magic/tricks/BoomBowListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;

src/buttondevteam/alipresents/components/magic/tricks/BoomBowRule.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
 //HEHEHHEHEH EAASSSTER EGGS
 public class BoomBowRule extends ModCommand{
 	public static boolean boomDecay;

src/buttondevteam/alipresents/components/magic/tricks/BoomDecayTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

src/buttondevteam/alipresents/components/magic/tricks/CannonBowListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

src/buttondevteam/alipresents/components/metrics/MetricsComponent.java

@@ -1,14 +1,14 @@
-package alisolarflare.components.metrics;
+package buttondevteam.alipresents.components.metrics;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
-import alisolarflare.components.metrics.collection.PlayerJoinListener;
+import buttondevteam.alipresents.components.metrics.collection.PlayerJoinListener;
-import alisolarflare.components.metrics.files.MetricsFile;
+import buttondevteam.alipresents.components.metrics.files.MetricsFile;
-import alisolarflare.components.metrics.output.GetLoginMetrics;
+import buttondevteam.alipresents.components.metrics.output.GetLoginMetrics;
 
 public class MetricsComponent extends Component{
 	String defaultPath = "src/alisolarflare/resources";

src/buttondevteam/alipresents/components/metrics/collection/PlayerJoinListener.java

@@ -1,11 +1,11 @@
-package alisolarflare.components.metrics.collection;
+package buttondevteam.alipresents.components.metrics.collection;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import alisolarflare.components.metrics.MetricsComponent;
+import buttondevteam.alipresents.components.metrics.MetricsComponent;
-import alisolarflare.components.metrics.files.MetricsFile;
+import buttondevteam.alipresents.components.metrics.files.MetricsFile;
 
 public class PlayerJoinListener implements Listener{
 	

src/buttondevteam/alipresents/components/metrics/files/MetricsFile.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.metrics.files;
+package buttondevteam.alipresents.components.metrics.files;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.metrics.output;
+package buttondevteam.alipresents.components.metrics.output;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -9,8 +9,8 @@ import java.util.List;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
-import alisolarflare.components.metrics.MetricsComponent;
+import buttondevteam.alipresents.components.metrics.MetricsComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 
 public class GetLoginMetrics extends ModCommand{

src/buttondevteam/alipresents/components/spawn/SpawnComponent.java

@@ -1,9 +1,9 @@
-package alisolarflare.components.spawn;
+package buttondevteam.alipresents.components.spawn;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
-import alisolarflare.components.spawn.cows.CowSpawnLoop;
+import buttondevteam.alipresents.components.spawn.cows.CowSpawnLoop;
 
 public class SpawnComponent extends Component {
 

src/buttondevteam/alipresents/components/spawn/cows/CowSpawnLoop.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.spawn.cows;
+package buttondevteam.alipresents.components.spawn.cows;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

src/buttondevteam/alipresents/graveyard/autouhc/UHCModule.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc;
 //package graveyard.autouhc;
 //import org.bukkit.plugin.java.JavaPlugin;
 //

src/buttondevteam/alipresents/graveyard/autouhc/controller/SetMatchState.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.controller;
 //package graveyard.autouhc.controller;
 //
 //import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/autouhc/idle/AddToUHC.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.idle;
 //package graveyard.autouhc.idle;
 //
 //import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/autouhc/idle/JoinUHC.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.idle;
 //package graveyard.autouhc.idle;
 //
 //import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/autouhc/intro/ConfigureMatch.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 //
 //import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/autouhc/intro/IntroductionCutscene.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 ///**@deprecated*/
 //public class IntroductionCutscene {

src/buttondevteam/alipresents/graveyard/autouhc/intro/ScheduleMatch.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 //
 //import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/autouhc/intro/StartMatch.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 //
 //import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchCyclingListener.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.listeners;
 //package graveyard.autouhc.listeners;
 //
 //import org.bukkit.event.Listener;

src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchMainLoop.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.listeners;
 //package graveyard.autouhc.listeners;
 //
 //import org.bukkit.scheduler.BukkitRunnable;

src/buttondevteam/alipresents/graveyard/autouhc/memory/MatchState.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.memory;
 //package graveyard.autouhc.memory;
 ///**@deprecated*/
 //public enum MatchState {

src/buttondevteam/alipresents/graveyard/autouhc/memory/UHCMatch.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.memory;
 //package graveyard.autouhc.memory;
 //
 //import java.util.ArrayList;

src/buttondevteam/alipresents/graveyard/minigames/GameState.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames;
 /*package graveyard.minigames;
 
 public enum GameState {

src/buttondevteam/alipresents/graveyard/minigames/MinigameComponent.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames;
 /*package graveyard.minigames;
 
 import java.util.List;

src/buttondevteam/alipresents/graveyard/minigames/commands/JoinMinigame.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import java.util.List;

src/buttondevteam/alipresents/graveyard/minigames/commands/LeaveMinigame.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import java.util.List;

src/buttondevteam/alipresents/graveyard/minigames/commands/ListFighters.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import org.bukkit.entity.Player;

src/buttondevteam/alipresents/graveyard/minigames/commands/SetColourSpawn.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import org.bukkit.entity.Player;

src/buttondevteam/alipresents/graveyard/minigames/data/SpawnSet.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.data;
 /*package graveyard.minigames.data;
 
 import org.bukkit.Location;

src/buttondevteam/alipresents/graveyard/shulker/AliShulkerModule.java

@@ -1,9 +1,9 @@
-package graveyard.shulker;
+package buttondevteam.alipresents.graveyard.shulker;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
-import graveyard.shulker.commands.AliShulker;
+import buttondevteam.alipresents.graveyard.shulker.commands.AliShulker;
 
 /**@deprecated*/
 public class AliShulkerModule extends Component {

src/buttondevteam/alipresents/graveyard/shulker/SetFlairDoorColour.java

@@ -1,4 +1,4 @@
-package graveyard.shulker;
+package buttondevteam.alipresents.graveyard.shulker;
 
 import java.util.Arrays;
 import java.util.List;

src/buttondevteam/alipresents/graveyard/shulker/commands/AliShulker.java

@@ -1,4 +1,4 @@
-package graveyard.shulker.commands;
+package buttondevteam.alipresents.graveyard.shulker.commands;
 
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth;
 /*package graveyard.thebuttonrebirth;
 
 import java.util.ArrayList;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/admin/CreateShrine.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.admin;
 /*package graveyard.thebuttonrebirth.admin;
 
 import org.bukkit.Material;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/commands/ShowBars.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.commands;
 /*package graveyard.thebuttonrebirth.commands;
 
 import org.bukkit.command.Command;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.listeners;
 /*package graveyard.thebuttonrebirth.listeners;
 
 import org.bukkit.event.Listener;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/MidnightListener.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.listeners;
 /*package graveyard.thebuttonrebirth.listeners;
 
 import org.bukkit.event.Listener;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/StealChestListener.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.listeners;
 /*package graveyard.thebuttonrebirth.listeners;
 
 import org.bukkit.event.Listener;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CheckChestTask.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.tasks;
 //package graveyard.thebuttonrebirth.tasks;
 //
 //import java.time.Clock;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.tasks;
 /*package graveyard.thebuttonrebirth.tasks;
 
 import java.time.Clock;

src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/StealChestTask.java

@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.tasks;
 /*package graveyard.thebuttonrebirth.tasks;
 
 import java.time.Clock;