-
-
Notifications
You must be signed in to change notification settings - Fork 94
Port to 1.21.1 #679
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Port to 1.21.1 #679
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
4f28b03
Initial 1.21.1 work, just adapted gradle
SirEndii 2918893
Merge branch 'dev/1.20.4' into dev/1.21.1
SirEndii 4e3968d
Merge branch 'dev/1.20.4' into dev/1.21.1
SirEndii 5993f6a
Merge branch 'release/1.20.4' into dev/1.21.1
SirEndii 34c1fe4
Update 1.21 config file
4879a60
Update 1.21 config file
1fafc44
Update 1.21 Registry
65423e4
Update 1.21 EventBusSubscriber
05f9a94
Update 1.21 ResourceLocation
a35acfd
Update 1.21 ChunkManager
0b53bab
Update 1.21 canSleepPlayer function
1c1a68d
Update ServerWorker to 1.21
227f6ec
Update 1.21 VillagerTrade
b2ea619
Update upgrade to 1.21
b2a3496
Update some provider and datagen to 1.21
b6f924f
Replace all ResourceLocation.fromNamespaceAndPath with AdvancedPeriph…
diemoell 0599fed
Merge pull request #677 from diemoell/update/1.21.1_work
SirEndii 0371d2f
Bump dependencies and remove mods that don't exist anymore
SirEndii e3e4554
Begone RS Bridge
SirEndii ea5dde9
Further porting, mostly Data Component work.
SirEndii c9bdf48
More component stuff, the project now builds, but it needs extensive …
SirEndii 7234441
Register data components, disable addons for now since we need to ref…
SirEndii 9524a08
Checkstyle
SirEndii 53589df
Change how we manage fake player turtle item/player properties
SirEndii 409fd37
Networking port, thanks to @CrazyDev05 !
SirEndii 3d3a9bd
Run data gen, fix more data component stuff
SirEndii 2735edb
Checkstyle
SirEndii 1910443
Fix crash with weak automata tooltip
SirEndii e1ec104
Fixed weak automata core, fixed data(hopefully)
SirEndii f6dd644
Automata Turtle Upgrade spinny again
SirEndii 46bf210
Fixed turtle models
SirEndii 65dd24b
Fixed pocket and turtle upgrade data provider
SirEndii 349061e
Adapted item and fluid filters to the new component system
SirEndii 0fcf21c
Adapt changelog
SirEndii d2f02fb
Re added pocket and turtle trades to our villager
SirEndii b0a439d
Don't throw an exception if a pocket/turtle upgrade was removed by da…
SirEndii 5e01fe4
Fixed ME Bridges `getUsedItemStorage` and `getUsedFluidStorage` function
SirEndii aa24fa0
comment github build in PR
SirEndii a2ab3de
Checkstyle
SirEndii 3d841a8
Update pr-comment-artifacts.yaml
zyxkad ddf5d57
update pr-comment-artifacts
zyxkad 32c6512
use raw output
zyxkad 69d03dc
Port colony integrator
SirEndii deb4c75
1.21.1-0.7.44a
SirEndii b38962c
Checkstyle
SirEndii fe97768
add publish
zyxkad dcf2a36
search if a pushed commit is in pr and then skip
zyxkad 9cd6b5e
Revert "search if a pushed commit is in pr and then skip"
zyxkad 4ea815a
Fixed several export/import item functions with block entities that d…
SirEndii 1fae723
Minecolonies cleanup and refactor
SirEndii 7c33467
Fixed wrong geo scanner turtle registration
SirEndii 27cf957
Removed old nbt key name field
SirEndii b6498e8
dat -> data
SirEndii 0084c9f
Fixed cooldown operations where we didn't set the data component before
SirEndii 11d75ca
New textures!
SirEndii 340fbbf
Server tick end/post instead of start/pre
SirEndii 191205f
Wrong chunk load time calculation
SirEndii d845cd4
Remove unnecessary check
SirEndii 67fb8c7
Math.max begone
SirEndii 7a2a45b
Don't waste time while copying the stack
SirEndii e9adb24
Use front textures for turtles
SirEndii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: Build and Test | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| pull_request: | ||
| types: | ||
| - opened | ||
| - synchronize | ||
|
|
||
| jobs: | ||
| generate-artifact-name: | ||
| runs-on: self-hosted | ||
| outputs: | ||
| name: ${{ steps.name.outputs.name }} | ||
| steps: | ||
| - name: Generate Name | ||
| id: name | ||
| run: | | ||
| if [[ "${{ github.event_name }}" == 'pull_request' ]]; then | ||
| suffix="PR ${{ github.event.number }}" | ||
| else | ||
| ref="${{ github.ref }}" | ||
| ref="${ref#refs/heads/}" | ||
| suffix="${ref//\//-}" | ||
| fi | ||
| name="AdvancedPeripherals $suffix" | ||
| echo "name: $name" | ||
| echo "name=$name" >> "$GITHUB_OUTPUT" | ||
|
|
||
| build-and-test: | ||
| needs: | ||
| - generate-artifact-name | ||
| uses: IntelligenceModding/actions/.github/workflows/build-and-test.yaml@master | ||
| with: | ||
| build_name: ${{ needs.generate-artifact-name.outputs.name }} | ||
| pr: ${{ github.event_name == 'pull_request' && github.event.number || '' }} | ||
| check: ${{ github.event_name != 'push' }} | ||
|
|
||
| publish: | ||
| if: ${{ github.event_name == 'push' && contains(github.ref, 'release/') }} | ||
| runs-on: self-hosted | ||
| needs: | ||
| - build-and-test | ||
| steps: | ||
| - name: Checkout sources | ||
| uses: actions/checkout@v4 | ||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@v4 | ||
| - name: Download Builds | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: ${{ needs.build-and-test.outputs.artifact-name }} | ||
| path: build/libs | ||
| - name: Patch Changelog | ||
| run: ./gradlew patchChangelog | ||
| - name: Github Release | ||
| run: ./gradlew githubRelease | ||
| - name: Publish Maven | ||
| run: ./gradlew publishAllPublicationsToPublicRepository | ||
| - name: Publish Modrinth | ||
| run: ./gradlew modrinth | ||
| - name: Publish CurseForge | ||
| run: ./gradlew publishCurseForge |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| # 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: | ||
| PR_NUMBER: ${{ steps.metadata.outputs.PR_NUMBER }} | ||
| HEAD_SHA: ${{ steps.metadata.outputs.HEAD_SHA }} | ||
| ARTIFACT_ID: ${{ steps.metadata.outputs.ARTIFACT_ID }} | ||
| ARTIFACT_URL: ${{ steps.metadata.outputs.ARTIFACT_URL }} | ||
| ARTIFACT_EXP: ${{ steps.metadata.outputs.ARTIFACT_EXP }} | ||
| ARTIFACT_NAME: ${{ steps.metadata.outputs.ARTIFACT_NAME }} | ||
| 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) }} | ||
| PREVIOUS_JOB_ID: ${{ github.event.workflow_run.id }} | ||
| run: | | ||
| echo "Previous Job ID: $PREVIOUS_JOB_ID" | ||
|
|
||
| LOG_URL="/repos/$OWNER/$REPO/actions/runs/$PREVIOUS_JOB_ID/logs" | ||
| echo "Getting previous logs: $LOG_URL" | ||
| gh api "$LOG_URL" >_logs.zip | ||
| echo "Unzipping logs" | ||
| unzip -p _logs.zip >_build.txt | ||
|
|
||
| echo "Parsing logs" | ||
| function parse_var { | ||
| name=$1 | ||
| echo "Parsing output $name" | ||
| line=$(cat _build.txt | grep -m 1 "output:${name}=" | cat) | ||
| export parsed=${line#*"output:${name}="} | ||
| } | ||
| parse_var PR_NUMBER | ||
| PR_NUMBER=$parsed | ||
| echo "PR Number: $PR_NUMBER" | ||
| echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_OUTPUT" | ||
|
|
||
| parse_var HEAD_SHA | ||
| HEAD_SHA=$parsed | ||
| echo "Head sha: $HEAD_SHA" | ||
| echo "HEAD_SHA=$HEAD_SHA" >> "$GITHUB_OUTPUT" | ||
|
|
||
| parse_var ARTIFACT_ID | ||
| ARTIFACT_ID=$parsed | ||
| echo "ARTIFACT ID: $ARTIFACT_ID" | ||
| echo "ARTIFACT_ID=$ARTIFACT_ID" >> "$GITHUB_OUTPUT" | ||
|
|
||
| parse_var ARTIFACT_URL | ||
| ARTIFACT_URL=$parsed | ||
| echo "ARTIFACT URL: $ARTIFACT_URL" | ||
| echo "ARTIFACT_URL=$ARTIFACT_URL" >> "$GITHUB_OUTPUT" | ||
|
|
||
| if [[ "$ARTIFACT_ID" != "" ]]; then | ||
| ARTIFACT_INFO="$(gh api "/repos/$OWNER/$REPO/actions/artifacts/$ARTIFACT_ID")" | ||
| ARTIFACT_EXP=$(echo "$ARTIFACT_INFO" | jq -r ".expires_at") | ||
| echo "ARTIFACT EXP: $ARTIFACT_EXP" | ||
| echo "ARTIFACT_EXP=$ARTIFACT_EXP" >> "$GITHUB_OUTPUT" | ||
| ARTIFACT_NAME=$(echo "$ARTIFACT_INFO" | jq -r ".name") | ||
| echo "ARTIFACT NAME: $ARTIFACT_NAME" | ||
| echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| exit 0 | ||
|
|
||
| comment-success: | ||
| if: ${{ needs.parse-metadata.outputs.PR_NUMBER != '' }} | ||
| runs-on: ubuntu-latest | ||
| needs: | ||
| - parse-metadata | ||
| steps: | ||
| - name: Find Comment | ||
| uses: peter-evans/find-comment@v3 | ||
| id: fc | ||
| with: | ||
| issue-number: ${{ needs.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/${{ github.event.workflow_run.id }}" | ||
| HEAD_SHA: ${{ needs.parse-metadata.outputs.HEAD_SHA }} | ||
| ARTIFACT_URL: ${{ needs.parse-metadata.outputs.ARTIFACT_URL }} | ||
| ARTIFACT_EXP: ${{ needs.parse-metadata.outputs.ARTIFACT_EXP }} | ||
| ARTIFACT_NAME: ${{ needs.parse-metadata.outputs.ARTIFACT_NAME }} | ||
| uses: peter-evans/create-or-update-comment@v4 | ||
| with: | ||
| issue-number: ${{ needs.parse-metadata.outputs.PR_NUMBER }} | ||
| comment-id: ${{ steps.fc.outputs.comment-id }} | ||
| edit-mode: replace | ||
| body: |- | ||
| ## Build Preview | ||
|
|
||
| [![badge]](${{ env.JOB_PATH }}) | ||
|
|
||
| You can find files attached to the below linked Workflow Run URL (Logs). | ||
|
|
||
| | Name | Link | | ||
| |-----------|-------------------------| | ||
| | Commit | ${{ env.HEAD_SHA }} | | ||
| | Logs | ${{ env.JOB_PATH }} | | ||
| ${{ env.ARTIFACT_URL && format('| Jar Files | [{0}]({1}) |', env.ARTIFACT_NAME, env.ARTIFACT_URL) || '' }} | ||
| ${{ env.ARTIFACT_EXP && format('| Expires At | {0} |', env.ARTIFACT_EXP) || '' }} | ||
|
|
||
| [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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.