From 8f9a3b7457829d86ef272dd6462d94bf8df7f02f Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Fri, 11 Nov 2016 20:53:43 -0500 Subject: [PATCH] Deprecated Autouhc --- .../flairdoor/commands/FlairMe.java | 3 ++- .../flairdoor/listeners/PortalListener.java | 4 ++-- .../modules/easyuhc/EasyUHCModule.java | 11 --------- .../{easyuhc => }/gpowers/GPowerMemory.java | 2 +- .../modules/gpowers/GPowerModule.java | 24 +++++++++++++++++++ .../gpowers/commands/GPower.java | 4 ++-- .../gpowers/commands/PowerAll.java | 6 ++--- .../gpowers/commands/PowerDown.java | 4 ++-- .../gpowers/commands/PowerUp.java | 4 ++-- .../gpowers/listeners/gPowerApplyingTask.java | 4 ++-- .../gpowers/listeners/gPowerListener.java | 4 ++-- .../autouhc/UHCModule.java | 14 ++++------- .../autouhc/controller/SetMatchState.java | 6 ++--- .../autouhc/idle/AddToUHC.java | 4 ++-- .../autouhc/idle/JoinUHC.java | 4 ++-- .../autouhc/intro/ConfigureMatch.java | 4 ++-- .../autouhc/intro/IntroductionCutscene.java | 2 +- .../autouhc/intro/ScheduleMatch.java | 4 ++-- .../autouhc/intro/StartMatch.java | 6 ++--- .../listeners/MatchCyclingListener.java | 2 +- .../autouhc/listeners/MatchMainLoop.java | 2 +- .../autouhc/memory/MatchState.java | 2 +- .../autouhc/memory/UHCMatch.java | 2 +- .../thebuttonrebirth/ButtonRebirthPlugin.java | 10 ++++---- .../thebuttonrebirth/admin/CreateShrine.java | 4 ++-- .../thebuttonrebirth/commands/ShowBars.java | 4 ++-- .../listeners/CyclicalDisplayListener.java | 6 ++--- .../listeners/MidnightListener.java | 6 ++--- .../listeners/StealChestListener.java | 6 ++--- .../tasks/CheckChestTask.java | 6 ++--- .../tasks/CyclicalDisplayTask.java | 4 ++-- .../tasks/StealChestTask.java | 4 ++-- 32 files changed, 90 insertions(+), 82 deletions(-) rename src/alisolarflare/modules/{easyuhc => }/gpowers/GPowerMemory.java (93%) create mode 100644 src/alisolarflare/modules/gpowers/GPowerModule.java rename src/alisolarflare/modules/{easyuhc => }/gpowers/commands/GPower.java (91%) rename src/alisolarflare/modules/{easyuhc => }/gpowers/commands/PowerAll.java (71%) rename src/alisolarflare/modules/{easyuhc => }/gpowers/commands/PowerDown.java (82%) rename src/alisolarflare/modules/{easyuhc => }/gpowers/commands/PowerUp.java (82%) rename src/alisolarflare/modules/{easyuhc => }/gpowers/listeners/gPowerApplyingTask.java (94%) rename src/alisolarflare/modules/{easyuhc => }/gpowers/listeners/gPowerListener.java (70%) rename src/{alisolarflare/modules => graveyard}/autouhc/UHCModule.java (59%) rename src/{alisolarflare/modules => graveyard}/autouhc/controller/SetMatchState.java (91%) rename src/{alisolarflare/modules => graveyard}/autouhc/idle/AddToUHC.java (90%) rename src/{alisolarflare/modules => graveyard}/autouhc/idle/JoinUHC.java (88%) rename src/{alisolarflare/modules => graveyard}/autouhc/intro/ConfigureMatch.java (75%) rename src/{alisolarflare/modules => graveyard}/autouhc/intro/IntroductionCutscene.java (64%) rename src/{alisolarflare/modules => graveyard}/autouhc/intro/ScheduleMatch.java (75%) rename src/{alisolarflare/modules => graveyard}/autouhc/intro/StartMatch.java (84%) rename src/{alisolarflare/modules => graveyard}/autouhc/listeners/MatchCyclingListener.java (88%) rename src/{alisolarflare/modules => graveyard}/autouhc/listeners/MatchMainLoop.java (69%) rename src/{alisolarflare/modules => graveyard}/autouhc/memory/MatchState.java (85%) rename src/{alisolarflare/modules => graveyard}/autouhc/memory/UHCMatch.java (92%) rename src/graveyard/{shulker => }/thebuttonrebirth/ButtonRebirthPlugin.java (83%) rename src/graveyard/{shulker => }/thebuttonrebirth/admin/CreateShrine.java (94%) rename src/graveyard/{shulker => }/thebuttonrebirth/commands/ShowBars.java (81%) rename src/graveyard/{shulker => }/thebuttonrebirth/listeners/CyclicalDisplayListener.java (70%) rename src/graveyard/{shulker => }/thebuttonrebirth/listeners/MidnightListener.java (65%) rename src/graveyard/{shulker => }/thebuttonrebirth/listeners/StealChestListener.java (65%) rename src/graveyard/{shulker => }/thebuttonrebirth/tasks/CheckChestTask.java (94%) rename src/graveyard/{shulker => }/thebuttonrebirth/tasks/CyclicalDisplayTask.java (95%) rename src/graveyard/{shulker => }/thebuttonrebirth/tasks/StealChestTask.java (95%) diff --git a/src/alisolarflare/components/flairdoor/commands/FlairMe.java b/src/alisolarflare/components/flairdoor/commands/FlairMe.java index faca295..8745da8 100644 --- a/src/alisolarflare/components/flairdoor/commands/FlairMe.java +++ b/src/alisolarflare/components/flairdoor/commands/FlairMe.java @@ -1,6 +1,7 @@ package alisolarflare.components.flairdoor.commands; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import alisolarflare.components.flairdoor.listeners.PortalListener; import alisolarflare.modules.PlayerCommand; @@ -9,7 +10,7 @@ public class FlairMe extends PlayerCommand { @Override public boolean OnCommand(CommandSender sender, String label, String[] args) { - PortalListener.playersToBeFlaired.add(sender.getName()); + PortalListener.playersToBeFlaired.add((Player) sender); sender.sendMessage("Setup Successful! Walk through a portal to get your flair"); return false; } diff --git a/src/alisolarflare/components/flairdoor/listeners/PortalListener.java b/src/alisolarflare/components/flairdoor/listeners/PortalListener.java index 5788167..2f42642 100644 --- a/src/alisolarflare/components/flairdoor/listeners/PortalListener.java +++ b/src/alisolarflare/components/flairdoor/listeners/PortalListener.java @@ -18,7 +18,7 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; public class PortalListener implements Listener{ - public static List playersToBeFlaired = new ArrayList(); + public static List playersToBeFlaired = new ArrayList(); public JavaPlugin plugin; Essentials essentials; @@ -35,7 +35,7 @@ public class PortalListener implements Listener{ Player player = event.getPlayer(); - if(!(playersToBeFlaired.contains(player.getName()))){ + if(!(playersToBeFlaired.contains(player))){ return; } diff --git a/src/alisolarflare/modules/easyuhc/EasyUHCModule.java b/src/alisolarflare/modules/easyuhc/EasyUHCModule.java index 01c4ea0..3d49527 100644 --- a/src/alisolarflare/modules/easyuhc/EasyUHCModule.java +++ b/src/alisolarflare/modules/easyuhc/EasyUHCModule.java @@ -11,11 +11,6 @@ import alisolarflare.modules.easyuhc.commands.SpreadPlayers; import alisolarflare.modules.easyuhc.commands.StartTimer; import alisolarflare.modules.easyuhc.commands.StartUHC; import alisolarflare.modules.easyuhc.commands.TeleportToUHC; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; -import alisolarflare.modules.easyuhc.gpowers.commands.GPower; -import alisolarflare.modules.easyuhc.gpowers.commands.PowerDown; -import alisolarflare.modules.easyuhc.gpowers.commands.PowerUp; -import alisolarflare.modules.easyuhc.gpowers.listeners.gPowerListener; public class EasyUHCModule extends Module{ public Location lobbyLocation; @@ -23,12 +18,6 @@ public class EasyUHCModule extends Module{ public void register(JavaPlugin plugin) { - GPowerMemory gPowerMemory = new GPowerMemory(); - registerCommand(plugin, new GPower(gPowerMemory)); - registerCommand(plugin, new PowerUp(gPowerMemory)); - registerCommand(plugin, new PowerDown(gPowerMemory)); - - registerListener(plugin, new gPowerListener(plugin, gPowerMemory)); registerCommand(plugin, new ActivatePowers()); registerCommand(plugin, new SetUHCLobby(this)); diff --git a/src/alisolarflare/modules/easyuhc/gpowers/GPowerMemory.java b/src/alisolarflare/modules/gpowers/GPowerMemory.java similarity index 93% rename from src/alisolarflare/modules/easyuhc/gpowers/GPowerMemory.java rename to src/alisolarflare/modules/gpowers/GPowerMemory.java index 83a35be..e0891d2 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/GPowerMemory.java +++ b/src/alisolarflare/modules/gpowers/GPowerMemory.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.easyuhc.gpowers; +package alisolarflare.modules.gpowers; import java.util.HashMap; import java.util.Map; diff --git a/src/alisolarflare/modules/gpowers/GPowerModule.java b/src/alisolarflare/modules/gpowers/GPowerModule.java new file mode 100644 index 0000000..3c74111 --- /dev/null +++ b/src/alisolarflare/modules/gpowers/GPowerModule.java @@ -0,0 +1,24 @@ +package alisolarflare.modules.gpowers; + +import org.bukkit.plugin.java.JavaPlugin; + +import alisolarflare.modules.Module; +import alisolarflare.modules.gpowers.commands.GPower; +import alisolarflare.modules.gpowers.commands.PowerDown; +import alisolarflare.modules.gpowers.commands.PowerUp; +import alisolarflare.modules.gpowers.listeners.gPowerListener; + +public class GPowerModule extends Module { + + @Override + public void register(JavaPlugin plugin) { + GPowerMemory gPowerMemory = new GPowerMemory(); + registerCommand(plugin, new GPower(gPowerMemory)); + registerCommand(plugin, new PowerUp(gPowerMemory)); + registerCommand(plugin, new PowerDown(gPowerMemory)); + + registerListener(plugin, new gPowerListener(plugin, gPowerMemory)); + + } + +} diff --git a/src/alisolarflare/modules/easyuhc/gpowers/commands/GPower.java b/src/alisolarflare/modules/gpowers/commands/GPower.java similarity index 91% rename from src/alisolarflare/modules/easyuhc/gpowers/commands/GPower.java rename to src/alisolarflare/modules/gpowers/commands/GPower.java index 816241a..7777d09 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/commands/GPower.java +++ b/src/alisolarflare/modules/gpowers/commands/GPower.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.easyuhc.gpowers.commands; +package alisolarflare.modules.gpowers.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import alisolarflare.modules.PlayerCommand; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.gpowers.GPowerMemory; public class GPower extends PlayerCommand { diff --git a/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerAll.java b/src/alisolarflare/modules/gpowers/commands/PowerAll.java similarity index 71% rename from src/alisolarflare/modules/easyuhc/gpowers/commands/PowerAll.java rename to src/alisolarflare/modules/gpowers/commands/PowerAll.java index be1c7c8..b92aba1 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerAll.java +++ b/src/alisolarflare/modules/gpowers/commands/PowerAll.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.easyuhc.gpowers.commands; +package alisolarflare.modules.gpowers.commands; import org.bukkit.command.CommandSender; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory.poweredPlayer; +import alisolarflare.modules.gpowers.GPowerMemory; +import alisolarflare.modules.gpowers.GPowerMemory.poweredPlayer; public class PowerAll extends ModCommand{ private GPowerMemory gPowerMemory; diff --git a/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerDown.java b/src/alisolarflare/modules/gpowers/commands/PowerDown.java similarity index 82% rename from src/alisolarflare/modules/easyuhc/gpowers/commands/PowerDown.java rename to src/alisolarflare/modules/gpowers/commands/PowerDown.java index abcffdb..a7849f6 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerDown.java +++ b/src/alisolarflare/modules/gpowers/commands/PowerDown.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.easyuhc.gpowers.commands; +package alisolarflare.modules.gpowers.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import alisolarflare.modules.PlayerCommand; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.gpowers.GPowerMemory; public class PowerDown extends PlayerCommand { diff --git a/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerUp.java b/src/alisolarflare/modules/gpowers/commands/PowerUp.java similarity index 82% rename from src/alisolarflare/modules/easyuhc/gpowers/commands/PowerUp.java rename to src/alisolarflare/modules/gpowers/commands/PowerUp.java index db14e9f..c82e669 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerUp.java +++ b/src/alisolarflare/modules/gpowers/commands/PowerUp.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.easyuhc.gpowers.commands; +package alisolarflare.modules.gpowers.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import alisolarflare.modules.PlayerCommand; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.gpowers.GPowerMemory; public class PowerUp extends PlayerCommand { diff --git a/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerApplyingTask.java b/src/alisolarflare/modules/gpowers/listeners/gPowerApplyingTask.java similarity index 94% rename from src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerApplyingTask.java rename to src/alisolarflare/modules/gpowers/listeners/gPowerApplyingTask.java index e8c05c8..d1404c3 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerApplyingTask.java +++ b/src/alisolarflare/modules/gpowers/listeners/gPowerApplyingTask.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.easyuhc.gpowers.listeners; +package alisolarflare.modules.gpowers.listeners; import java.util.Map; import java.util.UUID; @@ -10,7 +10,7 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory.poweredPlayer; +import alisolarflare.modules.gpowers.GPowerMemory.poweredPlayer; public class gPowerApplyingTask extends BukkitRunnable{ private int powerLength = 300; diff --git a/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerListener.java b/src/alisolarflare/modules/gpowers/listeners/gPowerListener.java similarity index 70% rename from src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerListener.java rename to src/alisolarflare/modules/gpowers/listeners/gPowerListener.java index 461387e..7021d68 100644 --- a/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerListener.java +++ b/src/alisolarflare/modules/gpowers/listeners/gPowerListener.java @@ -1,9 +1,9 @@ -package alisolarflare.modules.easyuhc.gpowers.listeners; +package alisolarflare.modules.gpowers.listeners; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.gpowers.GPowerMemory; public class gPowerListener implements Listener{ diff --git a/src/alisolarflare/modules/autouhc/UHCModule.java b/src/graveyard/autouhc/UHCModule.java similarity index 59% rename from src/alisolarflare/modules/autouhc/UHCModule.java rename to src/graveyard/autouhc/UHCModule.java index cd65d63..c3b36ae 100644 --- a/src/alisolarflare/modules/autouhc/UHCModule.java +++ b/src/graveyard/autouhc/UHCModule.java @@ -1,16 +1,10 @@ -package alisolarflare.modules.autouhc; - +package graveyard.autouhc; +/**@deprecated*/ import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.modules.Module; -import alisolarflare.modules.autouhc.controller.SetMatchState; -import alisolarflare.modules.autouhc.idle.AddToUHC; -import alisolarflare.modules.autouhc.idle.JoinUHC; -import alisolarflare.modules.autouhc.intro.ConfigureMatch; -import alisolarflare.modules.autouhc.intro.ScheduleMatch; -import alisolarflare.modules.autouhc.intro.StartMatch; -import alisolarflare.modules.autouhc.memory.MatchState; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.MatchState; +import graveyard.autouhc.memory.UHCMatch; public class UHCModule extends Module { public UHCMatch match; diff --git a/src/alisolarflare/modules/autouhc/controller/SetMatchState.java b/src/graveyard/autouhc/controller/SetMatchState.java similarity index 91% rename from src/alisolarflare/modules/autouhc/controller/SetMatchState.java rename to src/graveyard/autouhc/controller/SetMatchState.java index 8078fea..483c74c 100644 --- a/src/alisolarflare/modules/autouhc/controller/SetMatchState.java +++ b/src/graveyard/autouhc/controller/SetMatchState.java @@ -1,11 +1,11 @@ -package alisolarflare.modules.autouhc.controller; +package graveyard.autouhc.controller; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.autouhc.memory.MatchState; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.MatchState; +import graveyard.autouhc.memory.UHCMatch; public class SetMatchState extends ModCommand{ diff --git a/src/alisolarflare/modules/autouhc/idle/AddToUHC.java b/src/graveyard/autouhc/idle/AddToUHC.java similarity index 90% rename from src/alisolarflare/modules/autouhc/idle/AddToUHC.java rename to src/graveyard/autouhc/idle/AddToUHC.java index 5cfd45a..821e16b 100644 --- a/src/alisolarflare/modules/autouhc/idle/AddToUHC.java +++ b/src/graveyard/autouhc/idle/AddToUHC.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.autouhc.idle; +package graveyard.autouhc.idle; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.UHCMatch; /** * This class handles the specific command /addToUHC which, in-game, adds a player to a specific UltraHardcore match, that is defined by the constructor: {@linkplain #AddToUHC(UHCMatch)} diff --git a/src/alisolarflare/modules/autouhc/idle/JoinUHC.java b/src/graveyard/autouhc/idle/JoinUHC.java similarity index 88% rename from src/alisolarflare/modules/autouhc/idle/JoinUHC.java rename to src/graveyard/autouhc/idle/JoinUHC.java index b948c8f..9234aff 100644 --- a/src/alisolarflare/modules/autouhc/idle/JoinUHC.java +++ b/src/graveyard/autouhc/idle/JoinUHC.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.autouhc.idle; +package graveyard.autouhc.idle; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.UHCMatch; public class JoinUHC extends ModCommand{ diff --git a/src/alisolarflare/modules/autouhc/intro/ConfigureMatch.java b/src/graveyard/autouhc/intro/ConfigureMatch.java similarity index 75% rename from src/alisolarflare/modules/autouhc/intro/ConfigureMatch.java rename to src/graveyard/autouhc/intro/ConfigureMatch.java index dc5a58f..e3aa894 100644 --- a/src/alisolarflare/modules/autouhc/intro/ConfigureMatch.java +++ b/src/graveyard/autouhc/intro/ConfigureMatch.java @@ -1,9 +1,9 @@ -package alisolarflare.modules.autouhc.intro; +package graveyard.autouhc.intro; import org.bukkit.command.CommandSender; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.UHCMatch; public class ConfigureMatch extends ModCommand{ diff --git a/src/alisolarflare/modules/autouhc/intro/IntroductionCutscene.java b/src/graveyard/autouhc/intro/IntroductionCutscene.java similarity index 64% rename from src/alisolarflare/modules/autouhc/intro/IntroductionCutscene.java rename to src/graveyard/autouhc/intro/IntroductionCutscene.java index 6244a5f..3727cec 100644 --- a/src/alisolarflare/modules/autouhc/intro/IntroductionCutscene.java +++ b/src/graveyard/autouhc/intro/IntroductionCutscene.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.autouhc.intro; +package graveyard.autouhc.intro; public class IntroductionCutscene { //TODO: Teleport all players to the area. diff --git a/src/alisolarflare/modules/autouhc/intro/ScheduleMatch.java b/src/graveyard/autouhc/intro/ScheduleMatch.java similarity index 75% rename from src/alisolarflare/modules/autouhc/intro/ScheduleMatch.java rename to src/graveyard/autouhc/intro/ScheduleMatch.java index a451386..8190d2c 100644 --- a/src/alisolarflare/modules/autouhc/intro/ScheduleMatch.java +++ b/src/graveyard/autouhc/intro/ScheduleMatch.java @@ -1,9 +1,9 @@ -package alisolarflare.modules.autouhc.intro; +package graveyard.autouhc.intro; import org.bukkit.command.CommandSender; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.UHCMatch; public class ScheduleMatch extends ModCommand{ diff --git a/src/alisolarflare/modules/autouhc/intro/StartMatch.java b/src/graveyard/autouhc/intro/StartMatch.java similarity index 84% rename from src/alisolarflare/modules/autouhc/intro/StartMatch.java rename to src/graveyard/autouhc/intro/StartMatch.java index 5484653..2a6134e 100644 --- a/src/alisolarflare/modules/autouhc/intro/StartMatch.java +++ b/src/graveyard/autouhc/intro/StartMatch.java @@ -1,10 +1,10 @@ -package alisolarflare.modules.autouhc.intro; +package graveyard.autouhc.intro; import org.bukkit.command.CommandSender; import alisolarflare.modules.ModCommand; -import alisolarflare.modules.autouhc.memory.MatchState; -import alisolarflare.modules.autouhc.memory.UHCMatch; +import graveyard.autouhc.memory.MatchState; +import graveyard.autouhc.memory.UHCMatch; public class StartMatch extends ModCommand { private UHCMatch match; diff --git a/src/alisolarflare/modules/autouhc/listeners/MatchCyclingListener.java b/src/graveyard/autouhc/listeners/MatchCyclingListener.java similarity index 88% rename from src/alisolarflare/modules/autouhc/listeners/MatchCyclingListener.java rename to src/graveyard/autouhc/listeners/MatchCyclingListener.java index d8ef831..5a21b9c 100644 --- a/src/alisolarflare/modules/autouhc/listeners/MatchCyclingListener.java +++ b/src/graveyard/autouhc/listeners/MatchCyclingListener.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.autouhc.listeners; +package graveyard.autouhc.listeners; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/alisolarflare/modules/autouhc/listeners/MatchMainLoop.java b/src/graveyard/autouhc/listeners/MatchMainLoop.java similarity index 69% rename from src/alisolarflare/modules/autouhc/listeners/MatchMainLoop.java rename to src/graveyard/autouhc/listeners/MatchMainLoop.java index 4005028..0698590 100644 --- a/src/alisolarflare/modules/autouhc/listeners/MatchMainLoop.java +++ b/src/graveyard/autouhc/listeners/MatchMainLoop.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.autouhc.listeners; +package graveyard.autouhc.listeners; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/alisolarflare/modules/autouhc/memory/MatchState.java b/src/graveyard/autouhc/memory/MatchState.java similarity index 85% rename from src/alisolarflare/modules/autouhc/memory/MatchState.java rename to src/graveyard/autouhc/memory/MatchState.java index b4587b5..c97ed01 100644 --- a/src/alisolarflare/modules/autouhc/memory/MatchState.java +++ b/src/graveyard/autouhc/memory/MatchState.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.autouhc.memory; +package graveyard.autouhc.memory; public enum MatchState { IDLE, //Idle: Configure Match, Wait: Schedule Match, Intro: Start Match diff --git a/src/alisolarflare/modules/autouhc/memory/UHCMatch.java b/src/graveyard/autouhc/memory/UHCMatch.java similarity index 92% rename from src/alisolarflare/modules/autouhc/memory/UHCMatch.java rename to src/graveyard/autouhc/memory/UHCMatch.java index c0c64b9..f408d2c 100644 --- a/src/alisolarflare/modules/autouhc/memory/UHCMatch.java +++ b/src/graveyard/autouhc/memory/UHCMatch.java @@ -1,4 +1,4 @@ -package alisolarflare.modules.autouhc.memory; +package graveyard.autouhc.memory; import java.util.ArrayList; import java.util.List; diff --git a/src/graveyard/shulker/thebuttonrebirth/ButtonRebirthPlugin.java b/src/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java similarity index 83% rename from src/graveyard/shulker/thebuttonrebirth/ButtonRebirthPlugin.java rename to src/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java index 210bca4..13e0096 100644 --- a/src/graveyard/shulker/thebuttonrebirth/ButtonRebirthPlugin.java +++ b/src/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java @@ -1,4 +1,4 @@ -package graveyard.shulker.thebuttonrebirth; +package graveyard.thebuttonrebirth; import java.util.ArrayList; import java.util.List; @@ -9,10 +9,10 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; -import graveyard.shulker.thebuttonrebirth.admin.CreateShrine; -import graveyard.shulker.thebuttonrebirth.listeners.CyclicalDisplayListener; -import graveyard.shulker.thebuttonrebirth.listeners.MidnightListener; -import graveyard.shulker.thebuttonrebirth.listeners.StealChestListener; +import graveyard.thebuttonrebirth.admin.CreateShrine; +import graveyard.thebuttonrebirth.listeners.CyclicalDisplayListener; +import graveyard.thebuttonrebirth.listeners.MidnightListener; +import graveyard.thebuttonrebirth.listeners.StealChestListener; public class ButtonRebirthPlugin extends JavaPlugin{ public PluginDescriptionFile pdfFile; diff --git a/src/graveyard/shulker/thebuttonrebirth/admin/CreateShrine.java b/src/graveyard/thebuttonrebirth/admin/CreateShrine.java similarity index 94% rename from src/graveyard/shulker/thebuttonrebirth/admin/CreateShrine.java rename to src/graveyard/thebuttonrebirth/admin/CreateShrine.java index 6e8ded2..3f973e1 100644 --- a/src/graveyard/shulker/thebuttonrebirth/admin/CreateShrine.java +++ b/src/graveyard/thebuttonrebirth/admin/CreateShrine.java @@ -1,4 +1,4 @@ -package graveyard.shulker.thebuttonrebirth.admin; +package graveyard.thebuttonrebirth.admin; import org.bukkit.Material; import org.bukkit.World; @@ -7,7 +7,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; import net.md_5.bungee.api.ChatColor; public class CreateShrine implements CommandExecutor{ diff --git a/src/graveyard/shulker/thebuttonrebirth/commands/ShowBars.java b/src/graveyard/thebuttonrebirth/commands/ShowBars.java similarity index 81% rename from src/graveyard/shulker/thebuttonrebirth/commands/ShowBars.java rename to src/graveyard/thebuttonrebirth/commands/ShowBars.java index b375603..34f9a38 100644 --- a/src/graveyard/shulker/thebuttonrebirth/commands/ShowBars.java +++ b/src/graveyard/thebuttonrebirth/commands/ShowBars.java @@ -1,11 +1,11 @@ -package graveyard.shulker.thebuttonrebirth.commands; +package graveyard.thebuttonrebirth.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; public class ShowBars implements CommandExecutor{ diff --git a/src/graveyard/shulker/thebuttonrebirth/listeners/CyclicalDisplayListener.java b/src/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java similarity index 70% rename from src/graveyard/shulker/thebuttonrebirth/listeners/CyclicalDisplayListener.java rename to src/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java index 8b2c9ee..68b6c13 100644 --- a/src/graveyard/shulker/thebuttonrebirth/listeners/CyclicalDisplayListener.java +++ b/src/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java @@ -1,10 +1,10 @@ -package graveyard.shulker.thebuttonrebirth.listeners; +package graveyard.thebuttonrebirth.listeners; import org.bukkit.event.Listener; import org.bukkit.scheduler.BukkitTask; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; -import graveyard.shulker.thebuttonrebirth.tasks.CyclicalDisplayTask; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.tasks.CyclicalDisplayTask; public class CyclicalDisplayListener implements Listener{ private final ButtonRebirthPlugin plugin; diff --git a/src/graveyard/shulker/thebuttonrebirth/listeners/MidnightListener.java b/src/graveyard/thebuttonrebirth/listeners/MidnightListener.java similarity index 65% rename from src/graveyard/shulker/thebuttonrebirth/listeners/MidnightListener.java rename to src/graveyard/thebuttonrebirth/listeners/MidnightListener.java index 48afb1d..1e3b155 100644 --- a/src/graveyard/shulker/thebuttonrebirth/listeners/MidnightListener.java +++ b/src/graveyard/thebuttonrebirth/listeners/MidnightListener.java @@ -1,10 +1,10 @@ -package graveyard.shulker.thebuttonrebirth.listeners; +package graveyard.thebuttonrebirth.listeners; import org.bukkit.event.Listener; import org.bukkit.scheduler.BukkitTask; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; -import graveyard.shulker.thebuttonrebirth.tasks.CheckChestTask; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.tasks.CheckChestTask; public class MidnightListener implements Listener{ diff --git a/src/graveyard/shulker/thebuttonrebirth/listeners/StealChestListener.java b/src/graveyard/thebuttonrebirth/listeners/StealChestListener.java similarity index 65% rename from src/graveyard/shulker/thebuttonrebirth/listeners/StealChestListener.java rename to src/graveyard/thebuttonrebirth/listeners/StealChestListener.java index 062a592..1574add 100644 --- a/src/graveyard/shulker/thebuttonrebirth/listeners/StealChestListener.java +++ b/src/graveyard/thebuttonrebirth/listeners/StealChestListener.java @@ -1,10 +1,10 @@ -package graveyard.shulker.thebuttonrebirth.listeners; +package graveyard.thebuttonrebirth.listeners; import org.bukkit.event.Listener; import org.bukkit.scheduler.BukkitTask; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; -import graveyard.shulker.thebuttonrebirth.tasks.StealChestTask; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.tasks.StealChestTask; public class StealChestListener implements Listener{ diff --git a/src/graveyard/shulker/thebuttonrebirth/tasks/CheckChestTask.java b/src/graveyard/thebuttonrebirth/tasks/CheckChestTask.java similarity index 94% rename from src/graveyard/shulker/thebuttonrebirth/tasks/CheckChestTask.java rename to src/graveyard/thebuttonrebirth/tasks/CheckChestTask.java index 0fd2e7a..dae0446 100644 --- a/src/graveyard/shulker/thebuttonrebirth/tasks/CheckChestTask.java +++ b/src/graveyard/thebuttonrebirth/tasks/CheckChestTask.java @@ -1,4 +1,4 @@ -package graveyard.shulker.thebuttonrebirth.tasks; +package graveyard.thebuttonrebirth.tasks; import java.time.Clock; import java.time.LocalDateTime; @@ -13,8 +13,8 @@ import org.bukkit.block.Chest; import org.bukkit.inventory.Inventory; import org.bukkit.scheduler.BukkitRunnable; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; -import graveyard.shulker.thebuttonrebirth.admin.CreateShrine; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.admin.CreateShrine; public class CheckChestTask extends BukkitRunnable{ //Plugin diff --git a/src/graveyard/shulker/thebuttonrebirth/tasks/CyclicalDisplayTask.java b/src/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java similarity index 95% rename from src/graveyard/shulker/thebuttonrebirth/tasks/CyclicalDisplayTask.java rename to src/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java index fec8ece..5361af7 100644 --- a/src/graveyard/shulker/thebuttonrebirth/tasks/CyclicalDisplayTask.java +++ b/src/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java @@ -1,4 +1,4 @@ -package graveyard.shulker.thebuttonrebirth.tasks; +package graveyard.thebuttonrebirth.tasks; import java.time.Clock; import java.time.Duration; @@ -19,7 +19,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; public class CyclicalDisplayTask extends BukkitRunnable{ //Pointers diff --git a/src/graveyard/shulker/thebuttonrebirth/tasks/StealChestTask.java b/src/graveyard/thebuttonrebirth/tasks/StealChestTask.java similarity index 95% rename from src/graveyard/shulker/thebuttonrebirth/tasks/StealChestTask.java rename to src/graveyard/thebuttonrebirth/tasks/StealChestTask.java index 92778bc..1bc1239 100644 --- a/src/graveyard/shulker/thebuttonrebirth/tasks/StealChestTask.java +++ b/src/graveyard/thebuttonrebirth/tasks/StealChestTask.java @@ -1,4 +1,4 @@ -package graveyard.shulker.thebuttonrebirth.tasks; +package graveyard.thebuttonrebirth.tasks; import java.time.Clock; import java.time.LocalDateTime; @@ -15,7 +15,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; -import graveyard.shulker.thebuttonrebirth.ButtonRebirthPlugin; +import graveyard.thebuttonrebirth.ButtonRebirthPlugin; public class StealChestTask extends BukkitRunnable{