Skip to content

Commit 6f56eb4

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 6526446 + c098e24 commit 6f56eb4

File tree

865 files changed

+25000
-29853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

865 files changed

+25000
-29853
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tab_width = 4
88
[*.java]
99
ij_java_class_count_to_use_import_on_demand = 999999
1010
ij_java_names_count_to_use_import_on_demand = 999999
11-
ij_java_imports_layout = *,|,$*
11+
ij_java_imports_layout = *, |, $*
1212
ij_java_generate_final_locals = true
1313
ij_java_generate_final_parameters = true
1414

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ body:
7171
attributes:
7272
label: Additional Server Info
7373
description: |
74-
Do you use a proxy (e.g. BungeeCord)? What software do you use and what plugins?
74+
Do you use a proxy (e.g. Velocity)? What software do you use and what plugins?
7575
placeholder: |
76-
Example: "I also use BungeeCord with the following plugins: x, y, z"
76+
Example: "I also use Velocity with the following plugins: x, y, z"
7777
validations:
7878
required: false
7979

@@ -82,7 +82,7 @@ body:
8282
label: Checklist
8383
description: Make sure you have followed each of the steps outlined here.
8484
options:
85-
- label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. BungeeCord), **not on both**.
85+
- label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. Velocity), **not on both**.
8686
required: true
8787
- label: I have included a ViaVersion dump.
8888
required: true

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v4
1515
- name: Validate Gradle Wrapper
16-
uses: gradle/wrapper-validation-action@v2
16+
uses: gradle/actions/wrapper-validation@v3
1717
- name: Set up JDK 17
1818
uses: actions/setup-java@v4
1919
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v4
1515
- name: Validate Gradle Wrapper
16-
uses: gradle/wrapper-validation-action@v2
16+
uses: gradle/actions/wrapper-validation@v3
1717
- name: Set up JDK 17
1818
uses: actions/setup-java@v4
1919
with:

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
**Allows the connection of higher client versions to lower server versions -
88
it works on any platform you can think of.**
99

10-
The base ViaVersion jar runs on Paper, Velocity, Bungee, and Sponge. We also have projects integrating ViaVersion to run
11-
on Fabric, Forge, or as a standalone proxy to join from basically any client version on any server version from the
12-
past decade. **See [HERE](https://github.com/ViaVersion) for an overview of the different Via\* projects.**
10+
The base ViaVersion jar runs on Paper and Velocity. We also have projects integrating ViaVersion to run
11+
on Fabric, Forge, Bungee, Sponge, or as a standalone proxy to join from basically any client version on
12+
any server version from the past decade. **See [HERE](https://github.com/ViaVersion) for an overview of the different Via\* projects.**
1313

1414
Supported Versions:
1515

@@ -47,7 +47,7 @@ ViaVersion as a Dependency
4747
<dependency>
4848
<groupId>com.viaversion</groupId>
4949
<artifactId>viaversion-api</artifactId>
50-
<version>[4.0.0,5.0.0)</version>
50+
<version>[5.0.0,6.0.0)</version>
5151
<scope>provided</scope>
5252
</dependency>
5353
```
@@ -73,6 +73,8 @@ Building
7373
After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out
7474
of the `build/libs` directory.
7575

76+
You need JDK 17 or newer to build ViaVersion.
77+
7678

7779
Mapping Files
7880
--------------

api-legacy/build.gradle.kts

Lines changed: 0 additions & 3 deletions
This file was deleted.

api-legacy/src/main/java/us/myles/ViaVersion/api/Via.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

api-legacy/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java

Lines changed: 0 additions & 133 deletions
This file was deleted.

api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)