Skip to content

Commit

Permalink
Merge pull request #29 from SourceWriters/development
Browse files Browse the repository at this point in the history
Added support for 1_17_R1 and 1_18_R1 and restructured architecture
  • Loading branch information
YellowPhoenix18 authored Jan 20, 2022
2 parents e4d3b21 + a2c1ef5 commit 642303a
Show file tree
Hide file tree
Showing 505 changed files with 10,648 additions and 3,648 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/build-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,27 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
server-id: github
settings-path: ${{ github.workspace }}

- name: Build Spigot dependencies
- name: Download Server dependencies
run: |
chmod +x "${{ github.workspace }}/scripts/build-spigot.sh"
${{ github.workspace }}/scripts/build-spigot.sh "${{ github.workspace }}"
chmod +x "${{ github.workspace }}/scripts/download-spigot.sh"
${{ github.workspace }}/scripts/download-spigot.sh "${{ github.workspace }}"
- name: Download Mapping dependencies
run: |
chmod +x "${{ github.workspace }}/scripts/download-mapping.sh"
${{ github.workspace }}/scripts/download-mapping.sh "${{ github.workspace }}"
- name: Install Mapping dependencies
run: |
chmod +x "${{ github.workspace }}/scripts/install-mapping.sh"
${{ github.workspace }}/scripts/install-mapping.sh "${{ github.workspace }}"
- name: Building maven project
run: mvn -B package
Expand Down
25 changes: 15 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
/bin/
/target/
/dependencies/
*/bin/
*/target/
*/dependencies/
*/.settings/
*/.idea/
*/.m2/
*/.classpath
*/.project
*/.gitlab-ci.yml
*/test/
*/dependency-reduced-pom.xml
*.class
*.jar
/libraries/spigot/
/.settings/
/.idea/
/.m2/
/.classpath
/.project
/.gitlab-ci.yml
/test/
/libraries/spigot/
/dependency-reduced-pom.xml
/.classpath
1 change: 1 addition & 0 deletions .m2/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<activeProfiles>
<activeProfile>github</activeProfile>
<activeProfile>build-remote</activeProfile>
</activeProfiles>

<profiles>
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
[![Stargazers][stars-shield]][stars-url]
[![Issues][issues-shield]][issues-url]
[![MIT License][license-shield]][license-url]
[![Code quality: Java][lgtm-quality-shield]][lgtm-quality-url]



Expand Down Expand Up @@ -88,7 +87,7 @@
### Built With

* [Spigot](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/browse)
* [SyntaxApi](https://github.com/SyntaxPhoenix/syntaxapi)
* [SyntaxApi](https://github.com/SyntaxPhoenix/SyntaxApi)

<!-- GETTING STARTED -->
## Getting Started
Expand All @@ -104,7 +103,7 @@ Please notice that you need to authenticate with GitHub Packages ([Maven](https:
<depedency>
<groupId>net.sourcewriters.minecraft</groupId>
<artifactId>vcompat</artifactId>
<version>2.1.8</version>
<version>3.0.0</version>
<scope>provided</scope>
<dependency>
<depedencies>
Expand All @@ -118,7 +117,7 @@ plugins {
}
dependencies {
compileOnly group: 'net.sourcewriters.minecraft', name: 'vcompat', version: '2.1.8'
compileOnly group: 'net.sourcewriters.minecraft', name: 'vcompat', version: '3.0.0'
}
```

Expand Down Expand Up @@ -181,6 +180,4 @@ Project Link: [https://github.com/SourceWriters/vCompat](https://github.com/Sour
[issues-shield]: https://img.shields.io/github/issues/SourceWriters/vCompat.svg?style=flat-square
[issues-url]: https://github.com/SourceWriters/vCompat/issues
[license-shield]: https://img.shields.io/github/license/SourceWriters/vCompat.svg?style=flat-square
[license-url]: https://github.com/SourceWriters/vCompat/blob/master/LICENSE
[lgtm-quality-shield]: https://img.shields.io/lgtm/grade/java/g/SourceWriters/vCompat.svg?style=flat-square
[lgtm-quality-url]: https://lgtm.com/projects/g/SourceWriters/vCompat/context:java
[license-url]: https://github.com/SourceWriters/vCompat/blob/master/LICENSE
24 changes: 0 additions & 24 deletions lgtm.yml

This file was deleted.

Loading

0 comments on commit 642303a

Please sign in to comment.