1.21.4 update

Bukkit/build.gradle.kts

@@ -13,7 +13,7 @@ repositories {
 
     maven {
         name = "EssentialsX"
-        url = uri("https://repo.essentialsx.net/releases/")
+        url = uri("https://repo.essentialsx.net/snapshots/")
     }
 }
 
@@ -39,7 +39,9 @@ dependencies {
     }
     compileOnly(libs.placeholderapi)
     compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx)
+    compileOnly(libs.essentialsx) {
+        exclude(group = "org.spigotmc")
+    }
     compileOnly(libs.mvdwapi) { isTransitive = false }
 
     // Other libraries

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java

@@ -314,7 +314,7 @@ public void onBigBoom(EntityExplodeEvent event) {
                 if (this.lastRadius != 0) {
                     List<Entity> nearby = event.getEntity().getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
                     for (Entity near : nearby) {
-                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) {
+                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.TNT_MINECART)) {
                             if (!near.hasMetadata("plot")) {
                                 near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
                             }
@@ -338,7 +338,7 @@ public void onBigBoom(EntityExplodeEvent event) {
         event.setCancelled(true);
         //Spawn Explosion Particles when enabled in settings
         if (Settings.General.ALWAYS_SHOW_EXPLOSIONS) {
-            event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION_HUGE, event.getLocation(), 0);
+            event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION, event.getLocation(), 0);
         }
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java

@@ -132,7 +132,7 @@ public void creatureSpawnEvent(EntitySpawnEvent event) {
         Plot plot = location.getOwnedPlotAbs();
         EntityType type = entity.getType();
         if (plot == null) {
-            if (type == EntityType.DROPPED_ITEM) {
+            if (type == EntityType.ITEM) {
                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                     event.setCancelled(true);
                 }
@@ -154,7 +154,7 @@ public void creatureSpawnEvent(EntitySpawnEvent event) {
         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             event.setCancelled(true);
         }
-        if (type == EntityType.ENDER_CRYSTAL || type == EntityType.ARMOR_STAND) {
+        if (type == EntityType.END_CRYSTAL || type == EntityType.ARMOR_STAND) {
             if (BukkitEntityUtil.checkEntity(entity, plot)) {
                 event.setCancelled(true);
             }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -228,7 +228,7 @@ public void onPreCreatureSpawnEvent(PreCreatureSpawnEvent event) {
         if (plot == null) {
             EntityType type = event.getType();
             // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
-            if (type == EntityType.DROPPED_ITEM) {
+            if (type == EntityType.ITEM) {
                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                     event.setCancelled(true);
                 }
@@ -354,7 +354,7 @@ public void onProjectileLaunch(PlayerLaunchProjectileEvent event) {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
+            if (entity.getType().equals(EntityType.FISHING_BOBBER)) {
                 if (plot.getFlag(FishingFlag.class)) {
                     return;
                 }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -376,7 +376,7 @@ public void onEffect(@NonNull EntityPotionEffectEvent event) {
 
     @EventHandler
     public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
-        if (e.getVehicle().getType() == EntityType.BOAT) {
+        if (e.getVehicle().getType() == EntityType.OAK_BOAT) {
             Location location = BukkitUtil.adapt(e.getEntity().getLocation());
             if (location.isPlotArea()) {
                 if (e.getEntity() instanceof Player) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java

@@ -134,7 +134,7 @@ public void onProjectileLaunch(ProjectileLaunchEvent event) {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
+            if (entity.getType().equals(EntityType.FISHING_BOBBER)) {
                 if (plot.getFlag(FishingFlag.class)) {
                     return;
                 }
@@ -194,7 +194,7 @@ public void onProjectileHit(ProjectileHitEvent event) {
                 return;
             }
             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
-                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag(
+                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_BOBBER) && plot.getFlag(
                     FishingFlag.class))) {
                 return;
             }

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java

@@ -342,7 +342,7 @@ public static boolean entityDamage(Entity damager, Entity victim, EntityDamageEv
         //disable the firework damage. too much of a headache to support at the moment.
         if (vplot != null) {
             if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
-                    && damager.getType() == EntityType.FIREWORK) {
+                    && damager.getType() == EntityType.FIREWORK_ROCKET) {
                 return false;
             }
         }

build.gradle.kts

@@ -230,7 +230,7 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3")
+val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Platform expectations
-paper = "1.20.4-R0.1-SNAPSHOT"
+paper = "1.21.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.0"
 checkerqual = "3.48.4"
@@ -16,7 +16,7 @@ worldedit = "7.2.20"
 fawe = "2.12.3"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
-essentialsx = "2.20.1"
+essentialsx = "2.21.0-SNAPSHOT"
 mvdwapi = "3.1.1"
 
 # Third party