Skip to content

Commit df0e2b7

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents ff09769 + d0815ba commit df0e2b7

File tree

305 files changed

+8612
-3453
lines changed

Some content is hidden

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

305 files changed

+8612
-3453
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
charset = utf-8
33
indent_size = 4
44
indent_style = space
5-
insert_final_newline = false
5+
insert_final_newline = true
66
tab_width = 4
77

88
[*.java]
@@ -13,4 +13,4 @@ ij_java_generate_final_locals = true
1313
ij_java_generate_final_parameters = true
1414

1515
[{*.json,*.yml}]
16-
indent_size = 2
16+
indent_size = 2

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ jobs:
77
# Only run on PRs if the source branch is on a different repo. We do not need to run everything twice.
88
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
99

10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v4
1515
- name: Validate Gradle Wrapper
16-
uses: gradle/actions/wrapper-validation@v3
16+
uses: gradle/actions/wrapper-validation@v4
1717
- name: Set up JDK 17
1818
uses: actions/setup-java@v4
1919
with:

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
jobs:
99
publish:
1010
if: github.repository_owner == 'ViaVersion'
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v4
1515
- name: Validate Gradle Wrapper
16-
uses: gradle/actions/wrapper-validation@v3
16+
uses: gradle/actions/wrapper-validation@v4
1717
- name: Set up JDK 17
1818
uses: actions/setup-java@v4
1919
with:
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Update Gradle Wrapper
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "0 0 * * 0"
6+
7+
jobs:
8+
update-gradle-wrapper:
9+
runs-on: ubuntu-24.04
10+
steps:
11+
- name: Checkout Repository
12+
uses: actions/checkout@v4
13+
- name: Update Gradle Wrapper
14+
uses: gradle-update/update-gradle-wrapper-action@v2

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,7 @@ nb-configuration.xml
109109
.nb-gradle/
110110

111111
### MacOS ###
112-
.DS_Store
112+
.DS_Store
113+
114+
### Run Folder (ViaProxy) ###
115+
common/run/

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# ViaVersion
22

33
[![Latest Release](https://img.shields.io/github/v/release/ViaVersion/ViaVersion)](https://viaversion.com)
4-
[![Build Status](https://github.com/ViaVersion/ViaVersion/actions/workflows/gradle.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaVersion/actions)
4+
[![Build Status](https://github.com/ViaVersion/ViaVersion/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaVersion/actions)
55
[![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)
66

77
**Allows the connection of higher client versions to lower server versions -
88
it works on any platform you can think of.**
99

1010
The base ViaVersion jar runs on Paper and Velocity. We also have projects integrating ViaVersion to run
1111
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.**
12+
any server version from the past decade. **See [HERE](https://viaversion.com) for an overview of the different Via\* projects.**
1313

14-
Note that ViaVersion will be able to **run best on either Paper servers or Fabric clients** due to having
14+
Note that ViaVersion will be able to **run best on either Paper servers or through [ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus?tab=readme-ov-file#viafabricplus)** due to having
1515
direct access to client/server state and more extensive API.
1616

1717
Supported Versions:
1818

19-
![Table (https://i.imgur.com/sTrVnC2.png)](https://i.imgur.com/sTrVnC2.png)
19+
![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)
2020

2121
**User Docs:** https://docs.viaversion.com/display/VIAVERSION/
2222

@@ -83,7 +83,7 @@ You need JDK 17 or newer to build ViaVersion.
8383

8484
Mapping Files
8585
--------------
86-
Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings).
86+
Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings). The generated mapping output is stored [here](./common/src/main/resources/assets/viaversion).
8787

8888

8989
Resources
@@ -96,7 +96,7 @@ Resources
9696

9797
License
9898
--------
99-
The entirety of the [API directory](api) (including the legacy API directory) is licensed under the MIT License;
99+
The entirety of the [API directory](api) is licensed under the MIT License;
100100
see [licenses/MIT.md](licenses/MIT.md) for
101101
details.
102102

api/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ dependencies {
1919
api(libs.vianbt) {
2020
exclude("it.unimi.dsi", "fastutil")
2121
}
22-
api(libs.gson)
22+
api(libs.gson) {
23+
exclude("com.google.errorprone", "error_prone_annotations")
24+
}
2325
implementation(rootProject.libs.text) {
2426
exclude("com.google.code.gson", "gson")
2527
exclude("com.viaversion", "nbt")
2628
}
29+
api(libs.snakeYaml)
2730

28-
compileOnlyApi(libs.snakeYaml)
2931
compileOnlyApi(libs.netty)
3032
compileOnlyApi(libs.guava)
3133
compileOnlyApi(libs.checkerQual)

api/src/main/java/com/viaversion/viaversion/api/ViaManager.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ default void setDebug(boolean debug) {
140140
*/
141141
void addEnableListener(Runnable runnable);
142142

143+
/**
144+
* Adds a runnable to be executed when ViaVersion has finished its init after the full server load.
145+
*
146+
* @param runnable runnable to be executed
147+
*/
148+
void addPostEnableListener(Runnable runnable);
149+
143150
/**
144151
* Returns whether the manager has been initialized (and protocols have been loaded).
145152
*

api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public interface ViaVersionConfig extends Config {
6767
boolean isShowNewDeathMessages();
6868

6969
/**
70-
* Get if metadata errors will be suppressed
70+
* Get if entity data errors will be suppressed
7171
*
72-
* @return true if metadata errors suppression is enabled
72+
* @return true if entity data errors suppression is enabled
7373
*/
7474
boolean isSuppressMetadataErrors();
7575

@@ -292,13 +292,6 @@ public interface ViaVersionConfig extends Config {
292292
*/
293293
boolean isDisable1_13AutoComplete();
294294

295-
/**
296-
* Tries to minimize cooldown animation.
297-
*
298-
* @return true if enabled
299-
*/
300-
boolean isMinimizeCooldown();
301-
302295
/**
303296
* Enable the serverside blockconnections for 1.13+ clients
304297
*
@@ -464,4 +457,25 @@ public interface ViaVersionConfig extends Config {
464457
* @return true if enabled
465458
*/
466459
boolean handleInvalidItemCount();
460+
461+
/**
462+
* Tries to cancel block break/place sounds sent by 1.8 servers to 1.9+ clients to prevent them from playing twice
463+
*
464+
* @return true if enabled
465+
*/
466+
boolean cancelBlockSounds();
467+
468+
/**
469+
* Hides scoreboard numbers for 1.20.3+ clients on older server versions.
470+
*
471+
* @return true if enabled
472+
*/
473+
boolean hideScoreboardNumbers();
474+
475+
/**
476+
* Fixes 1.21+ clients on 1.20.5 servers placing water/lava buckets at the wrong location when moving fast.
477+
*
478+
* @return true if enabled
479+
*/
480+
boolean fix1_21PlacementRotation();
467481
}

0 commit comments

Comments
 (0)