add some abstraction layers to block entities

src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt

@@ -13,6 +13,8 @@
 
 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.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 

src/main/java/de/bixilon/minosoft/data/entities/block/container/BlastFurnaceBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class BlastFurnaceBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class BlastFurnaceBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
     companion object : BlockEntityFactory<BlastFurnaceBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:blast_furnace")

src/main/java/de/bixilon/minosoft/data/entities/block/container/BrewingStandBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class BrewingStandBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class BrewingStandBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
     companion object : BlockEntityFactory<BrewingStandBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:brewing_stand")

src/main/java/de/bixilon/minosoft/data/entities/block/container/ContainerBlockEntity.kt

@@ -0,0 +1,19 @@
+/*
+ * Minosoft
+ * Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ * This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.data.entities.block.container
+
+import de.bixilon.minosoft.data.entities.block.BlockEntity
+import de.bixilon.minosoft.protocol.network.connection.PlayConnection
+
+abstract class ContainerBlockEntity(connection: PlayConnection) : BlockEntity(connection)

src/main/java/de/bixilon/minosoft/data/entities/block/container/DispenserBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class DispenserBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class DispenserBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
     companion object : BlockEntityFactory<DispenserBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:dispenser")

src/main/java/de/bixilon/minosoft/data/entities/block/container/DropperBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class DropperBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class DropperBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
     companion object : BlockEntityFactory<DropperBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:dropper")

src/main/java/de/bixilon/minosoft/data/entities/block/container/FurnaceBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class FurnaceBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class FurnaceBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
     companion object : BlockEntityFactory<FurnaceBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:furnace")

src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class HopperBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class HopperBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
 
     companion object : BlockEntityFactory<HopperBlockEntity> {

src/main/java/de/bixilon/minosoft/data/entities/block/container/SmokerBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class SmokerBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class SmokerBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
     companion object : BlockEntityFactory<SmokerBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:smoker")

src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/BarrelBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container.storage
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class BarrelBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class BarrelBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
     companion object : BlockEntityFactory<BarrelBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:barrel")

src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container.storage
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class ChestBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class ChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
     companion object : BlockEntityFactory<ChestBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:chest")

src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container.storage
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class EnderChestBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class EnderChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
     companion object : BlockEntityFactory<EnderChestBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:ender_chest")

src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ShulkerBoxBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container.storage
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class ShulkerBoxBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class ShulkerBoxBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
     companion object : BlockEntityFactory<ShulkerBoxBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:shulker_box")

src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/StorageBlockEntity.kt

@@ -0,0 +1,19 @@
+/*
+ * Minosoft
+ * Copyright (C) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ * This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.data.entities.block.container.storage
+
+import de.bixilon.minosoft.data.entities.block.container.ContainerBlockEntity
+import de.bixilon.minosoft.protocol.network.connection.PlayConnection
+
+abstract class StorageBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection)

src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/TrappedChestBlockEntity.kt

@@ -11,12 +11,13 @@
  * 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.container.storage
 
+import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
 import de.bixilon.minosoft.data.mappings.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 
-class TrappedChestBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
+class TrappedChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
     companion object : BlockEntityFactory<TrappedChestBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:trapped_chest")