Upstream

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -71,7 +71,7 @@ body:
   - type: input
     attributes:
       label: Error log (if applicable)
-      description: If you are reporting a console error, upload any relevant log excerpts to either https://paste.gg/ or https://gist.github.com, save and the paste the link in this box.
+      description: If you are reporting a console error, upload any relevant log excerpts to https://gist.github.com, save and the paste the link in this box.
 
   - type: input
     attributes:

.github/workflows/build-pr.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

.github/workflows/label-merge-conflicts.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@v3.1.0
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -138,5 +138,4 @@ build/
 
 .DS_Store
 # Ignore run folders
-run-[0-9].[0-9][0-9]/
-run-[0-9].[0-9][0-9].[0-9]/
+run-*/

Bukkit/build.gradle.kts

@@ -38,7 +38,6 @@ dependencies {
 
     // Paper
     compileOnly(libs.paper)
-    implementation(libs.paperlib)
 
     // Plugins
     compileOnly(libs.worldeditBukkit)
@@ -78,7 +77,6 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("net.kyori.option", "com.plotsquared.core.configuration.option")
     relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
     relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
-    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
     relocate("org.bstats", "com.plotsquared.metrics")
     relocate("org.enginehub", "com.plotsquared.squirrelid")
     relocate("org.khelekore.prtree", "com.plotsquared.prtree")

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -48,6 +48,7 @@
 import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
+import com.plotsquared.bukkit.util.PaperSupport;
 import com.plotsquared.bukkit.util.SetGenCB;
 import com.plotsquared.bukkit.util.TranslationUpdateManager;
 import com.plotsquared.bukkit.util.UpdateUtility;
@@ -100,6 +101,7 @@
 import com.plotsquared.core.setup.SettingsNodesWrapper;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.FileUtils;
+import com.plotsquared.core.util.MinecraftVersion;
 import com.plotsquared.core.util.PlatformWorldManager;
 import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.PremiumVerification;
@@ -113,7 +115,6 @@
 import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@@ -237,14 +238,19 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return this.version;
     }
 
+    @Override
+    public MinecraftVersion minecraftVersion() {
+        return MinecraftVersion.current();
+    }
+
     @Override
     public int versionMinHeight() {
-        return serverVersion()[1] >= 18 ? -64 : 0;
+        return minecraftVersion().isNewerOrEqualThan(MinecraftVersion.CAVES_AND_CLIFFS_2) ? -64 : 0;
     }
 
     @Override
     public int versionMaxHeight() {
-        return serverVersion()[1] >= 18 ? 319 : 255;
+        return minecraftVersion().isNewerOrEqualThan(MinecraftVersion.CAVES_AND_CLIFFS_2) ? 319 : 255;
     }
 
     @Override
@@ -263,7 +269,7 @@ public void onEnable() {
         this.pluginName = getDescription().getName();
 
         final TaskTime.TimeConverter timeConverter;
-        if (PaperLib.isPaper()) {
+        if (PaperSupport.isPaper()) {
             timeConverter = new PaperTimeConverter();
         } else {
             timeConverter = new SpigotTimeConverter();
@@ -337,7 +343,7 @@ public void onEnable() {
                 try {
                     plotSquared.setConfigurationVersion("v5");
                 } catch (final Exception e) {
-                    e.printStackTrace();
+                    LOGGER.error("Failed to update configuration version", e);
                 }
             }
         }
@@ -364,21 +370,21 @@ public void onEnable() {
 
         if (Settings.Enabled_Components.EVENTS) {
             getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener.class), this);
-            if ((serverVersion()[1] == 20 && serverVersion()[2] >= 1) || serverVersion()[1] > 20) {
+            if (minecraftVersion().isNewerOrEqualThan(20, 1)) {
                 getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener1201.class), this);
             }
             getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener.class), this);
             if (Settings.HIGH_FREQUENCY_LISTENER) {
                 getServer().getPluginManager().registerEvents(injector().getInstance(HighFreqBlockEventListener.class), this);
             }
-            if (serverVersion()[1] >= 17) {
+            if (minecraftVersion().isNewerOrEqualThan(MinecraftVersion.CAVES_AND_CLIFFS)) {
                 getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener117.class), this);
             }
             getServer().getPluginManager().registerEvents(injector().getInstance(EntityEventListener.class), this);
             getServer().getPluginManager().registerEvents(injector().getInstance(ProjectileEventListener.class), this);
             getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this);
             getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this);
-            if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
+            if (PaperSupport.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
                 getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
             } else {
                 getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
@@ -501,7 +507,7 @@ public void onEnable() {
 
         if (!Settings.UUID.OFFLINE) {
             // If running Paper we'll also try to use their profiles
-            if (Bukkit.getOnlineMode() && PaperLib.isPaper() && Settings.UUID.SERVICE_PAPER) {
+            if (Bukkit.getOnlineMode() && PaperSupport.isPaper() && Settings.UUID.SERVICE_PAPER) {
                 final PaperUUIDService paperUUIDService = new PaperUUIDService();
                 this.impromptuPipeline.registerService(paperUUIDService);
                 this.backgroundPipeline.registerService(paperUUIDService);
@@ -787,7 +793,7 @@ private void runEntityTask() {
                 while (iterator.hasNext()) {
                     Entity entity = iterator.next();
                     //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol.
-                    if (PaperLib.isPaper() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
+                    if (PaperSupport.isPaper() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
                         continue;
                     }
                     // Fallback for Spigot not having Entity#getEntitySpawnReason

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java

@@ -50,7 +50,7 @@ public static BukkitAugmentedGenerator get(World world) {
     @Override
     public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
         QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(BukkitAdapter.adapt(world));
-        // The chunk is already loaded and we do not want to load the chunk in "fully" by using any PaperLib methods.
+        // The chunk is already loaded and we do not want to load the chunk in "fully" by using any Paper methods.
         queue.setForceSync(true);
         queue.setSideEffectSet(SideEffectSet.none());
         queue.setBiomesEnabled(false);

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -32,6 +32,7 @@
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
+import com.plotsquared.core.util.MinecraftVersion;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -90,14 +91,13 @@ public BukkitPlotGenerator(
         this.plotGenerator = generator;
         this.platformGenerator = this;
         this.populators = new ArrayList<>();
-        int minecraftMinorVersion = PlotSquared.platform().serverVersion()[1];
-        if (minecraftMinorVersion >= 17) {
+        if (MinecraftVersion.current().isNewerOrEqualThan(MinecraftVersion.CAVES_AND_CLIFFS)) {
             this.populators.add(new BlockStatePopulator(this.plotGenerator));
         } else {
             this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
         }
         this.full = true;
-        this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
+        this.useNewGenerationMethods = MinecraftVersion.current().isNewerOrEqualThan(MinecraftVersion.THE_WILD_UPDATE);
         this.biomeProvider = new BukkitPlotBiomeProvider();
     }
 
@@ -112,7 +112,7 @@ public BukkitPlotGenerator(final String world, final ChunkGenerator cg, final @N
         this.full = false;
         this.platformGenerator = cg;
         this.plotGenerator = new DelegatePlotGenerator(cg, world);
-        this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
+        this.useNewGenerationMethods = MinecraftVersion.current().isNewerOrEqualThan(MinecraftVersion.THE_WILD_UPDATE);
         this.biomeProvider = null;
     }
 
@@ -446,7 +446,7 @@ private final class BukkitPlotBiomeProvider extends BiomeProvider {
 
         static {
             Set<Biome> disabledBiomes = new HashSet<>(List.of(Biome.CUSTOM));
-            if (PlotSquared.platform().serverVersion()[1] <= 19) {
+            if (MinecraftVersion.current().isOlderOrEqualThan(MinecraftVersion.THE_WILD_UPDATE)) {
                 final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
                 if (cherryGrove != null) {
                     disabledBiomes.add(cherryGrove);

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

@@ -163,7 +163,8 @@ public void onBlockForm(BlockFormEvent event) {
         if (plot == null) {
             return;
         }
-        if (event.getNewState().getType().name().contains("COPPER")) {
+        String newTypeName = event.getNewState().getType().name();
+        if (newTypeName.contains("COPPER") || newTypeName.contains("LIGHTNING_ROD")) {
             if (!plot.getFlag(CopperOxideFlag.class)) {
                 plot.debug("Copper could not oxide because copper-oxide = false");
                 event.setCancelled(true);