Events Migration (Entity Events)

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

@@ -192,44 +192,6 @@ public static void register(EventValueRegistry registry) {
 		registry.register(EventValue.simple(SignChangeEvent.class, Player.class, SignChangeEvent::getPlayer));
 		registry.register(EventValue.simple(SignChangeEvent.class, Component[].class, event -> event.lines().toArray(new Component[0])));
 
-		// === EntityEvents ===
-		registry.register(EventValue.builder(EntityEvent.class, Entity.class)
-			.getter(EntityEvent::getEntity)
-			.excludes(EntityDamageEvent.class, EntityDeathEvent.class)
-			.excludedErrorMessage("Use 'attacker' and/or 'victim' in damage/death events")
-			.build());
-		registry.register(EventValue.builder(EntityEvent.class, CommandSender.class)
-			.getter(EntityEvent::getEntity)
-			.excludes(EntityDamageEvent.class, EntityDeathEvent.class)
-			.excludedErrorMessage("Use 'attacker' and/or 'victim' in damage/death events")
-			.build());
-		registry.register(EventValue.simple(EntityEvent.class, World.class, event -> event.getEntity().getWorld()));
-		registry.register(EventValue.simple(EntityEvent.class, Location.class, event -> event.getEntity().getLocation()));
-		registry.register(EventValue.builder(EntityEvent.class, EntityData.class)
-			.getter(event -> EntityData.fromEntity(event.getEntity()))
-			.excludes(EntityDamageEvent.class, EntityDeathEvent.class)
-			.excludedErrorMessage("Use 'type of attacker/victim' in damage/death events.")
-			.build());
-		// EntityDamageEvent
-		registry.register(EventValue.simple(EntityDamageEvent.class, DamageCause.class, EntityDamageEvent::getCause));
-		registry.register(EventValue.simple(EntityDamageByEntityEvent.class, Projectile.class, event -> {
-			if (event.getDamager() instanceof Projectile projectile)
-				return projectile;
-			return null;
-		}));
-		// EntityDeathEvent
-		registry.register(EventValue.simple(EntityDeathEvent.class, ItemStack[].class, event -> event.getDrops().toArray(new ItemStack[0])));
-		registry.register(EventValue.simple(EntityDeathEvent.class, Projectile.class, event -> {
-			EntityDamageEvent damageEvent = event.getEntity().getLastDamageCause();
-			if (damageEvent instanceof EntityDamageByEntityEvent entityEvent && entityEvent.getDamager() instanceof Projectile projectile)
-				return projectile;
-			return null;
-		}));
-		registry.register(EventValue.simple(EntityDeathEvent.class, DamageCause.class, event -> {
-			EntityDamageEvent damageEvent = event.getEntity().getLastDamageCause();
-			return damageEvent == null ? null : damageEvent.getCause();
-		}));
-
 		// ProjectileHitEvent
 		// ProjectileHitEvent#getHitBlock was added in 1.11
 		if (Skript.methodExists(ProjectileHitEvent.class, "getHitBlock"))
@@ -268,18 +230,6 @@ public static void register(EventValueRegistry registry) {
 		// EntityTameEvent
 		registry.register(EventValue.simple(EntityTameEvent.class, Entity.class, EntityTameEvent::getEntity));
 
-		// EntityChangeBlockEvent
-		registry.register(EventValue.builder(EntityChangeBlockEvent.class, Block.class)
-			.getter(EntityChangeBlockEvent::getBlock)
-			.time(Time.PAST)
-			.build());
-		registry.register(EventValue.simple(EntityChangeBlockEvent.class, Block.class, EntityChangeBlockEvent::getBlock));
-		registry.register(EventValue.simple(EntityChangeBlockEvent.class, BlockData.class, EntityChangeBlockEvent::getBlockData));
-		registry.register(EventValue.builder(EntityChangeBlockEvent.class, BlockData.class)
-			.getter(EntityChangeBlockEvent::getBlockData)
-			.time(Time.FUTURE)
-			.build());
-
 		// AreaEffectCloudApplyEvent
 		registry.register(EventValue.simple(AreaEffectCloudApplyEvent.class, LivingEntity[].class, event -> event.getAffectedEntities().toArray(new LivingEntity[0])));
 		registry.register(EventValue.simple(AreaEffectCloudApplyEvent.class, PotionEffectType.class, new Converter<>() {
@@ -302,10 +252,6 @@ public PotionEffectType convert(AreaEffectCloudApplyEvent event) {
 		registry.register(EventValue.simple(ItemSpawnEvent.class, ItemStack.class, event -> event.getEntity().getItemStack()));
 		// LightningStrikeEvent
 		registry.register(EventValue.simple(LightningStrikeEvent.class, Entity.class, LightningStrikeEvent::getLightning));
-		// EndermanAttackPlayerEvent
-		if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) {
-			registry.register(EventValue.simple(EndermanAttackPlayerEvent.class, Player.class, EndermanAttackPlayerEvent::getPlayer));
-		}
 
 		// --- PlayerEvents ---
 		registry.register(EventValue.simple(PlayerEvent.class, Player.class, PlayerEvent::getPlayer));
@@ -594,13 +540,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 		//PlayerTeleportEvent
 		registry.register(EventValue.simple(PlayerTeleportEvent.class, TeleportCause.class, PlayerTeleportEvent::getCause));
 		//EntityMoveEvent
-		if (Skript.classExists("io.papermc.paper.event.entity.EntityMoveEvent")) {
-			registry.register(EventValue.simple(EntityMoveEvent.class, Location.class, EntityMoveEvent::getFrom));
-			registry.register(EventValue.builder(EntityMoveEvent.class, Location.class)
-				.getter(EntityMoveEvent::getTo)
-				.time(Time.FUTURE)
-				.build());
-		}
 		//CreatureSpawnEvent
 		registry.register(EventValue.simple(CreatureSpawnEvent.class, SpawnReason.class, CreatureSpawnEvent::getSpawnReason));
 		//PlayerRespawnEvent - 1.21.5+ added AbstractRespawnEvent as a base class, where prior to that, getRespawnReason was in PlayerRespawnEvent
@@ -618,31 +557,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 				}));
 			} catch (NoSuchMethodException ignored) {}
 		}
-		//FireworkExplodeEvent
-		registry.register(EventValue.simple(FireworkExplodeEvent.class, Firework.class, FireworkExplodeEvent::getEntity));
-		registry.register(EventValue.simple(FireworkExplodeEvent.class, FireworkEffect.class, event -> {
-			List<FireworkEffect> effects = event.getEntity().getFireworkMeta().getEffects();
-			if (effects.isEmpty())
-				return null;
-			return effects.get(0);
-		}));
-		registry.register(EventValue.simple(FireworkExplodeEvent.class, Color[].class, event -> {
-			List<FireworkEffect> effects = event.getEntity().getFireworkMeta().getEffects();
-			if (effects.isEmpty())
-				return null;
-			List<Color> colors = new ArrayList<>();
-			for (FireworkEffect fireworkEffect : effects) {
-				for (org.bukkit.Color color : fireworkEffect.getColors()) {
-					if (SkriptColor.fromBukkitColor(color) != null)
-						colors.add(SkriptColor.fromBukkitColor(color));
-					else
-						colors.add(ColorRGB.fromBukkitColor(color));
-				}
-			}
-			if (colors.isEmpty())
-				return null;
-			return colors.toArray(Color[]::new);
-		}));
 		//PlayerRiptideEvent
 		registry.register(EventValue.simple(PlayerRiptideEvent.class, ItemStack.class, PlayerRiptideEvent::getItem));
 		//PlayerInventorySlotChangeEvent
@@ -694,15 +608,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 			registry.register(EventValue.simple(PlayerStopUsingItemEvent.class, ItemType.class, event -> new ItemType(event.getItem())));
 		}
 
-		// EntityResurrectEvent
-		registry.register(EventValue.simple(EntityResurrectEvent.class, Slot.class, event -> {
-			EquipmentSlot hand = event.getHand();
-			EntityEquipment equipment = event.getEntity().getEquipment();
-			if (equipment == null || hand == null)
-				return null;
-			return new ch.njol.skript.util.slot.EquipmentSlot(equipment, hand);
-		}));
-
 		// PlayerItemHeldEvent
 		registry.register(EventValue.simple(PlayerItemHeldEvent.class, Slot.class, event -> new InventorySlot(event.getPlayer().getInventory(), event.getNewSlot())));
 		registry.register(EventValue.builder(PlayerItemHeldEvent.class, Slot.class)
@@ -726,10 +631,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 		if (Skript.classExists("io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent"))
 			registry.register(EventValue.simple(PlayerStonecutterRecipeSelectEvent.class, ItemStack.class, event -> event.getStonecuttingRecipe().getResult()));
 
-		// EntityTransformEvent
-		registry.register(EventValue.simple(EntityTransformEvent.class, Entity[].class, event -> event.getTransformedEntities().stream().toArray(Entity[]::new)));
-		registry.register(EventValue.simple(EntityTransformEvent.class, TransformReason.class, EntityTransformEvent::getTransformReason));
-
 		// BellRingEvent - these are BlockEvents and not EntityEvents, so they have declared methods for getEntity()
 		if (Skript.classExists("org.bukkit.event.block.BellRingEvent")) {
 			registry.register(EventValue.simple(BellRingEvent.class, Entity.class, BellRingEvent::getEntity));
@@ -756,9 +657,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 			.build());
 		registry.register(EventValue.simple(InventoryMoveItemEvent.class, ItemStack.class, InventoryMoveItemEvent::getItem));
 
-		// EntityRegainHealthEvent
-		registry.register(EventValue.simple(EntityRegainHealthEvent.class, RegainReason.class, EntityRegainHealthEvent::getRegainReason));
-
 		// FurnaceExtractEvent
 		registry.register(EventValue.simple(FurnaceExtractEvent.class, Player.class, FurnaceExtractEvent::getPlayer));
 		registry.register(EventValue.simple(FurnaceExtractEvent.class, ItemStack[].class, event -> new ItemStack[]{ItemStack.of(event.getItemType(), event.getItemAmount())}));
@@ -814,20 +712,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 				.build());
 		}
 
-		registry.register(EventValue.simple(VillagerCareerChangeEvent.class, VillagerCareerChangeEvent.ChangeReason.class, VillagerCareerChangeEvent::getReason));
-		registry.register(EventValue.builder(VillagerCareerChangeEvent.class, Villager.Profession.class)
-			.getter(VillagerCareerChangeEvent::getProfession)
-			.registerChanger(ChangeMode.SET, (event, profession) -> {
-				if (profession == null)
-					return;
-				event.setProfession(profession);
-			})
-			.build());
-		registry.register(EventValue.builder(VillagerCareerChangeEvent.class, Villager.Profession.class)
-			.getter(event -> event.getEntity().getProfession())
-			.time(Time.PAST)
-			.build());
-
 	}
 
 }