Merge branch 'refactor-containers'

Author: Bixilon

doc/modding/Container.md

@@ -30,6 +30,7 @@ import de.bixilon.minosoft.gui.rendering.system.window.WindowFactory
 import de.bixilon.minosoft.gui.rendering.system.window.dummy.DummyWindow
 import de.bixilon.minosoft.main.BootTasks
 import de.bixilon.minosoft.main.MinosoftBoot
+import de.bixilon.minosoft.protocol.versions.Versions
 import de.bixilon.minosoft.terminal.RunConfiguration
 import de.bixilon.minosoft.test.IT
 import de.bixilon.minosoft.test.ITUtil
@@ -87,6 +88,7 @@ internal object MinosoftSIT {
         val (version, registries) = ITUtil.loadPixlyzerData(IT.TEST_VERSION_NAME)
         IT.VERSION = version
         IT.REGISTRIES = registries
+        ITUtil.loadPreFlatteningData(Versions["1.12.2"]!!).let { IT.REGISTRIES_PRE_FLATTENING = it }
         IT.FALLBACK_TAGS = FallbackTags.map(registries)
 
         IT::BLOCK_1.forceSet(registries.block[StoneBlock.Block]!!.states.default)

src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt

@@ -40,28 +40,28 @@ object ContainerTestUtil {
     }
 
     fun createContainer(session: PlaySession = createSession()): Container {
-        val container = UnknownContainer(session, this.container)
+        val container = UnknownContainer(session, this.container, id = 9)
         session.player.items.containers[9] = container
         return container
     }
 
     fun createChest(session: PlaySession = createSession()): Generic9x3Container {
-        val container = Generic9x3Container(session, this.chest, null)
+        val container = Generic9x3Container(session, this.chest, null, id = 9)
         session.player.items.containers[9] = container
         return container
     }
 
     fun createFurnace(session: PlaySession = createSession()): FurnaceContainer {
-        val container = FurnaceContainer(session, this.furnace, null)
+        val container = FurnaceContainer(session, this.furnace, null, id = 9)
         session.player.items.containers[9] = container
         return container
     }
 
     private object GenericContainerFactory : ContainerFactory<Container> {
         override val identifier: ResourceLocation = minosoft("test")
 
-        override fun build(session: PlaySession, type: ContainerType, title: ChatComponent?, slots: Int): Container {
-            return UnknownContainer(session, type, title)
+        override fun build(session: PlaySession, type: ContainerType, title: ChatComponent?, slots: Int, id: Int): Container {
+            return UnknownContainer(session, type, title, id)
         }
     }
 }

src/integration-test/kotlin/de/bixilon/minosoft/data/container/ContainerTestUtil.kt

@@ -0,0 +1,34 @@
+/*
+ * Minosoft
+ * Copyright (C) 2020-2025 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
+
+import org.testng.AssertJUnit.assertNull
+import org.testng.annotations.Test
+
+@Test(groups = ["item_stack"], dependsOnGroups = ["item"])
+class ItemStackUtilTest {
+
+    fun `no count null`() {
+        val item = ItemStackUtil.of(TestItem1, 0)
+        assertNull(item)
+    }
+
+    // TODO: dye color
+
+
+    // TODO: HideFlags
+
+
+    // TODO: hide, nbt, serialize
+}

src/integration-test/kotlin/de/bixilon/minosoft/data/container/ItemStackUtilTest.kt

@@ -0,0 +1,43 @@
+/*
+ * Minosoft
+ * Copyright (C) 2020-2025 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
+
+import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft
+import de.bixilon.minosoft.data.registries.item.items.DurableItem
+import de.bixilon.minosoft.data.registries.item.items.Item
+import de.bixilon.minosoft.data.registries.item.stack.StackableItem
+
+object TestItem1 : Item(minosoft("test1"))
+object TestItem2 : Item(minosoft("test2"))
+object TestItem3 : Item(minosoft("test3"))
+
+object StackableTest1 : Item(minosoft("stackable_test1")), StackableItem {
+    override val maxStackSize get() = 64
+}
+
+object StackableTest2 : Item(minosoft("stackable_test2")), StackableItem {
+    override val maxStackSize get() = 64
+}
+
+object StackableTest3 : Item(minosoft("stackable_test3")), StackableItem {
+    override val maxStackSize get() = 16
+}
+
+object DurableTestItem1 : Item(minosoft("durable_test1")), DurableItem {
+    override val maxDurability get() = 100
+}
+
+object DurableTestItem2 : Item(minosoft("durable_test2")), DurableItem {
+    override val maxDurability get() = 100
+}

src/integration-test/kotlin/de/bixilon/minosoft/data/container/TestItem.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2024 Moritz Zwerger
+ * Copyright (C) 2020-2025 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.
  *
@@ -15,10 +15,11 @@ package de.bixilon.minosoft.data.container.actions
 
 import de.bixilon.minosoft.data.container.ContainerTestUtil.createContainer
 import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf
+import de.bixilon.minosoft.data.container.StackableTest1
+import de.bixilon.minosoft.data.container.StackableTest2
+import de.bixilon.minosoft.data.container.StackableTest3
 import de.bixilon.minosoft.data.container.actions.types.CloneContainerAction
 import de.bixilon.minosoft.data.container.stack.ItemStack
-import de.bixilon.minosoft.data.registries.items.AppleTest0
-import de.bixilon.minosoft.data.registries.items.EggTest0
 import de.bixilon.minosoft.protocol.network.session.play.PacketTestUtil.assertNoPacket
 import de.bixilon.minosoft.protocol.network.session.play.PacketTestUtil.assertOnlyPacket
 import de.bixilon.minosoft.protocol.network.session.play.SessionTestUtil.createSession
@@ -33,70 +34,60 @@ class CloneContainerActionTest {
     fun testEmpty() {
         val session = createSession()
         val container = createContainer(session)
-        container.actions.invoke(CloneContainerAction(0))
-        assertNull(container.floatingItem)
+        container.execute(CloneContainerAction(0))
+        assertNull(container.floating)
         session.assertNoPacket()
     }
 
     fun testAlready1() {
         val session = createSession()
         val container = createContainer(session)
-        container.floatingItem = ItemStack(EggTest0.item, count = 7)
-        container.actions.invoke(CloneContainerAction(6))
-        assertEquals(container.floatingItem, ItemStack(EggTest0.item, count = 7))
-        assertNull(container[6])
+        container.floating = ItemStack(StackableTest1, count = 7)
+        container.execute(CloneContainerAction(6))
+        assertEquals(container.floating, ItemStack(StackableTest1, count = 7))
+        assertNull(container.items[6])
         session.assertNoPacket()
     }
 
     fun testAlready2() {
         val session = createSession()
         val container = createContainer(session)
-        container[6] = ItemStack(AppleTest0.item, count = 7)
-        container.floatingItem = ItemStack(EggTest0.item, count = 7)
-        container.actions.invoke(CloneContainerAction(6))
-        assertEquals(container.floatingItem, ItemStack(EggTest0.item, count = 7))
-        assertEquals(container[6], ItemStack(AppleTest0.item, count = 7))
+        container.items[6] = ItemStack(StackableTest2, count = 7)
+        container.floating = ItemStack(StackableTest1, count = 7)
+        container.execute(CloneContainerAction(6))
+        assertEquals(container.floating, ItemStack(StackableTest1, count = 7))
+        assertEquals(container.items[6], ItemStack(StackableTest2, count = 7))
         session.assertNoPacket()
     }
 
     fun testTaking() {
         val session = createSession()
         val container = createContainer(session)
-        container[1] = ItemStack(AppleTest0.item)
-        container.actions.invoke(CloneContainerAction(1))
-        assertEquals(container.floatingItem, ItemStack(AppleTest0.item, count = 64))
+        container.items[1] = ItemStack(StackableTest1)
+        container.execute(CloneContainerAction(1))
+        assertEquals(container.floating, ItemStack(StackableTest1, count = 64))
         // TODO: Not sending any packet in 1.18.2?
-        session.assertOnlyPacket(ContainerClickC2SP(9, container.serverRevision, 1, 3, 0, 0, slotsOf(), ItemStack(AppleTest0.item, count = 64)))
+        session.assertOnlyPacket(ContainerClickC2SP(9, container.serverRevision, 1, 3, 0, 0, slotsOf(), ItemStack(StackableTest1, count = 64)))
     }
 
     fun taskTalking2() {
         val session = createSession()
         val container = createContainer(session)
-        container[3] = ItemStack(AppleTest0.item, count = 8)
-        container.actions.invoke(CloneContainerAction(3))
-        assertEquals(container.floatingItem, ItemStack(AppleTest0.item, count = 64))
+        container.items[3] = ItemStack(StackableTest1, count = 8)
+        container.execute(CloneContainerAction(3))
+        assertEquals(container.floating, ItemStack(StackableTest1, count = 64))
         // TODO: Not sending any packet in 1.18.2?
-        session.assertOnlyPacket(ContainerClickC2SP(9, container.serverRevision, 3, 3, 0, 0, slotsOf(), ItemStack(AppleTest0.item, count = 64)))
+        session.assertOnlyPacket(ContainerClickC2SP(9, container.serverRevision, 3, 3, 0, 0, slotsOf(), ItemStack(StackableTest1, count = 64)))
     }
 
     fun testStackLimit() {
         val session = createSession()
         val container = createContainer(session)
-        container[8] = ItemStack(EggTest0.item, count = 9)
-        container.actions.invoke(CloneContainerAction(8))
-        assertEquals(container.floatingItem, ItemStack(EggTest0.item, count = 16))
+        container.items[8] = ItemStack(StackableTest3, count = 9)
+        container.execute(CloneContainerAction(8))
+        assertEquals(container.floating, ItemStack(StackableTest3, count = 16))
         // TODO: Not sending any packet in 1.18.2?
-        session.assertOnlyPacket(ContainerClickC2SP(9, container.serverRevision, 8, 3, 0, 0, slotsOf(), ItemStack(EggTest0.item, count = 16)))
+        session.assertOnlyPacket(ContainerClickC2SP(9, container.serverRevision, 8, 3, 0, 0, slotsOf(), ItemStack(StackableTest3, count = 16)))
     }
 
-    fun testRevert() {
-        val session = createSession()
-        val container = createContainer(session)
-        container[8] = ItemStack(EggTest0.item, count = 9)
-        val action = CloneContainerAction(8)
-        container.actions.invoke(action)
-        assertEquals(container.floatingItem, ItemStack(EggTest0.item, count = 16))
-        container.actions.revert(action)
-        assertNull(container.floatingItem)
-    }
 }