Add changes

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: 不具合を報告するIssueを作成します。
 title: ''
 labels: 👮security
-assignees: m2en
+assignees: acrylic-style
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature request
 about: 機能のリクエストなどを送信します。
 title: ''
 labels: ✨enhancement
-assignees: m2en
+assignees: acrylic-style
 
 ---
 

.github/workflows/deploy.yml

@@ -0,0 +1,16 @@
+name: Deploy
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'adoptium'
+          java-version: '21'
+      - run: ./gradlew shadowJar
+      - run: 'curl -X PUT --data-binary @build/libs/AfnwCore2-*-all.jar "https://saba8-deploy.azisaba.dev/deploy?secret={{ secrets.DEPLOYMAN_SECRET_SABA8 }}&token={{ secrets.DEPLOYMAN_TOKEN }}&filename=AfnwCore2.jar"'

README.md

@@ -11,26 +11,28 @@
 - [Intellij IDEA Ultimate](https://www.jetbrains.com/idea/)
 - [Java SE Development Kit 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
 - Java 17
-- Gradle 7.3
-- Paper 1.17.1 (gh 411)
+- Gradle 8.9
+- Paper 1.20.2
 
 ## 前提プラグイン
 
 AfnwCore2を導入したPaperを起動するには以下のプラグインが `plugins/` に導入されている必要があります。
 
 - [EssentialsX](https://essentialsx.net/downloads.html)
+- Votifier
+- [ItemStash](https://github.com/AzisabaNetwork/ItemStash)
 
 ## 使用API
 
-- [paper-api:1.17.1-R0.1-SNAPSHOT](https://papermc.io/repo/repository/maven-public/)
+- [paper-api:1.20.2-R0.1-SNAPSHOT](https://papermc.io/repo/repository/maven-public/)
   - [JavaDoc](https://papermc.io/repo/repository/maven-public/)
 - [EssentialsX API](https://repo.essentialsx.net/releases/)
 
 ## Build
 
 ```sh 
 git clone https://github.com/AfnwTeam/AfnwCore2.git
-gradle build
+gradlew reobfJar
 ```
 
 なお、Intellij IDEAを使用している場合はすべてGUI上で使用可能です。

build.gradle.kts

@@ -1,48 +1,39 @@
 plugins {
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
     java
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.gradleup.shadow") version "9.3.0"
 }
 
 group = "net.azisaba.afnw"
-version = "1.5.0-SNAPSHOT"
+version = "2.1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
-    maven {
-        name = "papermc-repo"
-        url = uri("https://papermc.io/repo/repository/maven-public/")
-    }
-    maven {
-        name = "sonatype"
-        url = uri("https://oss.sonatype.org/content/groups/public/")
-    }
-    maven {
-        name = "azisaba"
-        url = uri("https://repo.azisaba.net/repository/maven-public/")
-    }
-    maven {
-        name = "essentialsx"
-        url = uri("https://repo.essentialsx.net/releases/")
-    }
-    if (properties["azisabaNmsUsername"] != null && properties["azisabaNmsPassword"] != null) {
-        maven {
-            name = "azisabaNms"
-            credentials(PasswordCredentials::class)
-            url = uri("https://repo.azisaba.net/repository/nms/")
-        }
-    }
-    mavenLocal()
+    maven("https://repo.papermc.io/repository/maven-public/")
+    maven("https://oss.sonatype.org/content/groups/public/")
+    maven("https://repo.azisaba.net/repository/maven-public/")
+    maven("https://repo.essentialsx.net/releases/")
+    maven("https://mvn.lumine.io/repository/maven-public/")
+    maven("https://jitpack.io")
 }
 
 dependencies {
-    implementation("net.blueberrymc:native-util:2.1.0")
-    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT")
+//    implementation("net.blueberrymc:native-util:2.1.0")
+    implementation("xyz.acrylicstyle.java-util:common:2.1.1")
+    implementation("xyz.acrylicstyle.java-util:expression:2.1.1")
     compileOnly("net.azisaba.ballotbox:receiver:1.0.1")
-    compileOnly("net.essentialsx:EssentialsX:2.19.7")
+    compileOnly("net.azisaba:ItemStash:1.0.0-SNAPSHOT")
+    compileOnly("net.essentialsx:EssentialsX:2.20.1") {
+        exclude("org.spigotmc", "spigot-api")
+    }
+    compileOnly("io.lumine:Mythic-Dist:5.4.0")
+    compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT")
+    compileOnly("net.azisaba:TAB-BukkitBridge:3.1.0")
+    compileOnly("org.jetbrains:annotations:26.0.1")
+    paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 
 tasks {
     compileJava {
@@ -57,4 +48,8 @@ tasks {
             filteringCharset = "UTF-8"
         }
     }
+
+    shadowJar {
+        relocate("xyz.acrylicstyle.util", "net.azisaba.afnwcore2.lib.xyz.acrylicstyle.util")
+    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists