Paperweight 2.0

.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

.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

.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

.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

.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

.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'
 

.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'
 

.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'
 

.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'
 

.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

.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

.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

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/")

gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.parallel=true
+org.gradle.caching=true
+# org.gradle.configuration-cache=true

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" }

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

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)
 }

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:

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"
 }