Fix some things that broke on new skript versions

Author: Pikachu920

.gitignore

@@ -3,3 +3,4 @@
 build/
 out/
 server/
+dependencies/spigot*

build.gradle

@@ -47,7 +47,7 @@ dependencies {
     //Since it uses NMS/OBC stuffs, it's required to manually add the bukkit jars.
     compile fileTree(dir: 'dependencies', include: '*.jar')
     //Skript
-    compile 'ch.njol:skript:2.2-dev32'
+    compile 'ch.njol:skript:2.2-dev35b'
     //Generex API. Used to expressions to generate strings from regex
     compileWithJar files('dependencies/Generex.jar')
     //ViaVersion

dependencies/README.md

@@ -2,6 +2,10 @@
 
 Since it uses some NMS/OBC codes, It is necessary to manually add the spigot jars here.
 
+Note that gradle will use the Bukkit api from the first jar loaded and thus
+**you must prefix the latest Bukkit jar with `!!` so that gradle loads it first.**
+If you do not do this **TuSKe will not compile**. 
+
 1_12_R1: `spigot-1.12-R0.1-SNAPSHOT`  
 1_11_R1: `spigot-1.11-R0.1-SNAPSHOT`  
 1_10_R1: `spigot-1.10-R0.1-SNAPSHOT`  

src/main/java/com/github/tukenuke/tuske/effects/EffMakeDrop.java

@@ -2,7 +2,7 @@
 
 import ch.njol.skript.classes.Changer;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.Slot;
+import ch.njol.skript.util.slot.Slot;
 import com.github.tukenuke.tuske.TuSKe;
 import com.github.tukenuke.tuske.util.Registry;
 import org.bukkit.Material;

src/main/java/com/github/tukenuke/tuske/expressions/gui/ExprGUIValue.java

@@ -6,9 +6,9 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.CursorSlot;
-import ch.njol.skript.util.InventorySlot;
-import ch.njol.skript.util.Slot;
+import ch.njol.skript.util.slot.CursorSlot;
+import ch.njol.skript.util.slot.InventorySlot;
+import ch.njol.skript.util.slot.Slot;
 import com.github.tukenuke.tuske.manager.gui.v2.GUIInventory;
 import com.github.tukenuke.tuske.sections.gui.EffMakeGUI;
 import com.github.tukenuke.tuske.util.EffectSection;

src/main/java/com/github/tukenuke/tuske/util/VariableUtil.java

@@ -3,6 +3,7 @@
 import ch.njol.skript.variables.Variables;
 import org.bukkit.event.Event;
 
+import java.util.Map;
 import java.util.HashMap;
 import java.util.TreeMap;
 import java.util.WeakHashMap;
@@ -21,7 +22,7 @@ public static VariableUtil getInstance() {
 	private VariableUtil() {
 
 	}
-	public WeakHashMap<Event, Object> map = ReflectionUtils.getField(Variables.class, null, "localVariables");
+	public Map<Event, Object> map = ReflectionUtils.getField(Variables.class, null, "localVariables");
 	/**
 	 * Some hacking methods to copy variables from one event, and paste
 	 * to another. It allows to run the section using the same variables
@@ -39,8 +40,8 @@ public Object copyVariables(Event from){
 			//TuSKe.debug(newVariablesMap, variablesMap);
 			if (newVariablesMap == null)
 				return null;
-			HashMap<String, Object> single = ReflectionUtils.getField(newVariablesMap.getClass(), newVariablesMap, "hashMap");
-			TreeMap<String, Object> list = ReflectionUtils.getField(newVariablesMap.getClass(), newVariablesMap, "treeMap");
+			Map<String, Object> single = ReflectionUtils.getField(newVariablesMap.getClass(), newVariablesMap, "hashMap");
+			Map<String, Object> list = ReflectionUtils.getField(newVariablesMap.getClass(), newVariablesMap, "treeMap");
 			single.putAll(ReflectionUtils.getField(variablesMap.getClass(), variablesMap, "hashMap"));
 			list.putAll(ReflectionUtils.getField(variablesMap.getClass(), variablesMap, "treeMap"));
 			return newVariablesMap;