From 1510ec622dd738996e8746501c87211d42c6cb54 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 23 Nov 2022 15:22:04 +0100 Subject: [PATCH] it: load latest pixlyzer data, fix loading of 1.19.3-pre1 --- .../versions/PixLyzerLoadingTest.kt | 9 ++++++- .../kotlin/de/bixilon/minosoft/test/ITUtil.kt | 4 ++++ .../blocks/properties/BlockProperties.kt | 7 ++++++ .../protocol/protocol/ProtocolVersions.kt | 2 -- .../protocol/protocol/VersionSupport.kt | 24 +++++++++++++++++++ 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/bixilon/minosoft/protocol/protocol/VersionSupport.kt diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt index 0d1cf094e..4e046d7b2 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt @@ -16,6 +16,7 @@ package de.bixilon.minosoft.data.registries.versions import de.bixilon.minosoft.data.entities.entities.monster.Zombie import de.bixilon.minosoft.data.registries.blocks.MinecraftBlocks import de.bixilon.minosoft.data.registries.item.MinecraftItems +import de.bixilon.minosoft.protocol.protocol.VersionSupport import de.bixilon.minosoft.test.ITUtil import org.testng.Assert import org.testng.annotations.Test @@ -88,8 +89,14 @@ class PixLyzerLoadingTest { ITUtil.loadPixlyzerData("1.19").test() } - @Test(enabled = false) // already loaded in setup fun `1_19_2`() { ITUtil.loadPixlyzerData("1.19.2").test() } + + fun latest() { + val version = Versions.getById(VersionSupport.LATEST_VERSION)!! + println("Latest version $version") + ITUtil.loadPixlyzerData(version) + version.test() + } } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/test/ITUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/test/ITUtil.kt index d08b8eae1..06d283172 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/test/ITUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/test/ITUtil.kt @@ -31,6 +31,10 @@ object ITUtil { fun loadPixlyzerData(name: String): Version { val version = Versions[name]!! + if (version.registries != null) { + // already loaded + return version + } loadPixlyzerData(version) return version diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt index e6dc35d0f..0ea81258b 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt @@ -123,6 +123,13 @@ enum class BlockProperties { BOOKS_STORED("books_stored", IntBlockPropertiesSerializer), LAST_INTERACTION_BOOK_SLOT("last_interaction_book_slot", IntBlockPropertiesSerializer), + + BOOK_SLOT_OCCUPIED_0("slot_0_occupied", BooleanBlockPropertiesSerializer), + BOOK_SLOT_OCCUPIED_1("slot_1_occupied", BooleanBlockPropertiesSerializer), + BOOK_SLOT_OCCUPIED_2("slot_2_occupied", BooleanBlockPropertiesSerializer), + BOOK_SLOT_OCCUPIED_3("slot_3_occupied", BooleanBlockPropertiesSerializer), + BOOK_SLOT_OCCUPIED_4("slot_4_occupied", BooleanBlockPropertiesSerializer), + BOOK_SLOT_OCCUPIED_5("slot_5_occupied", BooleanBlockPropertiesSerializer), ; val group: String diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersions.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersions.kt index eca973a97..0dbd9225b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersions.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersions.kt @@ -478,6 +478,4 @@ object ProtocolVersions { const val V_13W43A = 2 const val V_13W42B = 1 const val V_13W41B = 0 - - const val LOWEST_VERSION_SUPPORTED = V_13W41B } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/VersionSupport.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/VersionSupport.kt new file mode 100644 index 000000000..ef4b9a4d9 --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/VersionSupport.kt @@ -0,0 +1,24 @@ +/* + * Minosoft + * Copyright (C) 2020-2022 Moritz Zwerger + * + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. If not, see . + * + * This software is not affiliated with Mojang AB, the original developer of Minecraft. + */ + +package de.bixilon.minosoft.protocol.protocol + +import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_13W41B +import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_19_2 +import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_19_3_PRE1 + +object VersionSupport { + const val MINIMUM_VERSION = V_13W41B + const val LATEST_VERSION = V_1_19_3_PRE1 + const val LATEST_RELEASE = V_1_19_2 +}