diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b304c8d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,38 @@ +version: 2 + +updates: + - package-ecosystem: maven + directory: /Spigot + schedule: + interval: weekly + day: monday + time: "05:00" + timezone: Asia/Tokyo + groups: + maven-dependencies: + patterns: + - "*" + + - package-ecosystem: gradle + directory: /fabric + schedule: + interval: weekly + day: monday + time: "05:00" + timezone: Asia/Tokyo + groups: + gradle-dependencies: + patterns: + - "*" + + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + day: monday + time: "05:00" + timezone: Asia/Tokyo + groups: + actions: + patterns: + - "*" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1f76c16 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,51 @@ +name: CI + +on: + push: + branches: + - main + pull_request: + +permissions: + contents: read + +jobs: + spigot: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: "21" + cache: maven + cache-dependency-path: Spigot/pom.xml + + - name: Build Spigot plugin + run: mvn -B -ntp -f Spigot/pom.xml verify + + fabric: + runs-on: ubuntu-latest + defaults: + run: + working-directory: fabric + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: "25" + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 + with: + gradle-version: "9.6.1" + + - name: Build Fabric mod + run: gradle --no-daemon build diff --git a/.gitignore b/.gitignore index 79b6901..51d41f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .idea .gradle build -.github local.properties .vscode *.iml @@ -29,7 +28,9 @@ local.properties *.seed *.pid.lock target/* +dependency-reduced-pom.xml +problems/ plan.md plugin-spec.md -DECISIONS.md \ No newline at end of file +DECISIONS.md diff --git a/Spigot/dependency-reduced-pom.xml b/Spigot/dependency-reduced-pom.xml deleted file mode 100644 index e9affd3..0000000 --- a/Spigot/dependency-reduced-pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - dev.acecore - common_modal-spigot - spigot - 1.0.0 - - clean package - - - true - src/main/resources - - - - - maven-compiler-plugin - 3.13.0 - - ${java.version} - ${java.version} - true - C:\Program Files\Java\jdk-21\bin\javac.exe - - - - maven-shade-plugin - 3.5.3 - - - package - - shade - - - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - org.spigotmc - spigot-api - 1.21.11-R0.1-SNAPSHOT - provided - - - - 21 - UTF-8 - - diff --git a/Spigot/pom.xml b/Spigot/pom.xml index b5815e9..6e17024 100644 --- a/Spigot/pom.xml +++ b/Spigot/pom.xml @@ -22,18 +22,18 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.15.0 - ${java.version} - ${java.version} - true - C:\Program Files\Java\jdk-21\bin\javac.exe + ${java.version} org.apache.maven.plugins maven-shade-plugin - 3.5.3 + 3.6.2 + + false + package @@ -74,13 +74,13 @@ org.jetbrains annotations - 24.0.1 + 26.1.0 - org.json - json - 20260522 - compile + com.google.code.gson + gson + 2.14.0 + provided diff --git a/Spigot/target/classes/plugin.yml b/Spigot/target/classes/plugin.yml deleted file mode 100644 index c8d4808..0000000 --- a/Spigot/target/classes/plugin.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: commonModal -version: 1.0.0 -main: dev.acecore.common_modal.CommonModalPlugin -api-version: '1.21' -author: acecore -softdepend: [] diff --git a/Spigot/target/maven-archiver/pom.properties b/Spigot/target/maven-archiver/pom.properties deleted file mode 100644 index 943d0ee..0000000 --- a/Spigot/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=common_modal-spigot -groupId=dev.acecore -version=1.0.0 diff --git a/Spigot/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Spigot/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index fa8fd3e..0000000 --- a/Spigot/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,27 +0,0 @@ -dev\acecore\common_modal\api\form\SimpleForm.class -dev\acecore\common_modal\api\form\component\DropdownComponent.class -dev\acecore\common_modal\CommonModal.class -dev\acecore\common_modal\api\CommonModalAPI$ActiveFormSession.class -dev\acecore\common_modal\api\form\component\InputComponent.class -dev\acecore\common_modal\listener\PlayerListener.class -dev\acecore\common_modal\api\form\component\LabelComponent.class -dev\acecore\common_modal\Events.class -dev\acecore\common_modal\api\CommonModalAPI.class -dev\acecore\common_modal\api\form\component\SliderComponent.class -dev\acecore\common_modal\api\form\ModalForm$Builder.class -dev\acecore\common_modal\api\form\Form.class -dev\acecore\common_modal\api\form\component\ToggleComponent.class -dev\acecore\common_modal\api\form\SimpleForm$Builder.class -dev\acecore\common_modal\api\form\CustomForm.class -dev\acecore\common_modal\api\form\FormImage.class -dev\acecore\common_modal\protocol\CommonModalChannels.class -dev\acecore\common_modal\api\form\CustomForm$Builder.class -dev\acecore\common_modal\CommandsTabList.class -dev\acecore\common_modal\CommonModalPlugin.class -dev\acecore\common_modal\Commands.class -dev\acecore\common_modal\api\form\component\FormComponent.class -dev\acecore\common_modal\api\form\SimpleForm$Button.class -dev\acecore\common_modal\api\form\FormImage$Type.class -dev\acecore\common_modal\api\form\ModalForm.class -dev\acecore\common_modal\api\ModalCheckerAPI.class -dev\acecore\common_modal\protocol\FormCodec.class diff --git a/Spigot/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Spigot/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 50ec035..0000000 --- a/Spigot/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,21 +0,0 @@ -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\CommonModalAPI.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\component\DropdownComponent.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\component\FormComponent.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\component\InputComponent.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\component\LabelComponent.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\component\SliderComponent.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\component\ToggleComponent.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\CustomForm.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\Form.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\FormImage.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\ModalForm.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\form\SimpleForm.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\api\ModalCheckerAPI.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\Commands.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\CommandsTabList.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\CommonModal.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\CommonModalPlugin.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\Events.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\listener\PlayerListener.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\protocol\CommonModalChannels.java -C:\sekisei\ace_server\projects\commonModal\Spigot\src\main\java\dev\acecore\common_modal\protocol\FormCodec.java diff --git a/fabric/gradle.properties b/fabric/gradle.properties index 68c5c3f..ff83106 100644 --- a/fabric/gradle.properties +++ b/fabric/gradle.properties @@ -9,12 +9,12 @@ org.gradle.configuration-cache=false # check these on https://fabricmc.net/develop minecraft_version=26.1.2 loader_version=0.19.3 -loom_version=1.16-SNAPSHOT +loom_version=1.17.17 # Mod Properties mod_version=1.0.0 # Dependencies -fabric_api_version=0.151.0+26.1.2 +fabric_api_version=0.155.2+26.1.2 maven_group=dev.acecore archives_base_name=commonmodal diff --git a/fabric/gradle/wrapper/gradle-wrapper.properties b/fabric/gradle/wrapper/gradle-wrapper.properties index 94f44f1..969eb0c 100644 --- a/fabric/gradle/wrapper/gradle-wrapper.properties +++ b/fabric/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,2 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 diff --git a/fabric/problems/problems-report.html b/fabric/problems/problems-report.html deleted file mode 100644 index 5654459..0000000 --- a/fabric/problems/problems-report.html +++ /dev/null @@ -1,659 +0,0 @@ - - - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - -