From eaaae3bdb5f943ef126733e9a1c9d2e81a6b955a Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 15 Sep 2022 20:59:46 +0700 Subject: [PATCH] remove extended inventory iterator --- .../ru/dbotthepony/mc/otm/capability/Ext.kt | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt index fdb181a61..7906e85d0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt @@ -192,58 +192,3 @@ fun Player.allItemsStream(): Stream { itemsStream().filter { it.isEmpty || it !in seen }, containerMenu.slots.stream().map { it.item }) } - -fun Player.extendedItemIterator(): MutableIterator { - return object : MutableIterator { - private val regular = this@extendedItemIterator.inventory.iterator() - private val mattery: MutableIterator - private var isSecond = false - - init { - val get = this@extendedItemIterator.matteryPlayer - - if (get != null && get.hasExoSuit) { - mattery = get.exoSuitContainer.iterator() - } else { - mattery = object : MutableIterator { - override fun hasNext(): Boolean { - return false - } - - override fun next(): ItemStack { - throw UnsupportedOperationException() - } - - override fun remove() { - throw UnsupportedOperationException() - } - } - } - } - - override fun hasNext(): Boolean { - return regular.hasNext() || mattery.hasNext() - } - - override fun next(): ItemStack { - if (isSecond) { - return mattery.next() - } - - if (!regular.hasNext()) { - isSecond = true - return mattery.next() - } - - return regular.next() - } - - override fun remove() { - if (isSecond) { - mattery.remove() - } else { - regular.remove() - } - } - } -}