Skip to content

Commit a1935c2

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents f52a557 + 49a1bff commit a1935c2

File tree

930 files changed

+9034
-2686
lines changed

Some content is hidden

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

930 files changed

+9034
-2686
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ body:
2121

2222
- type: textarea
2323
attributes:
24-
label: Console Error
24+
label: Server/Client Error
2525
description: |
2626
If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**.
2727
If the error is small/less than 10 lines, you may put it directly into this field.
28+
**Important**: If you are kicked for `Network Protocol Error` or an encoder/decoder exception, please click the `Open Report Directory` button on your client and paste the newest disconnect file contents.
2829
value: |
2930
```
3031
Put the mclo.gs link or text here.
@@ -40,7 +41,7 @@ body:
4041
Describe the unexpected behavior.
4142
If you want to attach screenshots, use the comment field at the bottom of the page.
4243
placeholder: |
43-
Example: "Placing signs on 1.13.2 causes text to disappear."
44+
Example: "Placing signs on 1.21.3 causes text to disappear."
4445
validations:
4546
required: true
4647

@@ -51,7 +52,7 @@ body:
5152
List the steps on how we can reproduce the issue. Make sure we can easily understand what you mean with each step.
5253
placeholder: |
5354
Example:
54-
1. Login with a 1.13.2 client
55+
1. Login with a 1.21.3 client
5556
2. Place a sign
5657
3. The sign text is displayed wrong
5758
validations:

.github/workflows/build.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ jobs:
1212
steps:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v4
15-
- name: Validate Gradle Wrapper
16-
uses: gradle/actions/wrapper-validation@v4
15+
with:
16+
persist-credentials: false
17+
- name: Set up Gradle
18+
uses: gradle/actions/setup-gradle@v4
1719
- name: Set up JDK 17
1820
uses: actions/setup-java@v4
1921
with:
@@ -22,3 +24,10 @@ jobs:
2224
check-latest: true
2325
- name: Build with Gradle
2426
run: ./gradlew build
27+
- name: Upload Artifacts to GitHub
28+
# Only upload on the preview repository as there is no CI job for it.
29+
if: ${{ github.repository == 'ViaVersion/ViaVersionDev' && github.ref_name == 'preview' }}
30+
uses: actions/upload-artifact@v4
31+
with:
32+
name: Artifacts
33+
path: build/libs/

.github/workflows/publish.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ jobs:
1212
steps:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v4
15-
- name: Validate Gradle Wrapper
16-
uses: gradle/actions/wrapper-validation@v4
15+
with:
16+
persist-credentials: false
17+
- name: Set up Gradle
18+
uses: gradle/actions/setup-gradle@v4
1719
- name: Set up JDK 17
1820
uses: actions/setup-java@v4
1921
with:

.github/workflows/update-gradle-wrapper.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ jobs:
1010
steps:
1111
- name: Checkout Repository
1212
uses: actions/checkout@v4
13+
with:
14+
persist-credentials: false
1315
- name: Update Gradle Wrapper
1416
uses: gradle-update/update-gradle-wrapper-action@v2

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Supported Versions:
1818

1919
![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)
2020

21-
**User Docs:** https://docs.viaversion.com/display/VIAVERSION/
21+
**User Docs:** https://docs.viaversion.com
2222

2323
Snapshot support
2424
--------
@@ -98,8 +98,7 @@ Resources
9898

9999
- **[Via Mappings Generator](https://github.com/ViaVersion/Mappings)**
100100
- **[Mojang mappings](https://minecraft.wiki/w/Obfuscation_map)** (Thank you, Mojang, very cool)
101-
- **[wiki.vg](https://wiki.vg)** (Used for historic information regarding packet structure, we also contribute back)
102-
- **[Burger](https://github.com/Pokechu22/Burger)** (See [PAaaS](https://github.com/Matsv/Paaas))
101+
- Previously: **[Burger](https://github.com/Pokechu22/Burger)** (see [PAaaS](https://github.com/Matsv/Paaas)) and **wiki.vg**
103102

104103
License
105104
--------

api/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
}
2525
implementation(rootProject.libs.text) {
2626
exclude("com.google.code.gson", "gson")
27+
exclude("com.google.guava", "guava")
2728
exclude("com.viaversion", "nbt")
2829
}
2930
api(libs.snakeYaml)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
3-
* Copyright (C) 2016-2024 ViaVersion and contributors
3+
* Copyright (C) 2016-2025 ViaVersion and contributors
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
3-
* Copyright (C) 2016-2024 ViaVersion and contributors
3+
* Copyright (C) 2016-2025 ViaVersion and contributors
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal
@@ -114,15 +114,17 @@ default int getPlayerVersion(UUID uuid) {
114114
ProtocolVersion getPlayerProtocolVersion(UUID uuid);
115115

116116
/**
117-
* Returns whether Via injected into this player connection.
117+
* Returns whether Via injected into this player connection. Note that this method may not work on
118+
* clientside implementations and is generally not recommended to be used. Use {@link ConnectionManager} instead.
118119
*
119120
* @param uuid uuid of the player
120121
* @return whether Via has a cached a UserConnection for this player
121122
*/
122123
boolean isInjected(UUID uuid);
123124

124125
/**
125-
* Returns the Via injected UserConnection if present.
126+
* Returns whether Via injected into this player connection. Note that this method may not work on
127+
* clientside implementations and is generally not recommended to be used. Use {@link ConnectionManager} instead.
126128
*
127129
* @param uuid uuid of the player
128130
* @return user connection if present

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
3-
* Copyright (C) 2016-2024 ViaVersion and contributors
3+
* Copyright (C) 2016-2025 ViaVersion and contributors
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

api/src/main/java/com/viaversion/viaversion/api/command/ViaCommandSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
3-
* Copyright (C) 2016-2024 ViaVersion and contributors
3+
* Copyright (C) 2016-2025 ViaVersion and contributors
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)