From 75861b4cb2e83544d948facc800b7aa9b70a8cee Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 14 Jul 2021 17:25:23 +0200 Subject: [PATCH] structure block entities --- .../data/entities/block/DefaultBlockEntityMetaDataFactory.kt | 4 ++++ .../data/entities/block/{ => end}/EndGatewayBlockEntity.kt | 5 ++++- .../data/entities/block/{ => end}/EndPortalBlockEntity.kt | 5 ++++- .../entities/block/{ => redstone}/ComparatorBlockEntity.kt | 4 +++- .../block/{ => redstone}/DaylightDetectorBlockEntity.kt | 4 +++- 5 files changed, 18 insertions(+), 4 deletions(-) rename src/main/java/de/bixilon/minosoft/data/entities/block/{ => end}/EndGatewayBlockEntity.kt (86%) rename src/main/java/de/bixilon/minosoft/data/entities/block/{ => end}/EndPortalBlockEntity.kt (84%) rename src/main/java/de/bixilon/minosoft/data/entities/block/{ => redstone}/ComparatorBlockEntity.kt (87%) rename src/main/java/de/bixilon/minosoft/data/entities/block/{ => redstone}/DaylightDetectorBlockEntity.kt (88%) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt index 95ffb95ac..7d4ecc32f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt @@ -15,8 +15,12 @@ package de.bixilon.minosoft.data.entities.block import de.bixilon.minosoft.data.entities.block.container.* import de.bixilon.minosoft.data.entities.block.container.storage.* +import de.bixilon.minosoft.data.entities.block.end.EndGatewayBlockEntity +import de.bixilon.minosoft.data.entities.block.end.EndPortalBlockEntity import de.bixilon.minosoft.data.entities.block.piston.PistonBlockEntity import de.bixilon.minosoft.data.entities.block.piston.StickyPistonBlockEntity +import de.bixilon.minosoft.data.entities.block.redstone.ComparatorBlockEntity +import de.bixilon.minosoft.data.entities.block.redstone.DaylightDetectorBlockEntity import de.bixilon.minosoft.data.registries.factory.DefaultFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/end/EndGatewayBlockEntity.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt rename to src/main/java/de/bixilon/minosoft/data/entities/block/end/EndGatewayBlockEntity.kt index d77b96258..1adcde50b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/end/EndGatewayBlockEntity.kt @@ -11,8 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.entities.block +package de.bixilon.minosoft.data.entities.block.end +import de.bixilon.minosoft.data.entities.block.BlockActionEntity +import de.bixilon.minosoft.data.entities.block.BlockEntity +import de.bixilon.minosoft.data.entities.block.BlockEntityFactory import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/EndPortalBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/end/EndPortalBlockEntity.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/entities/block/EndPortalBlockEntity.kt rename to src/main/java/de/bixilon/minosoft/data/entities/block/end/EndPortalBlockEntity.kt index b94e5c148..9fee6d2d5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/EndPortalBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/end/EndPortalBlockEntity.kt @@ -11,8 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.entities.block +package de.bixilon.minosoft.data.entities.block.end +import de.bixilon.minosoft.data.entities.block.BlockEntity +import de.bixilon.minosoft.data.entities.block.BlockEntityFactory +import de.bixilon.minosoft.data.entities.block.JukeboxBlockEntity import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/redstone/ComparatorBlockEntity.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt rename to src/main/java/de/bixilon/minosoft/data/entities/block/redstone/ComparatorBlockEntity.kt index 984e57ec7..0ecc10e55 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/redstone/ComparatorBlockEntity.kt @@ -11,8 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.entities.block +package de.bixilon.minosoft.data.entities.block.redstone +import de.bixilon.minosoft.data.entities.block.BlockEntity +import de.bixilon.minosoft.data.entities.block.BlockEntityFactory import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/redstone/DaylightDetectorBlockEntity.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt rename to src/main/java/de/bixilon/minosoft/data/entities/block/redstone/DaylightDetectorBlockEntity.kt index edfc75b8a..0b2d28db9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/redstone/DaylightDetectorBlockEntity.kt @@ -11,8 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.entities.block +package de.bixilon.minosoft.data.entities.block.redstone +import de.bixilon.minosoft.data.entities.block.BlockEntity +import de.bixilon.minosoft.data.entities.block.BlockEntityFactory import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection