From 173c0d5a70123f937c28d2b2fea1a078a613939c Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Thu, 24 Nov 2016 22:12:09 -0500 Subject: [PATCH] Changed a bit of architecture --- .../{components => architecture}/Component.java | 2 +- .../commands}/BaseCommand.java | 2 +- .../commands}/ModCommand.java | 2 +- .../commands}/PlayerCommand.java | 2 +- .../components/alilinks/AliLinkComponent.java | 2 +- .../alilinks/commands/PressAliLink.java | 2 +- .../alilinks/commands/SetAliLink.java | 2 +- .../bankchest/BankChestComponent.java | 2 +- .../components/bankchest/CreateBankChest.java | 2 +- .../CreativeBoundariesComponent.java | 2 +- .../creativeboundaries/commands/Cbgm0.java | 2 +- .../creativeboundaries/commands/Cbgm1.java | 2 +- .../commands/SetDickmode.java | 2 +- .../components/easyuhc/EasyUHCComponent.java | 2 +- .../easyuhc/commands/ActivatePowers.java | 2 +- .../easyuhc/commands/SetUHCLobby.java | 2 +- .../easyuhc/commands/SetWorldBorders.java | 2 +- .../easyuhc/commands/ShrinkWorldBorders.java | 2 +- .../easyuhc/commands/SpreadPlayers.java | 2 +- .../components/easyuhc/commands/StartTimer.java | 2 +- .../components/easyuhc/commands/StartUHC.java | 2 +- .../easyuhc/commands/TeleportToUHC.java | 2 +- .../flairdoor/FlairDoorComponent.java | 8 ++++---- .../{commands => flairme}/FlairMe.java | 4 ++-- .../PlayerProximityTask.java | 2 +- .../PlayerProximityTaskLauncher.java | 2 +- .../SetProximityLocation.java | 4 ++-- .../components/gpowers/GPowerComponent.java | 10 +++++----- .../components/gpowers/commands/GPower.java | 2 +- .../Enchanter.java} | 17 +++++++++++------ .../gpowers/listeners/gPowerListener.java | 13 ------------- .../{commands => powerstate}/PowerAll.java | 4 ++-- .../{commands => powerstate}/PowerDown.java | 4 ++-- .../{commands => powerstate}/PowerUp.java | 4 ++-- .../insurance/InsuranceComponent.java | 2 +- .../components/insurance/getInsurance.java | 2 +- .../components/insurance/getInsuranceBar.java | 2 +- .../components/insurance/getInsuranceBlock.java | 2 +- .../insurance/getInsuranceNugget.java | 2 +- .../components/magic/MagicComponent.java | 2 +- .../components/magic/tricks/BoomBowRule.java | 2 +- .../components/metrics/MetricsComponent.java | 6 +++--- .../PlayerJoinListener.java | 2 +- .../{commands => output}/GetLoginMetrics.java | 4 ++-- .../components/minigames/MinigameComponent.java | 2 +- .../minigames/commands/JoinMinigame.java | 2 +- .../minigames/commands/LeaveMinigame.java | 2 +- .../minigames/commands/ListFighters.java | 2 +- .../minigames/commands/SetColourSpawn.java | 2 +- src/graveyard/shulker/AliShulkerModule.java | 2 +- 50 files changed, 74 insertions(+), 82 deletions(-) rename src/alisolarflare/{components => architecture}/Component.java (95%) rename src/alisolarflare/{components => architecture/commands}/BaseCommand.java (70%) rename src/alisolarflare/{components => architecture/commands}/ModCommand.java (85%) rename src/alisolarflare/{components => architecture/commands}/PlayerCommand.java (94%) rename src/alisolarflare/components/flairdoor/{commands => flairme}/FlairMe.java (83%) rename src/alisolarflare/components/flairdoor/{listeners => playerproximity}/PlayerProximityTask.java (96%) rename src/alisolarflare/components/flairdoor/{listeners => playerproximity}/PlayerProximityTaskLauncher.java (86%) rename src/alisolarflare/components/flairdoor/{commands => playerproximity}/SetProximityLocation.java (90%) rename src/alisolarflare/components/gpowers/{listeners/gPowerApplyingTask.java => enchant/Enchanter.java} (85%) delete mode 100644 src/alisolarflare/components/gpowers/listeners/gPowerListener.java rename src/alisolarflare/components/gpowers/{commands => powerstate}/PowerAll.java (86%) rename src/alisolarflare/components/gpowers/{commands => powerstate}/PowerDown.java (79%) rename src/alisolarflare/components/gpowers/{commands => powerstate}/PowerUp.java (79%) rename src/alisolarflare/components/metrics/{listeners => collection}/PlayerJoinListener.java (95%) rename src/alisolarflare/components/metrics/{commands => output}/GetLoginMetrics.java (82%) diff --git a/src/alisolarflare/components/Component.java b/src/alisolarflare/architecture/Component.java similarity index 95% rename from src/alisolarflare/components/Component.java rename to src/alisolarflare/architecture/Component.java index 86a31e7..e2c4cd2 100644 --- a/src/alisolarflare/components/Component.java +++ b/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; diff --git a/src/alisolarflare/components/BaseCommand.java b/src/alisolarflare/architecture/commands/BaseCommand.java similarity index 70% rename from src/alisolarflare/components/BaseCommand.java rename to src/alisolarflare/architecture/commands/BaseCommand.java index 59a09db..bece01e 100644 --- a/src/alisolarflare/components/BaseCommand.java +++ b/src/alisolarflare/architecture/commands/BaseCommand.java @@ -1,4 +1,4 @@ -package alisolarflare.components; +package alisolarflare.architecture.commands; import buttondevteam.lib.chat.TBMCCommandBase; diff --git a/src/alisolarflare/components/ModCommand.java b/src/alisolarflare/architecture/commands/ModCommand.java similarity index 85% rename from src/alisolarflare/components/ModCommand.java rename to src/alisolarflare/architecture/commands/ModCommand.java index 6813f4f..3c13446 100644 --- a/src/alisolarflare/components/ModCommand.java +++ b/src/alisolarflare/architecture/commands/ModCommand.java @@ -1,4 +1,4 @@ -package alisolarflare.components; +package alisolarflare.architecture.commands; public abstract class ModCommand extends PlayerCommand{ diff --git a/src/alisolarflare/components/PlayerCommand.java b/src/alisolarflare/architecture/commands/PlayerCommand.java similarity index 94% rename from src/alisolarflare/components/PlayerCommand.java rename to src/alisolarflare/architecture/commands/PlayerCommand.java index 9fa4439..8d85fbf 100644 --- a/src/alisolarflare/components/PlayerCommand.java +++ b/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; diff --git a/src/alisolarflare/components/alilinks/AliLinkComponent.java b/src/alisolarflare/components/alilinks/AliLinkComponent.java index 85e1fac..8812dbf 100644 --- a/src/alisolarflare/components/alilinks/AliLinkComponent.java +++ b/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; diff --git a/src/alisolarflare/components/alilinks/commands/PressAliLink.java b/src/alisolarflare/components/alilinks/commands/PressAliLink.java index 68c82fb..8f9486a 100644 --- a/src/alisolarflare/components/alilinks/commands/PressAliLink.java +++ b/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 { diff --git a/src/alisolarflare/components/alilinks/commands/SetAliLink.java b/src/alisolarflare/components/alilinks/commands/SetAliLink.java index f253f31..a7eda06 100644 --- a/src/alisolarflare/components/alilinks/commands/SetAliLink.java +++ b/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 { diff --git a/src/alisolarflare/components/bankchest/BankChestComponent.java b/src/alisolarflare/components/bankchest/BankChestComponent.java index 0fe9ea6..e331e28 100644 --- a/src/alisolarflare/components/bankchest/BankChestComponent.java +++ b/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 { diff --git a/src/alisolarflare/components/bankchest/CreateBankChest.java b/src/alisolarflare/components/bankchest/CreateBankChest.java index 41c85c6..e73a27f 100644 --- a/src/alisolarflare/components/bankchest/CreateBankChest.java +++ b/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 { diff --git a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java b/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java index 762ebd1..999036c 100644 --- a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java +++ b/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; diff --git a/src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java b/src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java index 607dc8f..eba221e 100644 --- a/src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java +++ b/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{ diff --git a/src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java b/src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java index 5416aba..cf0dd7d 100644 --- a/src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java +++ b/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 { diff --git a/src/alisolarflare/components/creativeboundaries/commands/SetDickmode.java b/src/alisolarflare/components/creativeboundaries/commands/SetDickmode.java index 0d0c5ff..f4c484b 100644 --- a/src/alisolarflare/components/creativeboundaries/commands/SetDickmode.java +++ b/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{ diff --git a/src/alisolarflare/components/easyuhc/EasyUHCComponent.java b/src/alisolarflare/components/easyuhc/EasyUHCComponent.java index 3487368..15d0e3d 100644 --- a/src/alisolarflare/components/easyuhc/EasyUHCComponent.java +++ b/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; diff --git a/src/alisolarflare/components/easyuhc/commands/ActivatePowers.java b/src/alisolarflare/components/easyuhc/commands/ActivatePowers.java index 0933d54..7af36e2 100644 --- a/src/alisolarflare/components/easyuhc/commands/ActivatePowers.java +++ b/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{ diff --git a/src/alisolarflare/components/easyuhc/commands/SetUHCLobby.java b/src/alisolarflare/components/easyuhc/commands/SetUHCLobby.java index f7e6bd4..0a56438 100644 --- a/src/alisolarflare/components/easyuhc/commands/SetUHCLobby.java +++ b/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{ diff --git a/src/alisolarflare/components/easyuhc/commands/SetWorldBorders.java b/src/alisolarflare/components/easyuhc/commands/SetWorldBorders.java index 24d5b2e..bfc52d9 100644 --- a/src/alisolarflare/components/easyuhc/commands/SetWorldBorders.java +++ b/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 { diff --git a/src/alisolarflare/components/easyuhc/commands/ShrinkWorldBorders.java b/src/alisolarflare/components/easyuhc/commands/ShrinkWorldBorders.java index 0f80ff7..af993f2 100644 --- a/src/alisolarflare/components/easyuhc/commands/ShrinkWorldBorders.java +++ b/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 { diff --git a/src/alisolarflare/components/easyuhc/commands/SpreadPlayers.java b/src/alisolarflare/components/easyuhc/commands/SpreadPlayers.java index 2c054b6..6e402c2 100644 --- a/src/alisolarflare/components/easyuhc/commands/SpreadPlayers.java +++ b/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{ diff --git a/src/alisolarflare/components/easyuhc/commands/StartTimer.java b/src/alisolarflare/components/easyuhc/commands/StartTimer.java index b7c09fe..2859935 100644 --- a/src/alisolarflare/components/easyuhc/commands/StartTimer.java +++ b/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{ diff --git a/src/alisolarflare/components/easyuhc/commands/StartUHC.java b/src/alisolarflare/components/easyuhc/commands/StartUHC.java index 334245c..4f5dff4 100644 --- a/src/alisolarflare/components/easyuhc/commands/StartUHC.java +++ b/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{ diff --git a/src/alisolarflare/components/easyuhc/commands/TeleportToUHC.java b/src/alisolarflare/components/easyuhc/commands/TeleportToUHC.java index 8fe3876..3b64c82 100644 --- a/src/alisolarflare/components/easyuhc/commands/TeleportToUHC.java +++ b/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{ diff --git a/src/alisolarflare/components/flairdoor/FlairDoorComponent.java b/src/alisolarflare/components/flairdoor/FlairDoorComponent.java index 7329694..9b2901c 100644 --- a/src/alisolarflare/components/flairdoor/FlairDoorComponent.java +++ b/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 playersToBeFlaired = new ArrayList(); diff --git a/src/alisolarflare/components/flairdoor/commands/FlairMe.java b/src/alisolarflare/components/flairdoor/flairme/FlairMe.java similarity index 83% rename from src/alisolarflare/components/flairdoor/commands/FlairMe.java rename to src/alisolarflare/components/flairdoor/flairme/FlairMe.java index 822a43a..d41fb1f 100644 --- a/src/alisolarflare/components/flairdoor/commands/FlairMe.java +++ b/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 { diff --git a/src/alisolarflare/components/flairdoor/listeners/PlayerProximityTask.java b/src/alisolarflare/components/flairdoor/playerproximity/PlayerProximityTask.java similarity index 96% rename from src/alisolarflare/components/flairdoor/listeners/PlayerProximityTask.java rename to src/alisolarflare/components/flairdoor/playerproximity/PlayerProximityTask.java index b4d9ffb..864aa0f 100644 --- a/src/alisolarflare/components/flairdoor/listeners/PlayerProximityTask.java +++ b/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; diff --git a/src/alisolarflare/components/flairdoor/listeners/PlayerProximityTaskLauncher.java b/src/alisolarflare/components/flairdoor/playerproximity/PlayerProximityTaskLauncher.java similarity index 86% rename from src/alisolarflare/components/flairdoor/listeners/PlayerProximityTaskLauncher.java rename to src/alisolarflare/components/flairdoor/playerproximity/PlayerProximityTaskLauncher.java index b7d7192..2a4edd7 100644 --- a/src/alisolarflare/components/flairdoor/listeners/PlayerProximityTaskLauncher.java +++ b/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; diff --git a/src/alisolarflare/components/flairdoor/commands/SetProximityLocation.java b/src/alisolarflare/components/flairdoor/playerproximity/SetProximityLocation.java similarity index 90% rename from src/alisolarflare/components/flairdoor/commands/SetProximityLocation.java rename to src/alisolarflare/components/flairdoor/playerproximity/SetProximityLocation.java index 8277889..41a3704 100644 --- a/src/alisolarflare/components/flairdoor/commands/SetProximityLocation.java +++ b/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{ diff --git a/src/alisolarflare/components/gpowers/GPowerComponent.java b/src/alisolarflare/components/gpowers/GPowerComponent.java index 91ea408..51aae3e 100644 --- a/src/alisolarflare/components/gpowers/GPowerComponent.java +++ b/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)); } diff --git a/src/alisolarflare/components/gpowers/commands/GPower.java b/src/alisolarflare/components/gpowers/commands/GPower.java index ae5870d..a4aed7d 100644 --- a/src/alisolarflare/components/gpowers/commands/GPower.java +++ b/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 { diff --git a/src/alisolarflare/components/gpowers/listeners/gPowerApplyingTask.java b/src/alisolarflare/components/gpowers/enchant/Enchanter.java similarity index 85% rename from src/alisolarflare/components/gpowers/listeners/gPowerApplyingTask.java rename to src/alisolarflare/components/gpowers/enchant/Enchanter.java index d32e5fa..9f68877 100644 --- a/src/alisolarflare/components/gpowers/listeners/gPowerApplyingTask.java +++ b/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,21 +6,26 @@ 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 poweredPlayerList; - public gPowerApplyingTask(Server server, Map 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 @Override diff --git a/src/alisolarflare/components/gpowers/listeners/gPowerListener.java b/src/alisolarflare/components/gpowers/listeners/gPowerListener.java deleted file mode 100644 index 6ef02dd..0000000 --- a/src/alisolarflare/components/gpowers/listeners/gPowerListener.java +++ /dev/null @@ -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); - } -} \ No newline at end of file diff --git a/src/alisolarflare/components/gpowers/commands/PowerAll.java b/src/alisolarflare/components/gpowers/powerstate/PowerAll.java similarity index 86% rename from src/alisolarflare/components/gpowers/commands/PowerAll.java rename to src/alisolarflare/components/gpowers/powerstate/PowerAll.java index 1203005..ae8380d 100644 --- a/src/alisolarflare/components/gpowers/commands/PowerAll.java +++ b/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; diff --git a/src/alisolarflare/components/gpowers/commands/PowerDown.java b/src/alisolarflare/components/gpowers/powerstate/PowerDown.java similarity index 79% rename from src/alisolarflare/components/gpowers/commands/PowerDown.java rename to src/alisolarflare/components/gpowers/powerstate/PowerDown.java index d19c679..1e3bb45 100644 --- a/src/alisolarflare/components/gpowers/commands/PowerDown.java +++ b/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 { diff --git a/src/alisolarflare/components/gpowers/commands/PowerUp.java b/src/alisolarflare/components/gpowers/powerstate/PowerUp.java similarity index 79% rename from src/alisolarflare/components/gpowers/commands/PowerUp.java rename to src/alisolarflare/components/gpowers/powerstate/PowerUp.java index c64a623..e62203a 100644 --- a/src/alisolarflare/components/gpowers/commands/PowerUp.java +++ b/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 { diff --git a/src/alisolarflare/components/insurance/InsuranceComponent.java b/src/alisolarflare/components/insurance/InsuranceComponent.java index 41a36d0..14f8d5d 100644 --- a/src/alisolarflare/components/insurance/InsuranceComponent.java +++ b/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 { diff --git a/src/alisolarflare/components/insurance/getInsurance.java b/src/alisolarflare/components/insurance/getInsurance.java index 642f953..13bf55d 100644 --- a/src/alisolarflare/components/insurance/getInsurance.java +++ b/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 { diff --git a/src/alisolarflare/components/insurance/getInsuranceBar.java b/src/alisolarflare/components/insurance/getInsuranceBar.java index ec5341f..47bc004 100644 --- a/src/alisolarflare/components/insurance/getInsuranceBar.java +++ b/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 { diff --git a/src/alisolarflare/components/insurance/getInsuranceBlock.java b/src/alisolarflare/components/insurance/getInsuranceBlock.java index 401760b..60c76b3 100644 --- a/src/alisolarflare/components/insurance/getInsuranceBlock.java +++ b/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 { diff --git a/src/alisolarflare/components/insurance/getInsuranceNugget.java b/src/alisolarflare/components/insurance/getInsuranceNugget.java index 9f38bfa..24f1694 100644 --- a/src/alisolarflare/components/insurance/getInsuranceNugget.java +++ b/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 { diff --git a/src/alisolarflare/components/magic/MagicComponent.java b/src/alisolarflare/components/magic/MagicComponent.java index 835c80e..eeec5cd 100644 --- a/src/alisolarflare/components/magic/MagicComponent.java +++ b/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; diff --git a/src/alisolarflare/components/magic/tricks/BoomBowRule.java b/src/alisolarflare/components/magic/tricks/BoomBowRule.java index ca81e35..40cac59 100644 --- a/src/alisolarflare/components/magic/tricks/BoomBowRule.java +++ b/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; diff --git a/src/alisolarflare/components/metrics/MetricsComponent.java b/src/alisolarflare/components/metrics/MetricsComponent.java index fc0673b..2706f66 100644 --- a/src/alisolarflare/components/metrics/MetricsComponent.java +++ b/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{ diff --git a/src/alisolarflare/components/metrics/listeners/PlayerJoinListener.java b/src/alisolarflare/components/metrics/collection/PlayerJoinListener.java similarity index 95% rename from src/alisolarflare/components/metrics/listeners/PlayerJoinListener.java rename to src/alisolarflare/components/metrics/collection/PlayerJoinListener.java index 83ce00a..7744389 100644 --- a/src/alisolarflare/components/metrics/listeners/PlayerJoinListener.java +++ b/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; diff --git a/src/alisolarflare/components/metrics/commands/GetLoginMetrics.java b/src/alisolarflare/components/metrics/output/GetLoginMetrics.java similarity index 82% rename from src/alisolarflare/components/metrics/commands/GetLoginMetrics.java rename to src/alisolarflare/components/metrics/output/GetLoginMetrics.java index d05a2fd..045f14a 100644 --- a/src/alisolarflare/components/metrics/commands/GetLoginMetrics.java +++ b/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{ diff --git a/src/alisolarflare/components/minigames/MinigameComponent.java b/src/alisolarflare/components/minigames/MinigameComponent.java index aa9d96b..a4f8322 100644 --- a/src/alisolarflare/components/minigames/MinigameComponent.java +++ b/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; diff --git a/src/alisolarflare/components/minigames/commands/JoinMinigame.java b/src/alisolarflare/components/minigames/commands/JoinMinigame.java index f3ef12f..6eea609 100644 --- a/src/alisolarflare/components/minigames/commands/JoinMinigame.java +++ b/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 { diff --git a/src/alisolarflare/components/minigames/commands/LeaveMinigame.java b/src/alisolarflare/components/minigames/commands/LeaveMinigame.java index 5592fdb..d1e4345 100644 --- a/src/alisolarflare/components/minigames/commands/LeaveMinigame.java +++ b/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 { diff --git a/src/alisolarflare/components/minigames/commands/ListFighters.java b/src/alisolarflare/components/minigames/commands/ListFighters.java index ba63a5b..c5a9f10 100644 --- a/src/alisolarflare/components/minigames/commands/ListFighters.java +++ b/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 { diff --git a/src/alisolarflare/components/minigames/commands/SetColourSpawn.java b/src/alisolarflare/components/minigames/commands/SetColourSpawn.java index 0a46cf3..24a23d4 100644 --- a/src/alisolarflare/components/minigames/commands/SetColourSpawn.java +++ b/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{ diff --git a/src/graveyard/shulker/AliShulkerModule.java b/src/graveyard/shulker/AliShulkerModule.java index 04c6037..8ffde1e 100644 --- a/src/graveyard/shulker/AliShulkerModule.java +++ b/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*/