From 67fc8f99f62902201c01bf76413fd7badbc106fd Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 6 Mar 2025 22:30:42 +0700 Subject: [PATCH] ooprs!! --- .../ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt | 6 +++--- .../ru/dbotthepony/mc/otm/container/ISlottedContainer.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt index 6edd68823..1c2a1994b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt @@ -216,7 +216,7 @@ interface IEnhancedContainer : IContainer, RecipeInput, Iterable, Sta return list } - fun addItem(stack: ItemStack, simulate: Boolean, slots: IntSet = slotRange, onlyIntoExisting: Boolean = false, popTime: Int? = null): ItemStack { + fun addItem(stack: ItemStack, simulate: Boolean, slots: IntCollection = slotRange, onlyIntoExisting: Boolean = false, popTime: Int? = null): ItemStack { if (stack.isEmpty || slots.isEmpty()) return stack @@ -277,7 +277,7 @@ interface IEnhancedContainer : IContainer, RecipeInput, Iterable, Sta * * @return Whenever [stack] was modified */ - fun consumeItem(stack: ItemStack, simulate: Boolean, slots: IntSet = slotRange, onlyIntoExisting: Boolean = false, popTime: Int? = null): Boolean { + fun consumeItem(stack: ItemStack, simulate: Boolean, slots: IntCollection = slotRange, onlyIntoExisting: Boolean = false, popTime: Int? = null): Boolean { if (stack.isEmpty || slots.isEmpty()) return false @@ -286,7 +286,7 @@ interface IEnhancedContainer : IContainer, RecipeInput, Iterable, Sta return result.count != stack.count } - fun fullyAddItem(stack: ItemStack, slots: IntSet = slotRange, onlyIntoExisting: Boolean = false, popTime: Int? = null): Boolean { + fun fullyAddItem(stack: ItemStack, slots: IntCollection = slotRange, onlyIntoExisting: Boolean = false, popTime: Int? = null): Boolean { if (!addItem(stack, true, slots, onlyIntoExisting, popTime).isEmpty) return false diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ISlottedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ISlottedContainer.kt index 92530f6a3..8e2442836 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ISlottedContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ISlottedContainer.kt @@ -156,7 +156,7 @@ interface ISlottedContainer : IEnhancedContainer { override fun addItem( stack: ItemStack, simulate: Boolean, - slots: IntSet, + slots: IntCollection, onlyIntoExisting: Boolean, popTime: Int? ): ItemStack { @@ -166,14 +166,14 @@ interface ISlottedContainer : IEnhancedContainer { override fun consumeItem( stack: ItemStack, simulate: Boolean, - slots: IntSet, + slots: IntCollection, onlyIntoExisting: Boolean, popTime: Int? ): Boolean { return consumeItem(stack, simulate, slots, onlyIntoExisting, popTime, ignoreFilters = false) } - override fun fullyAddItem(stack: ItemStack, slots: IntSet, onlyIntoExisting: Boolean, popTime: Int?): Boolean { + override fun fullyAddItem(stack: ItemStack, slots: IntCollection, onlyIntoExisting: Boolean, popTime: Int?): Boolean { return fullyAddItem(stack, slots, onlyIntoExisting, popTime, ignoreFilters = false) } }