DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 64 Pull Requests Packages Releases Wiki Activity

Move SlottedContainer to subpackage

Browse Source
This commit is contained in:
DBotThePony 2025-02-28 09:10:03 +07:00
parent 6764af0dcc
commit ab1446b682
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerSlot.kt → src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt
View File

@ -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.HolderLookup
import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.BuiltInRegistries
@ -9,6 +9,8 @@ import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
import net.neoforged.neoforge.common.util.INBTSerializable import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager 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.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.set import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.core.registryName
@ -130,7 +132,8 @@ open class ContainerSlot(
listener: (new: ItemStack, old: ItemStack) -> Unit, listener: (new: ItemStack, old: ItemStack) -> Unit,
maxStackSize: Int = Item.DEFAULT_MAX_STACK_SIZE, maxStackSize: Int = Item.DEFAULT_MAX_STACK_SIZE,
) : Simple(listener, maxStackSize) { ) : 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 override var filter: Item? = null
set(value) { set(value) {
if (field !== value) { if (field !== value) {

11
src/main/kotlin/ru/dbotthepony/mc/otm/container/SlottedContainer.kt → src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt
View File

@ -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.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
@ -14,6 +14,9 @@ import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
import net.neoforged.neoforge.common.util.INBTSerializable import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager 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.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.set import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.data.codec.minRange
@ -83,7 +86,7 @@ class SlottedContainer(
it.group( it.group(
ItemStack.OPTIONAL_CODEC.fieldOf("item").forGetter { it.item }, ItemStack.OPTIONAL_CODEC.fieldOf("item").forGetter { it.item },
Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot }, Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot },
).apply(it, ::LegacySerializedItem) ).apply(it, SlottedContainer::LegacySerializedItem)
} }
} }
} }
@ -94,7 +97,7 @@ class SlottedContainer(
it.group( it.group(
BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter { it.item }, BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter { it.item },
Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot }, Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot },
).apply(it, ::LegacySerializedFilter) ).apply(it, SlottedContainer::LegacySerializedFilter)
} }
} }
} }
@ -108,7 +111,7 @@ class SlottedContainer(
it.group( it.group(
Codec.list(LegacySerializedItem.CODEC).fieldOf("items").forGetter { it.items }, Codec.list(LegacySerializedItem.CODEC).fieldOf("items").forGetter { it.items },
Codec.list(LegacySerializedFilter.CODEC).fieldOf("filters").forGetter { it.filters }, Codec.list(LegacySerializedFilter.CODEC).fieldOf("filters").forGetter { it.filters },
).apply(it, ::LegacySerializedState) ).apply(it, SlottedContainer::LegacySerializedState)
} }
} }
} }