From 8ebbb81fcfe0ea4dd4f5206388868d2e932ef2bd Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 4 Jun 2021 14:17:18 +0200 Subject: [PATCH] add some block entity aliases --- .../bixilon/minosoft/data/entities/block/BedBlockEntity.kt | 5 ++++- .../bixilon/minosoft/data/entities/block/SignBlockEntity.kt | 5 ++++- .../bixilon/minosoft/data/entities/block/SkullBlockEntity.kt | 5 ++++- .../data/entities/block/container/HopperBlockEntity.kt | 5 ++++- .../entities/block/container/storage/ChestBlockEntity.kt | 5 ++++- .../block/container/storage/EnderChestBlockEntity.kt | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt index 02d0c70eb..67533f0f4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt @@ -13,11 +13,13 @@ package de.bixilon.minosoft.data.entities.block +import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor import de.bixilon.minosoft.protocol.network.connection.PlayConnection +import de.bixilon.minosoft.util.KUtil.toResourceLocationList class BedBlockEntity(connection: PlayConnection) : BlockEntity(connection) { var color = ChatColors.RED @@ -58,8 +60,9 @@ class BedBlockEntity(connection: PlayConnection) : BlockEntity(connection) { } ?: ChatColors.RED } - companion object : BlockEntityFactory { + companion object : BlockEntityFactory, MultiResourceLocationAble { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:bed") + override val ALIASES: Set = setOf("minecraft:Bed").toResourceLocationList() override fun build(connection: PlayConnection): BedBlockEntity { return BedBlockEntity(connection) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt index 139b86186..0e35faa4b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt @@ -13,11 +13,13 @@ package de.bixilon.minosoft.data.entities.block +import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.KUtil.nullCast +import de.bixilon.minosoft.util.KUtil.toResourceLocationList class SignBlockEntity(connection: PlayConnection) : BlockEntity(connection) { var lines: Array = Array(ProtocolDefinition.SIGN_LINES) { ChatComponent.of("") } @@ -31,8 +33,9 @@ class SignBlockEntity(connection: PlayConnection) : BlockEntity(connection) { } } - companion object : BlockEntityFactory { + companion object : BlockEntityFactory, MultiResourceLocationAble { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:sign") + override val ALIASES: Set = setOf("minecraft:Sign").toResourceLocationList() override fun build(connection: PlayConnection): SignBlockEntity { return SignBlockEntity(connection) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt index bce4e65c2..9958e209e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt @@ -13,13 +13,16 @@ package de.bixilon.minosoft.data.entities.block +import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection +import de.bixilon.minosoft.util.KUtil.toResourceLocationList class SkullBlockEntity(connection: PlayConnection) : BlockEntity(connection) { - companion object : BlockEntityFactory { + companion object : BlockEntityFactory, MultiResourceLocationAble { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:skull") + override val ALIASES: Set = setOf("minecraft:Skull").toResourceLocationList() override fun build(connection: PlayConnection): SkullBlockEntity { return SkullBlockEntity(connection) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt index e6bce2404..ad7e1d7c1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt @@ -14,14 +14,17 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory +import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection +import de.bixilon.minosoft.util.KUtil.toResourceLocationList class HopperBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { - companion object : BlockEntityFactory { + companion object : BlockEntityFactory, MultiResourceLocationAble { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:hopper") + override val ALIASES: Set = setOf("minecraft:Hopper").toResourceLocationList() override fun build(connection: PlayConnection): HopperBlockEntity { return HopperBlockEntity(connection) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt index e19f5d738..a1394eaa1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt @@ -14,13 +14,16 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory +import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection +import de.bixilon.minosoft.util.KUtil.toResourceLocationList class ChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) { - companion object : BlockEntityFactory { + companion object : BlockEntityFactory, MultiResourceLocationAble { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:chest") + override val ALIASES: Set = setOf("minecraft:Chest").toResourceLocationList() override fun build(connection: PlayConnection): ChestBlockEntity { return ChestBlockEntity(connection) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt index 7f95beabc..5db72142f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt @@ -14,13 +14,16 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory +import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection +import de.bixilon.minosoft.util.KUtil.toResourceLocationList class EnderChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) { - companion object : BlockEntityFactory { + companion object : BlockEntityFactory, MultiResourceLocationAble { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:ender_chest") + override val ALIASES: Set = setOf("minecraft:EnderChest").toResourceLocationList() override fun build(connection: PlayConnection): EnderChestBlockEntity { return EnderChestBlockEntity(connection)