Merge branch 'dev/feature' into feature/beta-type-properties

Author: APickledWalrus

.github/CODEOWNERS

@@ -70,3 +70,6 @@
 
 # EntityData
 /src/main/java/ch/njol/skript/entity @Absolutionism @skriptlang/core-developers
+
+# Particles/Effects
+/src/main/java/org/skriptlang/skript/bukkit/particles @sovdeeth @skriptlang/core-developers

src/main/java/ch/njol/skript/Skript.java

@@ -99,9 +99,11 @@
 import org.skriptlang.skript.bukkit.fishing.FishingModule;
 import org.skriptlang.skript.bukkit.furnace.FurnaceModule;
 import org.skriptlang.skript.bukkit.input.InputModule;
+import org.skriptlang.skript.bukkit.interactions.InteractionModule;
 import org.skriptlang.skript.bukkit.itemcomponents.ItemComponentModule;
 import org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer;
 import org.skriptlang.skript.bukkit.loottables.LootTableModule;
+import org.skriptlang.skript.bukkit.particles.ParticleModule;
 import org.skriptlang.skript.bukkit.potion.PotionModule;
 import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
 import org.skriptlang.skript.bukkit.tags.TagModule;
@@ -449,7 +451,7 @@ public void onEnable() {
 					if (!aliasesFolder.mkdirs())
 						throw new IOException("Could not create the directory " + aliasesFolder);
 				}
-				
+
 				f = new ZipFile(getFile());
 				for (ZipEntry e : new EnumerationIterable<ZipEntry>(f.entries())) {
 					if (e.isDirectory())
@@ -605,8 +607,10 @@ public void onEnable() {
 				new BrewingModule(),
 				new EntityModule(),
 				new DamageSourceModule(),
+				new InteractionModule(),
 				new ItemComponentModule(),
-				new PotionModule());
+				new PotionModule(),
+				new ParticleModule());
 		} catch (final Exception e) {
 			exception(e, "Could not load required .class files: " + e.getLocalizedMessage());
 			setEnabled(false);

src/main/java/ch/njol/skript/classes/EnumParser.java

@@ -20,7 +20,7 @@ public class EnumParser<E extends Enum<E>> extends PatternedParser<E> implements
 	private final Class<E> enumClass;
 	private final String languageNode;
 	private String[] names;
-	private final Map<String, E> parseMap = new HashMap<>();
+	protected final Map<String, E> parseMap = new HashMap<>();
 	private String[] patterns;
 
 	/**
@@ -65,11 +65,17 @@ void refresh() {
 				String first = strippedOption.getFirst();
 				Integer second = strippedOption.getSecond();
 
+				NonNullPair<String, String> singlePlural = Noun.getPlural(first);
+				String single = singlePlural.getFirst();
+				String plural = singlePlural.getSecond();
+
 				if (names[ordinal] == null) { // Add to name array if needed
-					names[ordinal] = first;
+					names[ordinal] = single;
 				}
 
-				parseMap.put(first, constant);
+				parseMap.put(single, constant);
+				if (!plural.isEmpty())
+					parseMap.put(plural, constant);
 				if (second != -1) { // There is a gender present
 					parseMap.put(Noun.getArticleWithSpace(second, Language.F_INDEFINITE_ARTICLE) + first, constant);
 				}

src/main/java/ch/njol/skript/classes/Serializer.java

@@ -16,9 +16,6 @@
 import ch.njol.yggdrasil.Fields;
 import ch.njol.yggdrasil.YggdrasilSerializer;
 
-/**
- * @author Peter Güttinger
- */
 public abstract class Serializer<T> extends YggdrasilSerializer<T> {
 
 	@Nullable
@@ -79,10 +76,12 @@ public <E extends T> E newInstance(final Class<E> c) {
 	 */
 	@Override
 	public abstract Fields serialize(T o) throws NotSerializableException;
-	
+
 	@Override
-	public abstract void deserialize(T o, Fields f) throws StreamCorruptedException, NotSerializableException;
-	
+	public void deserialize(T o, Fields f) throws StreamCorruptedException, NotSerializableException {
+		throw new SkriptAPIException("deserialize(Object, Fields) has not been overridden in " + getClass() + " (serializer of " + info + ")");
+	}
+
 	/**
 	 * Not currently used (everything happens on Bukkit's main thread).
 	 *