Move away from a few recently deprecated code functions in the Paper API

me4502 · me4502 · commit f0ee4802cf04 · 2026-01-01T16:15:48.000+10:00
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/MechanicListenerAdapter.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/MechanicListenerAdapter.java
@@ -99,9 +99,12 @@ public void onPlayerInteract(final PlayerInteractEvent event) {
                     signClickTimer.put(event.getPlayer().getUniqueId(), System.currentTimeMillis());
                 }
             }
-            // Ignoring deprecation as we need this value to pass down.
-            @SuppressWarnings("deprecation")
-            Vector clickedPosition = event.getClickedPosition();
+            Location interactionPoint = event.getInteractionPoint();
+            Block clickedBlock = event.getClickedBlock();
+
+            Vector clickedPosition = interactionPoint != null && clickedBlock != null
+                    ? interactionPoint.subtract(clickedBlock.getLocation()).toVector()
+                    : null;
             if (clickedPosition == null) {
                 RayTraceResult rayTraceResult = event.getPlayer().rayTraceBlocks(5.0, FluidCollisionMode.NEVER);
                 if (rayTraceResult != null) {
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/BukkitElevator.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/BukkitElevator.java
@@ -317,10 +317,8 @@ private void activateElevator(CraftBookPlayer player, Player bukkitPlayer, Block
         boolean teleported = bukkitPlayer.getVehicle() == null
             ? bukkitPlayer.teleport(newLocation, PlayerTeleportEvent.TeleportCause.PLUGIN,
                 TeleportFlag.Relative.VELOCITY_X, TeleportFlag.Relative.VELOCITY_Y, TeleportFlag.Relative.VELOCITY_Z,
-                TeleportFlag.Relative.VELOCITY_ROTATION,
-                TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE,
-                TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY)
-            : bukkitPlayer.getVehicle().teleport(newLocation, PlayerTeleportEvent.TeleportCause.PLUGIN, TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE);
+                TeleportFlag.Relative.VELOCITY_ROTATION)
+            : bukkitPlayer.getVehicle().teleport(newLocation, PlayerTeleportEvent.TeleportCause.PLUGIN);
 
         if (teleported) {
             teleportFinish(player, destination, shift);
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/BukkitPaintingSwitcher.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/BukkitPaintingSwitcher.java
@@ -23,7 +23,6 @@
 import io.papermc.paper.registry.RegistryKey;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -175,14 +174,16 @@ public void onHeldItemChange(PlayerItemHeldEvent event) {
             return;
         }
 
-        int newID = artKeys.indexOf(paint.getArt().getKey()) + (isForwards ? 1 : -1);
+        var paintingRegistry = RegistryAccess.registryAccess().getRegistry(RegistryKey.PAINTING_VARIANT);
+
+        int newID = artKeys.indexOf(paintingRegistry.getKey(paint.getArt())) + (isForwards ? 1 : -1);
         if (newID < 0) {
             newID = artKeys.size() - 1;
         } else if (newID > artKeys.size() - 1) {
             newID = 0;
         }
 
-        while (!paint.setArt(Registry.ART.get(artKeys.get(newID)))) {
+        while (!paint.setArt(paintingRegistry.get(artKeys.get(newID)))) {
             if (newID > 0 && !isForwards) {
                 newID--;
             } else if (newID < artKeys.size() - 1 && isForwards) {
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/BukkitTeleporter.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/BukkitTeleporter.java
@@ -282,10 +282,8 @@ private void activateTeleporter(CraftBookPlayer player, Player bukkitPlayer, Blo
         boolean teleported = bukkitPlayer.getVehicle() == null
             ? bukkitPlayer.teleport(newLocation, PlayerTeleportEvent.TeleportCause.PLUGIN,
                 TeleportFlag.Relative.VELOCITY_X, TeleportFlag.Relative.VELOCITY_Y, TeleportFlag.Relative.VELOCITY_Z,
-                TeleportFlag.Relative.VELOCITY_ROTATION,
-                TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE,
-                TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY)
-            : bukkitPlayer.getVehicle().teleport(newLocation, PlayerTeleportEvent.TeleportCause.PLUGIN, TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE);
+                TeleportFlag.Relative.VELOCITY_ROTATION)
+            : bukkitPlayer.getVehicle().teleport(newLocation, PlayerTeleportEvent.TeleportCause.PLUGIN);
 
         if (teleported) {
             player.printInfo(TranslatableComponent.of("craftbook.teleporter.teleported"));
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/piston/BukkitBetterPistons.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/piston/BukkitBetterPistons.java
@@ -377,12 +377,10 @@ public void superSticky(final Block trigger, final BlockFace facing, final Chang
                                 if (ent instanceof Player player) {
                                     player.teleport(dest, PlayerTeleportEvent.TeleportCause.PLUGIN,
                                         TeleportFlag.Relative.VELOCITY_X, TeleportFlag.Relative.VELOCITY_Y, TeleportFlag.Relative.VELOCITY_Z,
-                                        TeleportFlag.Relative.VELOCITY_ROTATION,
-                                        TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE,
-                                        TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY
+                                        TeleportFlag.Relative.VELOCITY_ROTATION
                                     );
                                 } else {
-                                    ent.teleport(dest, TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE);
+                                    ent.teleport(dest);
                                 }
                             }
 
@@ -437,12 +435,10 @@ public void superPush(final Block trigger, final Piston piston, ChangedSign sign
                                 if (ent instanceof Player player) {
                                     player.teleport(dest, PlayerTeleportEvent.TeleportCause.PLUGIN,
                                         TeleportFlag.Relative.VELOCITY_X, TeleportFlag.Relative.VELOCITY_Y, TeleportFlag.Relative.VELOCITY_Z,
-                                        TeleportFlag.Relative.VELOCITY_ROTATION,
-                                        TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE,
-                                        TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY
+                                        TeleportFlag.Relative.VELOCITY_ROTATION
                                     );
                                 } else {
-                                    ent.teleport(dest, TeleportFlag.EntityState.RETAIN_PASSENGERS, TeleportFlag.EntityState.RETAIN_VEHICLE);
+                                    ent.teleport(dest);
                                 }
                             }
                             if (copyData(from, to)) {
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartLift.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartLift.java
@@ -18,7 +18,6 @@
 import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import io.papermc.paper.entity.TeleportFlag;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -95,7 +94,7 @@ public void onVehicleImpact(CartBlockImpactEvent event) {
         Vector oldVelocity = cart.getVelocity();
         Location newLocation = destination.getLocation();
         newLocation.setDirection(cart.getLocation().getDirection());
-        cart.teleport(newLocation, TeleportFlag.EntityState.RETAIN_VEHICLE, TeleportFlag.EntityState.RETAIN_PASSENGERS);
+        cart.teleport(newLocation);
         cart.setVelocity(oldVelocity);
 
         for (Entity entity : cart.getPassengers()) {
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartSorter.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartSorter.java
@@ -97,7 +97,7 @@ public void onVehicleImpact(CartBlockImpactEvent event) {
         // perhaps oddly, it's the sign facing that determines the concepts of left and right, and not the track.
         // this is required since there's not a north track and a south track; just a north-south track type.
         Rail trackData = (Rail) Material.RAIL.createBlockData();
-        BlockFace next = SignUtil.getFacing(event.getBlocks().sign());
+        BlockFace next = SignUtil.getBack(event.getBlocks().sign());
         switch (next) {
             case SOUTH:
                 switch (dir) {
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartTeleporter.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartTeleporter.java
@@ -18,7 +18,6 @@
 import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import io.papermc.paper.entity.TeleportFlag;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -81,7 +80,7 @@ public void onVehicleImpact(CartBlockImpactEvent event) {
 
         Location loc = new Location(world, x, y, z, event.getMinecart().getLocation().getYaw(), event.getMinecart().getLocation().getPitch()).toCenterLocation();
         loc.getChunk().load(true);
-        event.getMinecart().teleport(loc, TeleportFlag.EntityState.RETAIN_VEHICLE, TeleportFlag.EntityState.RETAIN_PASSENGERS);
+        event.getMinecart().teleport(loc);
     }
 
     @Override
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/station/CartStation.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/station/CartStation.java
@@ -17,7 +17,6 @@
 
 import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import io.papermc.paper.entity.TeleportFlag;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Location;
 import org.bukkit.block.sign.Side;
@@ -133,15 +132,15 @@ private void stationInteraction(Minecart cart, CartMechanismBlocks blocks, boole
                 if (autoStart && powerChange) {
                     return;
                 }
-                cart.setVelocity(SignUtil.getFacing(blocks.sign()).getDirection().multiply(0.2));
+                cart.setVelocity(SignUtil.getBack(blocks.sign()).getDirection().multiply(0.2));
             }
             case OFF, NA -> {
                 // park it.
                 cart.setVelocity(new Vector(0, 0, 0));
 
                 // recenter it
-                Location l = blocks.rail().getLocation().add(0.5, 0.5, 0.5);
-                cart.teleport(l, TeleportFlag.EntityState.RETAIN_VEHICLE, TeleportFlag.EntityState.RETAIN_PASSENGERS);
+                Location l = blocks.rail().getLocation().add(0.5, 0, 0.5);
+                cart.teleport(l);
             }
             default -> {
             }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`
`18`	`18`	`import com.sk89q.util.yaml.YAMLProcessor;`
`19`	`19`	`import com.sk89q.worldedit.world.block.BlockTypes;`
`20`		`-import io.papermc.paper.entity.TeleportFlag;`
`21`	`20`	`import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;`
`22`	`21`	`import org.bukkit.Location;`
`23`	`22`	`import org.bukkit.block.sign.Side;`
`@@ -133,15 +132,15 @@ private void stationInteraction(Minecart cart, CartMechanismBlocks blocks, boole`
`133`	`132`	`if (autoStart && powerChange) {`
`134`	`133`	`return;`
`135`	`134`	`}`
`136`		`- cart.setVelocity(SignUtil.getFacing(blocks.sign()).getDirection().multiply(0.2));`
	`135`	`+ cart.setVelocity(SignUtil.getBack(blocks.sign()).getDirection().multiply(0.2));`
`137`	`136`	`}`
`138`	`137`	`case OFF, NA -> {`
`139`	`138`	`// park it.`
`140`	`139`	`cart.setVelocity(new Vector(0, 0, 0));`
`141`	`140`
`142`	`141`	`// recenter it`
`143`		`- Location l = blocks.rail().getLocation().add(0.5, 0.5, 0.5);`
`144`		`- cart.teleport(l, TeleportFlag.EntityState.RETAIN_VEHICLE, TeleportFlag.EntityState.RETAIN_PASSENGERS);`
	`142`	`+ Location l = blocks.rail().getLocation().add(0.5, 0, 0.5);`
	`143`	`+ cart.teleport(l);`
`145`	`144`	`}`
`146`	`145`	`default -> {`
`147`	`146`	`}`