From d78220924556d974f9f9a1b341c9b02c31d8544f Mon Sep 17 00:00:00 2001 From: Mirco Kroon <23699979+mircokroon@users.noreply.github.com> Date: Tue, 9 Feb 2021 13:35:06 +0100 Subject: [PATCH 1/3] Downgrade java version to 8 --- README.md | 2 +- pom.xml | 2 +- src/main/java/game/data/entity/Entity.java | 5 +++-- src/main/java/game/data/entity/MobEntity.java | 3 ++- src/main/java/game/data/entity/ObjectEntity.java | 3 ++- src/main/java/game/data/entity/metadata/MetaData.java | 8 ++++++-- .../java/packets/builder/PacketBuilderAndParserTest.java | 3 ++- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 98768e75..ccd432d8 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A Minecraft world downloader that works by intercepting & decrypting network tra ### Requirements -- Java 9 or higher +- Java 8 or higher - Minecraft version 1.12.2+ // 1.13.2+ // 1.14.1+ // 1.15.2+ // 1.16.2+ ### Basic usage diff --git a/pom.xml b/pom.xml index 119d6408..58af9704 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 1.0 jar - 9 + 8 diff --git a/src/main/java/game/data/entity/Entity.java b/src/main/java/game/data/entity/Entity.java index b30fb668..01744000 100644 --- a/src/main/java/game/data/entity/Entity.java +++ b/src/main/java/game/data/entity/Entity.java @@ -11,6 +11,7 @@ import se.llbit.nbt.SpecificTag; import se.llbit.nbt.StringTag; +import java.util.Arrays; import java.util.List; public abstract class Entity { @@ -49,10 +50,10 @@ protected static Entity parseEntity(DataTypeProvider provider, Entity ent) { public SpecificTag toNbt() { CompoundTag root = new CompoundTag(); - List pos = List.of(new DoubleTag(x), new DoubleTag(y), new DoubleTag(z)); + List pos = Arrays.asList(new DoubleTag(x), new DoubleTag(y), new DoubleTag(z)); root.add("Pos", new ListTag(ListTag.TAG_DOUBLE, pos)); - List motion = List.of(new DoubleTag(velX), new DoubleTag(velY), new DoubleTag(velZ)); + List motion = Arrays.asList(new DoubleTag(velX), new DoubleTag(velY), new DoubleTag(velZ)); root.add("Motion", new ListTag(ListTag.TAG_DOUBLE, motion)); root.add("UUIDLeast", new LongTag(uuid.getLower())); diff --git a/src/main/java/game/data/entity/MobEntity.java b/src/main/java/game/data/entity/MobEntity.java index 9fea1065..1a0e94e7 100644 --- a/src/main/java/game/data/entity/MobEntity.java +++ b/src/main/java/game/data/entity/MobEntity.java @@ -6,6 +6,7 @@ import se.llbit.nbt.FloatTag; import se.llbit.nbt.ListTag; +import java.util.Arrays; import java.util.List; public class MobEntity extends Entity { @@ -19,7 +20,7 @@ private MobEntity() { } @Override protected void addNbtData(CompoundTag root) { - List pos = List.of(new FloatTag(pitch), new FloatTag(yaw)); + List pos = Arrays.asList(new FloatTag(pitch), new FloatTag(yaw)); root.add("Rotation", new ListTag(ListTag.TAG_FLOAT, pos)); metaData.addNbtTags(root); diff --git a/src/main/java/game/data/entity/ObjectEntity.java b/src/main/java/game/data/entity/ObjectEntity.java index 3e15ae79..ff8abac3 100644 --- a/src/main/java/game/data/entity/ObjectEntity.java +++ b/src/main/java/game/data/entity/ObjectEntity.java @@ -5,6 +5,7 @@ import se.llbit.nbt.FloatTag; import se.llbit.nbt.ListTag; +import java.util.Arrays; import java.util.List; public class ObjectEntity extends Entity { @@ -16,7 +17,7 @@ private ObjectEntity() { } @Override protected void addNbtData(CompoundTag root) { - List pos = List.of(new FloatTag(pitch), new FloatTag(yaw)); + List pos = Arrays.asList(new FloatTag(pitch), new FloatTag(yaw)); root.add("Rotation", new ListTag(ListTag.TAG_FLOAT, pos)); } diff --git a/src/main/java/game/data/entity/metadata/MetaData.java b/src/main/java/game/data/entity/metadata/MetaData.java index c816aef7..52d7a4aa 100644 --- a/src/main/java/game/data/entity/metadata/MetaData.java +++ b/src/main/java/game/data/entity/metadata/MetaData.java @@ -23,9 +23,13 @@ public void parse(DataTypeProvider provider) { Consumer indexHandler = getIndexHandler(index); Consumer typeHandler = getTypeHandler(type); - if (indexHandler == null || typeHandler == null) { break; } + if (indexHandler == null && typeHandler == null) { break; } - Objects.requireNonNullElse(indexHandler, typeHandler).accept(provider); + if (indexHandler != null) { + indexHandler.accept(provider); + } else { + typeHandler.accept(provider); + } } } diff --git a/src/test/java/packets/builder/PacketBuilderAndParserTest.java b/src/test/java/packets/builder/PacketBuilderAndParserTest.java index 097b21b1..69125207 100644 --- a/src/test/java/packets/builder/PacketBuilderAndParserTest.java +++ b/src/test/java/packets/builder/PacketBuilderAndParserTest.java @@ -8,6 +8,7 @@ import packets.lib.ByteQueue; import se.llbit.nbt.*; +import java.util.Arrays; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -139,7 +140,7 @@ void nbtCompoundTest() { @Test void nbtListTest() { - ListTag before = new ListTag(Tag.TAG_STRING, List.of( + ListTag before = new ListTag(Tag.TAG_STRING, Arrays.asList( new StringTag("a"), new StringTag("b"), new StringTag("c") From da92be6071a4b383e24181dc3285ec509ccd035a Mon Sep 17 00:00:00 2001 From: mircokroon <23699979+mircokroon@users.noreply.github.com> Date: Tue, 9 Feb 2021 13:37:28 +0100 Subject: [PATCH 2/3] Only run actions on PRs --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faa99e7f..6dd41bf7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Build -on: [push, pull_request] +on: [pull_request] jobs: build: @@ -20,4 +20,4 @@ jobs: with: java-version: '9.0.4' - run: | - mvn test \ No newline at end of file + mvn test From dcdd6e3d9850f8cc38b30672e278d21d129f22e3 Mon Sep 17 00:00:00 2001 From: mircokroon <23699979+mircokroon@users.noreply.github.com> Date: Tue, 9 Feb 2021 13:53:18 +0100 Subject: [PATCH 3/3] Change Java version in github action --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6dd41bf7..5832775f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: '9.0.4' + java-version: '8' - run: | mvn assembly:assembly test: @@ -18,6 +18,6 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: '9.0.4' + java-version: '8' - run: | mvn test