Minor fixes; remove api depend

lyokofirelyte · Jun 12, 2016 · 9dc4af1 · 9dc4af1
1 parent 92d4c5a
commit 9dc4af1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,6 +16,12 @@
 			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.github.lyokofirelyte</groupId>
+			<artifactId>vault</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<sourceDirectory>vt</sourceDirectory>

diff --git a/vt/com/github/lyokofirelyte/VariableTriggers/Manager/WorldEditHook.java b/vt/com/github/lyokofirelyte/VariableTriggers/Manager/WorldEditHook.java
@@ -1,6 +1,6 @@
 package com.github.lyokofirelyte.VariableTriggers.Manager;
 
-import org.bukkit.Bukkit;
+/*import org.bukkit.Bukkit;
 
 import com.github.lyokofirelyte.VariableTriggers.VariableTriggers;
 import com.github.lyokofirelyte.VariableTriggers.Identifiers.AR;
@@ -30,4 +30,4 @@ public boolean hookSetup(){
 	public WorldEditPlugin getWe(){
 		return we;
 	}
-}
+}*/
diff --git a/vt/com/github/lyokofirelyte/VariableTriggers/VTParser.java b/vt/com/github/lyokofirelyte/VariableTriggers/VTParser.java
@@ -17,9 +17,6 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
-import me.clip.placeholderapi.PlaceholderAPI;
-import net.milkbowl.vault.economy.EconomyResponse;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.Effect;
@@ -49,6 +46,8 @@
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 
+import net.milkbowl.vault.economy.EconomyResponse;
+
 public class VTParser {
 
 	private VariableTriggers main;
@@ -1557,9 +1556,9 @@ public String parseVars(String arg){
 		}
 
 		String toReturn = args.size() > 0 ? args.get(args.size()-1) : arg;
-		try {
+		/*try {
 			toReturn = PlaceholderAPI.setPlaceholders(p, toReturn);
-		} catch (Exception e){}
+		} catch (Exception e){}*/
 		return toReturn;
 	}
 

diff --git a/vt/com/github/lyokofirelyte/VariableTriggers/VTSetup.java b/vt/com/github/lyokofirelyte/VariableTriggers/VTSetup.java
@@ -28,7 +28,6 @@
 import com.github.lyokofirelyte.VariableTriggers.Identifiers.VTMap;
 import com.github.lyokofirelyte.VariableTriggers.Manager.VTRegistry;
 import com.github.lyokofirelyte.VariableTriggers.Manager.VaultHook;
-import com.github.lyokofirelyte.VariableTriggers.Manager.WorldEditHook;
 import com.github.lyokofirelyte.VariableTriggers.Utils.FWTools;
 import com.github.lyokofirelyte.VariableTriggers.Utils.VTUtils;
 import com.google.common.io.Files;
@@ -150,11 +149,11 @@ public VTSetup start(){
 		helpFiles();
 
 		main.vault = (VaultHook) registeredClasses.get(VaultHook.class.toString());
-		main.we = (WorldEditHook) registeredClasses.get(WorldEditHook.class.toString());
+		//main.we = (WorldEditHook) registeredClasses.get(WorldEditHook.class.toString());
 		main.fw = new FWTools().init();
 
 		main.vault.hookSetup();
-		main.we.hookSetup();
+		//main.we.hookSetup();
 
 		return this;
 	}

diff --git a/vt/com/github/lyokofirelyte/VariableTriggers/VariableTriggers.java b/vt/com/github/lyokofirelyte/VariableTriggers/VariableTriggers.java
@@ -17,7 +17,6 @@
 import com.github.lyokofirelyte.VariableTriggers.Identifiers.VTData;
 import com.github.lyokofirelyte.VariableTriggers.Identifiers.VTMap;
 import com.github.lyokofirelyte.VariableTriggers.Manager.VaultHook;
-import com.github.lyokofirelyte.VariableTriggers.Manager.WorldEditHook;
 import com.github.lyokofirelyte.VariableTriggers.Utils.FWTools;
 import com.github.lyokofirelyte.VariableTriggers.Utils.FancyLogging;
 
@@ -29,7 +28,7 @@ public class VariableTriggers extends JavaPlugin {
 	public FWTools fw;
 	public FancyLogging logger;
 	public VaultHook vault;
-	public WorldEditHook we;
+	//public WorldEditHook we;
 	public VTMap<Object, Object> clicks;
 	public VTMap<Object, Object> areas;
 	public VTMap<Object, Object> walks;