Skip to content

Commit

Permalink
Remove 1.19.4
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerS1066 committed Jun 15, 2024
1 parent a5c3d6d commit e31da23
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 751 deletions.
53 changes: 1 addition & 52 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,48 +50,6 @@ jobs:
if: steps.caves.outputs.sucess != 'true' || steps.cavesMojang.outputs.sucess != 'true' || steps.cavesObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.18.2 --remapped

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

- 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.19.4 Spigot
id: wild
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.19.4 Spigot (Mojang)
id: wildMojang
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.19.4 Spigot (Obf)
id: wildObf
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.19.4
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.6 NMS
v1_20:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -137,7 +95,7 @@ jobs:
# Build Movecraft
build:
runs-on: ubuntu-latest
needs: [v1_18, v1_19, v1_20]
needs: [v1_18, v1_20]

steps:
- name: Checkout Movecraft
Expand All @@ -162,15 +120,6 @@ jobs:
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_18
restore-keys: ${{ runner.os }}-v1_18
- name: Cache 1.19.4 Maven package
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_19
restore-keys: ${{ runner.os }}-v1_19
- name: Cache 1.20.6 Maven package
uses: actions/cache@v3
with:
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,48 +48,6 @@ jobs:
if: steps.caves.outputs.sucess != 'true' || steps.cavesMojang.outputs.sucess != 'true' || steps.cavesObf.outputs.sucess != 'true'
run: cd BuildTools && java -jar BuildTools.jar --rev 1.18.2 --remapped

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

- 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.19.4 Spigot
id: wild
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.19.4 Spigot (Mojang)
id: wildMojang
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Check 1.19.4 Spigot (Obf)
id: wildObf
run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
- name: Build 1.19.4
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.6 NMS
v1_20:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -135,7 +93,6 @@ jobs:
# Build Movecraft
build:
runs-on: ubuntu-latest
needs: [v1_18, v1_19, v1_20]

steps:
- name: Checkout Movecraft
Expand All @@ -160,15 +117,6 @@ jobs:
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_18
restore-keys: ${{ runner.os }}-v1_18
- name: Cache 1.19.4 Maven package
uses: actions/cache@v3
with:
path: |
~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/
~/.m2/repository/org/spigotmc/spigot-parent/
~/.m2/repository/org/spigotmc/minecraft-server/
key: ${{ runner.os }}-v1_19
restore-keys: ${{ runner.os }}-v1_19
- name: Cache 1.20.6 Maven package
uses: actions/cache@v3
with:
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ 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.18.2 and 1.19.4 with Java 17, and 1.20.6 with Java 21.
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.18.2 with Java 17, and 1.20.6 with Java 21.

```
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.6 --remapped
```

Expand Down
12 changes: 0 additions & 12 deletions modules/Movecraft/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@
<version>${revision}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.countercraft</groupId>
<artifactId>movecraft-v1_19</artifactId>
<version>${revision}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.countercraft</groupId>
<artifactId>movecraft-v1_20</artifactId>
Expand Down Expand Up @@ -164,12 +158,6 @@
<include>**</include>
</includes>
</filter>
<filter>
<artifact>net.countercraft:movecraft-v1_19</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<filter>
<artifact>net.countercraft:movecraft-v1_20</artifact>
<includes>
Expand Down
94 changes: 0 additions & 94 deletions modules/v1_19/pom.xml

This file was deleted.

Loading

0 comments on commit e31da23

Please sign in to comment.