From c671d2e13d7eb6bd2aadc48216520bb63dab6220 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 2 Mar 2023 22:17:22 +0700 Subject: [PATCH] Wasn't the best idea to write immutable list helper with uppercase I --- .../block/entity/matter/MatterCapacitorBankBlockEntity.kt | 4 ++-- .../mc/otm/block/entity/tech/BatteryBankBlockEntity.kt | 4 ++-- .../mc/otm/client/render/blockentity/BankRenderer.kt | 6 +++--- src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt | 2 +- .../ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt | 4 ++-- .../mc/otm/menu/decorative/MinecartCargoCrateMenu.kt | 4 ++-- .../ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt | 4 ++-- .../mc/otm/menu/matter/MatterCapacitorBankMenu.kt | 4 ++-- .../dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt | 4 ++-- .../ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt | 4 ++-- .../ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt | 4 ++-- .../ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt | 4 ++-- .../kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt index 75750314b..3777bb4de 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage import ru.dbotthepony.mc.otm.container.MatteryContainer -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.core.ifPresentK import ru.dbotthepony.mc.otm.graph.Graph6Node @@ -130,7 +130,7 @@ class MatterCapacitorBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) } }.also(::addDroppableContainer) - val capacitorStatus = ImmutableList(BatteryBankBlockEntity.CAPACITY) { + val capacitorStatus = immutableList(BatteryBankBlockEntity.CAPACITY) { synchronizer.bool(false, name = "capacitor$it") } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt index 893e98528..f8753ac68 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.capability.maxEnergyStoredMattery import ru.dbotthepony.mc.otm.capability.receiveEnergy import ru.dbotthepony.mc.otm.container.HandlerFilter import ru.dbotthepony.mc.otm.container.MatteryContainer -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.core.getValue import ru.dbotthepony.mc.otm.core.ifPresentK import ru.dbotthepony.mc.otm.core.math.Decimal @@ -38,7 +38,7 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte } }.also(::addDroppableContainer) - val batteryStatus = ImmutableList(CAPACITY) { + val batteryStatus = immutableList(CAPACITY) { synchronizer.bool(false, name = "battery$it") } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt index ae1c202e6..f83d5ef4d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt @@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.facingOne @@ -117,7 +117,7 @@ abstract class BankRenderer(private val context: B class BatteryBankRenderer(context: BlockEntityRendererProvider.Context) : BankRenderer(context) { override val models: List by lazy { - ImmutableList(12) { + immutableList(12) { minecraft.modelManager.modelBakery.bakedTopLevelModels[ResourceLocation(OverdriveThatMatters.MOD_ID, "block/battery/battery$it")]!! } } @@ -144,7 +144,7 @@ class BatteryBankRenderer(context: BlockEntityRendererProvider.Context) : BankRe class MatterBatteryBankRenderer(context: BlockEntityRendererProvider.Context) : BankRenderer(context) { override val models: List by lazy { - ImmutableList(12) { + immutableList(12) { minecraft.modelManager.modelBakery.bakedTopLevelModels[ResourceLocation(OverdriveThatMatters.MOD_ID, "block/battery/matter_capacitor$it")]!! } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt index 05c455fe9..45a7304c4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt @@ -115,7 +115,7 @@ fun > T.prev(values: Array): T { return values[next] } -inline fun ImmutableList(size: Int, initializer: (index: Int) -> T): ImmutableList { +inline fun immutableList(size: Int, initializer: (index: Int) -> T): ImmutableList { require(size >= 0) { "Invalid list size $size" } return when (size) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt index 003536e28..0a2ee3dc2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu.decorative import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.MatterySlot @@ -21,7 +21,7 @@ class CargoCrateMenu @JvmOverloads constructor( init { val container = tile?.container ?: SimpleContainer(CargoCrateBlockEntity.CAPACITY) - storageSlots = ImmutableList(CargoCrateBlockEntity.CAPACITY) { + storageSlots = immutableList(CargoCrateBlockEntity.CAPACITY) { addStorageSlot(MatterySlot(container, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt index 7d271b1c1..6b1f0253e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt @@ -4,7 +4,7 @@ import net.minecraft.world.Container import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.entity.MinecartCargoCrate import ru.dbotthepony.mc.otm.menu.MatteryMenu @@ -23,7 +23,7 @@ class MinecartCargoCrateMenu @JvmOverloads constructor( init { val container = cart as Container? ?: SimpleContainer(CargoCrateBlockEntity.CAPACITY) - storageSlots = ImmutableList(CargoCrateBlockEntity.CAPACITY) { + storageSlots = immutableList(CargoCrateBlockEntity.CAPACITY) { addStorageSlot(MatterySlot(container, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt index 217c1b301..33371430e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu.matter import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matter.canExtractMatter @@ -43,7 +43,7 @@ class MatterBottlerMenu @JvmOverloads constructor( workFlow = BooleanInputWithFeedback(this, tile::isBottling) } - storageSlots = ImmutableList(6) { index -> + storageSlots = immutableList(6) { index -> object : MatterySlot(container, index) { override fun mayPlace(p_40231_: ItemStack): Boolean { val cap = p_40231_.getCapability(MatteryCapability.MATTER).orNull() ?: return false diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt index 78fdd963c..4993feffe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu.matter import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.menu.MatterContainerInputSlot @@ -37,7 +37,7 @@ class MatterCapacitorBankMenu @JvmOverloads constructor( val container = tile?.container ?: SimpleContainer(2 * 6) - storageSlots = ImmutableList(2 * 6) { + storageSlots = immutableList(2 * 6) { addStorageSlot(MatterContainerInputSlot(container, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt index cb2f177c5..71350a85a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget import net.minecraft.world.SimpleContainer -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.menu.MachineOutputSlot import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu import ru.dbotthepony.mc.otm.registry.MMenus @@ -25,7 +25,7 @@ class MatterReplicatorMenu @JvmOverloads constructor( init { val container = tile?.container ?: SimpleContainer(5) - storageSlots = ImmutableList(5) { + storageSlots = immutableList(5) { addStorageSlot(MachineOutputSlot(container, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt index 3e8430154..7307b7867 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu.matter import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.block.entity.matter.PatternStorageBlockEntity import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.menu.MatteryMenu @@ -37,7 +37,7 @@ class PatternStorageMenu @JvmOverloads constructor( val patterns = tile?.container ?: SimpleContainer(2 * 4) - storageSlots = ImmutableList(2 * 4) { + storageSlots = immutableList(2 * 4) { addStorageSlot(PatternSlot(patterns, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt index 053674d5a..580b7512f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu.storage import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.block.entity.storage.DriveRackBlockEntity import ru.dbotthepony.mc.otm.menu.DriveSlot import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu @@ -19,7 +19,7 @@ class DriveRackMenu @JvmOverloads constructor( init { val container = tile?.container ?: SimpleContainer(4) - storageSlots = ImmutableList(4) { + storageSlots = immutableList(4) { addStorageSlot(DriveSlot(container, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt index eebcfa2e4..58b2cd957 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt @@ -6,7 +6,7 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity import net.minecraft.world.SimpleContainer import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.core.orNull @@ -33,7 +33,7 @@ class BatteryBankMenu @JvmOverloads constructor( val container: Container = tile?.container ?: SimpleContainer(BatteryBankBlockEntity.CAPACITY) powerLevel = LevelGaugeWidget(this, tile?.getCapability(MatteryCapability.ENERGY)?.orNull()) - storageSlots = ImmutableList(BatteryBankBlockEntity.CAPACITY) { + storageSlots = immutableList(BatteryBankBlockEntity.CAPACITY) { addStorageSlot(BatterySlot(container, it)) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt index fc442d141..0602bbf95 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt @@ -4,7 +4,7 @@ import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting import ru.dbotthepony.mc.otm.block.entity.tech.CobblerBlockEntity -import ru.dbotthepony.mc.otm.core.ImmutableList +import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.menu.MachineOutputSlot import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback @@ -17,7 +17,7 @@ class CobblerMenu @JvmOverloads constructor( inventory: Inventory, tile: CobblerBlockEntity? = null ) : MatteryMenu(MMenus.COBBLESTONE_GENERATOR, p_38852_, inventory, tile) { - val storageSlots = (tile?.container ?: SimpleContainer(CobblerBlockEntity.CONTAINER_SIZE)).let { c -> ImmutableList(c.containerSize) { addStorageSlot(MachineOutputSlot(c, it)) } } + val storageSlots = (tile?.container ?: SimpleContainer(CobblerBlockEntity.CONTAINER_SIZE)).let { c -> immutableList(c.containerSize) { addStorageSlot(MachineOutputSlot(c, it)) } } val redstone = EnumInputWithFeedback(this) val itemConfig = ItemHandlerPlayerInput(this, false, false)