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

useless

Browse Source
This commit is contained in:
DBotThePony 2022-09-25 21:19:55 +07:00
parent eb34844222
commit 7f99f6f03e
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
View File

@ -1,25 +1,19 @@
package ru.dbotthepony.mc.otm.compat.curios package ru.dbotthepony.mc.otm.compat.curios
import com.google.common.collect.Iterators
import com.google.common.collect.Streams import com.google.common.collect.Streams
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap
import net.minecraft.world.entity.player.Player import net.minecraft.world.entity.player.Player
import net.minecraft.world.inventory.Slot import net.minecraft.world.inventory.Slot
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
import net.minecraftforge.fml.ModList import net.minecraftforge.fml.ModList
import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.MatteryCapability
import ru.dbotthepony.mc.otm.container.awareIterator
import ru.dbotthepony.mc.otm.container.awareStream import ru.dbotthepony.mc.otm.container.awareStream
import ru.dbotthepony.mc.otm.container.iterator
import ru.dbotthepony.mc.otm.container.stream import ru.dbotthepony.mc.otm.container.stream
import ru.dbotthepony.mc.otm.core.AwareItemStack import ru.dbotthepony.mc.otm.core.AwareItemStack
import ru.dbotthepony.mc.otm.core.EmptyMutableIterator
import ru.dbotthepony.mc.otm.core.IAwareItemStackIterator
import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.core.orNull
import top.theillusivec4.curios.api.CuriosApi import top.theillusivec4.curios.api.CuriosApi
import top.theillusivec4.curios.common.inventory.CosmeticCurioSlot import top.theillusivec4.curios.common.inventory.CosmeticCurioSlot
import top.theillusivec4.curios.common.inventory.CurioSlot import top.theillusivec4.curios.common.inventory.CurioSlot
import java.util.LinkedList import java.util.*
import java.util.stream.Stream import java.util.stream.Stream
val isCuriosLoaded by lazy { val isCuriosLoaded by lazy {

3
src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerIterator.kt
View File

@ -4,7 +4,6 @@ import it.unimi.dsi.fastutil.objects.ObjectIterators
import net.minecraft.world.Container import net.minecraft.world.Container
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
import ru.dbotthepony.mc.otm.core.ContainerItemStackEntry import ru.dbotthepony.mc.otm.core.ContainerItemStackEntry
import ru.dbotthepony.mc.otm.core.IAwareItemStackIterator
import ru.dbotthepony.mc.otm.core.AwareItemStack import ru.dbotthepony.mc.otm.core.AwareItemStack
class ContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedListIterator<ItemStack>(0, initialPosition), MutableListIterator<ItemStack> { class ContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedListIterator<ItemStack>(0, initialPosition), MutableListIterator<ItemStack> {
@ -33,7 +32,7 @@ class ContainerIterator(private val container: Container, initialPosition: Int =
} }
} }
class AwareContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedIterator<AwareItemStack>(0, initialPosition), IAwareItemStackIterator { class AwareContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedIterator<AwareItemStack>(0, initialPosition), Iterator<AwareItemStack> {
init { init {
require(initialPosition in 0 .. container.containerSize) { "Invalid initial position: $initialPosition" } require(initialPosition in 0 .. container.containerSize) { "Invalid initial position: $initialPosition" }
} }

2
src/main/kotlin/ru/dbotthepony/mc/otm/core/AwareItemStack.kt
View File

@ -21,8 +21,6 @@ interface AwareItemStack {
fun extract(amount: Int, simulate: Boolean = true): ItemStack fun extract(amount: Int, simulate: Boolean = true): ItemStack
} }
typealias IAwareItemStackIterator = Iterator<AwareItemStack>
data class ContainerItemStackEntry(val index: Int, val container: Container) : AwareItemStack { data class ContainerItemStackEntry(val index: Int, val container: Container) : AwareItemStack {
override fun component0(): ItemStack { override fun component0(): ItemStack {
return container[index] return container[index]