diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt
index c66373f78..5c335adb3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt
@@ -6,6 +6,7 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.core.readNbt
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.writeNbt
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt
index 265b2300d..9d1181152 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt
@@ -9,6 +9,7 @@ import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.client.render.SkinElement
 import ru.dbotthepony.mc.otm.core.readNbt
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.writeNbt
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt
index 02634802f..bc61f5055 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt
@@ -10,6 +10,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures
 import ru.dbotthepony.mc.otm.registry.StatNames
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import kotlin.math.roundToInt
 
 class NanobotsArmor(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_ARMOR, android) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt
index 035e9682a..611d9e688 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt
@@ -9,6 +9,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures
 import ru.dbotthepony.mc.otm.registry.StatNames
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import kotlin.math.roundToInt
 
 class NanobotsRegeneration(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_REGENERATION, android) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt
index 16bf06923..42810e5cb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt
@@ -18,6 +18,7 @@ import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.menu.CargoCrateMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 class CargoCrateBlockEntity(
 	p_155229_: BlockPos,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt
index 101207242..95c0ad057 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt
@@ -25,6 +25,7 @@ import net.minecraftforge.common.capabilities.Capability
 import ru.dbotthepony.mc.otm.addPreWorldTickerOnce
 import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: BlockPos, p_155230_: BlockState) : BlockEntity(p_155228_, p_155229_, p_155230_), MenuProvider {
 	var customDisplayName: Component? = null
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt
index dc51e3aec..ae82e2dd0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt
@@ -14,6 +14,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 abstract class MatteryPoweredBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: BlockPos, p_155230_: BlockState) : MatteryBlockEntity(p_155228_, p_155229_, p_155230_) {
 	abstract val energy: BlockEnergyStorageImpl
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt
index 11b53bd64..85a24a20b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt
@@ -21,6 +21,7 @@ import ru.dbotthepony.mc.otm.menu.PlatePressMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MRecipes
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 class PlatePressBlockEntity(
 	p_155229_: BlockPos,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt
index 4a2d7a605..e5d9fd8c2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt
@@ -32,6 +32,7 @@ import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MItems
 import ru.dbotthepony.mc.otm.registry.MRegistry
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import kotlin.math.roundToInt
 import kotlin.math.sqrt
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
index b532fdfd9..54c36c604 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
@@ -15,7 +15,6 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.items.CapabilityItemHandler
-import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.WorkerState
@@ -25,15 +24,13 @@ import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler
 import ru.dbotthepony.mc.otm.capability.matter.MatterDirection
 import ru.dbotthepony.mc.otm.capability.matter.MatterHandlerImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
-import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.menu.MatterBottlerMenu
-import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.*
 
 class MatterBottlerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
 	MatteryPoweredBlockEntity(MBlockEntities.MATTER_BOTTLER, p_155229_, p_155230_), IMatterGraphNode {
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 32e578c82..55f026f69 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
@@ -29,6 +29,7 @@ import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
 import ru.dbotthepony.mc.otm.menu.MatterCapacitorBankMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import javax.annotation.ParametersAreNonnullByDefault
 
 @MethodsReturnNonnullByDefault
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
index 137f61053..94990d288 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
@@ -15,7 +15,6 @@ import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.items.IItemHandler
-import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
@@ -24,13 +23,11 @@ import ru.dbotthepony.mc.otm.capability.matter.MatterDirection
 import ru.dbotthepony.mc.otm.capability.matter.MatterHandlerImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerFilter
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.core.getImpreciseFraction
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
-import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.item.MatterDustItem
 import ru.dbotthepony.mc.otm.matter.baselineComplexityDecomposeTicks
 import ru.dbotthepony.mc.otm.matter.canDecompose
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
index f2a05c9bb..286254d3a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
@@ -32,6 +32,7 @@ import ru.dbotthepony.mc.otm.core.map
 import ru.dbotthepony.mc.otm.menu.MatterRecyclerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 class MatterRecyclerBlockEntity(blockPos: BlockPos, blockState: BlockState)
 	: MatteryWorkerBlockEntity<MatteryWorkerBlockEntity.Job>(MBlockEntities.MATTER_RECYCLER, blockPos, blockState, ::Job), IMatterGraphNode {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
index dc507cba0..aaa58728c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
@@ -14,24 +14,21 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.capability.matter.*
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerFilterOnlyOut
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.core.getImpreciseFraction
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
-import ru.dbotthepony.mc.otm.core.map
 import ru.dbotthepony.mc.otm.matter.baselineComplexityReplicateTicks
 import ru.dbotthepony.mc.otm.matter.getMatterValue
 import ru.dbotthepony.mc.otm.menu.MatterReplicatorMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.*
 
 class MatterReplicatorBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
 	MatteryWorkerBlockEntity<MatterReplicatorBlockEntity.ReplicatorJob>(MBlockEntities.MATTER_REPLICATOR, p_155229_, p_155230_, ::ReplicatorJob), IMatterGraphNode {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
index e6eccd271..eafe1d9d7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
@@ -23,6 +23,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.menu.DriveRackMenu
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.storage.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt
index 550e0e9c0..015fac0e0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt
@@ -21,6 +21,7 @@ import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.menu.DriveViewerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import javax.annotation.ParametersAreNonnullByDefault
 
 @MethodsReturnNonnullByDefault
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt
index 053f12a74..21a9b6e56 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt
@@ -40,6 +40,7 @@ import ru.dbotthepony.mc.otm.menu.ItemMonitorMenu
 import ru.dbotthepony.mc.otm.network.MatteryPacket
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.storage.*
 import java.math.BigInteger
 import java.util.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
index 0f60e574a..499b66901 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
@@ -25,6 +25,7 @@ import ru.dbotthepony.mc.otm.menu.StoragePowerSupplierMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 class StoragePowerSupplierBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryPoweredBlockEntity(MBlockEntities.STORAGE_POWER_SUPPLIER, blockPos, blockState) {
 	override val defaultDisplayName: Component
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt
index ea34cb555..01f9bd87a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt
@@ -16,6 +16,7 @@ import ru.dbotthepony.mc.otm.compat.mekanism.MatteryToMekanismEnergyWrapper
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.tagNotNull
 
 private enum class EnergyFlow {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt
index ba8b3f94c..1fbda2ec0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt
@@ -7,11 +7,8 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
 import net.minecraft.nbt.Tag
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.mc.otm.core.BigInteger
-import ru.dbotthepony.mc.otm.core.isPositive
-import ru.dbotthepony.mc.otm.core.serializeNBT
-import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.storage.*
 import java.math.BigInteger
 import java.util.ArrayList
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt
index 34915f30c..6cd728abb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt
@@ -10,6 +10,7 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.core.BigInteger
 import ru.dbotthepony.mc.otm.core.serializeNBT
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.storage.IStorageTuple
 import ru.dbotthepony.mc.otm.storage.ItemStackWrapper
 import ru.dbotthepony.mc.otm.storage.StorageStackType
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt
index 957363eb0..4adc14a74 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt
@@ -5,6 +5,7 @@ import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 open class MatterHandlerImpl @JvmOverloads constructor(
 	protected val listener: Runnable?,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt
index a0bcb3fbc..eec65f30c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt
@@ -15,6 +15,7 @@ import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.network.MatteryPacket
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 import java.util.Arrays
 import java.util.LinkedList
 import java.util.function.Supplier
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt
index e85d9e570..9fbf9aab8 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt
@@ -12,6 +12,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.matter.IMatterItem
 import ru.dbotthepony.mc.otm.matter.MatterTuple
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 class MatterDustItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(64)), IMatterItem {
 	private fun matter(stack: ItemStack): ImpreciseFraction {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
index 41d888b5f..47da9e5e8 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
@@ -131,7 +131,7 @@ class ItemMonitorMenu @JvmOverloads constructor(
 	override val storageSlots: List<Slot> = listOf(batterySlot)
 
 	override fun quickMoveStack(ply: Player, slotIndex: Int): ItemStack {
-		if (slotIndex in inventorySlotIndexStart..inventorySlotIndexEnd) {
+		if (playerInventorySlots.any { it.index == slotIndex }) {
 			if (tile == null) {
 				return ItemStack.EMPTY
 			}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt
index 87036055d..d0500fc95 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt
@@ -9,6 +9,7 @@ import net.minecraft.world.item.Items
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.core.registryName
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 fun stackFromJson(obj: JsonElement, field: String = "<unknown>"): ItemStack {
 	if (obj is JsonPrimitive) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt
index 083855b66..59fb89ec3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt
@@ -9,6 +9,7 @@ import net.minecraft.nbt.Tag
 import net.minecraft.world.level.saveddata.SavedData
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.set
 
 class SavedMapDelegate<V>(val parent: SavedCountingMap<SavedMapDelegate<V>>?, val index: Int, value: V) {
 	constructor(value: V) : this(null, -1, value)