Replace matches to prefilter builder

Author: Anatoliy057

.gitignore

@@ -343,4 +343,4 @@ persistence.json
 src/main/resources/apps.methodscript.com/tsp-output
 
 # VSCode
-.vscode
+.vscode/*

src/main/java/com/laytonsmith/abstraction/events/MCEntityEvent.java

@@ -0,0 +1,12 @@
+package com.laytonsmith.abstraction.events;
+
+import com.laytonsmith.abstraction.MCEntity;
+import com.laytonsmith.abstraction.enums.MCEntityType;
+import com.laytonsmith.core.events.BindableEvent;
+
+public interface MCEntityEvent extends BindableEvent {
+
+	MCEntity getEntity();
+
+	MCEntityType getEntityType();
+}

src/main/java/com/laytonsmith/abstraction/events/MCEntityToggleSwimEvent.java

@@ -1,14 +1,7 @@
 package com.laytonsmith.abstraction.events;
 
-import com.laytonsmith.abstraction.MCEntity;
-import com.laytonsmith.abstraction.enums.MCEntityType;
-import com.laytonsmith.core.events.BindableEvent;
 
-public interface MCEntityToggleSwimEvent extends BindableEvent {
+public interface MCEntityToggleSwimEvent extends MCEntityEvent {
 
 	boolean isSwimming();
-
-	MCEntity getEntity();
-
-	MCEntityType getEntityType();
 }

src/main/java/com/laytonsmith/core/events/drivers/EntityEvents.java

@@ -77,6 +77,9 @@
 import com.laytonsmith.core.events.EventBuilder;
 import com.laytonsmith.core.events.Prefilters;
 import com.laytonsmith.core.events.Prefilters.PrefilterType;
+import com.laytonsmith.core.events.prefilters.OptionalPlayerPrefilterMatcher;
+import com.laytonsmith.core.events.prefilters.PrefilterBuilder;
+import com.laytonsmith.core.events.prefilters.StringICPrefilterMatcher;
 import com.laytonsmith.core.exceptions.CRE.CREBadEntityException;
 import com.laytonsmith.core.exceptions.CRE.CREBindException;
 import com.laytonsmith.core.exceptions.CRE.CRECastException;
@@ -2074,16 +2077,23 @@ public String docs() {
 					+ " {}";
 		}
 
-		@Override
-		public boolean matches(Map<String, Mixed> filter, MCEntityToggleSwimEvent e) throws PrefilterNonMatchException {
-			MCEntity entity = e.getEntity();
-			Prefilters.match(filter, "type", entity.getType().name(), Prefilters.PrefilterType.MACRO);
-			Prefilters.match(filter, "id", entity.getUniqueId().toString(), Prefilters.PrefilterType.MACRO);
 
-			if(entity instanceof MCPlayer) {
-				Prefilters.match(filter, "player", ((MCPlayer) entity).getName(), Prefilters.PrefilterType.MACRO);
-			}
-			return true;
+		@Override
+		protected PrefilterBuilder getPrefilterBuilder() {
+			return new PrefilterBuilder<MCEntityToggleSwimEvent>()
+					.set("player", "The player that toggle swime", new OptionalPlayerPrefilterMatcher<>())
+					.set("type", "The entity type of the entity that toggle swime", new StringICPrefilterMatcher<>() {
+						@Override
+						protected String getProperty(MCEntityToggleSwimEvent event) {
+							return event.getEntityType().name();
+						}
+					})
+					.set("id", "The ID of the entity that toggle swime", new StringICPrefilterMatcher<>() {
+						@Override
+						protected String getProperty(MCEntityToggleSwimEvent event) {
+							return event.getEntity().getUniqueId().toString();
+						}
+					});
 		}
 
 		@Override
@@ -2125,7 +2135,8 @@ public Driver driver() {
 		}
 
 		@Override
-		public void cancel(MCEntityToggleSwimEvent o, boolean state) {}
+		public void cancel(MCEntityToggleSwimEvent o, boolean state) {
+		}
 
 		@Override
 		public boolean isCancellable(MCEntityToggleSwimEvent o) {

src/main/java/com/laytonsmith/core/events/prefilters/OptionalPlayerPrefilterMatcher.java

@@ -0,0 +1,62 @@
+package com.laytonsmith.core.events.prefilters;
+
+import com.laytonsmith.abstraction.MCEntity;
+import com.laytonsmith.abstraction.MCPlayer;
+import com.laytonsmith.abstraction.events.MCEntityEvent;
+import com.laytonsmith.core.ParseTree;
+import com.laytonsmith.core.compiler.CompilerEnvironment;
+import com.laytonsmith.core.compiler.CompilerWarning;
+import com.laytonsmith.core.constructs.CClassType;
+import com.laytonsmith.core.constructs.CNull;
+import com.laytonsmith.core.constructs.CString;
+import com.laytonsmith.core.constructs.Target;
+import com.laytonsmith.core.environments.Environment;
+import com.laytonsmith.core.events.prefilters.PlayerPrefilterMatcher.PlayerPrefilterDocs;
+import com.laytonsmith.core.exceptions.ConfigCompileException;
+import com.laytonsmith.core.exceptions.ConfigCompileGroupException;
+import com.laytonsmith.core.exceptions.ConfigRuntimeException;
+import com.laytonsmith.core.natives.interfaces.Mixed;
+
+/**
+ * A OptionalPlayerPrefilterMatcher is a relatively specialized PrefilterMatcher which only works with MCEntityEvent subtypes.
+ * It simply checks that entity is a player and matches the player name against the specified input.
+ *
+ * @param <T>
+ */
+public class OptionalPlayerPrefilterMatcher<T extends MCEntityEvent> extends MacroICPrefilterMatcher<T> {
+
+	@Override
+	public PrefilterDocs getDocsObject() {
+		return new PlayerPrefilterDocs();
+	}
+
+	@Override
+	public void validate(ParseTree node, CClassType nodeType, Environment env)
+			throws ConfigCompileException, ConfigCompileGroupException, ConfigRuntimeException {
+		if(!nodeType.doesExtend(CString.TYPE)) {
+			env.getEnv(CompilerEnvironment.class).addCompilerWarning(node.getFileOptions(),
+					new CompilerWarning("Expected a string (player) here, this may not perform as expected.",
+							node.getTarget(), null));
+		}
+	}
+
+	@Override
+	public boolean matches(String key, Mixed value, T event, Target t) {
+		Object prop = getProperty(event);
+		if(prop == null) {
+			return CNull.NULL.equals(value);
+		}
+
+		return super.matches(key, value, event, t);
+	}
+
+	@Override
+	protected Object getProperty(T event) {
+		MCEntity entity = event.getEntity();
+		if(entity instanceof MCPlayer player) {
+			return player.getName();
+		}
+
+		return null;
+	}
+}