Deprecated Autouhc

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;
 	}

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<String> playersToBeFlaired = new ArrayList<String>();
+	public static List<Player> playersToBeFlaired = new ArrayList<Player>();
 	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;
 		}
 		

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));

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;

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));
+
+	}
+
+}

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 {
 

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;

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 {
 

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 {
 

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;

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{
 	

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;

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{
 

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)}

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{
 

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{
 

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.

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{
 

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;

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;

src/graveyard/autouhc/listeners/MatchMainLoop.java

@@ -1,4 +1,4 @@
-package alisolarflare.modules.autouhc.listeners;
+package graveyard.autouhc.listeners;
 
 import org.bukkit.scheduler.BukkitRunnable;
 

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

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;

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;

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{

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{

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;

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{

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{

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

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

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{