Refactoring - Moved components into new folder

.classpath

@@ -17,18 +17,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-		<accessrules>
-			<accessrule kind="accessible" pattern="com/sun/net/httpserver/HttpExchange"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

src/main/java/buttondevteam/presents/Main.java

@@ -5,9 +5,9 @@ import java.util.logging.Logger;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import buttondevteam.presents.dictionary.DictionaryComponent;
+import buttondevteam.presents.components.dictionary.DictionaryComponent;
-import buttondevteam.presents.magic.MagicComponent;
+import buttondevteam.presents.components.magic.MagicComponent;
-import buttondevteam.presents.spawn.SpawnComponent;
+import buttondevteam.presents.components.spawn.SpawnComponent;
 
 public class Main extends JavaPlugin{
 	public void onEnable(){

src/main/java/buttondevteam/presents/components/dictionary/DictionaryComponent.java

@@ -0,0 +1,51 @@
+package buttondevteam.presents.components.dictionary;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.presents.architecture.Component;
+import buttondevteam.presents.components.dictionary.commands.SendJSON;
+import buttondevteam.presents.components.dictionary.commands.SendMessage;
+import buttondevteam.presents.components.dictionary.config.LoadConfig;
+import buttondevteam.presents.components.dictionary.config.SaveConfig;
+import buttondevteam.presents.components.dictionary.config.TimePersistence;
+import buttondevteam.presents.components.dictionary.effects.Bedsplode;
+import buttondevteam.presents.components.dictionary.pages.DataPage;
+import buttondevteam.presents.components.dictionary.pages.HelloPage;
+import buttondevteam.presents.components.dictionary.pages.JSONPage;
+import buttondevteam.presents.components.dictionary.pages.LocationPage;
+import buttondevteam.presents.components.dictionary.pages.POSTPage;
+import buttondevteam.presents.components.dictionary.pages.PlayersOnlinePage;
+import buttondevteam.presents.components.dictionary.spawning.PlaySound;
+import buttondevteam.presents.components.dictionary.spawning.SetBlock;
+import buttondevteam.presents.components.dictionary.spawning.SpawnCow;
+import buttondevteam.presents.components.dictionary.spawning.SpawnItem;
+import buttondevteam.presents.components.dictionary.spawning.SpawnMagicPotato;
+import buttondevteam.presents.components.dictionary.spawning.SpawnParticle;
+
+public class DictionaryComponent extends Component{
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		
+		this.registerCommand(plugin, new SendMessage());
+		this.registerCommand(plugin, new SendJSON());
+		this.registerCommand(plugin, new SaveConfig());
+		this.registerCommand(plugin, new LoadConfig());
+		this.registerCommand(plugin, new TimePersistence());
+		
+		this.registerListener(plugin, new Bedsplode());
+		this.registerCommand(plugin, new SpawnCow());
+		this.registerCommand(plugin, new SpawnItem());
+		this.registerCommand(plugin, new SpawnMagicPotato());
+		this.registerCommand(plugin, new SetBlock());
+		this.registerCommand(plugin, new SpawnParticle());
+		this.registerCommand(plugin, new PlaySound());
+		
+		this.addPage(plugin, new HelloPage());
+		this.addPage(plugin, new DataPage());
+		this.addPage(plugin, new PlayersOnlinePage(plugin));
+		this.addPage(plugin, new LocationPage(plugin));
+		this.addPage(plugin, new POSTPage(plugin));
+		this.addPage(plugin, new JSONPage());
+	}
+}

src/main/java/buttondevteam/presents/components/dictionary/commands/SendJSON.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.commands;
+package buttondevteam.presents.components.dictionary.commands;
 
 
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dictionary/commands/SendMessage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.commands;
+package buttondevteam.presents.components.dictionary.commands;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/buttondevteam/presents/components/dictionary/config/LoadConfig.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.config;
+package buttondevteam.presents.components.dictionary.config;
 
 
 

src/main/java/buttondevteam/presents/components/dictionary/config/SaveConfig.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.config;
+package buttondevteam.presents.components.dictionary.config;
 
 import java.util.Arrays;
 

src/main/java/buttondevteam/presents/components/dictionary/config/TimePersistence.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.config;
+package buttondevteam.presents.components.dictionary.config;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/buttondevteam/presents/components/dictionary/copy/DictionaryComponent.java

@@ -0,0 +1,51 @@
+package buttondevteam.presents.components.dictionary.copy;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.presents.architecture.Component;
+import buttondevteam.presents.components.dictionary.commands.SendJSON;
+import buttondevteam.presents.components.dictionary.commands.SendMessage;
+import buttondevteam.presents.components.dictionary.config.LoadConfig;
+import buttondevteam.presents.components.dictionary.config.SaveConfig;
+import buttondevteam.presents.components.dictionary.config.TimePersistence;
+import buttondevteam.presents.components.dictionary.effects.Bedsplode;
+import buttondevteam.presents.components.dictionary.pages.DataPage;
+import buttondevteam.presents.components.dictionary.pages.HelloPage;
+import buttondevteam.presents.components.dictionary.pages.JSONPage;
+import buttondevteam.presents.components.dictionary.pages.LocationPage;
+import buttondevteam.presents.components.dictionary.pages.POSTPage;
+import buttondevteam.presents.components.dictionary.pages.PlayersOnlinePage;
+import buttondevteam.presents.components.dictionary.spawning.PlaySound;
+import buttondevteam.presents.components.dictionary.spawning.SetBlock;
+import buttondevteam.presents.components.dictionary.spawning.SpawnCow;
+import buttondevteam.presents.components.dictionary.spawning.SpawnItem;
+import buttondevteam.presents.components.dictionary.spawning.SpawnMagicPotato;
+import buttondevteam.presents.components.dictionary.spawning.SpawnParticle;
+
+public class DictionaryComponent extends Component{
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		
+		this.registerCommand(plugin, new SendMessage());
+		this.registerCommand(plugin, new SendJSON());
+		this.registerCommand(plugin, new SaveConfig());
+		this.registerCommand(plugin, new LoadConfig());
+		this.registerCommand(plugin, new TimePersistence());
+		
+		this.registerListener(plugin, new Bedsplode());
+		this.registerCommand(plugin, new SpawnCow());
+		this.registerCommand(plugin, new SpawnItem());
+		this.registerCommand(plugin, new SpawnMagicPotato());
+		this.registerCommand(plugin, new SetBlock());
+		this.registerCommand(plugin, new SpawnParticle());
+		this.registerCommand(plugin, new PlaySound());
+		
+		this.addPage(plugin, new HelloPage());
+		this.addPage(plugin, new DataPage());
+		this.addPage(plugin, new PlayersOnlinePage(plugin));
+		this.addPage(plugin, new LocationPage(plugin));
+		this.addPage(plugin, new POSTPage(plugin));
+		this.addPage(plugin, new JSONPage());
+	}
+}

src/main/java/buttondevteam/presents/components/dictionary/effects/Bedsplode.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.effects;
+package buttondevteam.presents.components.dictionary.effects;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/buttondevteam/presents/components/dictionary/pages/DataPage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.pages;
+package buttondevteam.presents.components.dictionary.pages;
 
 import com.sun.net.httpserver.HttpExchange;
 

src/main/java/buttondevteam/presents/components/dictionary/pages/HelloPage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.pages;
+package buttondevteam.presents.components.dictionary.pages;
 
 import com.sun.net.httpserver.HttpExchange;
 

src/main/java/buttondevteam/presents/components/dictionary/pages/JSONPage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.pages;
+package buttondevteam.presents.components.dictionary.pages;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

src/main/java/buttondevteam/presents/components/dictionary/pages/LocationPage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.pages;
+package buttondevteam.presents.components.dictionary.pages;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dictionary/pages/POSTPage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.pages;
+package buttondevteam.presents.components.dictionary.pages;
 
 import java.io.IOException;
 

src/main/java/buttondevteam/presents/components/dictionary/pages/PlayersOnlinePage.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.pages;
+package buttondevteam.presents.components.dictionary.pages;
 
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;

src/main/java/buttondevteam/presents/components/dictionary/spawning/PlaySound.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.spawning;
+package buttondevteam.presents.components.dictionary.spawning;
 
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dictionary/spawning/SetBlock.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.spawning;
+package buttondevteam.presents.components.dictionary.spawning;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnCow.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.spawning;
+package buttondevteam.presents.components.dictionary.spawning;
 
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnItem.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.spawning;
+package buttondevteam.presents.components.dictionary.spawning;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnMagicPotato.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.spawning;
+package buttondevteam.presents.components.dictionary.spawning;
 
 import java.util.ArrayList;
 

src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnParticle.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dictionary.spawning;
+package buttondevteam.presents.components.dictionary.spawning;
 
 import org.bukkit.Particle;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dungeon/DungeonComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dungeon;
+package buttondevteam.presents.components.dungeon;
 
 import org.bukkit.plugin.java.JavaPlugin;
 

src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dungeon;
+package buttondevteam.presents.components.dungeon;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/dungeon/DungeonDelete.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.dungeon;
+package buttondevteam.presents.components.dungeon;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/magic/MagicComponent.java

@@ -1,13 +1,14 @@
-package buttondevteam.presents.magic;
+package buttondevteam.presents.components.magic;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
 import buttondevteam.presents.architecture.Component;
-import buttondevteam.presents.magic.tricks.AliArrowListener;
+import buttondevteam.presents.components.magic.tricks.AliArrowListener;
-import buttondevteam.presents.magic.tricks.BoomBowDeathListener;
+import buttondevteam.presents.components.magic.tricks.BoomBowDeathListener;
-import buttondevteam.presents.magic.tricks.BoomBowListener;
+import buttondevteam.presents.components.magic.tricks.BoomBowListener;
-import buttondevteam.presents.magic.tricks.CannonBowListener;
+import buttondevteam.presents.components.magic.tricks.CannonBowListener;
-import buttondevteam.presents.magic.tricks.CannonBowSettings;
+import buttondevteam.presents.components.magic.tricks.CannonBowSettings;
+
 
 public class MagicComponent extends Component{
 	

src/main/java/buttondevteam/presents/components/magic/tricks/AliArrowListener.java

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

src/main/java/buttondevteam/presents/components/magic/tricks/AliArrowTask.java

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

src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowDeathListener.java

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

src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowListener.java

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

src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowRule.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.magic.tricks;
+package buttondevteam.presents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 

src/main/java/buttondevteam/presents/components/magic/tricks/BoomDecayTask.java

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

src/main/java/buttondevteam/presents/components/magic/tricks/CannonBowListener.java

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

src/main/java/buttondevteam/presents/components/magic/tricks/CannonBowSettings.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.magic.tricks;
+package buttondevteam.presents.components.magic.tricks;
 
 import org.apache.commons.lang3.math.NumberUtils;
 import org.bukkit.entity.Player;

src/main/java/buttondevteam/presents/components/research/ResearchComponent.java

@@ -0,0 +1,15 @@
+package buttondevteam.presents.components.research;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.presents.architecture.Component;
+
+public class ResearchComponent extends Component {
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.spawn;
+package buttondevteam.presents.components.spawn;
 
 import org.bukkit.Server;
 import org.bukkit.command.BlockCommandSender;

src/main/java/buttondevteam/presents/components/spawn/SpawnComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.presents.spawn;
+package buttondevteam.presents.components.spawn;
 
 import org.bukkit.plugin.java.JavaPlugin;
 

src/main/java/buttondevteam/presents/dictionary/DictionaryComponent.java

@@ -1,51 +0,0 @@
-package buttondevteam.presents.dictionary;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import buttondevteam.presents.architecture.Component;
-import buttondevteam.presents.dictionary.commands.SendMessage;
-import buttondevteam.presents.dictionary.config.LoadConfig;
-import buttondevteam.presents.dictionary.config.SaveConfig;
-import buttondevteam.presents.dictionary.config.TimePersistence;
-import buttondevteam.presents.dictionary.commands.SendJSON;
-import buttondevteam.presents.dictionary.effects.Bedsplode;
-import buttondevteam.presents.dictionary.pages.DataPage;
-import buttondevteam.presents.dictionary.pages.JSONPage;
-import buttondevteam.presents.dictionary.pages.LocationPage;
-import buttondevteam.presents.dictionary.pages.POSTPage;
-import buttondevteam.presents.dictionary.pages.PlayersOnlinePage;
-import buttondevteam.presents.dictionary.spawning.PlaySound;
-import buttondevteam.presents.dictionary.spawning.SetBlock;
-import buttondevteam.presents.dictionary.spawning.SpawnCow;
-import buttondevteam.presents.dictionary.spawning.SpawnItem;
-import buttondevteam.presents.dictionary.spawning.SpawnMagicPotato;
-import buttondevteam.presents.dictionary.spawning.SpawnParticle;
-import buttondevteam.presents.dictionary.pages.HelloPage;
-
-public class DictionaryComponent extends Component{
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		
-		this.registerCommand(plugin, new SendMessage());
-		this.registerCommand(plugin, new SendJSON());
-		this.registerCommand(plugin, new SaveConfig());
-		this.registerCommand(plugin, new LoadConfig());
-		this.registerCommand(plugin, new TimePersistence());
-		
-		this.registerListener(plugin, new Bedsplode());
-		this.registerCommand(plugin, new SpawnCow());
-		this.registerCommand(plugin, new SpawnItem());
-		this.registerCommand(plugin, new SpawnMagicPotato());
-		this.registerCommand(plugin, new SetBlock());
-		this.registerCommand(plugin, new SpawnParticle());
-		this.registerCommand(plugin, new PlaySound());
-		
-		this.addPage(plugin, new HelloPage());
-		this.addPage(plugin, new DataPage());
-		this.addPage(plugin, new PlayersOnlinePage(plugin));
-		this.addPage(plugin, new LocationPage(plugin));
-		this.addPage(plugin, new POSTPage(plugin));
-		this.addPage(plugin, new JSONPage());
-	}
-}