diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/generic/Generic9x3Container.kt b/src/main/java/de/bixilon/minosoft/data/container/types/generic/Generic9x3Container.kt
index 280f911d0..f8c369ae8 100644
--- a/src/main/java/de/bixilon/minosoft/data/container/types/generic/Generic9x3Container.kt
+++ b/src/main/java/de/bixilon/minosoft/data/container/types/generic/Generic9x3Container.kt
@@ -20,7 +20,7 @@ import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
 
-class Generic9x3Container(connection: PlayConnection, type: ContainerType, title: ChatComponent?) : GenericContainer(3, connection, type, title) {
+open class Generic9x3Container(connection: PlayConnection, type: ContainerType, title: ChatComponent?) : GenericContainer(3, connection, type, title) {
 
     companion object : ContainerFactory<Generic9x3Container> {
         override val identifier: ResourceLocation = "minecraft:generic_9x3".toResourceLocation()
diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/generic/ShulkerBoxContainer.kt b/src/main/java/de/bixilon/minosoft/data/container/types/generic/ShulkerBoxContainer.kt
new file mode 100644
index 000000000..d8ef747f9
--- /dev/null
+++ b/src/main/java/de/bixilon/minosoft/data/container/types/generic/ShulkerBoxContainer.kt
@@ -0,0 +1,50 @@
+/*
+ * Minosoft
+ * Copyright (C) 2020-2023 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.container.types.generic
+
+import de.bixilon.minosoft.data.container.Container
+import de.bixilon.minosoft.data.container.slots.SlotType
+import de.bixilon.minosoft.data.container.stack.ItemStack
+import de.bixilon.minosoft.data.registries.containers.ContainerFactory
+import de.bixilon.minosoft.data.registries.containers.ContainerType
+import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
+import de.bixilon.minosoft.data.registries.identified.ResourceLocation
+import de.bixilon.minosoft.data.text.ChatComponent
+import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
+
+
+class ShulkerBoxContainer(connection: PlayConnection, type: ContainerType, title: ChatComponent?) : Generic9x3Container(connection, type, title) {
+
+    override fun getSlotType(slotId: Int): SlotType? {
+        if (slotId in 0 until rows * SLOTS_PER_ROW) {
+            return ShulkerBoxSlotType
+        }
+        return super.getSlotType(slotId)
+    }
+
+    private object ShulkerBoxSlotType : SlotType {
+
+        override fun canPut(container: Container, slot: Int, stack: ItemStack): Boolean {
+            return stack.item.item.identifier == identifier // TODO: don't compare identifier
+        }
+    }
+
+    companion object : ContainerFactory<ShulkerBoxContainer> {
+        override val identifier: ResourceLocation = minecraft("shulker_box")
+
+        override fun build(connection: PlayConnection, type: ContainerType, title: ChatComponent?, slots: Int): ShulkerBoxContainer {
+            return ShulkerBoxContainer(connection, type, title)
+        }
+    }
+}
diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/generic/legacy/ShulkerBoxContainer.kt b/src/main/java/de/bixilon/minosoft/data/container/types/generic/legacy/ShulkerBoxContainer.kt
deleted file mode 100644
index ebf5ae832..000000000
--- a/src/main/java/de/bixilon/minosoft/data/container/types/generic/legacy/ShulkerBoxContainer.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Minosoft
- * Copyright (C) 2020-2023 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.container.types.generic.legacy
-
-import de.bixilon.minosoft.data.container.types.generic.Generic9x3Container
-import de.bixilon.minosoft.data.container.types.generic.GenericContainer
-import de.bixilon.minosoft.data.registries.containers.ContainerFactory
-import de.bixilon.minosoft.data.registries.containers.ContainerType
-import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
-import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
-
-
-object ShulkerBoxContainer : ContainerFactory<GenericContainer> {
-    override val identifier = minecraft("shulker_box")
-
-    override fun build(connection: PlayConnection, type: ContainerType, title: ChatComponent?, slots: Int): GenericContainer {
-        return Generic9x3Container(connection, type, title)
-    }
-}
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/containers/DefaultContainerFactories.kt b/src/main/java/de/bixilon/minosoft/data/registries/containers/DefaultContainerFactories.kt
index a63863baf..d8431003a 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/containers/DefaultContainerFactories.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/containers/DefaultContainerFactories.kt
@@ -18,7 +18,6 @@ import de.bixilon.minosoft.data.container.types.EnchantingContainer
 import de.bixilon.minosoft.data.container.types.PlayerInventory
 import de.bixilon.minosoft.data.container.types.generic.*
 import de.bixilon.minosoft.data.container.types.generic.legacy.ChestContainer
-import de.bixilon.minosoft.data.container.types.generic.legacy.ShulkerBoxContainer
 import de.bixilon.minosoft.data.container.types.processing.smelting.BlastFurnaceContainer
 import de.bixilon.minosoft.data.container.types.processing.smelting.FurnaceContainer
 import de.bixilon.minosoft.data.container.types.processing.smelting.SmokerContainer