3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-28 09:00:09 +01:00

Merge branch 'master' into dev

# Conflicts:
#	.github/workflows/gradle.yml
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-01-27 13:49:48 +01:00
Commit 6473b608f6
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
3 geänderte Dateien mit 3 neuen und 6 gelöschten Zeilen

Datei anzeigen

@ -14,11 +14,11 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Validate Gradle Wrapper - name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1 uses: gradle/wrapper-validation-action@v1
- name: Set up JDK 11 - name: Set up JDK 17
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: 11 java-version: 17
check-latest: true check-latest: true
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew build run: ./gradlew build

Datei anzeigen

@ -135,9 +135,6 @@ public class MetadataRewriter1_14To1_13_2 extends EntityRewriter<ClientboundPack
filter().type(EntityTypes1_14.ABSTRACT_ARROW).addIndex(9); // Piercing level added filter().type(EntityTypes1_14.ABSTRACT_ARROW).addIndex(9); // Piercing level added
filter().type(EntityTypes1_14.FIREWORK_ROCKET).index(8).handler((event, meta) -> { filter().type(EntityTypes1_14.FIREWORK_ROCKET).index(8).handler((event, meta) -> {
});
filter().type(EntityTypes1_14.HORSE).index(18).handler((event, meta) -> {
meta.setMetaType(Types1_14.META_TYPES.optionalVarIntType); meta.setMetaType(Types1_14.META_TYPES.optionalVarIntType);
if (meta.getValue().equals(0)) { if (meta.getValue().equals(0)) {
meta.setValue(null); // https://bugs.mojang.com/browse/MC-111480 meta.setValue(null); // https://bugs.mojang.com/browse/MC-111480

Datei anzeigen

@ -1,7 +1,7 @@
dependencies { dependencies {
compileOnlyApi(projects.viaversionCommon) compileOnlyApi(projects.viaversionCommon)
compileOnly(libs.velocity) { compileOnly(libs.velocity) {
// Requires Java 11 // Requires Java 17
exclude("com.velocitypowered", "velocity-brigadier") exclude("com.velocitypowered", "velocity-brigadier")
} }
annotationProcessor(libs.velocity) annotationProcessor(libs.velocity)