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

Remove toImmutableList

Browse Source
This commit is contained in:
DBotThePony 2025-03-30 18:47:18 +07:00
parent 844323ead6
commit 339cacc545
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/ExopackInventoryTransferHandler.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.mc.otm.compat.jei package ru.dbotthepony.mc.otm.compat.jei
import com.google.common.collect.ImmutableList
import it.unimi.dsi.fastutil.ints.Int2IntArrayMap import it.unimi.dsi.fastutil.ints.Int2IntArrayMap
import it.unimi.dsi.fastutil.ints.IntArraySet import it.unimi.dsi.fastutil.ints.IntArraySet
import mezz.jei.api.constants.RecipeTypes import mezz.jei.api.constants.RecipeTypes
@ -16,7 +17,6 @@ import net.minecraft.world.inventory.Slot
import net.minecraft.world.item.crafting.CraftingRecipe import net.minecraft.world.item.crafting.CraftingRecipe
import net.minecraft.world.item.crafting.RecipeHolder import net.minecraft.world.item.crafting.RecipeHolder
import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.toImmutableList
import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
@ -116,9 +116,9 @@ class ExopackInventoryTransferHandler(private val helper: IRecipeTransferHandler
} }
} }
val outputs = recipeSlots.getSlotViews(RecipeIngredientRole.OUTPUT).toImmutableList() val outputs = ImmutableList.copyOf(recipeSlots.getSlotViews(RecipeIngredientRole.OUTPUT))
val catalysts = recipeSlots.getSlotViews(RecipeIngredientRole.CATALYST).toImmutableList() val catalysts = ImmutableList.copyOf(recipeSlots.getSlotViews(RecipeIngredientRole.CATALYST))
val render = recipeSlots.getSlotViews(RecipeIngredientRole.RENDER_ONLY).toImmutableList() val render = ImmutableList.copyOf(recipeSlots.getSlotViews(RecipeIngredientRole.RENDER_ONLY))
val combine = ArrayList<IRecipeSlotView>(filteredInputs.size + outputs.size + render.size) val combine = ArrayList<IRecipeSlotView>(filteredInputs.size + outputs.size + render.size)
@ -126,7 +126,7 @@ class ExopackInventoryTransferHandler(private val helper: IRecipeTransferHandler
combine.addAll(outputs) combine.addAll(outputs)
combine.addAll(render) combine.addAll(render)
val combined = combine.toImmutableList() val combined = ImmutableList.copyOf(combine)
val newView = object : IRecipeSlotsView { val newView = object : IRecipeSlotsView {
override fun getSlotViews(): List<IRecipeSlotView> { override fun getSlotViews(): List<IRecipeSlotView> {

4
src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt
View File

@ -131,10 +131,6 @@ operator fun <S : StateHolder<*, *>, T : Comparable<T>> S.set(property: Property
return setValue(property, value) as S return setValue(property, value) as S
} }
fun <T> List<T>.toImmutableList(): List<T> {
return ImmutableList.copyOf(this)
}
operator fun <R> (() -> R).getValue(thisRef: Any, property: KProperty<*>): R { operator fun <R> (() -> R).getValue(thisRef: Any, property: KProperty<*>): R {
return invoke() return invoke()
} }