Address comments

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Validate Gradle Wrapper"
         uses: gradle/wrapper-validation-action@v1.0.4
       - name: Setup Java
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v2.5.0
         with:
           distribution: temurin
           java-version: 17

.github/workflows/codeql.yml

@@ -1,37 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ v6 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ v6 ]
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1

.github/workflows/rebase.yml

@@ -0,0 +1,20 @@
+name: Rebase Pull Request
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && github.event.comment.author_association == 'MEMBER'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2.4.0
+        with:
+          token: ${{ secrets.REBASE_TOKEN }}
+          fetch-depth: 0
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.REBASE_TOKEN }}

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

@@ -83,31 +83,34 @@ public class BukkitWorld implements World<org.bukkit.World> {
         return this.world.getName();
     }
 
-    @Override
     public boolean equals(final Object o) {
-        if (this == o) {
+        if (o == this) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof final BukkitWorld other)) {
             return false;
         }
-        final BukkitWorld that = (BukkitWorld) o;
-        return world.equals(that.world);
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        if (!Objects.equals(this.world, other.world)) {
+            return false;
+        }
+        return true;
     }
 
-    @Override
-    public int hashCode() {
-        return world.hashCode();
-    }
-
-    /**
-     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof BukkitWorld;
     }
 
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $world = this.world;
+        result = result * PRIME + ($world == null ? 43 : $world.hashCode());
+        return result;
+    }
+
     public String toString() {
         return "BukkitWorld(world=" + this.world + ")";
     }

Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java

@@ -105,29 +105,31 @@ public abstract class PlotWorld {
         return this.world;
     }
 
-    @Override
     public boolean equals(final Object o) {
-        if (this == o) {
+        if (o == this) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof final PlotWorld other)) {
             return false;
         }
-        final PlotWorld plotWorld = (PlotWorld) o;
-        return world.equals(plotWorld.world);
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        final Object this$world = this.getWorld();
+        final Object other$world = other.getWorld();
+        return Objects.equals(this$world, other$world);
     }
 
-    @Override
-    public int hashCode() {
-        return world.hashCode();
-    }
-
-    /**
-     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof PlotWorld;
     }
 
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $world = this.getWorld();
+        result = result * PRIME + ($world == null ? 43 : $world.hashCode());
+        return result;
+    }
+
 }

Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java

@@ -371,31 +371,33 @@ public class FlagContainer {
         }
     }
 
-    @Override
     public boolean equals(final Object o) {
-        if (this == o) {
+        if (o == this) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof final FlagContainer other)) {
             return false;
         }
-        final FlagContainer that = (FlagContainer) o;
-        return flagMap.equals(that.flagMap);
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        final Object this$flagMap = this.getFlagMap();
+        final Object other$flagMap = other.getFlagMap();
+        return Objects.equals(this$flagMap, other$flagMap);
     }
 
-    @Override
-    public int hashCode() {
-        return flagMap.hashCode();
-    }
-
-    /**
-     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof FlagContainer;
     }
 
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $flagMap = this.getFlagMap();
+        result = result * PRIME + ($flagMap == null ? 43 : $flagMap.hashCode());
+        return result;
+    }
+
     /**
      * Update event types used in {@link PlotFlagUpdateHandler}.
      */

Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java

@@ -31,7 +31,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Objects;
 
 /**
  * A plot flag is any property that can be assigned
@@ -201,30 +200,34 @@ public abstract class PlotFlag<T, F extends PlotFlag<T, F>> {
         return Collections.emptyList();
     }
 
-    @Override
     public boolean equals(final Object o) {
-        if (this == o) {
+        if (o == this) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof final PlotFlag<?, ?> other)) {
             return false;
         }
-        final PlotFlag<?, ?> plotFlag = (PlotFlag<?, ?>) o;
-        return value.equals(plotFlag.value);
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        final Object this$value = this.getValue();
+        final Object other$value = other.getValue();
+        if (this$value == null ? other$value != null : !this$value.equals(other$value)) {
+            return false;
+        }
+        return true;
     }
 
-    @Override
-    public int hashCode() {
-        return value.hashCode();
-    }
-
-    /**
-     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof PlotFlag;
     }
 
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $value = this.getValue();
+        result = result * PRIME + ($value == null ? 43 : $value.hashCode());
+        return result;
+    }
 
 }

Core/src/main/java/com/plotsquared/core/uuid/UUIDMapping.java

@@ -51,29 +51,38 @@ public class UUIDMapping {
         return this.uuid;
     }
 
-    @Override
     public boolean equals(final Object o) {
-        if (this == o) {
+        if (o == this) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof final UUIDMapping other)) {
             return false;
         }
-        final UUIDMapping that = (UUIDMapping) o;
-        return uuid.equals(that.uuid) && username.equals(that.username);
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        final Object this$uuid = this.getUuid();
+        final Object other$uuid = other.getUuid();
+        if (!Objects.equals(this$uuid, other$uuid)) {
+            return false;
+        }
+        final Object this$username = this.getUsername();
+        final Object other$username = other.getUsername();
+        return Objects.equals(this$username, other$username);
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(uuid, username);
-    }
-
-    /**
-     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof UUIDMapping;
     }
 
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $uuid = this.getUuid();
+        result = result * PRIME + $uuid.hashCode();
+        final Object $username = this.getUsername();
+        result = result * PRIME + $username.hashCode();
+        return result;
+    }
+
 }

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     idea
 }
 
-version = "6.5.2-SNAPSHOT"
+version = "6.5.1-SNAPSHOT"
 
 allprojects {
     group = "com.plotsquared"

gradle/libs.versions.toml

@@ -28,7 +28,7 @@ mvdwapi = "3.1.1"
 # Third party
 prtree = "2.0.0"
 aopalliance = "1.0"
-cloud-services = "1.6.2"
+cloud-services = "1.6.1"
 arkitektonika = "2.1.1"
 paster = "1.1.4"
 bstats = "3.0.0"

settings.gradle.kts

@@ -5,4 +5,5 @@ include("Core", "Bukkit")
 project(":Core").name = "PlotSquared-Core"
 project(":Bukkit").name = "PlotSquared-Bukkit"
 
+enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")