Inventory actions WIP

Author: bensku

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -76,6 +76,7 @@
 import ch.njol.skript.util.BiomeUtils;
 import ch.njol.skript.util.DamageCauseUtils;
 import ch.njol.skript.util.EnchantmentType;
+import ch.njol.skript.util.InventoryActions;
 import ch.njol.skript.util.PotionEffectUtils;
 import ch.njol.skript.util.StringMode;
 import ch.njol.util.StringUtils;
@@ -482,7 +483,7 @@ public String getVariableNamePattern() {
 				.user("inventory actions?")
 				.name("Inventory Action")
 				.description("There are multiple ways to perform clicks in inventories. Inventory actions represent them.")
-				.user(Language.getList("inventory actions"))
+				.user(InventoryActions.getAllNames())
 				.examples("")
 				.since("2.2-dev16")
 				.defaultExpression(new EventValueExpression<InventoryAction>(InventoryAction.class))
@@ -491,22 +492,23 @@ public String getVariableNamePattern() {
 					@Override
 					@Nullable
 					public InventoryAction parse(String s, ParseContext context) {
-						return null; // TODO Do this, while supporting language changes... How?
+						return InventoryActions.parse(s);
 					}
 
 					@Override
 					public String toString(InventoryAction o, int flags) {
-						return Language.get("inventory actions." + o.toString().toLowerCase());
+						return InventoryActions.toString(o, flags);
 					}
 
+					@SuppressWarnings("null")
 					@Override
 					public String toVariableNameString(InventoryAction o) {
-						return Language.get("inventory actions." + o.toString().toLowerCase());
+						return o.name();
 					}
 
 					@Override
 					public String getVariableNamePattern() {
-						return "[a-z]+";
+						return "\\S+";
 					}
 
 				}));

src/main/java/ch/njol/skript/classes/data/DefaultChangers.java

@@ -196,7 +196,6 @@ public Class<? extends Object>[] acceptChange(final ChangeMode mode) {
 			return CollectionUtils.array(ItemType[].class, Inventory[].class);
 		}
 
-		@SuppressWarnings("null")
 		@Override
 		public void change(final Inventory[] invis, final @Nullable Object[] delta, final ChangeMode mode) {
 			for (final Inventory invi : invis) {

src/main/java/ch/njol/skript/util/InventoryActions.java

@@ -0,0 +1,46 @@
+/*
+ *   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.util;
+
+import org.bukkit.block.Biome;
+import org.bukkit.event.inventory.InventoryAction;
+import org.eclipse.jdt.annotation.Nullable;
+
+/**
+ * Inventory action utils...
+ */
+public class InventoryActions {
+	
+	private final static EnumUtils<InventoryAction> util = new EnumUtils<InventoryAction>(InventoryAction.class, "inventory actions");
+	
+	public static @Nullable InventoryAction parse(String s) {
+		return util.parse(s);
+	}
+	
+	public static String getAllNames() {
+		return util.getAllNames();
+	}
+	
+	public static String toString(final InventoryAction action, final int flags) {
+		return util.toString(action, flags);
+	}
+}