From 9e995d08b971be648b2d9e32e039a7d3e6a0d5b4 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Sun, 26 Nov 2023 20:48:32 +0100 Subject: [PATCH] registry tests: 1.8.9 and 1.12.2 entity data --- .../versions/registries/legacy/1_12_2.kt | 14 +++++++++++++- .../registries/versions/registries/legacy/1_8_9.kt | 13 ++++++++++++- .../data/entities/entities/item/ItemEntity.kt | 2 +- .../data/entities/entities/player/PlayerEntity.kt | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_12_2.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_12_2.kt index 65c5e5ace..b31644e57 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_12_2.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_12_2.kt @@ -13,7 +13,19 @@ package de.bixilon.minosoft.data.registries.versions.registries.legacy +import de.bixilon.minosoft.data.entities.entities.Entity +import de.bixilon.minosoft.data.entities.entities.item.ItemEntity +import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity +import org.testng.Assert.assertEquals import org.testng.annotations.Test @Test(groups = ["pixlyzer"], dependsOnGroups = ["version"], priority = Int.MAX_VALUE, timeOut = 15000L) -class `1_12_2` : LegacyLoadingTest("1.12.2") +class `1_12_2` : LegacyLoadingTest("1.12.2") { + + fun `entity data`() { + assertEquals(registries.getEntityDataIndex(Entity.FLAGS_DATA), 0) + assertEquals(registries.getEntityDataIndex(ItemEntity.ITEM_DATA), 6) + assertEquals(registries.getEntityDataIndex(PlayerEntity.SKIN_PARTS_DATA), 13) + } + +} diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_8_9.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_8_9.kt index db5318b2b..66771aa76 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_8_9.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/registries/legacy/1_8_9.kt @@ -13,7 +13,18 @@ package de.bixilon.minosoft.data.registries.versions.registries.legacy +import de.bixilon.minosoft.data.entities.entities.Entity +import de.bixilon.minosoft.data.entities.entities.item.ItemEntity +import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity +import org.testng.Assert.assertEquals import org.testng.annotations.Test @Test(groups = ["pixlyzer"], dependsOnGroups = ["version"], priority = Int.MAX_VALUE, timeOut = 15000L) -class `1_8_9` : LegacyLoadingTest("1.8.9") +class `1_8_9` : LegacyLoadingTest("1.8.9") { + + fun `entity data`() { + assertEquals(registries.getEntityDataIndex(Entity.FLAGS_DATA), 0) + assertEquals(registries.getEntityDataIndex(ItemEntity.ITEM_DATA), 10) + assertEquals(registries.getEntityDataIndex(PlayerEntity.SKIN_PARTS_DATA), 10) + } +} diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt index 6165c7e8e..4335e4d62 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt @@ -40,7 +40,7 @@ class ItemEntity(connection: PlayConnection, entityType: EntityType, data: Entit companion object : EntityFactory { override val identifier: ResourceLocation = minecraft("item") - private val ITEM_DATA = EntityDataField("ITEM_ITEM") + val ITEM_DATA = EntityDataField("ITEM_ITEM") override fun build(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation): ItemEntity { return ItemEntity(connection, entityType, data, position, rotation) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt index 1d1e39eed..50a26312f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt @@ -169,7 +169,7 @@ abstract class PlayerEntity( private val ABSORPTION_HEARTS_DATA = EntityDataField("PLAYER_ABSORPTION_HEARTS") private val SCORE_DATA = EntityDataField("PLAYER_SCORE") - private val SKIN_PARTS_DATA = EntityDataField("PLAYER_SKIN_PARTS_FLAGS") + val SKIN_PARTS_DATA = EntityDataField("PLAYER_SKIN_PARTS_FLAGS") private val MAIN_ARM_DATA = EntityDataField("PLAYER_SKIN_MAIN_HAND") private val LEFT_SHOULDER_DATA_DATA = EntityDataField("PLAYER_LEFT_SHOULDER_DATA") private val RIGHT_SHOULDER_DATA_DATA = EntityDataField("PLAYER_RIGHT_SHOULDER_DATA")