Merge branch 'master' into 847-visitor-inventory-fix

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,66 @@
+name: Bug Report
+description: Create a report to help us improve IridiumSkyblock!
+labels: ["bug", "unconfirmed"]
+assignees: ["PeachesMLG", "dlsf", "sh0inx"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: markdown
+    attributes:
+      value: Before submitting a new issue, ensure your bug hasn't already been reported. If it has, reply to the open issue instead.
+  - type: textarea
+    id: reproduction
+    validations:
+      required: true
+    attributes:
+      label: Steps to Reproduce
+      description: Provide clear and unambiguous steps on how to reproduce the bug
+      placeholder: |
+        1. Do this
+        2. Click on this
+        3. See error
+  - type: textarea
+    id: expected_behavior
+    validations:
+      required: true
+    attributes:
+      label: Expected Behavior
+      description: Describe what you expected to happen
+  - type: textarea
+    id: actual_behavior
+    validations:
+      required: true
+    attributes:
+      label: Actual Behavior
+      description: Describe what actually happened
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Optionally, add some screenshots to show the issue
+  - type: input
+    id: minecraft_version
+    validations:
+      required: true
+    attributes:
+      label: Server Software & Minecraft Version
+      description: Please copy and paste the output of `/version`, "latest" is not helpful
+  - type: input
+    id: skyblock_version
+    validations:
+      required: true
+    attributes:
+      label: IridiumSkyblock version
+      description: Please copy and paste the output of `/is version`, "latest" is not helpful
+  - type: input
+    id: logs
+    attributes:
+      label: Server logs
+      description: "If there are error messages in your console, please send them via [this](https://mclo.gs)"
+  - type: textarea
+    id: additional_comments
+    attributes:
+      label: Additional Comments
+      description: Optionally, add further comments which may enhance the issue

.github/renovate.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "automerge": true,
+  "autoApprove": true
+}

.github/workflows/gradle-build.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.commits[0].message, '[ci-skip]')"
     steps:
-      - uses: actions/checkout@v3.0.0
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
@@ -26,7 +26,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload artifacts
-        uses: "actions/upload-artifact@v2.2.3"
+        uses: actions/upload-artifact@v4
         with:
           name: "IridiumSkyblock"
-          path: "build/libs/IridiumSkyblock-*.jar"
+          path: "build/libs/IridiumSkyblock-*.jar"

.github/workflows/publish.yml

@@ -10,10 +10,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.0
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4.2.2
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: temurin
           java-version: 17
@@ -25,7 +25,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload artifacts
-        uses: "actions/upload-artifact@v2.2.3"
+        uses: "actions/upload-artifact@v4.5.0"
         with:
           name: "IridiumSkyblock"
           path: "build/libs/IridiumSkyblock-*.jar"
@@ -35,12 +35,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Downloading artifact
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: thecodemonkey/action-get-gradle-version@master
         id: version
         with:
           file: "build.gradle.kts"
-      - uses: actions/download-artifact@v3.0.2
+      - uses: actions/download-artifact@v4.1.8
         with:
           name: "IridiumSkyblock"
           path: "./"
@@ -55,12 +55,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Downloading artifact
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: thecodemonkey/action-get-gradle-version@master
         id: version
         with:
           file: "build.gradle.kts"
-      - uses: actions/download-artifact@v3.0.2
+      - uses: actions/download-artifact@v4.1.8
         with:
           name: "IridiumSkyblock"
           path: "./"
@@ -117,12 +117,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Downloading artifact
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: thecodemonkey/action-get-gradle-version@master
         id: version
         with:
           file: "build.gradle.kts"
-      - uses: actions/download-artifact@v3.0.2
+      - uses: actions/download-artifact@v4.1.8
         with:
           name: "IridiumSkyblock"
           path: "./"

build.gradle.kts

@@ -1,46 +1,75 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.github.goooler.shadow") version "8.1.8"
+    id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
 }
 
 group = "com.iridium"
-version = "4.0.9.1"
-description = "IridiumSkyblock"
+version = "4.1.0"
+description = "Skyblock Redefined"
 
 repositories {
+    mavenCentral()
+    mavenLocal()
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
     maven("https://ci.ender.zone/plugin/repository/everything/")
     maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
     maven("https://papermc.io/repo/repository/maven-public/")
     maven("https://jitpack.io")
     maven("https://maven.enginehub.org/repo/")
-    mavenCentral()
 }
 
 dependencies {
     // Dependencies that we want to shade in
-    implementation("org.jetbrains:annotations:24.1.0")
+    implementation("org.jetbrains:annotations:26.0.1")
     implementation("com.j256.ormlite:ormlite-core:6.1")
     implementation("com.j256.ormlite:ormlite-jdbc:6.1")
-    implementation("com.iridium:IridiumTeams:2.4.4")
+    implementation("com.iridium:IridiumTeams:2.5.9.8")
+    implementation("commons-lang:commons-lang:2.6")
 
     // Other dependencies that are not required or already available at runtime
-    compileOnly("org.projectlombok:lombok:1.18.32")
-    compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("org.projectlombok:lombok:1.18.36")
+    compileOnly("org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
     compileOnly("net.ess3:EssentialsXSpawn:2.16.1")
     compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.13-SNAPSHOT")
 
     // Enable lombok annotation processing
-    annotationProcessor("org.projectlombok:lombok:1.18.32")
+    annotationProcessor("org.projectlombok:lombok:1.18.36")
+}
+
+bukkit {
+    main = "com.iridium.iridiumskyblock.IridiumSkyblock"
+    apiVersion = "1.13"
+    author = "Peaches_MLG"
+    authors = listOf("das_", "sh0inx", "SlashRemix", "Faun471")
+    website = "https://www.spigotmc.org/resources/62480"
+
+    loadBefore = listOf("Multiverse-Core")
+    depend = listOf("Vault")
+    softDepend = listOf(
+        "MVdWPlaceholderAPI",
+        "PlaceholderAPI",
+        "Essentials",
+        "EssentialsSpawn",
+        "RoseStacker",
+        "WorldEdit",
+        "ObsidianStacker"
+    )
+
+    commands {
+        register("iridiumskyblock") {
+            description = "Main plugin command"
+            aliases = listOf("is", "island")
+        }
+    }
 }
 
 tasks {
-    // "Replace" the build task with the shadowJar task (probably bad but who cares)
-    jar {
-        dependsOn("shadowJar")
-        enabled = false
+    // Add the shadowJar task to the build task
+    build {
+        dependsOn(shadowJar)
     }
 
     shadowJar {
@@ -51,10 +80,23 @@ tasks {
         archiveClassifier.set("")
 
         // Relocate dependencies
+        relocate("com.iridium.iridiumteams")
         relocate("com.iridium.iridiumcore")
         relocate("com.j256.ormlite")
-        relocate("org.bstats")
         relocate("de.jeff_media.updatechecker")
+        relocate("org.bstats")
+        relocate("org.intellij.lang.annotations")
+        relocate("org.jetbrains.annotations")
+        relocate("org.jnbt")
+
+        // Relocate IridiumCore dependencies
+        relocate("de.tr7zw.changeme.nbtapi")
+        relocate("com.iridium.iridiumcolorapi")
+        relocate("org.yaml.snakeyaml")
+        relocate("io.papermc.lib")
+        relocate("com.cryptomorin.xseries")
+        relocate("com.fasterxml.jackson")
+        relocate("org.apache.commons")
 
         // Remove unnecessary files from the jar
         minimize()
@@ -65,16 +107,6 @@ tasks {
         options.encoding = "UTF-8"
     }
 
-    // Process Placeholders for the plugin.yml
-    processResources {
-        filesMatching("**/plugin.yml") {
-            expand(rootProject.project.properties)
-        }
-
-        // Always re-run this task
-        outputs.upToDateWhen { false }
-    }
-
     compileJava {
         sourceCompatibility = JavaVersion.VERSION_1_8.toString()
         targetCompatibility = JavaVersion.VERSION_1_8.toString()