Changed a bit of architecture

src/alisolarflare/architecture/Component.java

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

src/alisolarflare/architecture/commands/BaseCommand.java

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

src/alisolarflare/architecture/commands/ModCommand.java

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

src/alisolarflare/architecture/commands/PlayerCommand.java

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

src/alisolarflare/components/alilinks/AliLinkComponent.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import org.bukkit.Server;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import alisolarflare.components.alilinks.commands.PressAliLink;
 import alisolarflare.components.alilinks.commands.SetAliLink;
 import alisolarflare.components.alilinks.entities.Link;

src/alisolarflare/components/alilinks/commands/PressAliLink.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.alilinks.entities.Link;
 
 public class PressAliLink extends PlayerCommand {

src/alisolarflare/components/alilinks/commands/SetAliLink.java

@@ -8,7 +8,7 @@ import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.alilinks.entities.Link;
 
 public class SetAliLink extends PlayerCommand {

src/alisolarflare/components/bankchest/BankChestComponent.java

@@ -2,7 +2,7 @@ package alisolarflare.components.bankchest;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 
 public class BankChestComponent extends Component {
 

src/alisolarflare/components/bankchest/CreateBankChest.java

@@ -2,7 +2,7 @@ package alisolarflare.components.bankchest;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class CreateBankChest extends ModCommand {
 

src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java

@@ -6,7 +6,7 @@ import java.util.List;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import alisolarflare.components.creativeboundaries.commands.Cbgm0;
 import alisolarflare.components.creativeboundaries.commands.Cbgm1;
 import alisolarflare.components.creativeboundaries.commands.SetDickmode;

src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
 
 public class Cbgm0 extends PlayerCommand{

src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java

@@ -11,7 +11,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.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
 
 public class Cbgm1 extends PlayerCommand {

src/alisolarflare/components/creativeboundaries/commands/SetDickmode.java

@@ -2,7 +2,7 @@ package alisolarflare.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
 
 public class SetDickmode extends ModCommand{

src/alisolarflare/components/easyuhc/EasyUHCComponent.java

@@ -3,7 +3,7 @@ package alisolarflare.components.easyuhc;
 import org.bukkit.Location;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import alisolarflare.components.easyuhc.commands.ActivatePowers;
 import alisolarflare.components.easyuhc.commands.SetUHCLobby;
 import alisolarflare.components.easyuhc.commands.SetWorldBorders;

src/alisolarflare/components/easyuhc/commands/ActivatePowers.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class ActivatePowers extends ModCommand{
 	

src/alisolarflare/components/easyuhc/commands/SetUHCLobby.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.easyuhc.EasyUHCComponent;
 
 public class SetUHCLobby extends ModCommand{

src/alisolarflare/components/easyuhc/commands/SetWorldBorders.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class SetWorldBorders extends ModCommand {
 	

src/alisolarflare/components/easyuhc/commands/ShrinkWorldBorders.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class ShrinkWorldBorders extends ModCommand {
 

src/alisolarflare/components/easyuhc/commands/SpreadPlayers.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class SpreadPlayers extends ModCommand{
 

src/alisolarflare/components/easyuhc/commands/StartTimer.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class StartTimer extends ModCommand{
 

src/alisolarflare/components/easyuhc/commands/StartUHC.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 
 public class StartUHC extends ModCommand{
 

src/alisolarflare/components/easyuhc/commands/TeleportToUHC.java

@@ -2,7 +2,7 @@ package alisolarflare.components.easyuhc.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 
 public class TeleportToUHC extends PlayerCommand{
 

src/alisolarflare/components/flairdoor/FlairDoorComponent.java

@@ -7,11 +7,11 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
-import alisolarflare.components.flairdoor.commands.FlairMe;
-import alisolarflare.components.flairdoor.commands.SetProximityLocation;
-import alisolarflare.components.flairdoor.listeners.PlayerProximityTaskLauncher;
+import alisolarflare.architecture.Component;
+import alisolarflare.components.flairdoor.flairme.FlairMe;
 import alisolarflare.components.flairdoor.listeners.PortalListener;
+import alisolarflare.components.flairdoor.playerproximity.PlayerProximityTaskLauncher;
+import alisolarflare.components.flairdoor.playerproximity.SetProximityLocation;
 
 public class FlairDoorComponent extends Component {
 	public List<Player> playersToBeFlaired = new ArrayList<Player>();

src/alisolarflare/components/flairdoor/flairme/FlairMe.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.flairdoor.commands;
+package alisolarflare.components.flairdoor.flairme;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.flairdoor.FlairDoorComponent;
 
 public class FlairMe extends PlayerCommand {

src/alisolarflare/components/flairdoor/playerproximity/PlayerProximityTask.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flairdoor.listeners;
+package alisolarflare.components.flairdoor.playerproximity;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

src/alisolarflare/components/flairdoor/playerproximity/PlayerProximityTaskLauncher.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.flairdoor.listeners;
+package alisolarflare.components.flairdoor.playerproximity;
 
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;

src/alisolarflare/components/flairdoor/playerproximity/SetProximityLocation.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.flairdoor.commands;
+package alisolarflare.components.flairdoor.playerproximity;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.flairdoor.FlairDoorComponent;
 
 public class SetProximityLocation extends ModCommand{

src/alisolarflare/components/gpowers/GPowerComponent.java

@@ -2,11 +2,11 @@ package alisolarflare.components.gpowers;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import alisolarflare.components.gpowers.commands.GPower;
-import alisolarflare.components.gpowers.commands.PowerDown;
-import alisolarflare.components.gpowers.commands.PowerUp;
-import alisolarflare.components.gpowers.listeners.gPowerListener;
+import alisolarflare.components.gpowers.enchant.Enchanter;
+import alisolarflare.components.gpowers.powerstate.PowerDown;
+import alisolarflare.components.gpowers.powerstate.PowerUp;
 
 public class GPowerComponent extends Component {
 
@@ -17,7 +17,7 @@ public class GPowerComponent extends Component {
 		registerCommand(plugin, new PowerUp(gPowerMemory));
 		registerCommand(plugin, new PowerDown(gPowerMemory));
 
-		registerListener(plugin, new gPowerListener(plugin, gPowerMemory));
+		registerListener(plugin, new Enchanter(plugin, gPowerMemory));
 
 	}
 

src/alisolarflare/components/gpowers/commands/GPower.java

@@ -2,7 +2,7 @@ package alisolarflare.components.gpowers.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.gpowers.GPowerMemory;
 
 public class GPower extends PlayerCommand {

src/alisolarflare/components/gpowers/enchant/Enchanter.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers.listeners;
+package alisolarflare.components.gpowers.enchant;
 
 import java.util.Map;
 import java.util.UUID;
@@ -6,20 +6,25 @@ import java.util.UUID;
 import org.bukkit.Color;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import alisolarflare.components.gpowers.GPowerMemory;
 import alisolarflare.components.gpowers.GPowerMemory.poweredPlayer;
 
-public class gPowerApplyingTask extends BukkitRunnable{
+public class Enchanter extends BukkitRunnable implements Listener{
 	private int powerLength = 300;
 	private Server server;
 	private Map<UUID, poweredPlayer> poweredPlayerList;
 
-	public gPowerApplyingTask(Server server, Map<UUID, poweredPlayer> poweredPlayerList) {
-		this.server = server;
-		this.poweredPlayerList = poweredPlayerList;
+	
+	public Enchanter(JavaPlugin plugin, GPowerMemory gPowerMemory){
+		this.server = plugin.getServer();
+		this.poweredPlayerList = gPowerMemory.poweredPlayerList;
+		this.runTaskTimer(plugin, 0, 190);
 	}	
 	
 	//REPEATS EVERY 5 SECONDS

src/alisolarflare/components/gpowers/listeners/gPowerListener.java

@@ -1,13 +0,0 @@
-package alisolarflare.components.gpowers.listeners;
-
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.components.gpowers.GPowerMemory;
-
-public class gPowerListener implements Listener{
-	
-	public gPowerListener(JavaPlugin plugin, GPowerMemory gPowerMemory){
-		new gPowerApplyingTask(plugin.getServer(), gPowerMemory.poweredPlayerList).runTaskTimer(plugin, 0, 190);
-	}		
-}

src/alisolarflare/components/gpowers/powerstate/PowerAll.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.gpowers.commands;
+package alisolarflare.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.gpowers.GPowerMemory;
 import alisolarflare.components.gpowers.GPowerMemory.poweredPlayer;
 

src/alisolarflare/components/gpowers/powerstate/PowerDown.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.gpowers.commands;
+package alisolarflare.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.gpowers.GPowerMemory;
 
 public class PowerDown extends PlayerCommand {

src/alisolarflare/components/gpowers/powerstate/PowerUp.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.gpowers.commands;
+package alisolarflare.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.gpowers.GPowerMemory;
 
 public class PowerUp extends PlayerCommand {

src/alisolarflare/components/insurance/InsuranceComponent.java

@@ -2,7 +2,7 @@ package alisolarflare.components.insurance;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 
 public class InsuranceComponent extends Component {
 

src/alisolarflare/components/insurance/getInsurance.java

@@ -3,7 +3,7 @@ package alisolarflare.components.insurance;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.insurance.Insurance.InsuranceType;
 
 public class getInsurance extends ModCommand {

src/alisolarflare/components/insurance/getInsuranceBar.java

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

src/alisolarflare/components/insurance/getInsuranceBlock.java

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

src/alisolarflare/components/insurance/getInsuranceNugget.java

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

src/alisolarflare/components/magic/MagicComponent.java

@@ -2,7 +2,7 @@ package alisolarflare.components.magic;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import alisolarflare.components.magic.tricks.AliArrowListener;
 import alisolarflare.components.magic.tricks.BoomBowDeathListener;
 import alisolarflare.components.magic.tricks.BoomBowListener;

src/alisolarflare/components/magic/tricks/BoomBowRule.java

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

src/alisolarflare/components/metrics/MetricsComponent.java

@@ -11,9 +11,9 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
-import alisolarflare.components.metrics.commands.GetLoginMetrics;
-import alisolarflare.components.metrics.listeners.PlayerJoinListener;
+import alisolarflare.architecture.Component;
+import alisolarflare.components.metrics.collection.PlayerJoinListener;
+import alisolarflare.components.metrics.output.GetLoginMetrics;
 import buttondevteam.lib.TBMCCoreAPI;
 
 public class MetricsComponent extends Component{

src/alisolarflare/components/metrics/collection/PlayerJoinListener.java

@@ -1,4 +1,4 @@
-package alisolarflare.components.metrics.listeners;
+package alisolarflare.components.metrics.collection;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/alisolarflare/components/metrics/output/GetLoginMetrics.java

@@ -1,8 +1,8 @@
-package alisolarflare.components.metrics.commands;
+package alisolarflare.components.metrics.output;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.metrics.MetricsComponent;
 
 public class GetLoginMetrics extends ModCommand{

src/alisolarflare/components/minigames/MinigameComponent.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import alisolarflare.components.minigames.commands.JoinMinigame;
 import alisolarflare.components.minigames.commands.LeaveMinigame;
 import alisolarflare.components.minigames.commands.ListFighters;

src/alisolarflare/components/minigames/commands/JoinMinigame.java

@@ -2,7 +2,7 @@ package alisolarflare.components.minigames.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.minigames.MinigameComponent;
 
 public class JoinMinigame extends PlayerCommand {

src/alisolarflare/components/minigames/commands/LeaveMinigame.java

@@ -2,7 +2,7 @@ package alisolarflare.components.minigames.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.minigames.MinigameComponent;
 
 public class LeaveMinigame extends PlayerCommand {

src/alisolarflare/components/minigames/commands/ListFighters.java

@@ -2,7 +2,7 @@ package alisolarflare.components.minigames.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.PlayerCommand;
+import alisolarflare.architecture.commands.PlayerCommand;
 import alisolarflare.components.minigames.MinigameComponent;
 
 public class ListFighters extends PlayerCommand {

src/alisolarflare/components/minigames/commands/SetColourSpawn.java

@@ -2,7 +2,7 @@ package alisolarflare.components.minigames.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.components.ModCommand;
+import alisolarflare.architecture.commands.ModCommand;
 import alisolarflare.components.minigames.data.SpawnSet;
 
 public class SetColourSpawn extends ModCommand{

src/graveyard/shulker/AliShulkerModule.java

@@ -2,7 +2,7 @@ package graveyard.shulker;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.Component;
+import alisolarflare.architecture.Component;
 import graveyard.shulker.commands.AliShulker;
 
 /**@deprecated*/