Skip to content

Commit

Permalink
Merge branch 'versions/1.21.x' into versions/1.21.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sciwhiz12 authored Nov 9, 2024
2 parents 0c0a34c + d666128 commit a019c37
Show file tree
Hide file tree
Showing 8 changed files with 309 additions and 18 deletions.
80 changes: 80 additions & 0 deletions .github/workflows/bleeding.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
on:
workflow_dispatch:
push:
branches:
- 'versions/**'

name: Publish bleeding export

jobs:
publish:
name: Publish export
runs-on: ubuntu-latest
outputs:
CI_VERSION: ${{ steps.info.outputs.CI_VERSION }}
CI_GROUP: ${{ steps.info.outputs.CI_GROUP }}
CI_ARTIFACT: ${{ steps.info.outputs.CI_ARTIFACT }}
CI_GAME_VERSION: ${{ steps.info.outputs.CI_GAME_VERSION }}
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Obtain GAV info
id: info
run: ./gradlew --quiet -PreleaseType=bleeding printGHActionsOutput >> "$GITHUB_OUTPUT"

- name: Publish export
run: ./gradlew publishExport -PreleaseType=bleeding
env:
LDTTeamJfrogUsername: ${{ secrets.PUBLISHING_USERNAME }}
LDTTeamJfrogPassword: ${{ secrets.PUBLISHING_PASSWORD }}
announce:
name: Send announcement message
needs: publish
runs-on: ubuntu-latest
steps:
- name: Download discord.sh
run: curl -LOJ https://github.com/fieu/discord.sh/releases/download/v2.0.0/discord.sh

- name: Set discord.sh executable
run: chmod +x discord.sh

- name: Send announcement message
run: |
./discord.sh \
--webhook-url="$WEBHOOK" \
--username "ParchmentMC" \
--color "0xFF0000" \
--title "New bleeding for \`$CI_GAME_VERSION\`!" \
--field "Version;\`$CI_VERSION\`;false" \
--field "Group;\`$CI_GROUP\`;true" \
--field "Artifact;\`$CI_ARTIFACT\`;true" \
--field "Coordinate;\`$CI_GROUP:$CI_ARTIFACT:$CI_VERSION\`;false" \
--timestamp
env:
WEBHOOK: ${{ secrets.BLEEDING_DISCORD_WEBHOOK }}
CI_VERSION: ${{ needs.publish.outputs.CI_VERSION }}
CI_GROUP: ${{ needs.publish.outputs.CI_GROUP }}
CI_ARTIFACT: ${{ needs.publish.outputs.CI_ARTIFACT }}
CI_GAME_VERSION: ${{ needs.publish.outputs.CI_GAME_VERSION }}
set-variables:
name: Set repository variables
needs: publish
runs-on: ubuntu-latest
steps:
- name: Mark pending variables
run: |
gh -R $GITHUB_SERVER_URL/$GITHUB_REPOSITORY variable set HAS_PENDING_NIGHTLY --body "true"
gh -R $GITHUB_SERVER_URL/$GITHUB_REPOSITORY variable set HAS_PENDING_RELEASE --body "true"
env:
# This should be a GH PAT with 'repo' scope
GH_TOKEN: ${{ secrets.VARIABLES_GH_TOKEN }}
81 changes: 81 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
on:
workflow_dispatch:
schedule:
- cron: "0 12 * * *" # 12NN every day

name: Publish nightly export

jobs:
publish:
name: Publish export
runs-on: ubuntu-latest
# If triggered by schedule, only run if the variable is set to true
# (This allows the workflow to be triggered manually)
if: ${{ github.event_name != 'schedule' || fromJSON(vars.HAS_PENDING_NIGHTLY) == true }}
outputs:
CI_VERSION: ${{ steps.info.outputs.CI_VERSION }}
CI_GROUP: ${{ steps.info.outputs.CI_GROUP }}
CI_ARTIFACT: ${{ steps.info.outputs.CI_ARTIFACT }}
CI_GAME_VERSION: ${{ steps.info.outputs.CI_GAME_VERSION }}
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Obtain GAV info
id: info
run: ./gradlew --quiet -PreleaseType=nightly printGHActionsOutput >> "$GITHUB_OUTPUT"

- name: Publish export
run: ./gradlew publishExport -PreleaseType=nightly
env:
LDTTeamJfrogUsername: ${{ secrets.PUBLISHING_USERNAME }}
LDTTeamJfrogPassword: ${{ secrets.PUBLISHING_PASSWORD }}
announce:
name: Send announcement message
needs: publish
runs-on: ubuntu-latest
steps:
- name: Download discord.sh
run: curl -LOJ https://github.com/fieu/discord.sh/releases/download/v2.0.0/discord.sh

- name: Set discord.sh executable
run: chmod +x discord.sh

- name: Send announcement message
run: |
./discord.sh \
--webhook-url="$WEBHOOK" \
--username "ParchmentMC" \
--color "0xFFA500" \
--title "New nightly for \`$CI_GAME_VERSION\`!" \
--field "Version;\`$CI_VERSION\`;false" \
--field "Group;\`$CI_GROUP\`;true" \
--field "Artifact;\`$CI_ARTIFACT\`;true" \
--field "Coordinate;\`$CI_GROUP:$CI_ARTIFACT:$CI_VERSION\`;false" \
--timestamp
env:
WEBHOOK: ${{ secrets.NIGHTLY_DISCORD_WEBHOOK }}
CI_VERSION: ${{ needs.publish.outputs.CI_VERSION }}
CI_GROUP: ${{ needs.publish.outputs.CI_GROUP }}
CI_ARTIFACT: ${{ needs.publish.outputs.CI_ARTIFACT }}
CI_GAME_VERSION: ${{ needs.publish.outputs.CI_GAME_VERSION }}
set-variables:
name: Set repository variables
needs: publish
runs-on: ubuntu-latest
steps:
- name: Unmark pending variable
run: |
gh -R $GITHUB_SERVER_URL/$GITHUB_REPOSITORY variable set HAS_PENDING_NIGHTLY --body "false"
env:
# This should be a GH PAT with 'repo' scope
GH_TOKEN: ${{ secrets.VARIABLES_GH_TOKEN }}
30 changes: 30 additions & 0 deletions .github/workflows/prs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
on:
- pull_request

name: Validate PR

jobs:
build:
name: Build and validate PR
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Run validation task
run: ./gradlew validateData

- name: Upload ZIPs
uses: actions/upload-artifact@v4
with:
name: export-zips
path: build/exportZips/
99 changes: 99 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
on:
workflow_dispatch:
schedule:
- cron: "0 12 * * 0" # 12NN on Sundays

name: Publish release export

permissions:
contents: write # For creating and pushing the tag

jobs:
publish:
name: Publish export
runs-on: ubuntu-latest
# If triggered by schedule, only run if the variable is set to true
# (This allows the workflow to be triggered manually)
if: ${{ github.event_name != 'schedule' || fromJSON(vars.HAS_PENDING_RELEASE) == true }}
outputs:
CI_VERSION: ${{ steps.info.outputs.CI_VERSION }}
CI_GROUP: ${{ steps.info.outputs.CI_GROUP }}
CI_ARTIFACT: ${{ steps.info.outputs.CI_ARTIFACT }}
CI_GAME_VERSION: ${{ steps.info.outputs.CI_GAME_VERSION }}
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Obtain GAV info
id: info
run: ./gradlew --quiet -PreleaseType=release printGHActionsOutput >> "$GITHUB_OUTPUT"

- name: Publish export
run: ./gradlew publishExport -PreleaseType=release
env:
LDTTeamJfrogUsername: ${{ secrets.PUBLISHING_USERNAME }}
LDTTeamJfrogPassword: ${{ secrets.PUBLISHING_PASSWORD }}
create-tag:
name: Create tag
needs: publish
runs-on: ubuntu-latest
steps:
- name: Create tag
uses: actions/github-script@v7
with:
script: |
github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: 'refs/tags/releases/${{ needs.publish.outputs.CI_GAME_VERSION }}-${{ needs.publish.outputs.CI_VERSION }}',
sha: context.sha
})
announce:
name: Send announcement message
needs: publish
runs-on: ubuntu-latest
steps:
- name: Download discord.sh
run: curl -LOJ https://github.com/fieu/discord.sh/releases/download/v2.0.0/discord.sh

- name: Set discord.sh executable
run: chmod +x discord.sh

- name: Send announcement message
run: |
./discord.sh \
--webhook-url="$WEBHOOK" \
--username "ParchmentMC" \
--color "0x228B22" \
--title "New release for \`$CI_GAME_VERSION\`!" \
--field "Version;\`$CI_VERSION\`;false" \
--field "Group;\`$CI_GROUP\`;true" \
--field "Artifact;\`$CI_ARTIFACT\`;true" \
--field "Coordinate;\`$CI_GROUP:$CI_ARTIFACT:$CI_VERSION\`;false" \
--timestamp
env:
WEBHOOK: ${{ secrets.RELEASES_DISCORD_WEBHOOK }}
CI_VERSION: ${{ needs.publish.outputs.CI_VERSION }}
CI_GROUP: ${{ needs.publish.outputs.CI_GROUP }}
CI_ARTIFACT: ${{ needs.publish.outputs.CI_ARTIFACT }}
CI_GAME_VERSION: ${{ needs.publish.outputs.CI_GAME_VERSION }}
set-variables:
name: Set repository variables
needs: publish
runs-on: ubuntu-latest
steps:
- name: Unmark pending variables
run: |
gh -R $GITHUB_SERVER_URL/$GITHUB_REPOSITORY variable set HAS_PENDING_RELEASE --body "false"
env:
# This should be a GH PAT with 'repo' scope
GH_TOKEN: ${{ secrets.VARIABLES_GH_TOKEN }}
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Parchment Mappings
==================
[![Discord server badge](https://img.shields.io/discord/851855518398152725?color=5865F2&label=discord&logo=discord&logoColor=white)](https://discord.parchmentmc.org/)
[![Minecraft version badge](https://img.shields.io/badge/mc%20version-1.21-3b8526)](#)
![Minecraft version badge](https://img.shields.io/badge/mc%20version-1.21-3b8526)
 
[![Latest release version badge](https://img.shields.io/maven-metadata/v?color=forestgreen&label=release&metadataUrl=https%3A%2F%2Fldtteam.jfrog.io%2Fartifactory%2Fparchmentmc-internal%2Forg%2Fparchmentmc%2Fdata%2Fparchment-1.21%2Fmaven-metadata.xml)](#)
[![CI release build status](https://buildsystem.ldtteam.com/app/rest/builds/buildType:(id:ParchmentMC_Mappings_Release),branch:1.21.x/statusIcon)](#)
![Latest release version badge](https://img.shields.io/maven-metadata/v?color=forestgreen&label=release&metadataUrl=https%3A%2F%2Fldtteam.jfrog.io%2Fartifactory%2Fparchmentmc-internal%2Forg%2Fparchmentmc%2Fdata%2Fparchment-1.21%2Fmaven-metadata.xml)
![CI release build status](https://github.com/ParchmentMC/Parchment/actions/workflows/release.yml/badge.svg)

[![Latest nightly version badge](https://img.shields.io/maven-metadata/v?color=orange&label=nightly&metadataUrl=https%3A%2F%2Fldtteam.jfrog.io%2Fartifactory%2Fparchmentmc-snapshots%2Forg%2Fparchmentmc%2Fdata%2Fparchment-1.21%2Fmaven-metadata.xml)](#)
[![CI nightly build status](https://buildsystem.ldtteam.com/app/rest/builds/buildType:(id:ParchmentMC_Mappings_Nightly),branch:1.21.x/statusIcon)](#)
![Latest nightly version badge](https://img.shields.io/maven-metadata/v?color=orange&label=nightly&metadataUrl=https%3A%2F%2Fldtteam.jfrog.io%2Fartifactory%2Fparchmentmc-snapshots%2Forg%2Fparchmentmc%2Fdata%2Fparchment-1.21%2Fmaven-metadata.xml)
![CI nightly build status](https://github.com/ParchmentMC/Parchment/actions/workflows/nightly.yml/badge.svg)
 
[![Latest bleeding version badge](https://img.shields.io/maven-metadata/v?color=red&label=bleeding&metadataUrl=https%3A%2F%2Fldtteam.jfrog.io%2Fartifactory%2Fparchmentmc-bleeding%2Forg%2Fparchmentmc%2Fdata%2Fparchment-1.21%2Fmaven-metadata.xml)](#)
[![CI bleeding build status](https://buildsystem.ldtteam.com/app/rest/builds/buildType:(id:ParchmentMC_Mappings_Bleeding),branch:1.21.x/statusIcon)](#)
![Latest bleeding version badge](https://img.shields.io/maven-metadata/v?color=red&label=bleeding&metadataUrl=https%3A%2F%2Fldtteam.jfrog.io%2Fartifactory%2Fparchmentmc-bleeding%2Forg%2Fparchmentmc%2Fdata%2Fparchment-1.21%2Fmaven-metadata.xml)
![CI bleeding build status](https://github.com/ParchmentMC/Parchment/actions/workflows/bleeding.yml/badge.svg)

Welcome to the Parchment mappings repository!

Expand Down
19 changes: 10 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ final isBleeding = releaseType.toString() == 'bleeding'
if (isBleeding) {
version = 'BLEEDING-SNAPSHOT'
}
println("Version: $version")
// Only output if not in CI
if (!Boolean.parseBoolean(System.getenv("CI"))){
println("Version: $version")
}

writtenbooks {
snapshotVersion = !isRelease
Expand Down Expand Up @@ -75,14 +78,12 @@ dependencies {
jammer 'org.parchmentmc.jam:jam-parchment:0.1.0'
}

afterEvaluate {
final isCI = Boolean.parseBoolean(project.findProperty('isCI') as String)
if (isCI) {
println('Running on CI.')
println("##teamcity[setParameter name='env.CI_VERSION' value='$version']")
println("##teamcity[setParameter name='env.CI_GROUP' value='$group']")
println("##teamcity[setParameter name='env.CI_ARTIFACT' value='parchment-${project.compass.version.get()}']")
println("##teamcity[setParameter name='env.CI_GAME_VERSION' value='${project.compass.version.get()}']")
tasks.register('printGHActionsOutput') {
doLast {
println("CI_VERSION=${project.version}")
println("CI_GROUP=${project.group}")
println("CI_ARTIFACT=parchment-${project.compass.version.get()}")
println("CI_GAME_VERSION=${project.compass.version.get()}")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CLASS net/minecraft/util/datafix/fixes/SavedDataFeaturePoolElementFix
ARG 1 name
ARG 2 stateProviderType
ARG 3 state
ARG 4 staaeProviderName
ARG 4 stateProviderName
ARG 5 foliagePlacerType
ARG 6 leavesState
METHOD updateChildren (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CLASS net/minecraft/world/level/levelgen/flat/FlatLevelGeneratorSettings
METHOD adjustGenerationSettings (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
ARG 1 biome
METHOD createLakesList (Lnet/minecraft/core/HolderGetter;)Ljava/util/List;
ARG 0 placedFEatureGetter
ARG 0 placedFeatureGetter
METHOD getBiome ()Lnet/minecraft/core/Holder;
COMMENT Return the biome used on this preset.
METHOD getBiome (Ljava/util/Optional;Lnet/minecraft/core/Holder;)Lnet/minecraft/core/Holder;
Expand Down

0 comments on commit a019c37

Please sign in to comment.