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.

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

Added support for 1_17_R1 and 1_18_R1 and restructured architecture #29

Merged
merged 48 commits into from
Jan 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9e93552
Update build-spigot.sh
Lauriichan Jan 18, 2022
670e0c9
Update build-spigot.sh
Lauriichan Jan 18, 2022
d73c57b
Update build-spigot.sh
Lauriichan Jan 18, 2022
8b0cd33
Add 1_17_R1 support
Lauriichan Jan 18, 2022
4a3a498
WIP: Support 1_18_R1 (Missing ConsoleReaderWrapper for 1_8_R1 - 1_9_R2)
Lauriichan Jan 18, 2022
cfb6947
Added 1_18_R1 support
Lauriichan Jan 18, 2022
f0c35fc
Update versions.txt
Lauriichan Jan 18, 2022
48a6efc
Change structure of vCompat
Lauriichan Jan 19, 2022
e4d6588
Move stuff
Lauriichan Jan 19, 2022
f3a28d4
Move dependencies around
Lauriichan Jan 19, 2022
907ed92
Update api to be up2date with latest technology developed for vCompat
Lauriichan Jan 19, 2022
20fd7a3
Implement new init classes
Lauriichan Jan 19, 2022
d07d234
Update .gitignore
Lauriichan Jan 19, 2022
baf0d46
Delete .classpath
Lauriichan Jan 19, 2022
345b4c3
Delete .project
Lauriichan Jan 19, 2022
a343f96
Delete .classpath
Lauriichan Jan 19, 2022
0530925
Delete .project
Lauriichan Jan 19, 2022
2152bd5
Delete org.eclipse.jdt.core.prefs
Lauriichan Jan 19, 2022
55ef770
Delete org.eclipse.core.resources.prefs
Lauriichan Jan 19, 2022
d3963e5
Delete org.eclipse.m2e.core.prefs
Lauriichan Jan 19, 2022
fe11533
Delete org.eclipse.jdt.core.prefs
Lauriichan Jan 19, 2022
4070a67
Delete org.eclipse.core.resources.prefs
Lauriichan Jan 19, 2022
e0b5319
Delete org.eclipse.m2e.core.prefs
Lauriichan Jan 19, 2022
a71dda0
Fix project build
Lauriichan Jan 19, 2022
783397b
Update .gitignore
Lauriichan Jan 19, 2022
3e3f383
Update .gitignore
Lauriichan Jan 19, 2022
0f7c9ff
Update .gitignore
Lauriichan Jan 19, 2022
7381655
Update .gitignore
Lauriichan Jan 19, 2022
803f943
Update .gitingore
Lauriichan Jan 19, 2022
a9b9530
Fix .gitignore and add vcompat-legacy
Lauriichan Jan 19, 2022
2cbbaa9
Update vCompat Legacy
Lauriichan Jan 19, 2022
dcd52ec
Fully implemented 1_8_R1 - 1_16_R3 support again
Lauriichan Jan 19, 2022
950fe9c
Fix project build
Lauriichan Jan 19, 2022
b72539a
Add 1_17_R1 and 1_18_R1 support
Lauriichan Jan 19, 2022
0be0c24
Update pom.xml
Lauriichan Jan 19, 2022
af9baf1
Updated github stuff
Lauriichan Jan 19, 2022
d5a9abd
Fix paths
Lauriichan Jan 19, 2022
76a5f46
Try to fix github build
Lauriichan Jan 19, 2022
46e83f0
Refactor workflow
Lauriichan Jan 19, 2022
a494c71
Fix 1.18.1 download
Lauriichan Jan 19, 2022
e917e78
Update .gitignore
Lauriichan Jan 20, 2022
7b7698f
Rename all 1_18_R1 to match the version
Lauriichan Jan 20, 2022
98c55bf
Update build-maven.yml
Lauriichan Jan 20, 2022
d8fa5da
Update specialsource-maven-plugin
Lauriichan Jan 20, 2022
f53e3d7
Merge branch 'development' of https://github.com/SourceWriters/vCompa…
Lauriichan Jan 20, 2022
276ef5b
Install mappings script
Lauriichan Jan 20, 2022
ab02325
Update install-mapping.sh
Lauriichan Jan 20, 2022
a2c1ef5
Update build-maven.yml
Lauriichan Jan 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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