From cef6fb35b1ac3799e27cab6cca87eb459439fa7f Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Sat, 20 Jan 2024 21:18:42 +0100 Subject: [PATCH 1/2] Update JDK to 17, setup-java to v4 (#3660) --- .github/workflows/gradle.yml | 6 +++--- .github/workflows/publish.yml | 2 +- velocity/build.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 169f1cbe9..c9be95286 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,11 +14,11 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 11 - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 check-latest: true - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8e4b4e5bb..a7aba4a34 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 670dbaf07..4c60a4d33 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { compileOnlyApi(projects.viaversionCommon) compileOnly(libs.velocity) { - // Requires Java 11 + // Requires Java 17 exclude("com.velocitypowered", "velocity-brigadier") } annotationProcessor(libs.velocity) From f3d95b1e5e564f20dd3965413d44015ea2a2d34c Mon Sep 17 00:00:00 2001 From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:46:20 +0100 Subject: [PATCH 2/2] Fix elytra not working with firework rockets in 1.14 -> 1.13.2 (#3669) Closes https://github.com/ViaVersion/ViaFabricPlus/issues/331 --- .../metadata/MetadataRewriter1_14To1_13_2.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java index 7966ae069..1a9c79b94 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java @@ -135,9 +135,6 @@ public class MetadataRewriter1_14To1_13_2 extends EntityRewriter { - }); - - filter().type(EntityTypes1_14.HORSE).index(18).handler((event, meta) -> { meta.setMetaType(Types1_14.META_TYPES.optionalVarIntType); if (meta.getValue().equals(0)) { meta.setValue(null); // https://bugs.mojang.com/browse/MC-111480