Entity Migration

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

@@ -7,7 +7,7 @@
 import ch.njol.skript.config.Config;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
-import ch.njol.skript.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.localization.*;
 import ch.njol.skript.log.BlockingLogHandler;

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

@@ -6,7 +6,7 @@
 import org.bukkit.Material;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 
 /**
  * Stores the aliases.

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

@@ -4,7 +4,7 @@
 import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.bukkitutil.block.BlockCompat;
 import ch.njol.skript.bukkitutil.block.BlockValues;
-import ch.njol.skript.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 import com.google.gson.Gson;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import java.util.ArrayList;

src/main/java/ch/njol/skript/bukkitutil/EntityUtils.java

@@ -1,12 +1,11 @@
 package ch.njol.skript.bukkitutil;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import org.bukkit.Location;
 import org.bukkit.entity.*;
-import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;

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

@@ -5,7 +5,7 @@
 import ch.njol.skript.bukkitutil.InventoryUtils;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.command.CommandEvent;
-import ch.njol.skript.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 import ch.njol.skript.events.bukkit.ScriptEvent;
 import ch.njol.skript.events.bukkit.SkriptStartEvent;
 import ch.njol.skript.events.bukkit.SkriptStopEvent;

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

@@ -6,16 +6,11 @@
 import ch.njol.skript.aliases.ItemData;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.entity.BoatChestData;
-import ch.njol.skript.entity.BoatData;
-import ch.njol.skript.entity.EntityData;
-import ch.njol.skript.entity.RabbitData;
 import ch.njol.skript.util.*;
 import ch.njol.skript.util.slot.EquipmentSlot;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.skript.util.slot.SlotWithIndex;
 import ch.njol.util.StringUtils;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
@@ -25,11 +20,18 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.enchantments.EnchantmentOffer;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntitySnapshot;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Wither;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.skriptlang.skript.bukkit.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityItemTypeComparable;
 import org.skriptlang.skript.lang.comparator.Comparator;
 import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.comparator.Relation;
@@ -270,23 +272,17 @@ public boolean supportsOrdering() {
 	// EntityData - ItemType
 	public final static Comparator<EntityData, ItemType> entityItemComparator = new Comparator<EntityData, ItemType>() {
 		@Override
-		public Relation compare(EntityData e, ItemType i) {
+		public Relation compare(EntityData entityData, ItemType itemType) {
 			// TODO fix broken comparisions - will probably require updating potion API of Skript
 
-			if (e instanceof Item)
-				return Relation.get(i.isOfType(((Item) e).getItemStack()));
-//			if (Skript.classExists("org.bukkit.entity.WitherSkull") && e instanceof WitherSkull)
-//				return Relation.get(i.isOfType(Material.SKULL_ITEM.getId(), (short) 1));
-			if (e instanceof BoatData)
-				return Relation.get(((BoatData)e).isOfItemType(i));
-			if (e instanceof BoatChestData)
-				return Relation.get(((BoatChestData) e).isOfItemType(i));
-			if (e instanceof RabbitData)
-				return Relation.get(i.isOfType(Material.RABBIT));
-			for (ItemData data : i.getTypes()) {
+			if (entityData instanceof Item item)
+				return Relation.get(itemType.isOfType(item.getItemStack()));
+			if (entityData instanceof EntityItemTypeComparable entityItemTypeComparable)
+				return Relation.get(entityItemTypeComparable.isOfItemType(itemType));
+			for (ItemData data : itemType.getTypes()) {
 				assert data != null;
 				EntityData<?> entity = Aliases.getRelatedEntity(data);
-				if (entity != null && entity.getType().isAssignableFrom(e.getType()))
+				if (entity != null && entity.getType().isAssignableFrom(entityData.getType()))
 					return Relation.EQUAL;
 			}
 			return Relation.NOT_EQUAL;

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

@@ -7,9 +7,9 @@
 import ch.njol.skript.command.Commands;
 import ch.njol.skript.config.Config;
 import ch.njol.skript.config.Node;
-import ch.njol.skript.entity.EntityData;
-import ch.njol.skript.entity.EntityType;
-import ch.njol.skript.entity.XpOrbData;
+import org.skriptlang.skript.bukkit.entity.EntityData;
+import org.skriptlang.skript.bukkit.entity.EntityType;
+import org.skriptlang.skript.bukkit.entity.data.XpOrbData;
 import ch.njol.skript.lang.util.common.AnyAmount;
 import ch.njol.skript.lang.util.common.AnyNamed;
 import ch.njol.skript.util.*;

src/main/java/ch/njol/skript/conditions/CondIsOfType.java

@@ -8,7 +8,6 @@
 import ch.njol.skript.doc.Example;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -17,6 +16,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 import org.skriptlang.skript.lang.comparator.Relation;
 
 import java.util.function.Predicate;
@@ -54,10 +54,10 @@ public boolean check(Event event) {
 				(Predicate<Object>) o2 -> {
 					if (o2 instanceof ItemType && o1 instanceof ItemStack) {
 						return ((ItemType) o2).isSupertypeOf(new ItemType((ItemStack) o1));
-					} else if (o2 instanceof EntityData && o1 instanceof Entity) {
-						return ((EntityData<?>) o2).isInstance((Entity) o1);
-					} else if (o2 instanceof ItemType && o1 instanceof Entity) {
-						return Relation.EQUAL.isImpliedBy(DefaultComparators.entityItemComparator.compare(EntityData.fromEntity((Entity) o1), (ItemType) o2));
+					} else if (o2 instanceof EntityData<?> entityData && o1 instanceof Entity entity) {
+						return entityData.isInstance(entity);
+					} else if (o2 instanceof ItemType itemType && o1 instanceof Entity entity) {
+						return Relation.EQUAL.isImpliedBy(DefaultComparators.entityItemComparator.compare(EntityData.fromEntity(entity), itemType));
 					} else {
 						return false;
 					}

src/main/java/ch/njol/skript/conditions/CondIsRiding.java

@@ -1,6 +1,5 @@
 package ch.njol.skript.conditions;
 
-import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.lang.util.SimpleExpression;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
@@ -16,6 +15,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 
 @Name("Is Riding")
 @Description("Tests whether an entity is riding any entity, a specific entity type, or a specific entity.")

src/main/java/ch/njol/skript/conditions/CondIsSpawnable.java

@@ -5,7 +5,6 @@
 import ch.njol.skript.doc.Example;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -14,6 +13,7 @@
 import org.bukkit.World;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 
 @Name("Is Spawnable")
 @Description("""

src/main/java/ch/njol/skript/effects/EffVehicle.java

@@ -5,14 +5,14 @@
 import ch.njol.skript.doc.Example;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.entity.EntityData;
 
 @Name("Vehicle")
 @Description("Makes an entity ride another entity, e.g. a minecart, a saddled pig, an arrow, etc.")