diff --git a/.github/workflows/publish-javadoc.yaml b/.github/workflows/publish-javadoc.yaml index d4ab5d71..e06abc95 100644 --- a/.github/workflows/publish-javadoc.yaml +++ b/.github/workflows/publish-javadoc.yaml @@ -5,6 +5,7 @@ on: branches: - master - feature/doc + - '**/*-javadoc' tags: - '*' delete: @@ -26,7 +27,7 @@ jobs: with: fetch-depth: 0 ref: gh-pages - + - name: Deploy 🚀 id: deploy shell: bash @@ -34,17 +35,17 @@ jobs: if git rm -r $TARGET_FOLDER ; then echo Nothing to clean up fi - + find . -name javadoc -type d -print | sed 's#^\./\(.*\)/javadoc$#\1#' | sort --version-sort --reverse > index.txt git add index.txt git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR_ID}-${GITHUB_ACTOR}@users.noreply.github.com" git commit -m "Clean up javadoc after ref $TARGET_FOLDER is deleted" git push - echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT + echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT env: TARGET_FOLDER: ${{ github.ref_name }} - + javadoc: if: github.event_name == 'push' concurrency: javadoc-publish diff --git a/addon.gradle b/addon.gradle index 32cd6394..84129c33 100644 --- a/addon.gradle +++ b/addon.gradle @@ -1,7 +1,7 @@ javadoc { javadocTool = javaToolchains.javadocToolFor { // Last version with frames, but it also has search - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(25) vendor = JvmVendorSpec.ADOPTIUM } @@ -18,9 +18,8 @@ javadoc { options { overview "src/main/javadoc/overview.html" - links 'https://docs.oracle.com/javase/8/docs/api/' + links 'https://docs.oracle.com/en/java/javase/25/docs/api/' links 'https://skmedix.github.io/ForgeJavaDocs/javadoc/forge/1.7.10-10.13.4.1614/' - addBooleanOption("-frames", true) } } diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index 631b54d2..67bad619 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -637,7 +637,7 @@ public static IStructureElementCheckOnly ofBlocksTiered(ITierConver * given tier, then player will be allowed to use multiple kinds of blocks, but their tier is guaranteed to be the * same. *

- *

WARNING

You SHOULD NOT return notSet from your tierExtractor. If you do so, we will have this + *

WARNING

You SHOULD NOT return notSet from your tierExtractor. If you do so, we will have this * chain of events: * - *

Example Implementation

+ *

Example Implementation

*

* Assume you have 16 tier, each map to one particular block's 16 different meta. You will usually want something * like this