v1.6.0

.github/workflows/build-scenamatica.yml

@@ -13,27 +13,54 @@ jobs:
       - uses: actions/checkout@v4
       - name: Change directory to scenamatica
         run: cd Scenamatica
-      - name: Set up JDK 17
+      - name: Set up JDK 22
         uses: actions/setup-java@v4
-        id: maven-cache
         with:
-          java-version: 17
+          java-version: 22
           distribution: zulu
-          cache: maven
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.8.2
-      - name: Restore NMS cache
-        uses: actions/cache@v4
+##### NMS 以外のキャッシュを利かせる #####
+      - name: Try to restore cache
+        uses: actions/cache/restore@v4
+        id: restore-cache
         with:
-          path: nms-build/.m2
-          key: nms-maven
-          restore-keys: nms-maven
-      - name: Deploy NMS cache
-        if: steps.maven-cache.outputs.cache-hit != 'true'
+          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: |
-          mv -f nms-build/.m2/repository/repository $HOME/.m2/ -v
+          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 }}
+          versions: |
+            1.18.1  # v1_18_R1
+            1.18.1  # v1_18_R1
+            1.17.1  # v1_17_R1
+            1.16.5  # v1_16_R3
+            1.16.3  # v1_16_R2
+            1.16.1  # v1_16_R1
+            1.15.2  # v1_15_R1
+            1.14.4  # v1_14_R1
+            1.13.2  # v1_13_R2
+            1.13    # v1_13_R1
       - name: Build with Maven
         run: |
           cd Scenamatica

.github/workflows/codeql-analysis.yml

@@ -12,10 +12,6 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [main, develop]
-    paths:
-      - "Scenamatica/**"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [develop]
@@ -26,45 +22,65 @@ on:
   workflow_dispatch:
 
 jobs:
-  setup-nms:
-    name: Setup NMS
-    uses: "./.github/workflows/build-nms.yml"
-    secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
   build-and-analyze:
     name: Build with Maven
     runs-on: ubuntu-latest
-    needs: setup-nms
     steps:
       - uses: actions/checkout@v4
       - name: Change directory to scenamatica
         run: cd Scenamatica
-      - name: Set up JDK 8
+      - name: Set up JDK 22
         uses: actions/setup-java@v4
         id: maven-cache
         with:
-          java-version: 8
+          java-version: 22
           distribution: zulu
-          cache: maven
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.8.2
-      - name: Restore NMS cache
-        uses: actions/cache@v4
-        with:
-          path: nms-build/.m2
-          key: nms-maven
-          restore-keys: nms-maven
-      - name: Deploy NMS cache
-        if: steps.maven-cache.outputs.cache-hit != 'true'
-        run: |
-          mv -f nms-build/.m2/repository $HOME/.m2/ -v
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         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 }}
+          versions: |
+            1.17.1  # v1_17_R1
+            1.16.5  # v1_16_R3
+            1.16.3  # v1_16_R2
+            1.16.1  # v1_16_R1
+            1.15.2  # v1_15_R1
+            1.14.4  # v1_14_R1
+            1.13.2  # v1_13_R2
+            1.13    # v1_13_R1
       - name: Build with Maven
         run: |
           cd Scenamatica

.github/workflows/docs-deploy.yml

@@ -53,11 +53,11 @@ jobs:
         uses: pnpm/action-setup@v3
         with: 
           package_json_file: docs/package.json
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         id: maven-cache
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: maven
       - name: Set up Maven

.github/workflows/scenamatica-build-and-test.yml

@@ -15,17 +15,11 @@ concurrency:
   group: ${{ github.workflow }}-scenamatica-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  setup-nms:
-    name: Setup NMS
-    uses: "./.github/workflows/build-nms.yml"
-    secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
   build:
     name: Build with Maven
-    needs: setup-nms
     uses: "./.github/workflows/build-scenamatica.yml"
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
+      token: ${{ secrets.GH_PAT }}
   self-tests:
     name: Self-test with Scenamatica
     runs-on: ubuntu-latest

Bookkeeper/annotations/src/main/java/org/kunlab/scenamatica/bookkeeper/annotations/TypeDoc.java

@@ -53,6 +53,7 @@
      *
      * @return サポートする Minecraft バージョンの終了バージョン
      */
+    @Nullable
     MCVersion supportsUntil() default MCVersion.UNSET;
 
     /**

Bookkeeper/annotations/src/main/java/org/kunlab/scenamatica/bookkeeper/annotations/TypeProperty.java

@@ -1,6 +1,8 @@
 package org.kunlab.scenamatica.bookkeeper.annotations;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.kunlab.scenamatica.bookkeeper.enums.MCVersion;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -78,6 +80,22 @@
      */
     double min() default Integer.MIN_VALUE;
 
+    /**
+     * サポートする Minecraft バージョンの開始バージョンを返します。
+     *
+     * @return サポートする Minecraft バージョンの開始バージョン
+     */
+    @Nullable
+    MCVersion supportsSince() default MCVersion.UNSET;
+
+    /**
+     * サポートする Minecraft バージョンの終了バージョンを返します。
+     *
+     * @return サポートする Minecraft バージョンの終了バージョン
+     */
+    @Nullable
+    MCVersion supportsUntil() default MCVersion.UNSET;
+
     /**
      * 型プロパティのアドモ二ションを取得します。
      *

Bookkeeper/core/src/main/java/org/kunlab/scenamatica/bookkeeper/compiler/TypeCompiler.java

@@ -121,7 +121,9 @@ protected TypeReference doCompile(TypeDefinition definition)
                         definition.getClazz().name,
                         definition.getMappingOf() != null ? definition.getMappingOf().getClassName().replace('.', '/'): null,
                         compileProperties(definition.getProperties(), parentCompiled),
-                        admonitions.toArray(new GenericAdmonition[0])
+                        admonitions.toArray(new GenericAdmonition[0]),
+                        definition.getSupportsSince(),
+                        definition.getSupportsUntil()
                 )
         );
     }
@@ -159,7 +161,9 @@ private Map<String, CompiledType.Property> compileProperties(TypePropertyDefinit
                             property.getMin(),
                             property.getMax(),
                             property.getDefaultValue(),
-                            property.getAdmonitions()
+                            property.getAdmonitions(),
+                            property.getSupportsSince(),
+                            property.getSupportsUntil()
                     )
             );
         }
@@ -292,7 +296,9 @@ private TypeReference getEnumReference(Type type, @NotNull ClassNode classNode)
                         classNameSimple,
                         null,
                         category,
-                        className
+                        className,
+                        null,
+                        null
                 ),
                 enumValues
         );
@@ -371,7 +377,7 @@ public static class PrimitiveType extends CompiledType implements IPrimitiveType
     {
         private PrimitiveType(String primitiveName, Class<?> clazz)
         {
-            super(primitiveName, primitiveName, null, null, clazz.getName());
+            super(primitiveName, primitiveName, null, null, clazz.getName(), null, null);
         }
 
         @Override

Bookkeeper/core/src/main/java/org/kunlab/scenamatica/bookkeeper/compiler/models/CompiledSpecifierType.java

@@ -36,7 +36,9 @@ private CompiledSpecifierType(String type, String className)
                 type.substring(0, 1).toUpperCase() + type.substring(1) + "Specifier",
                 null,
                 null,
-                className
+                className,
+                null,
+                null
         );
     }