chore: v1.6.2

TeamKun · Dec 31, 2024 · 3424fc2 · 3424fc2
2 parents 4de95a4 + 242e98f
commit 3424fc2
Show file tree

Hide file tree

Showing 57 changed files with 527 additions and 328 deletions.
diff --git a/.github/workflows/build-scenamatica.yml b/.github/workflows/build-scenamatica.yml
@@ -4,7 +4,19 @@ on:
     secrets:
       token:
         required: true
-
+    inputs:
+      profile:
+        default: debug
+        type: string
+        required: true
+      artifact:
+        default: scenamatica
+        type: string
+        required: true
+      pull-request:
+        default: false
+        type: boolean
+        required: true
 jobs:
   build:
     name: Build with Maven
@@ -26,19 +38,20 @@ jobs:
       - name: Try to restore cache
         uses: actions/cache/restore@v4
         id: restore-cache
+        if: "!inputs.pull-request"
         with:
           key: maven-cache-${{ hashFiles('**/pom.xml') }}
           path: ~/.m2/repository
           enableCrossOsArchive: true
       - name: Collect dependencies without NMS
-        if: steps.restore-cache.outputs.cache-hit != 'true'
+        if: "!(inputs.pull-request || steps.restore-cache.outputs.cache-hit == 'true')"
         run: |
           mvn dependency:go-offline -f Scenamatica/pom.xml
           mvn dependency:go-offline -f Bookkeeper/pom.xml
         # 失敗することが前提なので↓
         continue-on-error: true
       - name: Cache dependencies without NMS
-        if: steps.restore-cache.outputs.cache-hit != 'true'
+        if: "!(inputs.pull-request || steps.restore-cache.outputs.cache-hit == 'true')"
         uses: actions/cache/save@v4
         id: cache-dependencies
         with:
@@ -65,11 +78,11 @@ jobs:
         run: |
           cd Scenamatica
           chmod +x build.sh
-          ./build.sh -D"jar.finalName=Scenamatica" -P debug
+          ./build.sh -D"jar.finalName=Scenamatica" -P ${{ inputs.profile }}
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: scenamatica
+          name: ${{ inputs.artifact }}
           path: Scenamatica/ScenamaticaPlugin/target/Scenamatica.jar
           retention-days: 1
           if-no-files-found: error
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,35 +44,12 @@ jobs:
         uses: github/codeql-action/init@v3
         with:
           languages: java
-##### NMS 以外のキャッシュを利かせる #####
-      - name: Try to restore cache
-        uses: actions/cache/restore@v4
-        id: restore-cache
-        with:
-          key: maven-cache-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2/repository
-          enableCrossOsArchive: true
-      - name: Collect dependencies without NMS
-        if: steps.restore-cache.outputs.cache-hit != 'true'
-        run: |
-          mvn dependency:go-offline -f Scenamatica/pom.xml
-          mvn dependency:go-offline -f Bookkeeper/pom.xml
-        # 失敗することが前提なので↓
-        continue-on-error: true
-      - name: Cache dependencies without NMS
-        if: steps.restore-cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        id: cache-dependencies
-        with:
-          key: maven-cache-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2/repository
-          enableCrossOsArchive: true
-##### おわり of NMS 以外のキャッシュを利かせる #####
       - name: Deploy NMS
         uses: TeamKun/NMSAccess@v2
         with:
-          access-token: ${{ secrets.token }}
+          access-token: ${{ secrets.GH_PAT }}
           versions: |
+            1.18.1  # v1_18_R1
             1.17.1  # v1_17_R1
             1.16.5  # v1_16_R3
             1.16.3  # v1_16_R2

diff --git a/.github/workflows/scenamatica-build-and-test.yml b/.github/workflows/scenamatica-build-and-test.yml
@@ -3,6 +3,9 @@ on:
   push:
     paths:
       - "Scenamatica/**"
+    branches:
+      - main
+      - develop
   pull_request:
     paths:
       - "Scenamatica/**"
@@ -20,6 +23,10 @@ jobs:
     uses: "./.github/workflows/build-scenamatica.yml"
     secrets:
       token: ${{ secrets.GH_PAT }}
+    with:
+      artifact: scenamatica
+      profile: debug
+      pull-request: ${{ github.event_name == 'pull_request' }}
   self-tests:
     name: Self-test with Scenamatica
     runs-on: ubuntu-latest

diff --git a/Scenamatica/NMSBridge/NMSCore/pom.xml b/Scenamatica/NMSBridge/NMSCore/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,62 +23,62 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
 
         <!-- NMS Implementions -->
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_13_R1</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_13_R2</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_14_R1</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_15_R1</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_16_R1</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_16_R2</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_16_R3</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_17_R1</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>v1_18_R1</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/Scenamatica/NMSBridge/NMSTypes/pom.xml b/Scenamatica/NMSBridge/NMSTypes/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/Scenamatica/NMSBridge/pom.xml b/Scenamatica/NMSBridge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>Scenamatica</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>NMSBridge</artifactId>

diff --git a/Scenamatica/NMSBridge/v1_13_R1/pom.xml b/Scenamatica/NMSBridge/v1_13_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_13_R2/pom.xml b/Scenamatica/NMSBridge/v1_13_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_14_R1/pom.xml b/Scenamatica/NMSBridge/v1_14_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_15_R1/pom.xml b/Scenamatica/NMSBridge/v1_15_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_16_R1/pom.xml b/Scenamatica/NMSBridge/v1_16_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_16_R2/pom.xml b/Scenamatica/NMSBridge/v1_16_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_16_R3/pom.xml b/Scenamatica/NMSBridge/v1_16_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_17_R1/pom.xml b/Scenamatica/NMSBridge/v1_17_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>io.papermc.paper</groupId>

diff --git a/Scenamatica/NMSBridge/v1_18_R1/pom.xml b/Scenamatica/NMSBridge/v1_18_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>NMSBridge</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica.nms</groupId>
             <artifactId>NMSTypes</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>io.papermc.paper</groupId>

diff --git a/Scenamatica/ScenamaticaAPI/pom.xml b/Scenamatica/ScenamaticaAPI/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.scenamatica</groupId>
         <artifactId>Scenamatica</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>ScenamaticaAPI</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.kunlab.scenamatica</groupId>
             <artifactId>ScenamaticaModels</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>