Skip to content

Commit

Permalink
Update UHC Pack to be compatible with Minecraft 1.17 release version
Browse files Browse the repository at this point in the history
* Update build to use Java 16
* Update item command syntax
* Disable Paper build for the time being as Paper 1.17 has not been
  released
* Update README
  • Loading branch information
DrHenchman committed Jun 9, 2021
1 parent 8ca1009 commit 145807d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Sets up JDK 1.8 as using standard setup
- name: Set up JDK 1.8
# Sets up JDK 16 as using standard setup, the minimum Java version since Minecraft 1.17
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 16
# Run against supported Minecraft versions
- name: Build and test (Minecraft version = latest release, variant = vanilla)
run: bin/ci.sh --clean
- name: Build and test (Minecraft version = latest release, variant = paper)
run: bin/ci.sh --clean --variant paper
- name: Build and test (Minecraft version = 1.15.2, variant = vanilla)
run: bin/ci.sh --clean --version 1.15.2
- name: Build and test (Minecraft version = 1.15.2, variant = paper)
run: bin/ci.sh --clean --version 1.15.2 --variant paper
# Paper 1.17 tracking ticket https://github.com/PaperMC/Paper/issues/5785
#- name: Build and test (Minecraft version = latest release, variant = paper)
# run: bin/ci.sh --clean --variant paper
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Sets up JDK 1.8 as using standard setup
- name: Set up JDK 1.8
# Sets up JDK 16 as using standard setup, the minimum Java version since Minecraft 1.17
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 16
- name: Build Artifact
run: bin/ci.sh --clean
- name: Create Release
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Sets up JDK 1.8 as using standard setup
- name: Set up JDK 1.8
# Sets up JDK 16 as using standard setup, the minimum Java version since Minecraft 1.17
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 16
# Run against supported Minecraft versions
- name: Build and test (Minecraft version = latest snapshot, variant = vanilla)
run: bin/ci.sh --clean --version snapshot
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ A datapack for Minecraft Java Edition for running Ultra Hardcore (UHC) tournamen

Currently supported Minecraft versions:

* 1.16.x
* 1.15.x
* 1.17.x

Earlier versions are not compatible due to the use of new command in the datapack. More
recent versions (including snapshots) may be compatible but are not actively supported
Expand Down
2 changes: 1 addition & 1 deletion bin/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function generate_book() {
echo '# Entity: the player' >> "$output_file"
echo '#' >> "$output_file"
echo '' >> "$output_file"
echo -n 'item entity @s hotbar.0 replace minecraft:written_book{title:"UHC Pack",author:"DrHenchman",display:{Lore:["by DrHenchman"]},HideFlags:32,pages:[' >> "$output_file"
echo -n 'item replace entity @s hotbar.0 with minecraft:written_book{title:"UHC Pack",author:"DrHenchman",display:{Lore:["by DrHenchman"]},HideFlags:32,pages:[' >> "$output_file"
echo -n "$json_text" >> "$output_file"
echo -n ']}' >> "$output_file"
echo '' >> "$output_file"
Expand Down

0 comments on commit 145807d

Please sign in to comment.