From ab1446b6820692daec1e3a3f3ca16005cc259ed5 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 28 Feb 2025 09:10:03 +0700
Subject: [PATCH] Move SlottedContainer to subpackage

---
 .../mc/otm/container/{ => slotted}/ContainerSlot.kt   |  7 +++++--
 .../otm/container/{ => slotted}/SlottedContainer.kt   | 11 +++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename src/main/kotlin/ru/dbotthepony/mc/otm/container/{ => slotted}/ContainerSlot.kt (94%)
 rename src/main/kotlin/ru/dbotthepony/mc/otm/container/{ => slotted}/SlottedContainer.kt (94%)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerSlot.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt
similarity index 94%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerSlot.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt
index 2ab6e6119..990bb32fc 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerSlot.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.container
+package ru.dbotthepony.mc.otm.container.slotted
 
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.registries.BuiltInRegistries
@@ -9,6 +9,8 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.neoforged.neoforge.common.util.INBTSerializable
 import org.apache.logging.log4j.LogManager
+import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot
+import ru.dbotthepony.mc.otm.container.IFilteredAutomatedContainerSlot
 import ru.dbotthepony.mc.otm.core.isNotEmpty
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.registryName
@@ -130,7 +132,8 @@ open class ContainerSlot(
 		listener: (new: ItemStack, old: ItemStack) -> Unit,
 		maxStackSize: Int = Item.DEFAULT_MAX_STACK_SIZE,
 	) : Simple(listener, maxStackSize) {
-		protected open inner class Instance(container: SlottedContainer, slot: Int) : Simple.Instance(container, slot), IFilteredAutomatedContainerSlot {
+		protected open inner class Instance(container: SlottedContainer, slot: Int) : Simple.Instance(container, slot),
+			IFilteredAutomatedContainerSlot {
 			override var filter: Item? = null
 				set(value) {
 					if (field !== value) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/SlottedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt
similarity index 94%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/container/SlottedContainer.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt
index 18dde606f..45c7d60b9 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/SlottedContainer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.container
+package ru.dbotthepony.mc.otm.container.slotted
 
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
@@ -14,6 +14,9 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.neoforged.neoforge.common.util.INBTSerializable
 import org.apache.logging.log4j.LogManager
+import ru.dbotthepony.mc.otm.container.IAutomatedContainer
+import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot
+import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot
 import ru.dbotthepony.mc.otm.core.isNotEmpty
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.data.codec.minRange
@@ -83,7 +86,7 @@ class SlottedContainer(
 				it.group(
 					ItemStack.OPTIONAL_CODEC.fieldOf("item").forGetter { it.item },
 					Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot },
-				).apply(it, ::LegacySerializedItem)
+				).apply(it, SlottedContainer::LegacySerializedItem)
 			}
 		}
 	}
@@ -94,7 +97,7 @@ class SlottedContainer(
 				it.group(
 					BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter { it.item },
 					Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot },
-				).apply(it, ::LegacySerializedFilter)
+				).apply(it, SlottedContainer::LegacySerializedFilter)
 			}
 		}
 	}
@@ -108,7 +111,7 @@ class SlottedContainer(
 				it.group(
 					Codec.list(LegacySerializedItem.CODEC).fieldOf("items").forGetter { it.items },
 					Codec.list(LegacySerializedFilter.CODEC).fieldOf("filters").forGetter { it.filters },
-				).apply(it, ::LegacySerializedState)
+				).apply(it, SlottedContainer::LegacySerializedState)
 			}
 		}
 	}