Added pom.xml

2016-09-17 16:51:06 -04:00 · 2016-09-17 16:51:06 -04:00 · 38007dae2d
parent b9c0c59371
commit 38007dae2d
9 changed files with 102 additions and 26 deletions
--- a/.classpath
+++ b/.classpath
@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<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/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="C:/Users/Alisolarflare/Personal/Hobbies/The Button Rebirth/Button Plugin/Minecraft Test Server/craftbukkit-1.9.2.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Alisolarflare/Personal/Hobbies/The Button Rebirth/Button Plugin/Minecraft Test Server/spigot-1.9.2.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Alisolarflare/Personal/Hobbies/The Button Rebirth/Dependencies/gson-2.7.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /bin/
+/target/
--- a/.project
+++ b/.project
@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
--- a/.settings/org.eclipse.m2e.core.prefs
+++ b/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/pom.xml
+++ b/pom.xml
@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.github.tbmcplugins</groupId>
+  <artifactId>AliPresents</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>AliPresents</name>
+  <description>A bucket of aaall the stuff Ali makes. It's a bit smelly.</description>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source/>
+          <target/>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
--- a/src/alisolarflare/flairdoors/PortalListener.java
+++ b/src/alisolarflare/flairdoors/PortalListener.java
@ -1,20 +1,23 @@
 package alisolarflare.flairdoors;

 import java.util.AbstractMap;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;

 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.world.PortalCreateEvent;
+import org.bukkit.event.entity.EntityPortalEvent;

 import alisolarflare.AliPresents;

 public class PortalListener implements Listener{
 	AbstractMap<String,Location> portalMap = new HashMap<String,Location>();
+	public List<String> playersToBeFlaired = new ArrayList<String>();
 	private AliPresents plugin;
 	
 	//TODO: CREATE - LIST OF PORTALS (only x-z values)
@ -23,7 +26,38 @@ public class PortalListener implements Listener{
 	public PortalListener(AliPresents plugin) {
 		this.plugin = plugin;
 	}
-	
+	@EventHandler
+	public void onPortalEnter(EntityPortalEvent event){
+		if(!(event.getEntity() instanceof Player)){
+			return;
+		}
+		Player player = (Player) event.getEntity();
+		if(!(playersToBeFlaired.contains(player.getName()))){
+			return;
+		}
+		
+		int x = player.getLocation().getBlockX();
+		int y = player.getLocation().getBlockY();
+		int z = player.getLocation().getBlockZ();
+		
+		Material blockTopper = player.getWorld().getBlockAt(x,y-1,z).getType();
+		Material blockMiddle = player.getWorld().getBlockAt(x,y-2,z).getType();
+		Material blockBottom = player.getWorld().getBlockAt(x,y-3,z).getType();
+		
+		if(blockTopper == Material.STONE){
+			
+		}else if(blockTopper == Material.WOOL){
+			
+		}
+		//TODO: IF PLAYER LOCATION IS INSIDE A COLOUR PORTAL
+		//TODO: IF PLAYER NOT FLAIRED
+		//TODO: IF PLAYERSTATE IS TRUE
+		//TODO: CHANGE CUSTOM DISPLAY NAME
+		//TODO: TELEPORT TO SPAWN
+		//TODO: MARK PLAYER AS COLOURED
+		
+	}
+	/*
 	@EventHandler
 	public void onAliRightClick(PlayerInteractEvent event){
 		if (event.getPlayer().getName() != "alisolarflare"){
@ -48,7 +82,8 @@ public class PortalListener implements Listener{
 	/*
 	 *  NOTE: WRONG ENTITY EVENT ALLTOGETHER.
 	 *  ENTITY CREATE PORTAL EVENT ONLY TRIGGERS WHEN AN ENDERDRAGON DIES
-	 * 
+	 */
+	/*
 	@EventHandler
 	public void onPortalLight(EntityCreatePortalEvent event){
 		plugin.getServer().broadcastMessage("PORTAL LIT WHOOP WHOOP");
@ -79,16 +114,7 @@ public class PortalListener implements Listener{
 			portalMap.put(colourMode, portalLocation);
 		}
 	}
-	/*
-	@EventHandler
-	public void onPortalEnter(EntityPortalEvent event){
-		//TODO: IF PLAYER LOCATION IS INSIDE A COLOUR PORTAL
-		//TODO: IF PLAYER NOT FLAIRED
-		//TODO: IF PLAYERSTATE IS TRUE
-		//TODO: CHANGE CUSTOM DISPLAY NAME
-		//TODO: TELEPORT TO SPAWN
-		//TODO: MARK PLAYER AS COLOURED
-		
-	}
 	*/
+	
+	
 }
--- a/src/alisolarflare/links/commands/SetAliLink.java
+++ b/src/alisolarflare/links/commands/SetAliLink.java
@ -1,6 +1,5 @@
 package alisolarflare.links.commands;

-import java.io.IOException;

 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Location;
@ -55,9 +54,9 @@ public class SetAliLink implements CommandExecutor{
 		subplugin.plugin.getConfig().set("aliLinkList", subplugin.linkList);
 		try {
 			player.sendMessage("SAVIN");
-			subplugin.plugin.getConfig().save("aliLinkList");
+			subplugin.plugin.saveConfig();
 			player.sendMessage("GOOD SAVE");
-		} catch (IOException e) {
+		} catch (Exception e) {
 			player.sendMessage("YOU FUCKED STUFF UP");
 			// TODO Auto-generated catch block
 			e.printStackTrace();
--- a/src/alisolarflare/links/entities/Link.java
+++ b/src/alisolarflare/links/entities/Link.java
@ -14,10 +14,10 @@ public class Link implements Serializable{
 	 */
 	private static final long serialVersionUID = 1L;
 	public String frequency;
-	String world;
-	String x;
-	String y;
-	String z;
+	public String world;
+	public String x;
+	public String y;
+	public String z;
 	
 	
 	public Link(String frequency, Location location){