diff --git a/.github/workflows/pr-comment-artifacts.yml b/.github/workflows/pr-comment-artifacts.yml deleted file mode 100644 index 0589f3a..0000000 --- a/.github/workflows/pr-comment-artifacts.yml +++ /dev/null @@ -1,104 +0,0 @@ -# https://github.com/orgs/community/discussions/51403 - -name: Comment Artifacts - -on: - workflow_run: - types: - - "completed" - workflows: - - "Build And Test" - -permissions: - actions: read - attestations: read - contents: read - pull-requests: write - -jobs: - parse-metadata: - runs-on: ubuntu-latest - outputs: - PREVIOUS_JOB_ID: ${{ steps.metadata.outputs.PREVIOUS_JOB_ID }} - PR_NUMBER: ${{ steps.metadata.outputs.PR_NUMBER }} - HEAD_SHA: ${{ steps.metadata.outputs.HEAD_SHA }} - ARTIFACT_URL: ${{ steps.metadata.outputs.ARTIFACT_URL }} - steps: - - name: Get Artifact URL & PR Info - id: metadata - env: - GITHUB_TOKEN: ${{ github.token }} - OWNER: ${{ github.repository_owner }} - REPO: ${{ github.event.repository.name }} - WORKFLOW_RUN_EVENT_OBJ: ${{ toJSON(github.event.workflow_run) }} - run: | - PREVIOUS_JOB_ID=${{ github.event.workflow_run.id }} - echo "Previous Job ID: $PREVIOUS_JOB_ID" - echo "PREVIOUS_JOB_ID=$PREVIOUS_JOB_ID" >> "$GITHUB_OUTPUT" - - gh api "/repos/$OWNER/$REPO/actions/runs/$PREVIOUS_JOB_ID/logs" >logs.zip - unzip -p logs.zip 'Build/*.txt' >build.txt - - function parse_var() { - name=$1 - line=$(cat build.txt | grep "output:${name}=") - export parsed=${line#*"output:${name}="} - } - parse_var PR_NUMBER - PR_NUMBER=$parsed - parse_var HEAD_SHA - HEAD_SHA=$parsed - parse_var ARTIFACT_URL - ARTIFACT_URL=$parsed - - echo "ARTIFACT URL: $ARTIFACT_URL" - echo "ARTIFACT_URL=$ARTIFACT_URL" >> "$GITHUB_OUTPUT" - - # PR_NUMBER=$(jq -r '.pull_requests[0].number' <<< "$WORKFLOW_RUN_EVENT_OBJ") - - echo "PR Number: $PR_NUMBER" - echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_OUTPUT" - - # HEAD_SHA=$(jq -r '.pull_requests[0].head.sha' <<< "$WORKFLOW_RUN_EVENT_OBJ") - - echo "Head sha: $HEAD_SHA" - echo "HEAD_SHA=$HEAD_SHA" >> "$GITHUB_OUTPUT" - - comment-success: - if: ${{ jobs.parse-metadata.outputs.PR_NUMBER != '' }} - runs-on: ubuntu-latest - steps: - - name: Find Comment - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ jobs.parse-metadata.outputs.PR_NUMBER }} - comment-author: 'github-actions[bot]' - body-includes: '## Build Preview' - - - name: Update Comment - env: - JOB_PATH: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ jobs.parse-metadata.outputs.PREVIOUS_JOB_ID }}" - HEAD_SHA: ${{ jobs.parse-metadata.outputs.HEAD_SHA }} - ARTIFACT_URL: ${{ jobs.parse-metadata.outputs.ARTIFACT_URL }} - uses: peter-evans/create-or-update-comment@v4 - with: - issue-number: ${{ jobs.parse-metadata.outputs.PR_NUMBER }} - comment-id: ${{ steps.fc.outputs.comment-id }} - edit-mode: replace - body: |- - ## Build Preview - - [![badge]]($JOB_PATH) - - You can find files attached to the below linked Workflow Run URL (Logs). - - Please note that files only stay for around 90 days! - - | Name | Link | - |-----------|-------------------------| - | Commit | ${{ env.HEAD_SHA }} | - | Logs | ${{ env.JOB_PATH }} | - ${{ env.ARTIFACT_URL && format('| Jar Files | {0} |', env.ARTIFACT_URL) || '' }} - - [badge]: https://img.shields.io/badge/${{ format('{0}-{1}', github.event.workflow_run.conclusion, github.event.workflow_run.conclusion == 'success' && '3fb950' || 'f85149') }}?style=for-the-badge&logo=github&label=build diff --git a/build.gradle b/build.gradle index cc615b0..33d1e2d 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ apply plugin: "org.jetbrains.kotlin.jvm" //group = mod_version base { - archivesName = "Starlance-${mod_version}${mod_artifact_suffix}" + archivesName = "${archives_base_name}-${mod_version}" } java { @@ -275,7 +275,7 @@ tasks.named('jar', Jar).configure { "Specification-Vendor": mod_authors, "Specification-Version": "1", // We are version 1 of ourselves "Implementation-Title": project.name, - "Implementation-Version": project.jar.archiveVersion, + "Implementation-Version": mod_version, "Implementation-Vendor": mod_authors, "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) diff --git a/gradle.properties b/gradle.properties index b2e0b5a..4f0826d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx6G org.gradle.daemon=false -archives_base_name=vsch-1201 +archives_base_name=starlance # The mod version. See https://semver.org/ mod_version=1.2.0 @@ -20,8 +20,6 @@ mapping_version=1.20.1 mod_id=vsch mod_name=Starlance: Valkyrien Skies X Cosmic Horizons mod_license=All Rights Reserved -# keep artifact suffix empty cause its should be passed in command line -mod_artifact_suffix= mod_group_id=net.jcm mod_authors=Jcm, Brickyboy mod_description=Adds Valkyrien Skies compat to Cosmic Horizons, as well as space-focused blocks for VS ships. [WIP] @@ -42,5 +40,4 @@ flywheel_version = 0.6.11-13 registrate_version = MC1.20-1.3.3 lodestone_version=1.4.1.435 -jei_version = 15.2.0.27 -block_external_repositories= +jei_version = 15.2.0.27 \ No newline at end of file diff --git a/src/main/java/net/jcm/vsch/blocks/entity/template/ParticleBlockEntity.java b/src/main/java/net/jcm/vsch/blocks/entity/template/ParticleBlockEntity.java index 83b8d83..4d6ed49 100644 --- a/src/main/java/net/jcm/vsch/blocks/entity/template/ParticleBlockEntity.java +++ b/src/main/java/net/jcm/vsch/blocks/entity/template/ParticleBlockEntity.java @@ -12,12 +12,12 @@ default void clientTick(Level level, BlockPos pos, BlockState state, ParticleBlo } default void serverTick(Level level, BlockPos pos, BlockState state, ParticleBlockEntity be) { - if (level instanceof ServerLevel) { - tickForce(level, pos, state); + if (level instanceof ServerLevel serverLevel) { + tickForce(serverLevel, pos, state); } } - void tickForce(Level level, BlockPos pos, BlockState state); + void tickForce(ServerLevel level, BlockPos pos, BlockState state); void tickParticles(Level level, BlockPos pos, BlockState state); }