Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev

This commit is contained in:
simibubi 2024-08-11 10:09:46 +02:00
commit 879220efb4
6 changed files with 86 additions and 26 deletions

55
.github/config/label-actions.yml vendored Normal file
View File

@ -0,0 +1,55 @@
# Configuration for Label Actions - https://github.com/dessant/label-actions
# ----------------------------------- ISSUES ----------------------------------- #
'env: fabric':
issues:
close: true
close-reason: 'not planned'
comment: >
**Fabric Loader**: This issue tracker is only for the Forge/NeoForge versions of Create. Since you mentioned using Fabric Loader, please reopen this issue on the [Create Fabric issue tracker](https://github.com/Fabricators-of-Create/Create/issues). Thanks!
'env: hybrid server':
issues:
close: true
close-reason: 'not planned'
comment: >
**Hybrid Server Software**: Create cannot reasonably support hybrid server software, such as [MohistMC](https://mohistmc.com/), as their changes under the hood make it difficult for larger mods to function properly. If you encounter this issue on official Forge/NeoForge server software, feel free to open a new issue. Otherwise, consider reporting this issue to the hybrid server software you are using. Thanks!
'env: outdated create version':
issues:
close: true
close-reason: 'not planned'
comment: >
**Outdated Create Version**: Since you are using an outdated Create version, please update to the latest version as it may resolve your issue. If this issue persists after updating Create, feel free to open a new issue. Thanks!
'env: pojav':
issues:
close: true
close-reason: 'not planned'
comment: >
**Pojav**: Create does not support Pojav or other mobile launchers due to rendering limitations. If you encounter this issue on a PC, feel free to open a new issue. Thanks!
'env: unsupported minecraft version':
issues:
close: true
close-reason: 'not planned'
comment: >
**Unsupported Minecraft Version**: Unsupported Minecraft versions no longer receive Create updates. Please check the [supported Minecraft versions](https://github.com/Creators-of-Create/Create/wiki/dev.status). If you encounter this issue on a supported Minecraft version, feel free to open a new issue. Thanks!
# ----------------------------------- PULL REQUESTS ----------------------------------- #
'pr status: conflicts':
prs:
comment: >
@{issue-author}, this pull request has merge conflicts with the target branch. Please merge the latest changes and leave a message here so we can continue with the process of reviewing and merging this pull request. Thanks!
'pr status: waiting for author':
prs:
comment: >
@{issue-author}, a developer has left a review and requested changes. Please make the requested changes or further discuss them with the developer so this pull request can be merged. Thanks!
'pr status: wrong target':
prs:
comment: >
@{issue-author}, this pull request is targeting the wrong branch. Pull requests should target the branch corresponding to the earliest supported Minecraft version unless the changes are specific to code that only exists for a newer Minecraft version. Please change the target branch, resolve any merge conflicts, and leave a message here so we can continue with the process of reviewing and merging this pull request. Thanks!

View File

@ -1,24 +0,0 @@
name: "Close Issues"
on:
schedule:
- cron: '0 */12 * * *'
workflow_dispatch:
jobs:
close:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/stale@v4
with:
days-before-issue-stale: 21
days-before-issue-close: 21
stale-issue-label: "stale"
exempt-issue-labels: "timeless, suggestion, critical"
stale-issue-message: "This issue has been marked as stale because it has been inactive for 3 weeks. It will be closed if it remains inactive for another 3 weeks."
close-issue-message: "This issue has been closed since it has been inactive for 3 weeks since it was marked as stale."
days-before-pr-stale: -1
days-before-pr-close: -1
operations-per-run: 10000
repo-token: ${{ secrets.GITHUB_TOKEN }}

21
.github/workflows/label-actions.yml vendored Normal file
View File

@ -0,0 +1,21 @@
name: "Label Actions"
on:
issues:
types: [labeled, unlabeled]
pull_request_target:
types: [labeled, unlabeled]
permissions:
contents: read
issues: write
pull-requests: write
discussions: write
jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # Depend on an exact commit
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
config-path: '.github/config/label-actions.yml'

View File

@ -2,7 +2,6 @@ buildscript {
repositories {
maven { url = 'https://maven.minecraftforge.net' }
mavenCentral()
jcenter()
maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
maven { url = 'https://maven.parchmentmc.org' }
}

View File

@ -33,6 +33,7 @@ public class ElevatorColumn {
protected List<Integer> contacts;
protected int targetedYLevel;
protected boolean isActive;
protected boolean targetAvailable;
@Nullable
public static ElevatorColumn get(LevelAccessor level, ColumnCoords coords) {
@ -49,6 +50,7 @@ public class ElevatorColumn {
this.level = level;
this.coords = coords;
contacts = new ArrayList<>();
targetAvailable = false;
}
public void markDirty() {
@ -113,6 +115,11 @@ public class ElevatorColumn {
public void target(int yLevel) {
targetedYLevel = yLevel;
targetAvailable = true;
}
public boolean isTargetAvailable() {
return targetAvailable;
}
public int getTargetedYLevel() {

View File

@ -87,7 +87,9 @@ public class ElevatorContraption extends PulleyContraption {
ElevatorColumn column = ElevatorColumn.get(level, coords);
if (column == null)
return null;
int targetedYLevel = column.targetedYLevel;
if (!column.isTargetAvailable())
return null;
int targetedYLevel = column.getTargetedYLevel();
if (isTargetUnreachable(targetedYLevel))
return null;
return targetedYLevel;