Events Migration (Player Events 2)

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

@@ -358,21 +358,6 @@ public PotionEffectType convert(AreaEffectCloudApplyEvent event) {
 			.build());
 		// PlayerItemBreakEvent
 		registry.register(EventValue.simple(PlayerItemBreakEvent.class, ItemStack.class, PlayerItemBreakEvent::getBrokenItem));
-		// PlayerInteractEntityEvent
-		registry.register(EventValue.simple(PlayerInteractEntityEvent.class, Entity.class, PlayerInteractEntityEvent::getRightClicked));
-		registry.register(EventValue.simple(PlayerInteractEntityEvent.class, ItemStack.class, event -> {
-			EquipmentSlot hand = event.getHand();
-			if (hand == EquipmentSlot.HAND)
-				return event.getPlayer().getInventory().getItemInMainHand();
-			else if (hand == EquipmentSlot.OFF_HAND)
-				return event.getPlayer().getInventory().getItemInOffHand();
-			else
-				return null;
-		}));
-		// PlayerInteractEvent
-		registry.register(EventValue.simple(PlayerInteractEvent.class, ItemStack.class, PlayerInteractEvent::getItem));
-		registry.register(EventValue.simple(PlayerInteractEvent.class, Block.class, PlayerInteractEvent::getClickedBlock));
-		registry.register(EventValue.simple(PlayerInteractEvent.class, Direction.class, event -> new Direction(new double[]{event.getBlockFace().getModX(), event.getBlockFace().getModY(), event.getBlockFace().getModZ()})));
 		// PlayerShearEntityEvent
 		registry.register(EventValue.simple(PlayerShearEntityEvent.class, Entity.class, PlayerShearEntityEvent::getEntity));
 		// PlayerMoveEvent
@@ -562,26 +547,7 @@ else if (hand == EquipmentSlot.OFF_HAND)
 		if (Skript.methodExists(PortalCreateEvent.class, "getEntity")) { // Minecraft 1.14+
 			registry.register(EventValue.simple(PortalCreateEvent.class, Entity.class, PortalCreateEvent::getEntity));
 		}
-		//PlayerEditBookEvent
-		registry.register(EventValue.builder(PlayerEditBookEvent.class, ItemStack.class)
-			.getter(event -> {
-				ItemStack book = new ItemStack(Material.WRITABLE_BOOK);
-				book.setItemMeta(event.getPreviousBookMeta());
-				return book;
-			})
-			.time(Time.PAST)
-			.build());
-		registry.register(EventValue.simple(PlayerEditBookEvent.class, ItemStack.class, event -> {
-			ItemStack book = new ItemStack(Material.WRITABLE_BOOK);
-			book.setItemMeta(event.getNewBookMeta());
-			return book;
-		}));
-		registry.register(EventValue.builder(PlayerEditBookEvent.class, Component[].class)
-			.getter(event -> ExprBookPages.getPages(event.getPreviousBookMeta()).toArray(new Component[0]))
-			.time(Time.PAST)
-			.build());
-		registry.register(EventValue.simple(PlayerEditBookEvent.class, Component[].class, event ->
-			ExprBookPages.getPages(event.getNewBookMeta()).toArray(new Component[0])));
+
 		//ItemDespawnEvent
 		registry.register(EventValue.simple(ItemDespawnEvent.class, Item.class, ItemDespawnEvent::getEntity));
 		registry.register(EventValue.simple(ItemDespawnEvent.class, ItemStack.class, event -> event.getEntity().getItemStack()));

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

@@ -6,7 +6,6 @@
 import ch.njol.skript.doc.Example;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.events.EvtClick;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -24,6 +23,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.entity.player.elements.events.EvtClick;
 
 @Name("Cancel Event")
 @Description("Cancels the event (e.g. prevent blocks from being placed, or damage being taken).")