From f8504c026470cb8f38ea88d0dc74e90326141c5e Mon Sep 17 00:00:00 2001
From: alisolarflare <alisunderstorm@gmail.com>
Date: Sat, 10 Jun 2017 00:47:33 -0700
Subject: [PATCH] Created HelloDataPage, and refactored

---
 .../java/buttondevteam/presents/Main.java     |  2 --
 .../presents/architecture/Component.java      |  6 +++++
 .../presents/hello/HelloComponent.java        |  5 ++++
 .../presents/hello/pages/HelloDataPage.java   | 26 +++++++++++++++++++
 .../pages/HelloWorldPage.java}                |  6 ++---
 .../presents/servlet/ServletComponent.java    | 16 ------------
 6 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/buttondevteam/presents/hello/pages/HelloDataPage.java
 rename src/main/java/buttondevteam/presents/{servlet/AliHelloPage.java => hello/pages/HelloWorldPage.java} (72%)
 delete mode 100644 src/main/java/buttondevteam/presents/servlet/ServletComponent.java

diff --git a/src/main/java/buttondevteam/presents/Main.java b/src/main/java/buttondevteam/presents/Main.java
index 921cd99..d27ecfc 100644
--- a/src/main/java/buttondevteam/presents/Main.java
+++ b/src/main/java/buttondevteam/presents/Main.java
@@ -7,7 +7,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import buttondevteam.presents.hello.HelloComponent;
 import buttondevteam.presents.rtp.RandomTeleportComponent;
-import buttondevteam.presents.servlet.ServletComponent;
 
 public class Main extends JavaPlugin{
 	public void onEnable(){
@@ -18,7 +17,6 @@ PluginDescriptionFile pdfFile = getDescription();
 		
 		new HelloComponent().register(this);
 		new RandomTeleportComponent().register(this);
-		new ServletComponent().register(this);
 		
 		logger.info(pdfFile.getName() + " has fully registered (V." + pdfFile.getVersion()+ ").");
 	}
diff --git a/src/main/java/buttondevteam/presents/architecture/Component.java b/src/main/java/buttondevteam/presents/architecture/Component.java
index 0d6a98c..9d6d055 100644
--- a/src/main/java/buttondevteam/presents/architecture/Component.java
+++ b/src/main/java/buttondevteam/presents/architecture/Component.java
@@ -7,6 +7,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import buttondevteam.lib.chat.TBMCCommandBase;
+import buttondevteam.website.ButtonWebsiteModule;
+import buttondevteam.website.page.Page;
 
 /**
  * A Module class allows the compacting of projects into one single package. 
@@ -48,6 +50,10 @@ public abstract class Component{
 		TBMCCoreAPI.RegisterEventsForExceptions(listener, plugin);
 		return listener;
 	}
+	protected Page addPage(JavaPlugin plugin, Page page){
+		ButtonWebsiteModule.addPage(page);
+		return page;
+	}
 
 	public void saveData(FileConfiguration config, String pathToData, Object data){
 		config.set("moduledata." + this.getClassName() + "." + pathToData, data);
diff --git a/src/main/java/buttondevteam/presents/hello/HelloComponent.java b/src/main/java/buttondevteam/presents/hello/HelloComponent.java
index 433c8c1..3a93a41 100644
--- a/src/main/java/buttondevteam/presents/hello/HelloComponent.java
+++ b/src/main/java/buttondevteam/presents/hello/HelloComponent.java
@@ -14,6 +14,8 @@ import buttondevteam.presents.hello.effects.HelloItem;
 import buttondevteam.presents.hello.effects.HelloMagicPotato;
 import buttondevteam.presents.hello.effects.HelloParticle;
 import buttondevteam.presents.hello.effects.HelloSound;
+import buttondevteam.presents.hello.pages.HelloDataPage;
+import buttondevteam.presents.hello.pages.HelloWorldPage;
 
 public class HelloComponent extends Component{
 
@@ -30,5 +32,8 @@ public class HelloComponent extends Component{
 		this.registerCommand(plugin, new HelloBlock());
 		this.registerCommand(plugin, new HelloParticle());
 		this.registerCommand(plugin, new HelloSound());
+		
+		this.addPage(plugin, new HelloWorldPage());
+		this.addPage(plugin, new HelloDataPage());
 	}
 }
diff --git a/src/main/java/buttondevteam/presents/hello/pages/HelloDataPage.java b/src/main/java/buttondevteam/presents/hello/pages/HelloDataPage.java
new file mode 100644
index 0000000..2c2dc84
--- /dev/null
+++ b/src/main/java/buttondevteam/presents/hello/pages/HelloDataPage.java
@@ -0,0 +1,26 @@
+package buttondevteam.presents.hello.pages;
+
+import com.sun.net.httpserver.HttpExchange;
+
+import buttondevteam.website.io.Response;
+import buttondevteam.website.page.Page;
+
+public class HelloDataPage extends Page{
+	private final int data = 1234561;
+
+	@Override
+	public String GetName() {
+		return "ali/hello/data";
+	}
+
+	@Override
+	public Response handlePage(HttpExchange exchange) {
+		String responseString = 
+			"<h1>Come check out this data!</h1>"
+			+ "<p>" + data + "</p>"
+			+ "<p>This is not suspicious shit at all</p>";
+		
+		return new Response(200, responseString, exchange);
+	}
+
+}
diff --git a/src/main/java/buttondevteam/presents/servlet/AliHelloPage.java b/src/main/java/buttondevteam/presents/hello/pages/HelloWorldPage.java
similarity index 72%
rename from src/main/java/buttondevteam/presents/servlet/AliHelloPage.java
rename to src/main/java/buttondevteam/presents/hello/pages/HelloWorldPage.java
index e8f6e9f..3dedc32 100644
--- a/src/main/java/buttondevteam/presents/servlet/AliHelloPage.java
+++ b/src/main/java/buttondevteam/presents/hello/pages/HelloWorldPage.java
@@ -1,15 +1,15 @@
-package buttondevteam.presents.servlet;
+package buttondevteam.presents.hello.pages;
 
 import com.sun.net.httpserver.HttpExchange;
 
 import buttondevteam.website.io.Response;
 import buttondevteam.website.page.Page;
 
-public class AliHelloPage extends Page {
+public class HelloWorldPage extends Page {
 
 	@Override
 	public String GetName() {
-		return "ali";
+		return "ali/hello/world";
 	}
 
 	@Override
diff --git a/src/main/java/buttondevteam/presents/servlet/ServletComponent.java b/src/main/java/buttondevteam/presents/servlet/ServletComponent.java
deleted file mode 100644
index 58cb125..0000000
--- a/src/main/java/buttondevteam/presents/servlet/ServletComponent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package buttondevteam.presents.servlet;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import buttondevteam.presents.architecture.Component;
-import buttondevteam.website.ButtonWebsiteModule;
-
-public class ServletComponent extends Component {
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		ButtonWebsiteModule.addPage(new AliHelloPage());
-
-	}
-
-}