Skript timings WIP

Author: bensku

src/main/java/ch/njol/skript/aliases/ItemType.java

@@ -794,7 +794,7 @@ public boolean removeAll(final Inventory invi) {
 	 * @return Whether everything could be removed from the inventory
 	 */
 	public boolean removeFrom(final Inventory invi) {
-		final ItemStack[] buf = invi.getContents();
+		final ItemStack[] buf = getStorageContents(invi);
 		final ItemStack[] armour = invi instanceof PlayerInventory ? ((PlayerInventory) invi).getArmorContents() : null;
 
 		@SuppressWarnings("unchecked")

src/main/java/ch/njol/skript/timings/Timing.java

@@ -0,0 +1,29 @@
+/*
+ *   This file is part of Skript.
+ *
+ *  Skript is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Skript is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * Copyright 2011-2016 Peter Güttinger and contributors
+ * 
+ */
+
+package ch.njol.skript.timings;
+
+/**
+ *
+ */
+public class Timing {
+	
+}

src/main/java/ch/njol/skript/timings/Timings.java

@@ -0,0 +1,59 @@
+/*
+ *   This file is part of Skript.
+ *
+ *  Skript is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Skript is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * Copyright 2011-2016 Peter Güttinger and contributors
+ * 
+ */
+
+package ch.njol.skript.timings;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Static utils for Skript timings.
+ */
+public class Timings {
+	
+	static class TimingObject extends HashMap<String,Timing> {}
+	
+	private static Map<Object,TimingObject> timings = new HashMap<Object,TimingObject>();
+	
+	public static Timing of(Object obj, String name) {
+		TimingObject map;
+		synchronized (timings) {
+			if (timings.containsKey(obj)) {
+				map = timings.get(obj);
+			} else {
+				map = new TimingObject();
+				timings.put(obj, map);
+			}
+		}
+		
+		synchronized (map) {
+			if (map.containsKey(name)) {
+				return map.get(name);
+			} else {
+				Timing timing = new Timing();
+				map.put(name, timing);
+				return timing;
+			}
+		}
+	}
+}

src/main/java/ch/njol/skript/timings/package-info.java

@@ -0,0 +1,10 @@
+/**
+ * Code related to item aliases.
+ * 
+ * @author Peter Güttinger
+ */
+@NonNullByDefault
+package ch.njol.skript.timings;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+