cleanup entity/player changer usage

Author: sovdeeth

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

@@ -1235,7 +1235,7 @@ public String toVariableNameString(WorldBorder border) {
 			.name("Vehicle")
 			.description("Represents a vehicle.")
 			.since("2.10.2")
-			.changer(DefaultChangers.entityChanger)
+			.changer(new EntityClassInfo.EntityChanger())
 		);
 
 		Classes.registerClass(new EnumClassInfo<>(EquipmentSlot.class, "equipmentslot", "equipment slots")

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

@@ -12,6 +12,7 @@
 import org.skriptlang.skript.bukkit.base.types.BlockClassInfo;
 import org.skriptlang.skript.bukkit.base.types.EntityClassInfo;
 import org.skriptlang.skript.bukkit.base.types.InventoryClassInfo;
+import org.skriptlang.skript.bukkit.base.types.PlayerClassInfo;
 
 /**
  * @author Peter Güttinger
@@ -25,22 +26,13 @@ public DefaultChangers() {}
 	 */
 	@Deprecated(since = "INSERT VERSION")
 	public final static Changer<Entity> entityChanger = new EntityClassInfo.EntityChanger();
-	
-	public final static Changer<Player> playerChanger = new Changer<Player>() {
-		@Override
-		@Nullable
-		public Class<? extends Object>[] acceptChange(final ChangeMode mode) {
-			if (mode == ChangeMode.DELETE)
-				return null;
-			return entityChanger.acceptChange(mode);
-		}
-		
-		@Override
-		public void change(final Player[] players, final @Nullable Object[] delta, final ChangeMode mode) {
-			entityChanger.change(players, delta, mode);
-		}
-	};
-	
+
+	/**
+	 * @deprecated Use {@link PlayerClassInfo.PlayerChanger} directly.
+	 */
+	@Deprecated(since = "INSERT VERSION")
+	public final static Changer<Player> playerChanger = new PlayerClassInfo.PlayerChanger();
+
 	public final static Changer<Entity> nonLivingEntityChanger = new Changer<Entity>() {
 		@Override
 		@Nullable
@@ -49,7 +41,7 @@ public Class<Object>[] acceptChange(final ChangeMode mode) {
 				return CollectionUtils.array();
 			return null;
 		}
-		
+
 		@Override
 		public void change(final Entity[] entities, final @Nullable Object[] delta, final ChangeMode mode) {
 			assert mode == ChangeMode.DELETE;

src/main/java/ch/njol/skript/expressions/ExprSpectatorTarget.java

@@ -1,29 +1,9 @@
 package ch.njol.skript.expressions;
 
-import ch.njol.skript.classes.Changer;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
-import ch.njol.skript.expressions.base.SimplePropertyExpression;
-import ch.njol.util.coll.CollectionUtils;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-import com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent;
-import com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent;
-
 import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer;
 import ch.njol.skript.classes.Changer.ChangeMode;
-import ch.njol.skript.classes.data.DefaultChangers;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.effects.Delay;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
@@ -32,6 +12,14 @@
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent;
+import com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.base.types.EntityClassInfo;
 
 @Name("Spectator Target")
 @Description("Grabs the spectator target entity of the players.")
@@ -57,6 +45,7 @@ public class ExprSpectatorTarget extends SimpleExpression<Entity> {
 	}
 
 	private Expression<Player> players;
+	private static final Changer<Entity> ENTITY_CHANGER = new EntityClassInfo.EntityChanger();
 
 	@Override
 	@SuppressWarnings("unchecked")
@@ -99,7 +88,7 @@ protected Entity[] get(Event event) {
 	public Class<?>[] acceptChange(ChangeMode mode) {
 		// Make 'spectator target' act as an entity changer. Will error in init for unsupported server platform.
 		if (players == null)
-			return DefaultChangers.entityChanger.acceptChange(mode);
+			return ENTITY_CHANGER.acceptChange(mode);
 		if (mode == ChangeMode.SET || mode == ChangeMode.RESET || mode == ChangeMode.DELETE)
 			return CollectionUtils.array(Entity.class);
 		return null;
@@ -112,7 +101,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 			Entity[] entities = get(event);
 			if (entities.length == 0)
 				return;
-			DefaultChangers.entityChanger.change(entities, delta, mode);
+			ENTITY_CHANGER.change(entities, delta, mode);
 			return;
 		}
 		switch (mode) {