Move extension functions around

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt

@@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.datagen.models.BlockMatteryModelProvider
 import ru.dbotthepony.mc.otm.datagen.recipes.MatteryRecipeProvider
 import ru.dbotthepony.mc.otm.datagen.recipes.has
 import ru.dbotthepony.mc.otm.registry.*
-import ru.dbotthepony.mc.otm.*
+import ru.dbotthepony.mc.otm.core.registryName
 import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider
 import ru.dbotthepony.mc.otm.datagen.loot.addLootModifiers
 import ru.dbotthepony.mc.otm.datagen.recipes.addCraftingTableRecipes

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt

@@ -12,7 +12,7 @@ import ru.dbotthepony.mc.otm.datagen.DataGen
 import ru.dbotthepony.mc.otm.datagen.getValueNullable
 import ru.dbotthepony.mc.otm.datagen.toXRotBlockstate
 import ru.dbotthepony.mc.otm.datagen.toYRotBlockstate
-import ru.dbotthepony.mc.otm.registryName
+import ru.dbotthepony.mc.otm.core.registryName
 
 typealias AdvancedBlockStateFunction = (BlockState, ConfiguredModel.Builder<*>, String) -> String?
 private data class AdvancedBlockStateEntry(val block: Block, val func: AdvancedBlockStateFunction)

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt

@@ -6,7 +6,7 @@ import net.minecraftforge.client.model.generators.ItemModelProvider
 import net.minecraftforge.data.event.GatherDataEvent
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.datagen.DataGen
-import ru.dbotthepony.mc.otm.registryName
+import ru.dbotthepony.mc.otm.core.registryName
 
 private data class SimpleItemModel(val item: String, val path: ResourceLocation) {
 	val traceback = IllegalArgumentException("Failed to register model")

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelBuilder.kt

@@ -9,7 +9,7 @@ import net.minecraft.core.Direction
 import net.minecraft.resources.ResourceLocation
 import net.minecraftforge.client.model.generators.ModelBuilder
 import net.minecraftforge.common.data.ExistingFileHelper
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 
 data class TextureSize(val width: Float, val height: Float) {
 	constructor(arr: JsonArray) : this(arr[0].asFloat, arr[1].asFloat)

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt

@@ -8,7 +8,7 @@ import net.minecraft.world.level.block.Block
 import net.minecraftforge.client.model.generators.ModelProvider
 import net.minecraftforge.data.event.GatherDataEvent
 import ru.dbotthepony.mc.otm.datagen.DataGen
-import ru.dbotthepony.mc.otm.registryName
+import ru.dbotthepony.mc.otm.core.registryName
 
 private typealias Callback = (MatteryModelProvider) -> Unit
 

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt

@@ -4,8 +4,6 @@ import net.minecraft.data.recipes.FinishedRecipe
 import net.minecraft.data.recipes.ShapedRecipeBuilder
 import net.minecraft.data.recipes.ShapelessRecipeBuilder
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.tags.TagKey
-import net.minecraft.world.item.Item
 import net.minecraft.world.item.Items
 import net.minecraft.world.item.crafting.Ingredient
 import net.minecraftforge.common.Tags
@@ -15,7 +13,7 @@ import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MItemTags
 import ru.dbotthepony.mc.otm.registry.MItems
 import ru.dbotthepony.mc.otm.registry.MRegistry
-import ru.dbotthepony.mc.otm.registryName
+import ru.dbotthepony.mc.otm.core.registryName
 import java.util.function.Consumer
 
 fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipe.kt

@@ -11,7 +11,7 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.level.ItemLike
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.registryName
+import ru.dbotthepony.mc.otm.core.registryName
 import java.util.function.Consumer
 
 private interface RecipeCell {

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt

@@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.crafting.RecipeSerializer
 import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe
 import ru.dbotthepony.mc.otm.recipe.PlatePressRecipeFactory
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 
 class PlatePressFinishedRecipe(private val recipe: PlatePressRecipe) : FinishedRecipe {
 	override fun serializeRecipeData(it: JsonObject) {

src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java

@@ -10,8 +10,7 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.ForgeRegistry;
-import net.minecraftforge.registries.RegistryManager;
+import ru.dbotthepony.mc.otm.core.UnOverengineeringKt;
-import ru.dbotthepony.mc.otm.UnOverengineeringKt;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java

@@ -8,8 +8,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.ForgeRegistry;
-import net.minecraftforge.registries.RegistryManager;
+import ru.dbotthepony.mc.otm.core.UnOverengineeringKt;
-import ru.dbotthepony.mc.otm.UnOverengineeringKt;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java

@@ -17,8 +17,8 @@ import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-import static ru.dbotthepony.mc.otm.UnOverengineeringKt.TextComponent;
+import static ru.dbotthepony.mc.otm.core.UnOverengineeringKt.TextComponent;
-import static ru.dbotthepony.mc.otm.UnOverengineeringKt.TranslatableComponent;
+import static ru.dbotthepony.mc.otm.core.UnOverengineeringKt.TranslatableComponent;
 
 public class MatterPanelScreen extends MatteryScreen<MatterPanelMenu> {
 	private static final int MODAL_WIDTH = 213;

src/main/kotlin/ru/dbotthepony/mc/otm/Ext.kt

@@ -1,233 +0,0 @@
-
-@file:Suppress("unused")
-
-package ru.dbotthepony.mc.otm
-
-import com.google.common.collect.ImmutableList
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.core.Vec3i
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.LongArrayTag
-import net.minecraft.nbt.Tag
-import net.minecraft.world.Container
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.phys.Vec3
-import net.minecraftforge.common.util.LazyOptional
-import net.minecraftforge.items.IItemHandler
-import java.util.*
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-operator fun Direction.unaryMinus(): Direction = this.opposite
-operator fun Vec3i.unaryMinus(): Vec3i = Vec3i(-x, -y, -z)
-operator fun BlockPos.unaryMinus(): BlockPos = BlockPos(-x, -y, -z)
-
-operator fun CompoundTag.set(index: String, value: Tag) = 				put(index, value)
-operator fun CompoundTag.set(index: String, value: Int) = 				putInt(index, value)
-operator fun CompoundTag.set(index: String, value: Byte) = 				putByte(index, value)
-operator fun CompoundTag.set(index: String, value: Short) = 			putShort(index, value)
-operator fun CompoundTag.set(index: String, value: Long) = 				putLong(index, value)
-operator fun CompoundTag.set(index: String, value: Float) = 			putFloat(index, value)
-operator fun CompoundTag.set(index: String, value: Double) = 			putDouble(index, value)
-operator fun CompoundTag.set(index: String, value: String) = 			putString(index, value)
-operator fun CompoundTag.set(index: String, value: Boolean) = 			putBoolean(index, value)
-operator fun CompoundTag.set(index: String, value: ByteArray) = 		putByteArray(index, value)
-operator fun CompoundTag.set(index: String, value: IntArray) = 			putIntArray(index, value)
-operator fun CompoundTag.set(index: String, value: LongArray) = 		putLongArray(index, value)
-
-@JvmInline
-value class CompoundTagInt(val tag: CompoundTag) : ReadWriteProperty<Any, Int> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getInt(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Int) = tag.putInt(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagLong(val tag: CompoundTag) : ReadWriteProperty<Any, Long> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getLong(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Long) = tag.putLong(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagByte(val tag: CompoundTag) : ReadWriteProperty<Any, Byte> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getByte(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Byte) = tag.putByte(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagShort(val tag: CompoundTag) : ReadWriteProperty<Any, Short> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getShort(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Short) = tag.putShort(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagFloat(val tag: CompoundTag) : ReadWriteProperty<Any, Float> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getFloat(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Float) = tag.putFloat(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagBoolean(val tag: CompoundTag) : ReadWriteProperty<Any, Boolean> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getBoolean(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Boolean) = tag.putBoolean(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagDouble(val tag: CompoundTag) : ReadWriteProperty<Any, Double> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getDouble(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: Double) = tag.putDouble(property.name, value)
-}
-
-@JvmInline
-value class CompoundTagString(val tag: CompoundTag) : ReadWriteProperty<Any, String> {
-	override fun getValue(thisRef: Any, property: KProperty<*>): String = tag.getString(property.name)
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: String) = tag.putString(property.name, value)
-}
-
-val EMPTY_UUID = UUID(0L, 0L)
-
-@JvmInline
-value class CompoundTagUUID(val tag: CompoundTag) : ReadWriteProperty<Any, UUID> {
-	override fun getValue(thisRef: Any, property: KProperty<*>) = (tag.get(property.name) as LongArrayTag?)?.asLongArray?.let { UUID(it[0], it[1]) } ?: EMPTY_UUID
-	override fun setValue(thisRef: Any, property: KProperty<*>, value: UUID) = tag.putLongArray(property.name, longArrayOf(value.mostSignificantBits, value.leastSignificantBits))
-}
-
-val CompoundTag.ints get() = CompoundTagInt(this)
-val CompoundTag.longs get() = CompoundTagLong(this)
-val CompoundTag.bytes get() = CompoundTagByte(this)
-val CompoundTag.shorts get() = CompoundTagShort(this)
-val CompoundTag.floats get() = CompoundTagFloat(this)
-val CompoundTag.doubles get() = CompoundTagDouble(this)
-val CompoundTag.booleans get() = CompoundTagBoolean(this)
-val CompoundTag.strings get() = CompoundTagString(this)
-val CompoundTag.uuids get() = CompoundTagUUID(this)
-
-operator fun Container.set(index: Int, value: ItemStack) = setItem(index, value)
-operator fun Container.get(index: Int): ItemStack = getItem(index)
-operator fun IItemHandler.get(index: Int): ItemStack = getStackInSlot(index)
-
-operator fun JsonObject.set(s: String, value: JsonElement) = add(s, value)
-
-inline fun <R, reified T : Tag> CompoundTag.map(s: String, consumer: (T) -> R): R? {
-	val tag = get(s)
-
-	if (tag is T) {
-		return consumer(tag)
-	}
-
-	return null
-}
-
-inline fun <T> CompoundTag.ifCompound(s: String, consumer: (CompoundTag) -> T): T? {
-	val tag = get(s)
-
-	if (tag is CompoundTag) {
-		return consumer(tag)
-	}
-
-	return null
-}
-
-inline fun CompoundTag.ifHas(s: String, consumer: (Tag) -> Unit) {
-	val tag = get(s)
-
-	if (tag != null) {
-		consumer(tag)
-	}
-}
-
-inline fun CompoundTag.ifHas(s: String, type: Byte, consumer: (Tag) -> Unit) {
-	val tag = get(s)
-
-	if (tag != null && tag.id == type) {
-		consumer(tag)
-	}
-}
-
-inline fun <reified T : Tag> CompoundTag.ifHas(s: String, type: Class<T>, consumer: (T) -> Unit) {
-	val tag = get(s)
-
-	if (tag != null && tag::class.java === type) {
-		consumer(tag as T)
-	}
-}
-
-fun <T> LazyOptional<T>.orNull(): T? {
-	if (!isPresent) {
-		return null
-	}
-
-	return resolve().orElse(null)
-}
-
-fun <T> LazyOptional<T>.orThrow(): T {
-	if (!isPresent) {
-		throw IllegalStateException("Capability was expected to be not null")
-	}
-
-	return resolve().orElse(null) ?: throw IllegalStateException("Capability was expected to be not null")
-}
-
-inline fun <T> LazyOptional<T>.ifPresentK(lambda: (T) -> Unit) {
-	if (isPresent) {
-		val value = resolve().orElse(null) ?: throw IllegalStateException("Capability was expected to be not null")
-		lambda.invoke(value)
-	}
-}
-
-val ItemStack.tagNotNull: CompoundTag get() = orCreateTag
-
-inline var Entity.position: Vec3
-	get() = position()
-	set(value) { setPos(value) }
-
-inline val <reified T : Enum<T>> T.next: T get() {
-	val values = enumValues<T>()
-	val next = (ordinal + 1) % values.size
-	return values[next]
-}
-
-inline val <reified T : Enum<T>> T.prev: T get() {
-	val values = enumValues<T>()
-	var next = ordinal - 1
-
-	if (next < 0) {
-		next = values.size - 1
-	}
-
-	return values[next]
-}
-
-fun <T : Enum<T>> T.next(values: Array<out T>): T {
-	val next = (ordinal + 1) % values.size
-	return values[next]
-}
-
-fun <T : Enum<T>> T.prev(values: Array<out T>): T {
-	var next = ordinal - 1
-
-	if (next < 0) {
-		next = values.size - 1
-	}
-
-	return values[next]
-}
-
-inline fun <T> ImmutableList(size: Int, initializer: (index: Int) -> T): ImmutableList<T> {
-	require(size >= 0) { "Invalid list size $size" }
-
-	return when (size) {
-		0 -> ImmutableList.of()
-		1 -> ImmutableList.of(initializer(0))
-		else -> ImmutableList.Builder<T>().let {
-			for (i in 0 until size) {
-				it.add(initializer(i))
-			}
-
-			it.build()
-		}
-	}
-}

src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt

@@ -4,9 +4,9 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.event.entity.living.LivingHurtEvent
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
-import ru.dbotthepony.mc.otm.readNbt
+import ru.dbotthepony.mc.otm.core.readNbt
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.writeNbt
+import ru.dbotthepony.mc.otm.core.writeNbt
 import java.io.InputStream
 import java.io.OutputStream
 

src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt

@@ -5,7 +5,7 @@ import net.minecraft.network.chat.ComponentContents
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.chat.contents.TranslatableContents
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
-import ru.dbotthepony.mc.otm.getKeyNullable
+import ru.dbotthepony.mc.otm.core.getKeyNullable
 import ru.dbotthepony.mc.otm.registry.MRegistry
 
 open class AndroidFeatureType<T : AndroidFeature> {

src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt

@@ -7,9 +7,9 @@ import net.minecraft.world.item.ItemStack
 import net.minecraftforge.common.util.INBTSerializable
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.client.render.SkinElement
-import ru.dbotthepony.mc.otm.readNbt
+import ru.dbotthepony.mc.otm.core.readNbt
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.writeNbt
+import ru.dbotthepony.mc.otm.core.writeNbt
 import java.io.InputStream
 import java.io.OutputStream
 

src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt

@@ -6,7 +6,7 @@ import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.render.SkinElement
 import ru.dbotthepony.mc.otm.container.iterator
 import ru.dbotthepony.mc.otm.registry.MRegistry
@@ -335,7 +335,8 @@ class AndroidResearchBuilder(
 					}
 
 					if (experience != 0) {
-						builder.add(TranslatableComponent("otm.android_station.research.xp_cost", experience).withStyle(
+						builder.add(
+							TranslatableComponent("otm.android_station.research.xp_cost", experience).withStyle(
 							if (capability.ply.experienceLevel >= experience)
 								ChatFormatting.DARK_GREEN
 							else
@@ -346,7 +347,8 @@ class AndroidResearchBuilder(
 					for (value in this.type.flatPrerequisites) {
 						val instance = capability.getResearch(value)
 
-						builder.add(TranslatableComponent("android_research.status.requires", instance.screenTooltipHeader).withStyle(
+						builder.add(
+							TranslatableComponent("android_research.status.requires", instance.screenTooltipHeader).withStyle(
 							if (instance.isResearched)
 								ChatFormatting.DARK_GREEN
 							else

src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt

@@ -6,9 +6,9 @@ import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.ComponentContents
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.chat.contents.TranslatableContents
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
-import ru.dbotthepony.mc.otm.getKeyNullable
+import ru.dbotthepony.mc.otm.core.getKeyNullable
 import ru.dbotthepony.mc.otm.registry.MRegistry
 import java.util.*
 import kotlin.collections.HashSet

src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt

@@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.capability.extractEnergyInnerExact
 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.set
+import ru.dbotthepony.mc.otm.core.set
 import kotlin.math.roundToInt
 
 class NanobotsArmor(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_ARMOR, android) {

src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt

@@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 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.set
+import ru.dbotthepony.mc.otm.core.set
 import kotlin.math.roundToInt
 
 class NanobotsRegeneration(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_REGENERATION, android) {

src/main/kotlin/ru/dbotthepony/mc/otm/block/AndroidStationBlock.kt

@@ -16,7 +16,7 @@ import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import ru.dbotthepony.mc.otm.block.entity.AndroidStationBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
-import ru.dbotthepony.mc.otm.orNull
+import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt

@@ -9,7 +9,7 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.AABB
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BatteryBankBlockEntity.kt

@@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.BatteryBankBlock
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.menu.BatteryBankMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import javax.annotation.ParametersAreNonnullByDefault

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt

@@ -12,13 +12,12 @@ 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.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.CargoCrateBlock
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.ifHas
 import ru.dbotthepony.mc.otm.menu.CargoCrateMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 
 class CargoCrateBlockEntity(
 	p_155229_: BlockPos,

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt

@@ -21,8 +21,7 @@ import ru.dbotthepony.mc.otm.*
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.core.plus
 import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import java.lang.ref.WeakReference

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/EnergyCounterBlockEntity.kt

@@ -25,7 +25,7 @@ import ru.dbotthepony.mc.otm.*
 import ru.dbotthepony.mc.otm.block.EnergyCounterBlock
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.compat.mekanism.MatteryToMekanismEnergyWrapper
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu
 import ru.dbotthepony.mc.otm.network.MatteryPacket
 import ru.dbotthepony.mc.otm.network.WorldNetworkChannel

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/GravitationStabilizerBlockEntity.kt

@@ -9,7 +9,7 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.AABB
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.BlockGravitationStabilizer
 import ru.dbotthepony.mc.otm.block.BlockGravitationStabilizerLens
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt

@@ -23,8 +23,8 @@ import net.minecraft.network.chat.Component
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.Capability
 import ru.dbotthepony.mc.otm.addPreWorldTickerOnce
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.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

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt

@@ -8,13 +8,12 @@ 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 net.minecraftforge.energy.CapabilityEnergy
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.ifPresentK
+import ru.dbotthepony.mc.otm.core.ifPresentK
-import ru.dbotthepony.mc.otm.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

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryWorkerBlockEntity.kt

@@ -7,8 +7,8 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.block.Block
 import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.map
+import ru.dbotthepony.mc.otm.core.map
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 
 private fun isReason(status: Any?, reason: Any) = status == null || status == reason
 

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PatternStorageBlockEntity.kt

@@ -21,14 +21,14 @@ import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraftforge.common.capabilities.Capability
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.matter.*
 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.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 import java.util.ArrayList
 
 @MethodsReturnNonnullByDefault

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt

@@ -12,7 +12,7 @@ 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.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerFilter
@@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 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.set
+import ru.dbotthepony.mc.otm.core.set
 
 class PlatePressBlockEntity(
 	p_155229_: BlockPos,

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneSetting.kt

@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm.block.entity
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 
 enum class RedstoneSetting(val label: Component, val description: Component) {
 	IGNORED(TranslatableComponent("otm.gui.redstone.ignored"), TranslatableComponent("otm.gui.redstone.ignored.description")),

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt

@@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.matter.getMatterValue
 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.set
+import ru.dbotthepony.mc.otm.core.set
 import kotlin.math.roundToInt
 import kotlin.math.sqrt
 

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/Explosions.kt

@@ -23,7 +23,7 @@ import ru.dbotthepony.mc.otm.block.BlockExplosionDebugger
 import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.core.Vector
 import ru.dbotthepony.mc.otm.registry.MRegistry
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt

@@ -15,7 +15,7 @@ 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.TranslatableComponent
+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
@@ -29,11 +29,11 @@ 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.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.menu.MatterBottlerMenu
-import ru.dbotthepony.mc.otm.orNull
+import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 
 class MatterBottlerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
 	MatteryPoweredBlockEntity(MBlockEntities.MATTER_BOTTLER, p_155229_, p_155230_), IMatterGraphNode {

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt

@@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.BatteryBankBlock
 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
@@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 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.set
+import ru.dbotthepony.mc.otm.core.set
 import javax.annotation.ParametersAreNonnullByDefault
 
 @MethodsReturnNonnullByDefault

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt

@@ -15,7 +15,7 @@ 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.TranslatableComponent
+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
@@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.core.set
 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.ifHas
+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
@@ -38,7 +38,6 @@ import ru.dbotthepony.mc.otm.matter.getMatterValue
 import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MItems
-import ru.dbotthepony.mc.otm.set
 
 fun moveMatterAsDustIntoContainer(_matterValue: ImpreciseFraction, container: MatteryContainer, OUTPUT_DUST_MAIN: Int, OUTPUT_DUST_STACKING: Int): ImpreciseFraction {
 	var matterValue = _matterValue

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt

@@ -23,7 +23,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.Capability
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt

@@ -14,7 +14,7 @@ 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.TranslatableComponent
+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
@@ -28,10 +28,10 @@ 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.item.MatterDustItem
-import ru.dbotthepony.mc.otm.map
+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.set
+import ru.dbotthepony.mc.otm.core.set
 
 class MatterRecyclerBlockEntity(blockPos: BlockPos, blockState: BlockState)
 	: MatteryWorkerBlockEntity<MatteryWorkerBlockEntity.Job>(MBlockEntities.MATTER_RECYCLER, blockPos, blockState, ::Job), IMatterGraphNode {

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt

@@ -14,7 +14,7 @@ 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.TranslatableComponent
+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
@@ -26,12 +26,12 @@ 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.map
+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.set
+import ru.dbotthepony.mc.otm.core.set
 
 class MatterReplicatorBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
 	MatteryWorkerBlockEntity<MatterReplicatorBlockEntity.ReplicatorJob>(MBlockEntities.MATTER_REPLICATOR, p_155229_, p_155230_, ::ReplicatorJob), IMatterGraphNode {

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt

@@ -14,8 +14,7 @@ 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 net.minecraftforge.items.CapabilityItemHandler
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt

@@ -13,16 +13,16 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
 import ru.dbotthepony.mc.otm.menu.DriveRackMenu
-import ru.dbotthepony.mc.otm.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.*

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt

@@ -11,7 +11,7 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock
 import ru.dbotthepony.mc.otm.block.entity.WorkerState
@@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 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.set
+import ru.dbotthepony.mc.otm.core.set
 import javax.annotation.ParametersAreNonnullByDefault
 
 @MethodsReturnNonnullByDefault

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt

@@ -26,26 +26,25 @@ import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.network.NetworkEvent
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.get
+import ru.dbotthepony.mc.otm.core.get
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
 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.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.storage.*
 import java.math.BigInteger
 import java.util.*
 import java.util.function.Supplier
 import kotlin.collections.HashMap
-import kotlin.collections.HashSet
 
 class ItemMonitorPlayerSettings : INBTSerializable<CompoundTag>, MatteryPacket {
 	enum class RefillSource(val component: Component) {

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt

@@ -25,10 +25,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.ItemFilter
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.core.isPositive
-import ru.dbotthepony.mc.otm.core.isZero
-import ru.dbotthepony.mc.otm.core.plus
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.GraphNodeListener
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt

@@ -23,8 +23,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.container.ItemFilter
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.core.plus
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.GraphNodeListener
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt

@@ -13,7 +13,7 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
@@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
 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.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

src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageBusBlock.kt

@@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.StorageCableBlock
 import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
-import ru.dbotthepony.mc.otm.unaryMinus
+import ru.dbotthepony.mc.otm.core.unaryMinus
 
 class StorageBusBlock : RotatableMatteryBlock(), EntityBlock {
 	override val hasFreeRotation: Boolean get() = true

src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageInterfaces.kt

@@ -23,7 +23,7 @@ import ru.dbotthepony.mc.otm.block.entity.storage.StorageExporterBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
-import ru.dbotthepony.mc.otm.unaryMinus
+import ru.dbotthepony.mc.otm.core.unaryMinus
 
 class StorageImporterBlock : RotatableMatteryBlock(), EntityBlock {
 	override val hasFreeRotation: Boolean get() = true

src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt

@@ -12,12 +12,11 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
-import net.minecraftforge.energy.CapabilityEnergy
 import ru.dbotthepony.mc.otm.compat.mekanism.MatteryToMekanismEnergyWrapper
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.tagNotNull
+import ru.dbotthepony.mc.otm.core.tagNotNull
 
 private enum class EnergyFlow {
 	INPUT, OUTPUT, BI_DIRECTIONAL

src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt

@@ -10,7 +10,7 @@ import net.minecraftforge.fml.ModList
 import ru.dbotthepony.mc.otm.compat.mekanism.getMekanismEnergySided
 import ru.dbotthepony.mc.otm.compat.mekanism.mekanismEnergy
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.orNull
+import ru.dbotthepony.mc.otm.core.orNull
 
 val ICapabilityProvider.matteryPlayer: MatteryPlayerCapability? get() = getCapability(MatteryCapability.MATTERY_PLAYER).orNull()
 

src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt

@@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.capability
 
 import it.unimi.dsi.fastutil.objects.ObjectArraySet
 import net.minecraft.ChatFormatting
-import net.minecraft.advancements.CriteriaTriggers
 import net.minecraft.core.Direction
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
@@ -39,7 +38,7 @@ import ru.dbotthepony.mc.otm.android.AndroidFeatureType
 import ru.dbotthepony.mc.otm.android.AndroidResearch
 import ru.dbotthepony.mc.otm.android.AndroidResearchType
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.menu.ExoSuitInventoryMenu
 import ru.dbotthepony.mc.otm.network.*
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures

src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt

@@ -1,21 +1,17 @@
 package ru.dbotthepony.mc.otm.capability.drive
 
-import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap
-import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap
 import it.unimi.dsi.fastutil.objects.ObjectArraySet
 import kotlin.jvm.JvmOverloads
 import java.util.UUID
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
-import net.minecraft.nbt.LongTag
 import net.minecraft.nbt.Tag
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.core.BigInteger
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.isPositive
 import ru.dbotthepony.mc.otm.core.serializeNBT
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.storage.*
 import java.math.BigInteger
 import java.util.ArrayList

src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt

@@ -6,12 +6,10 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraftforge.registries.ForgeRegistries
-import net.minecraftforge.registries.RegistryManager
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.core.BigInteger
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.serializeNBT
-import ru.dbotthepony.mc.otm.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

src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt

@@ -4,7 +4,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 
 open class MatterHandlerImpl @JvmOverloads constructor(
 	protected val listener: Runnable?,

src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt

@@ -18,14 +18,13 @@ import net.minecraftforge.client.gui.overlay.GuiOverlayManager
 import net.minecraftforge.eventbus.api.EventPriority
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TextComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.core.RGBAColor
-import ru.dbotthepony.mc.otm.ifPresentK
+import ru.dbotthepony.mc.otm.core.ifPresentK
 import java.util.*
 
 object MatteryGUI {

src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt

@@ -11,7 +11,7 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
 import net.minecraft.world.phys.Vec3
 import org.lwjgl.opengl.GL30
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
 import ru.dbotthepony.mc.otm.capability.matteryPlayer

src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt

@@ -6,7 +6,7 @@ import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
 import net.minecraft.core.Direction
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.EnergyCounterBlock
 import ru.dbotthepony.mc.otm.block.entity.EnergyCounterBlockEntity
 import ru.dbotthepony.mc.otm.client.render.*

src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt

@@ -10,7 +10,7 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.core.Direction
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.BlackHoleBlock
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt

@@ -11,7 +11,7 @@ import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvents
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.android.AndroidResearch
 import ru.dbotthepony.mc.otm.android.AndroidResearchType
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
@@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.client.render.drawRect
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 import ru.dbotthepony.mc.otm.core.RGBAColor
-import ru.dbotthepony.mc.otm.ifPresentK
+import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.menu.AndroidStationMenu
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import ru.dbotthepony.mc.otm.network.AndroidResearchRequestPacket

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt

@@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt

@@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.core.formatPower
 import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt

@@ -3,9 +3,8 @@ package ru.dbotthepony.mc.otm.client.screen
 import com.mojang.blaze3d.vertex.PoseStack
 import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap
 import it.unimi.dsi.fastutil.ints.Int2ObjectFunction
-import net.minecraft.client.gui.screens.inventory.InventoryScreen
 import net.minecraft.world.inventory.Slot
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.render.element
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.menu.ExoSuitInventoryMenu

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt

@@ -8,7 +8,7 @@ import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import org.lwjgl.opengl.GL11
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorPlayerSettings
 import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 import ru.dbotthepony.mc.otm.client.render.Widgets8

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt

@@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
 import ru.dbotthepony.mc.otm.menu.StorageBusMenu

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt

@@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
 import ru.dbotthepony.mc.otm.menu.StorageExporterMenu

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt

@@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
 import ru.dbotthepony.mc.otm.menu.StorageImporterMenu

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt

@@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 import ru.dbotthepony.mc.otm.core.formatPower
 

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.kt

@@ -8,12 +8,12 @@ import net.minecraft.client.gui.components.Button.OnPress
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvents
-import ru.dbotthepony.mc.otm.TextComponent
+import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
-import ru.dbotthepony.mc.otm.next
+import ru.dbotthepony.mc.otm.core.next
-import ru.dbotthepony.mc.otm.prev
+import ru.dbotthepony.mc.otm.core.prev
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.reflect.KMutableProperty0

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels
 
 import net.minecraft.client.gui.components.EditBox
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.TextComponent
+import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 
 open class EditBoxPanel(

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/Label.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels
 
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.TextComponent
+import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.RGBAColor
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NumberInputPanel.kt

@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm.client.screen.panels
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.TextComponent
+import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.menu.widget.NumberPlayerInputWidget
 import java.math.BigDecimal

src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt

@@ -4,7 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel

src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Tooltips.kt

@@ -4,7 +4,7 @@ import mekanism.common.registries.MekanismItems
 import net.minecraft.ChatFormatting
 import net.minecraftforge.event.entity.player.ItemTooltipEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.isMekanismLoaded
 
 private val BLACKHOLE_IMMUNITY = TranslatableComponent("otm.item.blackhole_immunity").withStyle(ChatFormatting.DARK_GRAY)

src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt

@@ -11,10 +11,10 @@ import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.network.NetworkEvent
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.ifHas
+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.set
+import ru.dbotthepony.mc.otm.core.set
 import java.util.Arrays
 import java.util.LinkedList
 import java.util.function.Supplier

src/main/kotlin/ru/dbotthepony/mc/otm/container/Iterators.kt

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.container
 import net.minecraft.world.Container
 import net.minecraft.world.item.ItemStack
 import net.minecraftforge.common.capabilities.Capability
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 import java.util.function.Consumer
 
 class ContainerIteratorItemStack(private val container: Container) : MutableIterator<ItemStack>, Iterable<ItemStack> {

src/main/kotlin/ru/dbotthepony/mc/otm/container/MatteryContainer.kt

@@ -9,9 +9,9 @@ import kotlin.jvm.JvmOverloads
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraftforge.common.capabilities.Capability
-import ru.dbotthepony.mc.otm.get
+import ru.dbotthepony.mc.otm.core.get
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.set
+import ru.dbotthepony.mc.otm.core.set
 import java.util.*
 import java.util.function.Consumer
 

src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagDelegates.kt

@@ -0,0 +1,78 @@
+package ru.dbotthepony.mc.otm.core
+
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.LongArrayTag
+import java.util.*
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+@JvmInline
+value class CompoundTagInt(val tag: CompoundTag) : ReadWriteProperty<Any, Int> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getInt(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Int) = tag.putInt(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagLong(val tag: CompoundTag) : ReadWriteProperty<Any, Long> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getLong(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Long) = tag.putLong(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagByte(val tag: CompoundTag) : ReadWriteProperty<Any, Byte> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getByte(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Byte) = tag.putByte(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagShort(val tag: CompoundTag) : ReadWriteProperty<Any, Short> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getShort(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Short) = tag.putShort(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagFloat(val tag: CompoundTag) : ReadWriteProperty<Any, Float> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getFloat(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Float) = tag.putFloat(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagBoolean(val tag: CompoundTag) : ReadWriteProperty<Any, Boolean> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getBoolean(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Boolean) = tag.putBoolean(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagDouble(val tag: CompoundTag) : ReadWriteProperty<Any, Double> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getDouble(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: Double) = tag.putDouble(property.name, value)
+}
+
+@JvmInline
+value class CompoundTagString(val tag: CompoundTag) : ReadWriteProperty<Any, String> {
+	override fun getValue(thisRef: Any, property: KProperty<*>): String = tag.getString(property.name)
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: String) = tag.putString(property.name, value)
+}
+
+val EMPTY_UUID = UUID(0L, 0L)
+
+@JvmInline
+value class CompoundTagUUID(val tag: CompoundTag) : ReadWriteProperty<Any, UUID> {
+	override fun getValue(thisRef: Any, property: KProperty<*>) = (tag.get(property.name) as LongArrayTag?)?.asLongArray?.let {
+		UUID(
+			it[0],
+			it[1]
+		)
+	} ?: EMPTY_UUID
+	override fun setValue(thisRef: Any, property: KProperty<*>, value: UUID) = tag.putLongArray(property.name, longArrayOf(value.mostSignificantBits, value.leastSignificantBits))
+}
+
+val CompoundTag.ints get() = CompoundTagInt(this)
+val CompoundTag.longs get() = CompoundTagLong(this)
+val CompoundTag.bytes get() = CompoundTagByte(this)
+val CompoundTag.shorts get() = CompoundTagShort(this)
+val CompoundTag.floats get() = CompoundTagFloat(this)
+val CompoundTag.doubles get() = CompoundTagDouble(this)
+val CompoundTag.booleans get() = CompoundTagBoolean(this)
+val CompoundTag.strings get() = CompoundTagString(this)
+val CompoundTag.uuids get() = CompoundTagUUID(this)

src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagExt.kt

@@ -0,0 +1,61 @@
+package ru.dbotthepony.mc.otm.core
+
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.Tag
+
+operator fun CompoundTag.set(index: String, value: Tag) = 				put(index, value)
+operator fun CompoundTag.set(index: String, value: Int) = 				putInt(index, value)
+operator fun CompoundTag.set(index: String, value: Byte) = 				putByte(index, value)
+operator fun CompoundTag.set(index: String, value: Short) = 			putShort(index, value)
+operator fun CompoundTag.set(index: String, value: Long) = 				putLong(index, value)
+operator fun CompoundTag.set(index: String, value: Float) = 			putFloat(index, value)
+operator fun CompoundTag.set(index: String, value: Double) = 			putDouble(index, value)
+operator fun CompoundTag.set(index: String, value: String) = 			putString(index, value)
+operator fun CompoundTag.set(index: String, value: Boolean) = 			putBoolean(index, value)
+operator fun CompoundTag.set(index: String, value: ByteArray) = 		putByteArray(index, value)
+operator fun CompoundTag.set(index: String, value: IntArray) = 			putIntArray(index, value)
+operator fun CompoundTag.set(index: String, value: LongArray) = 		putLongArray(index, value)
+
+inline fun <R, reified T : Tag> CompoundTag.map(s: String, consumer: (T) -> R): R? {
+	val tag = get(s)
+
+	if (tag is T) {
+		return consumer(tag)
+	}
+
+	return null
+}
+
+inline fun <T> CompoundTag.ifCompound(s: String, consumer: (CompoundTag) -> T): T? {
+	val tag = get(s)
+
+	if (tag is CompoundTag) {
+		return consumer(tag)
+	}
+
+	return null
+}
+
+inline fun CompoundTag.ifHas(s: String, consumer: (Tag) -> Unit) {
+	val tag = get(s)
+
+	if (tag != null) {
+		consumer(tag)
+	}
+}
+
+inline fun CompoundTag.ifHas(s: String, type: Byte, consumer: (Tag) -> Unit) {
+	val tag = get(s)
+
+	if (tag != null && tag.id == type) {
+		consumer(tag)
+	}
+}
+
+inline fun <reified T : Tag> CompoundTag.ifHas(s: String, type: Class<T>, consumer: (T) -> Unit) {
+	val tag = get(s)
+
+	if (tag != null && tag::class.java === type) {
+		consumer(tag as T)
+	}
+}

src/main/kotlin/ru/dbotthepony/mc/otm/core/EuclidMath.kt

@@ -2,7 +2,9 @@ package ru.dbotthepony.mc.otm.core
 
 import com.mojang.math.Quaternion
 import com.mojang.math.Vector3f
+import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
+import net.minecraft.core.Vec3i
 import net.minecraft.world.phys.Vec3
 import kotlin.math.*
 
@@ -338,6 +340,7 @@ fun bezierCurve(t: Double, vararg values: Vector): Vector {
 		}
 	}
 }
+
 fun bezierCurve(t: Double, values: DoubleArray): Double {
 	when (values.size) {
 		0, 1 -> throw IllegalArgumentException("Provided array has only ${values.size} entries in it")
@@ -359,3 +362,23 @@ fun bezierCurve(t: Double, values: DoubleArray): Double {
 		}
 	}
 }
+
+operator fun BlockPos.plus(direction: Vec3i): BlockPos = this.offset(direction)
+operator fun BlockPos.plus(direction: Direction): BlockPos = this.offset(direction.normal)
+operator fun BlockPos.minus(direction: Vec3i): BlockPos = this.subtract(direction)
+operator fun BlockPos.minus(direction: Direction): BlockPos = this.subtract(direction.normal)
+
+operator fun Vec3i.plus(direction: Vec3i): Vec3i = this.offset(direction)
+operator fun Vec3i.plus(direction: Direction): Vec3i = this.offset(direction.normal)
+operator fun Vec3i.minus(direction: Vec3i): Vec3i = this.subtract(direction)
+operator fun Vec3i.minus(direction: Direction): Vec3i = this.subtract(direction.normal)
+operator fun Vec3i.times(int: Int): Vec3i = this.multiply(int)
+operator fun Vec3i.times(double: Double): Vector = Vector(x * double, y * double, z * double)
+
+fun BlockPos.asVector(): Vector {
+	return Vector(x + 0.5, y + 0.5, z + 0.5)
+}
+
+operator fun Direction.unaryMinus(): Direction = this.opposite
+operator fun Vec3i.unaryMinus(): Vec3i = Vec3i(-x, -y, -z)
+operator fun BlockPos.unaryMinus(): BlockPos = BlockPos(-x, -y, -z)

src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt

@@ -3,31 +3,21 @@
 
 package ru.dbotthepony.mc.otm.core
 
-import net.minecraft.core.BlockPos
+import com.google.common.collect.ImmutableList
-import net.minecraft.core.Direction
+import com.google.gson.JsonElement
-import net.minecraft.core.Vec3i
+import com.google.gson.JsonObject
 import net.minecraft.nbt.ByteArrayTag
+import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.Tag
 import net.minecraft.network.FriendlyByteBuf
+import net.minecraft.world.Container
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+import net.minecraftforge.common.util.LazyOptional
+import net.minecraftforge.items.IItemHandler
 import java.math.BigInteger
 
-operator fun BlockPos.plus(direction: Vec3i): BlockPos = this.offset(direction)
-operator fun BlockPos.plus(direction: Direction): BlockPos = this.offset(direction.normal)
-operator fun BlockPos.minus(direction: Vec3i): BlockPos = this.subtract(direction)
-operator fun BlockPos.minus(direction: Direction): BlockPos = this.subtract(direction.normal)
-
-operator fun Vec3i.plus(direction: Vec3i): Vec3i = this.offset(direction)
-operator fun Vec3i.plus(direction: Direction): Vec3i = this.offset(direction.normal)
-operator fun Vec3i.minus(direction: Vec3i): Vec3i = this.subtract(direction)
-operator fun Vec3i.minus(direction: Direction): Vec3i = this.subtract(direction.normal)
-
-operator fun Vec3i.times(int: Int): Vec3i = this.multiply(int)
-operator fun Vec3i.times(double: Double): Vector = Vector(x * double, y * double, z * double)
-
-fun BlockPos.asVector(): Vector {
-	return Vector(x + 0.5, y + 0.5, z + 0.5)
-}
-
 /**
  * Performs type check+cast and sums two numbers.
  *
@@ -213,14 +203,6 @@ fun Number.toImpreciseFraction(): ImpreciseFraction {
 	}
 }
 
-fun Float.toImpreciseFraction() = ImpreciseFraction(this)
-fun Double.toImpreciseFraction() = ImpreciseFraction(this)
-fun Int.toImpreciseFraction() = ImpreciseFraction(this)
-fun Byte.toImpreciseFraction() = ImpreciseFraction(this)
-fun Short.toImpreciseFraction() = ImpreciseFraction(this)
-fun Long.toImpreciseFraction() = ImpreciseFraction(this)
-fun ImpreciseFraction.toImpreciseFraction() = this
-
 fun BigInteger(tag: Tag?): BigInteger {
 	if (tag !is ByteArrayTag)
 		return BigInteger.ZERO
@@ -237,3 +219,87 @@ fun FriendlyByteBuf.writeBigInteger(value: BigInteger) {
 }
 
 fun FriendlyByteBuf.readBigInteger(byteLimit: Int = 128) = BigInteger(readByteArray(byteLimit))
+
+operator fun Container.set(index: Int, value: ItemStack) = setItem(index, value)
+operator fun Container.get(index: Int): ItemStack = getItem(index)
+
+operator fun IItemHandler.get(index: Int): ItemStack = getStackInSlot(index)
+
+operator fun JsonObject.set(s: String, value: JsonElement) = add(s, value)
+
+fun <T> LazyOptional<T>.orNull(): T? {
+	if (!isPresent) {
+		return null
+	}
+
+	return resolve().orElse(null)
+}
+
+fun <T> LazyOptional<T>.orThrow(): T {
+	if (!isPresent) {
+		throw IllegalStateException("Capability was expected to be not null")
+	}
+
+	return resolve().get() ?: throw IllegalStateException("Capability was expected to be not null")
+}
+
+inline fun <T> LazyOptional<T>.ifPresentK(lambda: (T) -> Unit) {
+	if (isPresent) {
+		val value = resolve().orElse(null) ?: throw IllegalStateException("Capability was expected to be not null")
+		lambda.invoke(value)
+	}
+}
+
+val ItemStack.tagNotNull: CompoundTag get() = orCreateTag
+
+inline var Entity.position: Vec3
+	get() = position()
+	set(value) { setPos(value) }
+
+inline val <reified T : Enum<T>> T.next: T get() {
+	val values = enumValues<T>()
+	val next = (ordinal + 1) % values.size
+	return values[next]
+}
+
+inline val <reified T : Enum<T>> T.prev: T get() {
+	val values = enumValues<T>()
+	var next = ordinal - 1
+
+	if (next < 0) {
+		next = values.size - 1
+	}
+
+	return values[next]
+}
+
+fun <T : Enum<T>> T.next(values: Array<out T>): T {
+	val next = (ordinal + 1) % values.size
+	return values[next]
+}
+
+fun <T : Enum<T>> T.prev(values: Array<out T>): T {
+	var next = ordinal - 1
+
+	if (next < 0) {
+		next = values.size - 1
+	}
+
+	return values[next]
+}
+
+inline fun <T> ImmutableList(size: Int, initializer: (index: Int) -> T): ImmutableList<T> {
+	require(size >= 0) { "Invalid list size $size" }
+
+	return when (size) {
+		0 -> ImmutableList.of()
+		1 -> ImmutableList.of(initializer(0))
+		else -> ImmutableList.Builder<T>().let {
+			for (i in 0 until size) {
+				it.add(initializer(i))
+			}
+
+			it.build()
+		}
+	}
+}

src/main/kotlin/ru/dbotthepony/mc/otm/core/Formatting.kt

@@ -2,8 +2,6 @@ package ru.dbotthepony.mc.otm.core
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.TextComponent
-import ru.dbotthepony.mc.otm.TranslatableComponent
 import java.math.BigDecimal
 import java.math.BigInteger
 

src/main/kotlin/ru/dbotthepony/mc/otm/core/FriendlyStreams.kt

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm
+package ru.dbotthepony.mc.otm.core
 
 import io.netty.handler.codec.EncoderException
 import net.minecraft.nbt.CompoundTag

src/main/kotlin/ru/dbotthepony/mc/otm/core/ImpreciseFraction.kt

@@ -5,10 +5,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.StringTag
 import net.minecraft.nbt.Tag
 import net.minecraft.network.FriendlyByteBuf
-import ru.dbotthepony.mc.otm.readDouble
-import ru.dbotthepony.mc.otm.readVarIntLE
-import ru.dbotthepony.mc.otm.writeDouble
-import ru.dbotthepony.mc.otm.writeVarIntLE
 import java.io.InputStream
 import java.io.OutputStream
 import java.math.BigDecimal
@@ -666,3 +662,10 @@ fun CompoundTag.getImpreciseFraction(key: String) = ImpreciseFraction.deserializ
 fun CompoundTag.putImpreciseFraction(key: String, value: ImpreciseFraction) = put(key, value.serializeNBT())
 
 operator fun CompoundTag.set(key: String, value: ImpreciseFraction) = putImpreciseFraction(key, value)
+fun Float.toImpreciseFraction() = ImpreciseFraction(this)
+fun Double.toImpreciseFraction() = ImpreciseFraction(this)
+fun Int.toImpreciseFraction() = ImpreciseFraction(this)
+fun Byte.toImpreciseFraction() = ImpreciseFraction(this)
+fun Short.toImpreciseFraction() = ImpreciseFraction(this)
+fun Long.toImpreciseFraction() = ImpreciseFraction(this)
+fun ImpreciseFraction.toImpreciseFraction() = this

src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm
+package ru.dbotthepony.mc.otm.core
 
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.chat.MutableComponent

src/main/kotlin/ru/dbotthepony/mc/otm/data/LootTableAppender.kt

@@ -17,7 +17,7 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
 import net.minecraftforge.common.loot.IGlobalLootModifier
 import net.minecraftforge.common.loot.LootModifier
 import net.minecraftforge.registries.ForgeRegistries
-import ru.dbotthepony.mc.otm.registryName
+import ru.dbotthepony.mc.otm.core.registryName
 
 // 1.19 do be like overengineering already overengineered stuff beyond any recognition
 private fun getJson(it: Dynamic<Any?>): JsonElement {

src/main/kotlin/ru/dbotthepony/mc/otm/graph/storage/StorageNetworkGraph.kt

@@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.graph.Abstract6Graph
 import ru.dbotthepony.mc.otm.graph.Graph6Node
-import ru.dbotthepony.mc.otm.orNull
+import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.storage.*
 import java.util.LinkedList
 

src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt

@@ -10,12 +10,12 @@ import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.EnergyCapacitorItem
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.formatPower
-import ru.dbotthepony.mc.otm.ifPresentK
+import ru.dbotthepony.mc.otm.core.ifPresentK
 
 class BatteryItem : Item {
 	private inner class BatteryMatteryCapability(stack: ItemStack)

src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt

@@ -22,8 +22,7 @@ import net.minecraft.world.level.material.Material
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import ru.dbotthepony.mc.otm.*
 import ru.dbotthepony.mc.otm.capability.*
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.core.formatPower
 import ru.dbotthepony.mc.otm.registry.EMPDamageSource
 
 class EnergySwordItem : Item(Properties().stacksTo(1).rarity(Rarity.RARE).tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB)) {

src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt

@@ -10,7 +10,7 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.addPostTickTimer
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft

src/main/kotlin/ru/dbotthepony/mc/otm/item/GravitationalDisruptorItem.kt

@@ -8,7 +8,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.Rarity
 import net.minecraft.world.level.Level
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 
 class GravitationalDisruptorItem :
 	Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(1).rarity(Rarity.EPIC)) {

src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt

@@ -14,7 +14,7 @@ import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler
 import ru.dbotthepony.mc.otm.capability.matter.MatterDirection

src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt

@@ -7,11 +7,11 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 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.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 {

src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt

@@ -14,9 +14,9 @@ import net.minecraft.network.chat.Component
 import net.minecraft.world.item.Item
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.Capability
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.matter.*
-import ru.dbotthepony.mc.otm.ifHas
+import ru.dbotthepony.mc.otm.core.ifHas
 import java.util.*
 
 class PatternStorageItem : Item {

src/main/kotlin/ru/dbotthepony/mc/otm/item/PillItem.kt

@@ -13,7 +13,7 @@ import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.util.FakePlayer
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 
 enum class PillType {

src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt

@@ -21,12 +21,10 @@ import net.minecraftforge.event.ForgeEventFactory
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.event.entity.player.EntityItemPickupEvent
 import net.minecraftforge.eventbus.api.EventPriority
-import ru.dbotthepony.mc.otm.TextComponent
+import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.capability.drive.DrivePool
 import ru.dbotthepony.mc.otm.container.ItemFilter
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.ifHas
-import ru.dbotthepony.mc.otm.set
 import java.math.BigInteger
 import java.util.*
 

src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt

@@ -12,7 +12,7 @@ import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.level.Level
 import net.minecraftforge.client.extensions.common.IClientItemExtensions
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.model.GravitationStabilizerModel
 import java.util.function.Consumer
 

src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt

@@ -3,7 +3,6 @@ package ru.dbotthepony.mc.otm.item
 import net.minecraft.ChatFormatting
 import net.minecraft.core.Direction
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.IntTag
 import net.minecraft.network.chat.Component
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
@@ -13,13 +12,11 @@ import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.capabilities.ICapabilityProvider
-import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.*
 import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
-import ru.dbotthepony.mc.otm.core.ImpreciseFraction
+import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.core.formatPower
 import ru.dbotthepony.mc.otm.saveddata.SavedCountingMap
 import ru.dbotthepony.mc.otm.saveddata.SavedMapDelegate
 
@@ -209,7 +206,8 @@ class QuantumBatteryItem : Item {
 			components.add(TranslatableComponent("otm.item.quantum_battery.creative2").withStyle(ChatFormatting.DARK_GRAY))
 		} else {
 			components.add(TranslatableComponent("otm.item.power.normal.storage", power.batteryLevel.formatPower(), capacity!!.formatPower()).withStyle(ChatFormatting.GRAY))
-			components.add(TranslatableComponent(
+			components.add(
+				TranslatableComponent(
 				"otm.item.power.normal.throughput",
 				throughput!!.formatPower(),
 				throughput.formatPower()