From 7387013788721edcfbdfa82ecaa08953c488720a Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Sun, 23 Oct 2016 02:12:11 +0200
Subject: [PATCH] Moved files

---
 .../java/buttondevteam/bucket/MainPlugin.java | 25 ++-----------------
 .../buttondevteam/bucket/PlayerListener.java  |  2 +-
 .../buttondevteam/bucket/TBMCCoreAPI.java     |  4 +--
 .../java/buttondevteam/bucket/TBMCPlayer.java |  2 +-
 .../bucket/TBMCPlayerAddEvent.java            |  2 +-
 .../bucket/TBMCPlayerJoinEvent.java           |  2 +-
 .../bucket/TBMCPlayerLoadEvent.java           |  2 +-
 .../bucket/TBMCPlayerQuitEvent.java           |  2 +-
 .../bucket/TBMCPlayerSaveEvent.java           |  2 +-
 9 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/main/java/buttondevteam/bucket/MainPlugin.java b/src/main/java/buttondevteam/bucket/MainPlugin.java
index 6d78583..4f4c675 100644
--- a/src/main/java/buttondevteam/bucket/MainPlugin.java
+++ b/src/main/java/buttondevteam/bucket/MainPlugin.java
@@ -2,45 +2,24 @@ package buttondevteam.bucket;
 
 import java.util.logging.Logger;
 
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import buttondevteam.bucket.core.CoreSubPlugin;
-
 public class MainPlugin extends JavaPlugin {
 	public static MainPlugin Instance;
 
 	private PluginDescriptionFile pdfFile;
 	private Logger logger;
-	private CoreSubPlugin playerSubPlugin;
 
 	public void onEnable() {
 		// Logs "Plugin Enabled", registers commands
 		Instance = this;
 		pdfFile = getDescription();
 		logger = getLogger();
-		logger.info(pdfFile.getName() + " has been started (V." + pdfFile.getVersion() + ").");
-
-		registerSubPlugins();
-		registerCommands();
-		registerEvents();
 
 		logger.info(pdfFile.getName() + " has been Enabled (V." + pdfFile.getVersion() + ").");
-	}
-
-	private void registerSubPlugins() {
-		playerSubPlugin = new CoreSubPlugin(this);
-		playerSubPlugin.register();
-	}
-
-	private void registerCommands() {
-		// TODO Auto-generated method stub
-
-	}
-
-	private void registerEvents() {
-		// TODO Auto-generated method stub
-
+		Bukkit.getPluginManager().registerEvents(new PlayerListener(), this);
 	}
 
 }
diff --git a/src/main/java/buttondevteam/bucket/PlayerListener.java b/src/main/java/buttondevteam/bucket/PlayerListener.java
index 33a25f2..7b4f243 100644
--- a/src/main/java/buttondevteam/bucket/PlayerListener.java
+++ b/src/main/java/buttondevteam/bucket/PlayerListener.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/buttondevteam/bucket/TBMCCoreAPI.java b/src/main/java/buttondevteam/bucket/TBMCCoreAPI.java
index bf244a8..2214985 100644
--- a/src/main/java/buttondevteam/bucket/TBMCCoreAPI.java
+++ b/src/main/java/buttondevteam/bucket/TBMCCoreAPI.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -17,8 +17,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import buttondevteam.bucket.MainPlugin;
-
 public final class TBMCCoreAPI {
 	/**
 	 * Updates or installs the specified plugin. The plugin must use Maven.
diff --git a/src/main/java/buttondevteam/bucket/TBMCPlayer.java b/src/main/java/buttondevteam/bucket/TBMCPlayer.java
index 192b051..cae2c1d 100644
--- a/src/main/java/buttondevteam/bucket/TBMCPlayer.java
+++ b/src/main/java/buttondevteam/bucket/TBMCPlayer.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/buttondevteam/bucket/TBMCPlayerAddEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerAddEvent.java
index 7d0b789..6aba70e 100644
--- a/src/main/java/buttondevteam/bucket/TBMCPlayerAddEvent.java
+++ b/src/main/java/buttondevteam/bucket/TBMCPlayerAddEvent.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/buttondevteam/bucket/TBMCPlayerJoinEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerJoinEvent.java
index 3480acc..769e813 100644
--- a/src/main/java/buttondevteam/bucket/TBMCPlayerJoinEvent.java
+++ b/src/main/java/buttondevteam/bucket/TBMCPlayerJoinEvent.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/buttondevteam/bucket/TBMCPlayerLoadEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerLoadEvent.java
index 0c387bc..5dd67fa 100644
--- a/src/main/java/buttondevteam/bucket/TBMCPlayerLoadEvent.java
+++ b/src/main/java/buttondevteam/bucket/TBMCPlayerLoadEvent.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.Event;
diff --git a/src/main/java/buttondevteam/bucket/TBMCPlayerQuitEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerQuitEvent.java
index bae3509..d32a63a 100644
--- a/src/main/java/buttondevteam/bucket/TBMCPlayerQuitEvent.java
+++ b/src/main/java/buttondevteam/bucket/TBMCPlayerQuitEvent.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/buttondevteam/bucket/TBMCPlayerSaveEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerSaveEvent.java
index 3eb242b..8668249 100644
--- a/src/main/java/buttondevteam/bucket/TBMCPlayerSaveEvent.java
+++ b/src/main/java/buttondevteam/bucket/TBMCPlayerSaveEvent.java
@@ -1,4 +1,4 @@
-package buttondevteam.bucket.core;
+package buttondevteam.bucket;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.Event;