diff --git a/.github/workflows/ansible_kira_restart.yml b/.github/workflows/ansible_kira_restart.yml index d439a7dbc..57779e9a4 100644 --- a/.github/workflows/ansible_kira_restart.yml +++ b/.github/workflows/ansible_kira_restart.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/ansible_ping.yml b/.github/workflows/ansible_ping.yml index 410353388..d0c69edd7 100644 --- a/.github/workflows/ansible_ping.yml +++ b/.github/workflows/ansible_ping.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/ansible_setup_server.yml b/.github/workflows/ansible_setup_server.yml index 3c705d967..3df5442a9 100644 --- a/.github/workflows/ansible_setup_server.yml +++ b/.github/workflows/ansible_setup_server.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/ansible_start_server.yml b/.github/workflows/ansible_start_server.yml index f03fec7d8..75f95cbfc 100644 --- a/.github/workflows/ansible_start_server.yml +++ b/.github/workflows/ansible_start_server.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/ansible_stop_server.yml b/.github/workflows/ansible_stop_server.yml index 291ea9bb2..5b4ed6141 100644 --- a/.github/workflows/ansible_stop_server.yml +++ b/.github/workflows/ansible_stop_server.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/ansible_update_server.yml b/.github/workflows/ansible_update_server.yml index 09c041d39..ac29d9015 100644 --- a/.github/workflows/ansible_update_server.yml +++ b/.github/workflows/ansible_update_server.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'gradle' diff --git a/.github/workflows/ansible_update_server_minecraft.yml b/.github/workflows/ansible_update_server_minecraft.yml index 915dcf892..82933ef64 100644 --- a/.github/workflows/ansible_update_server_minecraft.yml +++ b/.github/workflows/ansible_update_server_minecraft.yml @@ -19,7 +19,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'gradle' diff --git a/.github/workflows/ansible_update_specific_server_paper.yml b/.github/workflows/ansible_update_specific_server_paper.yml index 6807c5012..d7148084b 100644 --- a/.github/workflows/ansible_update_specific_server_paper.yml +++ b/.github/workflows/ansible_update_specific_server_paper.yml @@ -20,7 +20,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'gradle' diff --git a/.github/workflows/ansible_update_specific_server_pvp.yml b/.github/workflows/ansible_update_specific_server_pvp.yml index 1f5501dc6..91dbdd32d 100644 --- a/.github/workflows/ansible_update_specific_server_pvp.yml +++ b/.github/workflows/ansible_update_specific_server_pvp.yml @@ -20,7 +20,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'gradle' diff --git a/.github/workflows/build_gradle_project.yaml b/.github/workflows/build_gradle_project.yaml index d9bcebda0..03af119a1 100644 --- a/.github/workflows/build_gradle_project.yaml +++ b/.github/workflows/build_gradle_project.yaml @@ -37,7 +37,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/check_gradle_all.yaml b/.github/workflows/check_gradle_all.yaml index 7c74b5916..9c9dd7af0 100644 --- a/.github/workflows/check_gradle_all.yaml +++ b/.github/workflows/check_gradle_all.yaml @@ -17,7 +17,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/.github/workflows/publish_gradle_project.yaml b/.github/workflows/publish_gradle_project.yaml index 60b116d20..bbc1c2e9e 100644 --- a/.github/workflows/publish_gradle_project.yaml +++ b/.github/workflows/publish_gradle_project.yaml @@ -51,7 +51,7 @@ jobs: - name: ☕ Setup Java uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: 🐘 Setup Gradle diff --git a/build.gradle.kts b/build.gradle.kts index 6a76830dc..07cda2973 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ allprojects { repositories { mavenCentral() maven("https://oss.sonatype.org/content/repositories/snapshots") - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.aikar.co/content/groups/aikar/") maven("https://libraries.minecraft.net") maven("https://repo.codemc.io/repository/maven-public/") diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..9a1fda2fb --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.parallel=true +org.gradle.caching=true +# org.gradle.configuration-cache=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1c9c472a..9ee5d75a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,9 +4,9 @@ junit = "5.8.2" nuotifier = "2.7.2" [plugins] -paper-userdev = { id = "io.papermc.paperweight.userdev", version = "1.7.2" } +paper-userdev = { id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.11" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } -runpaper = { id = "xyz.jpenilla.run-paper", version = "2.2.2" } +runpaper = { id = "xyz.jpenilla.run-paper", version = "2.3.1" } [libraries] paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } @@ -28,8 +28,6 @@ luckperms-api = { group = "net.luckperms", name = "api", version = "5.0" } aswm-api = { group = "com.infernalsuite.aswm", name = "api", version = "3.0.0-SNAPSHOT"} -# TODO -brewery = { group = "com.github.DieReicheErethons", name = "Brewery", version = "3.1" } breweryx = { group = "com.github.Jsinco", name = "BreweryX", version = "3.3.2" } worldedit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version = "7.2.8" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917..7f93135c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e0930..cea7a793a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/plugins/exilepearl-paper/build.gradle.kts b/plugins/exilepearl-paper/build.gradle.kts index 1ec0f2918..50208cd67 100644 --- a/plugins/exilepearl-paper/build.gradle.kts +++ b/plugins/exilepearl-paper/build.gradle.kts @@ -18,5 +18,5 @@ dependencies { compileOnly(project(":plugins:banstick-paper")) compileOnly(project(":plugins:randomspawn-paper")) - compileOnly(libs.brewery) + compileOnly(libs.breweryx) } diff --git a/plugins/exilepearl-paper/src/main/resources/plugin.yml b/plugins/exilepearl-paper/src/main/resources/plugin.yml index bb9d9ef81..77a358a3a 100644 --- a/plugins/exilepearl-paper/src/main/resources/plugin.yml +++ b/plugins/exilepearl-paper/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: ExilePearl version: ${version} main: com.devotedmc.ExilePearl.ExilePearlPlugin depend: [ CivModCore ] -softdepend: [ NameLayer, Citadel, Bastion, CivChat2, JukeAlert, CombatTagPlus, RandomSpawn, MythicMobs, Brewery, BanStick ] +softdepend: [ NameLayer, Citadel, Bastion, CivChat2, JukeAlert, CombatTagPlus, RandomSpawn, MythicMobs, BreweryX, BanStick ] commands: ep: suicide: diff --git a/settings.gradle.kts b/settings.gradle.kts index 5d28f0a9b..9985b1d82 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,12 @@ rootProject.name = "Civ" +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://repo.papermc.io/repository/maven-public/") + } +} + plugins { id("com.gradle.enterprise") version "3.16.2" }