Merge branch 'master' into dev

# Conflicts:
#	.github/workflows/gradle.yml
This commit is contained in:
Nassim Jahnke 2024-01-27 13:49:48 +01:00
commit 6473b608f6
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
3 changed files with 3 additions and 6 deletions

View File

@ -14,11 +14,11 @@ jobs:
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Set up JDK 11
- 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

View File

@ -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.FIREWORK_ROCKET).index(8).handler((event, meta) -> {
});
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

View File

@ -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)