Skip to content
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.

Sign up for GitHub

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

1.20.1 #591

Merged
merged 18 commits into from
Jun 15, 2023
Merged

1.20.1 #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e887645
Remove 1.14.4
TylerS1066 Jun 4, 2023
5299d41
Stub out 1.20 world handler based on 1.19.4
TylerS1066 Jun 4, 2023
438d559
Remove 1.14.4
TylerS1066 Jun 4, 2023
5487586
Stub out 1.20 world handler based on 1.19.4
TylerS1066 Jun 4, 2023
f3ce10e
Move classes
TylerS1066 Jun 4, 2023
ea0ab35
Merge remote-tracking branch 'origin/1.20' into 1.20
TylerS1066 Jun 4, 2023
0f96033
Remove 1.17.1
TylerS1066 Jun 4, 2023
02331e9
Update to 1.20 RC1 mappings
TylerS1066 Jun 5, 2023
2ec5ecd
Temporarily remove magic numbers check
TylerS1066 Jun 5, 2023
45fd726
Update CI to 1.20
TylerS1066 Jun 7, 2023
52939fa
Update readme and setup script
TylerS1066 Jun 7, 2023
d1c9ee7
Fix filter
TylerS1066 Jun 7, 2023
e62c68c
Update mappings link
TylerS1066 Jun 7, 2023
517fff7
Update publish.yml
TylerS1066 Jun 7, 2023
71f4ba1
Re-add mappings number check
TylerS1066 Jun 7, 2023
5662564
Update various mentions to 1.14, upgrade API to 1.16
TylerS1066 Jun 7, 2023
713a7fc
Update for 1.20.1
TylerS1066 Jun 14, 2023
59ad13c
Try and fix hanging cruise and cruise on pilot signs
TylerS1066 Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 52 additions & 91 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,6 @@ on:
- cron: '22 13 * * 6'

jobs:
# Build 1.14.4 NMS
v1_14_R1:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 13 # 1.14.4 can be built with Java 8 to Java 13
uses: actions/setup-java@v3
with:
distribution: 'adopt-hotspot'
java-version: '13'
- name: Cache 1.14.4 Maven package
id: cachePillage
uses: actions/cache@v3
with:
path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
key: ${{ runner.os }}-v1_14_R1
restore-keys: ${{ runner.os }}-v1_14_R1
- name: Cache Maven packages
id: cacheMain
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2_v1_14_R1
restore-keys: ${{ runner.os }}-m2_v1_14_R1

- name: Setup BuildTools
run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Check 1.14.4
id: pillage
run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/craftbukkit-1.14.4-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.14.4
if: steps.pillage.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit

# Build 1.16.5 NMS
v1_16_R3:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -74,48 +41,6 @@ jobs:
if: steps.nether.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit

# Build 1.17.1 NMS
v1_17_R1:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 17 # 1.17.1 can be built with Java 16 to Java 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Cache 1.17.1 Maven package
id: cacheGoats
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_17_R1
restore-keys: ${{ runner.os }}-v1_17_R1
- name: Cache Maven packages
id: cacheMain
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-v1_17_R1
restore-keys: ${{ runner.os }}-m2-v1_17_R1

- name: Setup BuildTools
run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Check 1.17.1 Spigot
id: goats
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.17.1 Spigot (Mojang)
id: goatsMojang
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.17.1 Spigot (Obf)
id: goatsObf
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.17.1
if: steps.goats.outputs.sucess != 'true' || steps.goatsMojang.outputs.sucess != 'true' || steps.goatsObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.17.1 --remapped

# Build 1.18.2 NMS
v1_18_R2:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -200,10 +125,52 @@ jobs:
if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped

# Build 1.20.1 NMS
v1_20_R1:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 17 # 1.20.1 can only be built with Java 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Cache 1.20.1 Maven package
id: cacheWild_r2
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_20_R1
restore-keys: ${{ runner.os }}-v1_20_R1
- name: Cache Maven packages
id: cacheMain
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-v1_20_R1
restore-keys: ${{ runner.os }}-m2-v1_20_R1

- name: Setup BuildTools
run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Check 1.20.1 Spigot
id: wild
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.20.1 Spigot (Mojang)
id: wildMojang
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.20.1 Spigot (Obf)
id: wildObf
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.20.1
if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.1 --remapped

# Build Movecraft
build:
runs-on: ubuntu-latest
needs: [v1_14_R1, v1_16_R3, v1_17_R1, v1_18_R2, v1_19_R3]
needs: [v1_16_R3, v1_18_R2, v1_19_R3, v1_20_R1]

steps:
- name: Checkout Movecraft
Expand All @@ -219,27 +186,12 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2
restore-keys: ${{ runner.os }}-m2
- name: Cache 1.14.4 Maven package
uses: actions/cache@v3
with:
path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
key: ${{ runner.os }}-v1_14_R1
restore-keys: ${{ runner.os }}-v1_14_R1
- name: Cache 1.16.5 Maven package
uses: actions/cache@v3
with:
path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
key: ${{ runner.os }}-v1_16_R3
restore-keys: ${{ runner.os }}-v1_16_R3
- name: Cache 1.17.1 Maven package
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_17_R1
restore-keys: ${{ runner.os }}-v1_17_R1
- name: Cache 1.18.2 Maven package
uses: actions/cache@v3
with:
Expand All @@ -258,6 +210,15 @@ jobs:
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_19_R3
restore-keys: ${{ runner.os }}-v1_19_R3
- name: Cache 1.20.1 Maven package
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_20_R1
restore-keys: ${{ runner.os }}-v1_20_R1

- name: Build with Maven
run: mvn -T 1C -B package --file pom.xml
Expand Down
143 changes: 52 additions & 91 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,6 @@ on:
types: [created, prereleased]

jobs:
# Build 1.14.4 NMS
v1_14_R1:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 13 # 1.14.4 can be built with Java 8 to Java 13
uses: actions/setup-java@v3
with:
distribution: 'adopt-hotspot'
java-version: '13'
- name: Cache 1.14.4 Maven package
id: cachePillage
uses: actions/cache@v3
with:
path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
key: ${{ runner.os }}-v1_14_R1
restore-keys: ${{ runner.os }}-v1_14_R1
- name: Cache Maven packages
id: cacheMain
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2_v1_14_R1
restore-keys: ${{ runner.os }}-m2_v1_14_R1

- name: Setup BuildTools
run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Check 1.14.4
id: pillage
run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/craftbukkit-1.14.4-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.14.4
if: steps.pillage.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit

# Build 1.16.5 NMS
v1_16_R3:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -72,48 +39,6 @@ jobs:
if: steps.nether.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit

# Build 1.17.1 NMS
v1_17_R1:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 17 # 1.17.1 can be built with Java 16 to Java 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Cache 1.17.1 Maven package
id: cacheGoats
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_17_R1
restore-keys: ${{ runner.os }}-v1_17_R1
- name: Cache Maven packages
id: cacheMain
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-v1_17_R1
restore-keys: ${{ runner.os }}-m2-v1_17_R1

- name: Setup BuildTools
run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Check 1.17.1 Spigot
id: goats
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.17.1 Spigot (Mojang)
id: goatsMojang
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.17.1 Spigot (Obf)
id: goatsObf
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.17.1
if: steps.goats.outputs.sucess != 'true' || steps.goatsMojang.outputs.sucess != 'true' || steps.goatsObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.17.1 --remapped

# Build 1.18.2 NMS
v1_18_R2:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -198,10 +123,52 @@ jobs:
if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped

# Build 1.20.1 NMS
v1_20_R1:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 17 # 1.20.1 can only be built with Java 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Cache 1.20.1 Maven package
id: cacheWild_r2
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_20_R1
restore-keys: ${{ runner.os }}-v1_20_R1
- name: Cache Maven packages
id: cacheMain
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-v1_20_R1
restore-keys: ${{ runner.os }}-m2-v1_20_R1

- name: Setup BuildTools
run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Check 1.20.1 Spigot
id: wild
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.20.1 Spigot (Mojang)
id: wildMojang
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.20.1 Spigot (Obf)
id: wildObf
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.20.1
if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.1 --remapped

# Build Movecraft
build:
runs-on: ubuntu-latest
needs: [v1_14_R1, v1_16_R3, v1_17_R1, v1_18_R2, v1_19_R3]
needs: [v1_16_R3, v1_18_R2, v1_19_R3, v1_20_R1]

steps:
- name: Checkout Movecraft
Expand All @@ -217,27 +184,12 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2
restore-keys: ${{ runner.os }}-m2
- name: Cache 1.14.4 Maven package
uses: actions/cache@v3
with:
path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
key: ${{ runner.os }}-v1_14_R1
restore-keys: ${{ runner.os }}-v1_14_R1
- name: Cache 1.16.5 Maven package
uses: actions/cache@v3
with:
path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
key: ${{ runner.os }}-v1_16_R3
restore-keys: ${{ runner.os }}-v1_16_R3
- name: Cache 1.17.1 Maven package
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_17_R1
restore-keys: ${{ runner.os }}-v1_17_R1
- name: Cache 1.18.2 Maven package
uses: actions/cache@v3
with:
Expand All @@ -256,6 +208,15 @@ jobs:
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_19_R3
restore-keys: ${{ runner.os }}-v1_19_R3
- name: Cache 1.20.1 Maven package
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_20_R1
restore-keys: ${{ runner.os }}-v1_20_R1

- name: Build with Maven
run: mvn -T 1C -B package --file pom.xml
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ Please check the [Wiki](https://github.com/APDevTeam/Movecraft/wiki) and [FAQ](h
[Discord](http://bit.ly/JoinAP-Dev)

## Development Environment
Movecraft uses multiple versions of the Spigot server software for legacy support. As such, you need to run [BuildTools](https://www.spigotmc.org/wiki/buildtools/) for several versions before building the plugin. It doesn't matter where you do this, but inside the Movecraft directory is probably a bad place. We recommend building Spigot 1.14.4 & 1.16.5 with Java 13 and Java 17 to build 1.17.1, 1.18.2 & 1.19.2. Alternatively, you can use GitHub codespaces and run the `setup.sh` script to build all the needed versions automatically.
Movecraft uses multiple versions of the Spigot server software for legacy support. As such, you need to run [BuildTools](https://www.spigotmc.org/wiki/buildtools/) for several versions before building the plugin. It doesn't matter where you do this, but inside the Movecraft directory is probably a bad place. We recommend building Spigot 1.16.5 with Java 13 and Java 17 to build 1.18.2, 1.19.4 & 1.20.1. Alternatively, you can use GitHub codespaces and run the `setup.sh` script to build all the needed versions automatically.

```
java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit
java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit
java -jar BuildTools.jar --rev 1.17.1 --remapped
java -jar BuildTools.jar --rev 1.18.2 --remapped
java -jar BuildTools.jar --rev 1.19.4 --remapped
java -jar BuildTools.jar --rev 1.20.1 --remapped
```

Once you have compiled CraftBukkit, it should continue to exist in your local maven repository, and thus you should need to compile each version at most one time. Once complete, run the following to build Movecraft through `maven`.
Expand Down
Loading