Sort core package

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

@@ -4,7 +4,7 @@ import net.minecraft.tags.ItemTags
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.Items
 import net.minecraftforge.common.Tags
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.matter.MatterDataProvider
 import ru.dbotthepony.mc.otm.registry.MItemTags
 import ru.dbotthepony.mc.otm.registry.MItems

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

@@ -10,6 +10,7 @@ import net.minecraftforge.client.model.generators.ModelBuilder
 import net.minecraftforge.common.data.ExistingFileHelper
 import org.joml.Vector3f
 import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
 
 data class TextureSize(val width: Float, val height: Float) {

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

@@ -8,6 +8,7 @@ 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.container.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
 
 class PlatePressFinishedRecipe(private val recipe: PlatePressRecipe) : FinishedRecipe {

src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java

@@ -4,8 +4,6 @@ import kotlin.KotlinVersion;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.eventbus.api.EventPriority;
@@ -35,7 +33,7 @@ import ru.dbotthepony.mc.otm.client.model.TritaniumArmorModel;
 import ru.dbotthepony.mc.otm.client.render.ShockwaveRenderer;
 import ru.dbotthepony.mc.otm.compat.mekanism.QIOKt;
 import ru.dbotthepony.mc.otm.compat.mekanism.TooltipsKt;
-import ru.dbotthepony.mc.otm.core.Decimal;
+import ru.dbotthepony.mc.otm.core.math.Decimal;
 import ru.dbotthepony.mc.otm.item.ItemTritaniumArmor;
 import ru.dbotthepony.mc.otm.item.QuantumBatteryItem;
 import ru.dbotthepony.mc.otm.item.weapon.AbstractWeaponItem;

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

@@ -11,8 +11,8 @@ import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity
 import ru.dbotthepony.mc.otm.capability.energy.BlockEnergyStorageImpl
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
 import ru.dbotthepony.mc.otm.item.EnergySwordItem
 import ru.dbotthepony.mc.otm.registry.MNames
 

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

@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm
 
 import net.minecraft.util.TimeSource
-import ru.dbotthepony.mc.otm.core.formatTickDuration
+import ru.dbotthepony.mc.otm.core.util.formatTickDuration
 import java.util.function.LongSupplier
 
 /**

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

@@ -5,7 +5,7 @@ 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.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.network.FieldSynchronizer
 import java.io.InputStream
 

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

@@ -16,9 +16,9 @@ import ru.dbotthepony.mc.otm.capability.awareItemsStream
 import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.addAll
-import ru.dbotthepony.mc.otm.core.getCompoundList
+import ru.dbotthepony.mc.otm.core.nbt.getCompoundList
 import ru.dbotthepony.mc.otm.core.registryName
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.milliTime
 import ru.dbotthepony.mc.otm.network.FieldSynchronizer
 import ru.dbotthepony.mc.otm.registry.MRegistry

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

@@ -23,10 +23,11 @@ import net.minecraft.world.level.ItemLike
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.SpriteType
-import ru.dbotthepony.mc.otm.core.ListSet
+import ru.dbotthepony.mc.otm.core.collect.ListSet
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.isActuallyEmpty
 import ru.dbotthepony.mc.otm.core.registryName
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.toImmutableList
 import ru.dbotthepony.mc.otm.data.stream

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

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.android
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.nbt.CompoundTag
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 abstract class AndroidSwitchableFeature(type: AndroidFeatureType<*>, android: MatteryPlayerCapability) : AndroidFeature(type, android) {
 	var isActive by synchronizer.bool(setter = setter@{ value, access, setByRemote ->

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

@@ -36,19 +36,19 @@ import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource
 import ru.dbotthepony.mc.otm.client.render.ResearchIcons
 import ru.dbotthepony.mc.otm.client.render.sprite
 import ru.dbotthepony.mc.otm.client.render.linesIgnoreZRenderType
-import ru.dbotthepony.mc.otm.core.Vector
+import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.core.asVector
+import ru.dbotthepony.mc.otm.core.math.asVector
-import ru.dbotthepony.mc.otm.core.component1
+import ru.dbotthepony.mc.otm.core.math.component1
-import ru.dbotthepony.mc.otm.core.component2
+import ru.dbotthepony.mc.otm.core.math.component2
-import ru.dbotthepony.mc.otm.core.component3
+import ru.dbotthepony.mc.otm.core.math.component3
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
 import ru.dbotthepony.mc.otm.core.genericPositions
 import ru.dbotthepony.mc.otm.core.holder
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
-import ru.dbotthepony.mc.otm.core.rotateXDegrees
+import ru.dbotthepony.mc.otm.core.math.rotateXDegrees
-import ru.dbotthepony.mc.otm.core.rotateYDegrees
+import ru.dbotthepony.mc.otm.core.math.rotateYDegrees
-import ru.dbotthepony.mc.otm.core.shortestDistanceBetween
+import ru.dbotthepony.mc.otm.core.math.shortestDistanceBetween
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import ru.dbotthepony.mc.otm.milliTime
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures
 import ru.dbotthepony.mc.otm.registry.MNames

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

@@ -16,13 +16,13 @@ import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.ResearchIcons
-import ru.dbotthepony.mc.otm.core.Vector
+import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
 import ru.dbotthepony.mc.otm.core.getEntitiesInEllipsoid
-import ru.dbotthepony.mc.otm.core.minus
+import ru.dbotthepony.mc.otm.core.math.minus
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
 import ru.dbotthepony.mc.otm.core.position
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import ru.dbotthepony.mc.otm.network.MatteryPacket
 import ru.dbotthepony.mc.otm.network.WorldNetworkChannel
 import ru.dbotthepony.mc.otm.network.packetHandled

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

@@ -17,9 +17,9 @@ import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.ResearchIcons
-import ru.dbotthepony.mc.otm.core.Vector
+import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
 import ru.dbotthepony.mc.otm.network.MatteryPacket
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import ru.dbotthepony.mc.otm.network.enqueueWork

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

@@ -9,10 +9,10 @@ import ru.dbotthepony.mc.otm.android.AndroidFeature
 import ru.dbotthepony.mc.otm.android.AndroidResearchManager
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures
 import ru.dbotthepony.mc.otm.registry.StatNames
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.onceServer
 import ru.dbotthepony.mc.otm.triggers.NanobotsArmorTrigger
 import kotlin.math.roundToInt

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

@@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.android.AndroidFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures
 import ru.dbotthepony.mc.otm.registry.StatNames
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import kotlin.math.roundToInt
 
 class NanobotsRegenerationFeature(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_REGENERATION, android) {

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

@@ -19,16 +19,16 @@ import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact
 import ru.dbotthepony.mc.otm.client.render.ResearchIcons
-import ru.dbotthepony.mc.otm.core.Vector
+import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
-import ru.dbotthepony.mc.otm.core.getEllipsoidBlockPositions
+import ru.dbotthepony.mc.otm.core.math.getEllipsoidBlockPositions
 import ru.dbotthepony.mc.otm.core.getEntitiesInEllipsoid
 import ru.dbotthepony.mc.otm.core.getExplosionResistance
-import ru.dbotthepony.mc.otm.core.minus
+import ru.dbotthepony.mc.otm.core.math.minus
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
 import ru.dbotthepony.mc.otm.core.position
-import ru.dbotthepony.mc.otm.core.roundToIntVector
+import ru.dbotthepony.mc.otm.core.math.roundToIntVector
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.network.MatteryPacket

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

@@ -26,7 +26,7 @@ import ru.dbotthepony.mc.otm.capability.energy.GeneratorEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.ItemEnergyStorageImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.oncePre
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -25,8 +25,8 @@ import net.minecraft.world.phys.shapes.VoxelShape
 import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.WorkerState
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import ru.dbotthepony.mc.otm.oncePre
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks

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

@@ -23,9 +23,9 @@ import net.minecraft.world.phys.shapes.VoxelShape
 import ru.dbotthepony.mc.otm.ServerConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.get
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
-import ru.dbotthepony.mc.otm.core.unaryMinus
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
 import ru.dbotthepony.mc.otm.once
 import ru.dbotthepony.mc.otm.registry.MBlocks
 

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

@@ -25,9 +25,9 @@ import net.minecraft.world.level.material.MaterialColor
 import net.minecraft.world.phys.BlockHitResult
 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.WorkerState
-import ru.dbotthepony.mc.otm.core.component1
+import ru.dbotthepony.mc.otm.core.math.component1
-import ru.dbotthepony.mc.otm.core.component2
+import ru.dbotthepony.mc.otm.core.math.component2
-import ru.dbotthepony.mc.otm.core.component3
+import ru.dbotthepony.mc.otm.core.math.component3
 import ru.dbotthepony.mc.otm.core.get
 
 interface IDroppableContainer {

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

@@ -12,7 +12,6 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
-import net.minecraft.world.level.LevelReader
 import net.minecraft.world.level.NaturalSpawner
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
@@ -27,8 +26,8 @@ import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import net.minecraftforge.common.ForgeHooks
 import ru.dbotthepony.mc.otm.core.get
-import ru.dbotthepony.mc.otm.core.minus
+import ru.dbotthepony.mc.otm.core.math.minus
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
 import ru.dbotthepony.mc.otm.once
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -13,9 +13,9 @@ import net.minecraft.world.phys.AABB
 import net.minecraftforge.common.ForgeConfigSpec
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
-import ru.dbotthepony.mc.otm.core.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
 import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.menu.AndroidStationMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities

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

@@ -28,6 +28,9 @@ import ru.dbotthepony.mc.otm.compat.mekanism.Mattery2MekanismEnergyWrapper
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.menu.BatteryBankMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 
@@ -177,7 +180,8 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte
 				throw UnsupportedOperationException("Can't set battery value for battery bank")
 			}
 
-		override val maxBatteryLevel: Decimal get() {
+		override val maxBatteryLevel: Decimal
+			get() {
 			var result = Decimal.ZERO
 
 			for (i in 0 until container.containerSize) {

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

@@ -33,8 +33,8 @@ import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.menu.CargoCrateMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MSoundEvents

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

@@ -30,6 +30,13 @@ import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.plus
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 import java.lang.ref.WeakReference
 
 class ChemicalGeneratorBlockEntity(pos: BlockPos, state: BlockState) : MatteryBlockEntity(MBlockEntities.CHEMICAL_GENERATOR, pos, state), IDroppableContainer {
@@ -77,8 +84,8 @@ class ChemicalGeneratorBlockEntity(pos: BlockPos, state: BlockState) : MatteryBl
 		valid = true
 	}
 
-	override fun setLevel(level: Level) {
+	override fun setLevel(p_155231_: Level) {
-		super.setLevel(level)
+		super.setLevel(p_155231_)
 		tickOnceServer(this::checkSurroundings)
 	}
 

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

@@ -22,6 +22,13 @@ import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.compat.mekanism.Mattery2MekanismEnergyWrapper
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
+import ru.dbotthepony.mc.otm.core.nbt.getByteArrayList
+import ru.dbotthepony.mc.otm.core.nbt.ifHas
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import java.lang.ref.WeakReference

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

@@ -25,9 +25,9 @@ import ru.dbotthepony.mc.otm.capability.maxEnergyStoredMattery
 import ru.dbotthepony.mc.otm.capability.receiveEnergy
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.menu.EnergyServoMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks

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

@@ -14,8 +14,8 @@ import ru.dbotthepony.mc.otm.block.BlockGravitationStabilizer
 import ru.dbotthepony.mc.otm.block.BlockGravitationStabilizerLens
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 
 class GravitationStabilizerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryBlockEntity(

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

@@ -3,7 +3,6 @@ package ru.dbotthepony.mc.otm.block.entity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.core.BlockPos
 import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.MenuProvider
 import java.lang.Runnable
 import net.minecraft.server.level.ServerLevel
@@ -23,16 +22,8 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity
 import net.minecraftforge.common.capabilities.Capability
 import ru.dbotthepony.mc.otm.core.TextComponent
-import ru.dbotthepony.mc.otm.core.TranslatableComponent
+import ru.dbotthepony.mc.otm.core.nbt.ifHas
-import ru.dbotthepony.mc.otm.core.component1
+import ru.dbotthepony.mc.otm.core.nbt.set
-import ru.dbotthepony.mc.otm.core.component2
-import ru.dbotthepony.mc.otm.core.component3
-import ru.dbotthepony.mc.otm.core.ifHas
-import ru.dbotthepony.mc.otm.core.position
-import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.network.BlockEntitySyncPacket
-import ru.dbotthepony.mc.otm.network.FieldSynchronizer
-import ru.dbotthepony.mc.otm.network.WorldNetworkChannel
 import ru.dbotthepony.mc.otm.oncePre
 
 abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: BlockPos, p_155230_: BlockState) : SynchronizedBlockEntity(p_155228_, p_155229_, p_155230_), MenuProvider {

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

@@ -16,15 +16,14 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.capability.energy.BlockEnergyStorageImpl
-import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.ItemEnergyStorageImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.ifHas
+import ru.dbotthepony.mc.otm.core.nbt.ifHas
 import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.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

@@ -12,7 +12,14 @@ import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.block.Block
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
+import ru.dbotthepony.mc.otm.core.math.set
+import ru.dbotthepony.mc.otm.core.math.weakEqualDoubles
+import ru.dbotthepony.mc.otm.core.math.weakGreaterThan
+import ru.dbotthepony.mc.otm.core.math.weakLessThan
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 private fun isReason(status: Any?, reason: Any) = status == null || status == reason
 

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

@@ -19,12 +19,12 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 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.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 class PlatePressBlockEntity(
 	p_155229_: BlockPos,

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

@@ -10,7 +10,6 @@ import net.minecraft.world.entity.EquipmentSlot
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.entity.player.Player
-import net.minecraft.world.level.Explosion
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
@@ -22,14 +21,14 @@ import ru.dbotthepony.mc.otm.block.BlackHoleBlock
 import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.SynchronizedBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.blackhole.ExplosionQueue.Companion.queueForLevel
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
 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.core.getSphericalBlockPositions
+import ru.dbotthepony.mc.otm.core.math.getSphericalBlockPositions
-import ru.dbotthepony.mc.otm.core.mapIf
+import ru.dbotthepony.mc.otm.core.nbt.mapIf
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.matter.MatterManager
 import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger
 import java.util.LinkedList

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

@@ -7,8 +7,8 @@ import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.Vec3
-import ru.dbotthepony.mc.otm.core.plus
+import ru.dbotthepony.mc.otm.core.math.plus
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 
 class BlockEntityExplosionDebugger(p_155229_: BlockPos, p_155230_: BlockState) : BlockEntity(MBlockEntities.DEBUG_EXPLOSION_SMALL, p_155229_, p_155230_) {

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

@@ -21,7 +21,15 @@ import net.minecraftforge.eventbus.api.SubscribeEvent
 import org.apache.logging.log4j.LogManager
 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.core.math.Vector
+import ru.dbotthepony.mc.otm.core.math.component1
+import ru.dbotthepony.mc.otm.core.math.component2
+import ru.dbotthepony.mc.otm.core.math.component3
+import ru.dbotthepony.mc.otm.core.math.left
+import ru.dbotthepony.mc.otm.core.math.plus
+import ru.dbotthepony.mc.otm.core.math.rotateAroundAxis
+import ru.dbotthepony.mc.otm.core.math.up
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.registry.MRegistry
 import java.util.*
 import kotlin.collections.ArrayList

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

@@ -39,6 +39,11 @@ import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 class MatterBottlerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
 	MatteryPoweredBlockEntity(MBlockEntities.MATTER_BOTTLER, p_155229_, p_155230_), IMatterGraphNode, IDroppableContainer {

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

@@ -23,15 +23,15 @@ import ru.dbotthepony.mc.otm.capability.FlowDirection
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.ifPresentK
 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.menu.MatterCapacitorBankMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 class MatterCapacitorBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryBlockEntity(MBlockEntities.MATTER_CAPACITOR_BANK, p_155229_, p_155230_), IMatterGraphNode, IMatterStorage, IDroppableContainer {
 	var gaugeLevel by synchronizer.float()
@@ -43,7 +43,8 @@ class MatterCapacitorBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState)
 	override val canSetMatterLevel: Boolean
 		get() = false
 
-	override var storedMatter: Decimal get() {
+	override var storedMatter: Decimal
+		get() {
 		var summ = Decimal.ZERO
 
 		for (stack in container)
@@ -58,7 +59,8 @@ class MatterCapacitorBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState)
 		throw UnsupportedOperationException()
 	}
 
-	override val maxStoredMatter: Decimal get() {
+	override val maxStoredMatter: Decimal
+		get() {
 		var summ = Decimal.ZERO
 
 		for (stack in container)

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

@@ -39,6 +39,13 @@ import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MItems
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
+import ru.dbotthepony.mc.otm.core.math.set
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.matter.MatterManager
 
 fun moveMatterAsDustIntoContainer(_matterValue: Decimal, container: MatteryContainer, OUTPUT_DUST_MAIN: Int, OUTPUT_DUST_STACKING: Int): Decimal {

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

@@ -28,21 +28,22 @@ import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage
 import ru.dbotthepony.mc.otm.capability.matter.MatterStorageImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 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.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.menu.MatterRecyclerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.core.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
-import ru.dbotthepony.mc.otm.core.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.WriteOnce
-import ru.dbotthepony.mc.otm.core.getDecimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
+import ru.dbotthepony.mc.otm.core.math.set
 
 class MatterRecyclerBlockEntity(blockPos: BlockPos, blockState: BlockState)
 	: MatteryWorkerBlockEntity<MatterRecyclerBlockEntity.RecyclerJob>(MBlockEntities.MATTER_RECYCLER, blockPos, blockState, ::RecyclerJob), IMatterGraphNode, IDroppableContainer {

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

@@ -35,6 +35,13 @@ import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
+import ru.dbotthepony.mc.otm.core.math.set
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.matter.MatterManager
 
 class MatterReplicatorBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :

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

@@ -26,10 +26,10 @@ import ru.dbotthepony.mc.otm.capability.matter.IPatternState
 import ru.dbotthepony.mc.otm.capability.matter.PatternState
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.DecimalConfigValue
+import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
-import ru.dbotthepony.mc.otm.core.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph

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

@@ -27,13 +27,13 @@ import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.capability.matter.*
-import ru.dbotthepony.mc.otm.core.iterator
+import ru.dbotthepony.mc.otm.core.collect.iterator
 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.core.nbt.map
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import java.util.ArrayList
 import java.util.stream.Stream
 

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

@@ -20,8 +20,8 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.menu.DriveRackMenu
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks

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

@@ -21,8 +21,8 @@ import ru.dbotthepony.mc.otm.capability.energy.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.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.registry.MBlocks
 
 class DriveViewerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryPoweredBlockEntity(MBlockEntities.DRIVE_VIEWER, p_155229_, p_155230_), IDroppableContainer {

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

@@ -39,8 +39,8 @@ 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.getEnum
+import ru.dbotthepony.mc.otm.core.nbt.getEnum
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.storage.*
 import java.math.BigInteger

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

@@ -27,6 +27,12 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.ItemFilter
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.isPositive
+import ru.dbotthepony.mc.otm.core.math.isZero
+import ru.dbotthepony.mc.otm.core.math.plus
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 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

@@ -26,6 +26,12 @@ import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact
 import ru.dbotthepony.mc.otm.container.ItemFilter
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.plus
+import ru.dbotthepony.mc.otm.core.math.toIntSafe
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
 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

@@ -19,14 +19,14 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.transferChecked
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 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.core.getDecimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.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

@@ -26,7 +26,7 @@ import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
-import ru.dbotthepony.mc.otm.core.unaryMinus
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
 import ru.dbotthepony.mc.otm.oncePre
 
 class StorageBusBlock : RotatableMatteryBlock(), EntityBlock {

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

@@ -27,7 +27,7 @@ import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
-import ru.dbotthepony.mc.otm.core.unaryMinus
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
 import ru.dbotthepony.mc.otm.oncePre
 
 class StorageImporterBlock : RotatableMatteryBlock(), EntityBlock {

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

@@ -20,9 +20,9 @@ import ru.dbotthepony.mc.otm.compat.mekanism.getMekanismEnergySided
 import ru.dbotthepony.mc.otm.compat.mekanism.mekanismEnergy
 import ru.dbotthepony.mc.otm.container.awareStream
 import ru.dbotthepony.mc.otm.container.stream
-import ru.dbotthepony.mc.otm.core.AwareItemStack
+import ru.dbotthepony.mc.otm.core.collect.AwareItemStack
-import ru.dbotthepony.mc.otm.core.ContainerItemStackEntry
+import ru.dbotthepony.mc.otm.core.collect.ContainerItemStackEntry
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.orNull
 import java.util.IdentityHashMap
 import java.util.LinkedList
@@ -68,7 +68,8 @@ internal fun IEnergyStorage.extractEnergy(amount: Decimal, simulate: Boolean): D
 	return Decimal.valueOf(extractEnergy(amount.toInt(), simulate))
 }
 
-val IEnergyStorage.maxEnergyStoredMattery: Decimal get() {
+val IEnergyStorage.maxEnergyStoredMattery: Decimal
+	get() {
 	if (this is IMatteryEnergyStorage) {
 		return maxBatteryLevel
 	}

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

@@ -49,6 +49,15 @@ import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.stream
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.collect.UUIDIntModifiersMap
+import ru.dbotthepony.mc.otm.core.collect.nonEmpty
+import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.math.set
+import ru.dbotthepony.mc.otm.core.nbt.getCompoundList
+import ru.dbotthepony.mc.otm.core.nbt.map
+import ru.dbotthepony.mc.otm.core.nbt.set
+import ru.dbotthepony.mc.otm.core.util.IntValueCodec
+import ru.dbotthepony.mc.otm.core.util.UUIDValueCodec
 import ru.dbotthepony.mc.otm.menu.ExoPackInventoryMenu
 import ru.dbotthepony.mc.otm.network.*
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures

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

@@ -7,8 +7,12 @@ 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.container.set
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.BigInteger
+import ru.dbotthepony.mc.otm.core.math.isPositive
+import ru.dbotthepony.mc.otm.core.math.serializeNBT
+import ru.dbotthepony.mc.otm.core.nbt.ifHas
+import ru.dbotthepony.mc.otm.core.nbt.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

@@ -7,10 +7,9 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.core.BigInteger
+import ru.dbotthepony.mc.otm.core.math.BigInteger
-import ru.dbotthepony.mc.otm.core.serializeNBT
+import ru.dbotthepony.mc.otm.core.math.serializeNBT
-import ru.dbotthepony.mc.otm.container.set
+import ru.dbotthepony.mc.otm.core.nbt.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/energy/AndroidPowerSource.kt

@@ -9,11 +9,11 @@ import net.minecraftforge.common.util.INBTSerializable
 import ru.dbotthepony.mc.otm.capability.FlowDirection
 import ru.dbotthepony.mc.otm.capability.extractEnergy
 import ru.dbotthepony.mc.otm.capability.receiveEnergy
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.getDecimal
+import ru.dbotthepony.mc.otm.core.math.getDecimal
-import ru.dbotthepony.mc.otm.core.getItemStack
+import ru.dbotthepony.mc.otm.core.nbt.getItemStack
 import ru.dbotthepony.mc.otm.core.ifPresentK
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.network.FieldSynchronizer
 import ru.dbotthepony.mc.otm.registry.StatNames
 import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger

src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BlockEnergyStorageImpl.kt

@@ -17,11 +17,11 @@ import ru.dbotthepony.mc.otm.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.VerboseBalanceValues
 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.capability.FlowDirection
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.defineDecimal
+import ru.dbotthepony.mc.otm.core.math.defineDecimal
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.mapIf
+import ru.dbotthepony.mc.otm.core.nbt.mapIf
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 sealed class BlockEnergyStorageImpl(
 	protected val listener: () -> Unit,

src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IEnergyStorageImpl.kt

@@ -4,10 +4,9 @@ import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
 import net.minecraftforge.energy.IEnergyStorage
 import ru.dbotthepony.mc.otm.capability.FlowDirection
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
-import java.math.BigInteger
 
 sealed interface IEnergyStorageImpl {
 	val maxInput: Decimal?

src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IMatteryEnergyStorage.kt

@@ -2,8 +2,8 @@ package ru.dbotthepony.mc.otm.capability.energy
 
 import net.minecraftforge.energy.IEnergyStorage
 import ru.dbotthepony.mc.otm.capability.FlowDirection
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import java.math.BigInteger
 import kotlin.math.roundToInt
 

src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ItemEnergyStorageImpl.kt

@@ -14,9 +14,9 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy
 import ru.dbotthepony.mc.otm.capability.isMekanismLoaded
 import ru.dbotthepony.mc.otm.compat.mekanism.Mattery2MekanismEnergyWrapper
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.map
+import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.tagNotNull
 
 sealed class ItemEnergyStorageImpl(

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

@@ -3,8 +3,8 @@ package ru.dbotthepony.mc.otm.capability.matter
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.FlowDirection
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.orNull
 import kotlin.math.roundToInt
 

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

@@ -1,10 +1,9 @@
 package ru.dbotthepony.mc.otm.capability.matter
 
-import net.minecraft.util.Mth
 import net.minecraft.world.item.Item
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.orNull
 import java.util.*
 import java.util.function.Predicate

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

@@ -6,8 +6,8 @@ import net.minecraftforge.common.util.LazyOptional
 import ru.dbotthepony.mc.otm.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.VerboseBalanceValues
 import ru.dbotthepony.mc.otm.capability.FlowDirection
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 
 open class MatterStorageImpl @JvmOverloads constructor(
 	protected val listener: Runnable?,

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

@@ -9,6 +9,8 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.nbt.contains
+import ru.dbotthepony.mc.otm.core.nbt.set
 import java.util.*
 
 sealed interface IPatternState {

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

@@ -10,7 +10,7 @@ import net.minecraft.world.item.Items
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.core.readItemType
 import ru.dbotthepony.mc.otm.core.registryName
-import ru.dbotthepony.mc.otm.core.set
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.writeItemType
 import java.util.UUID
 

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

@@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.client
 
 import com.mojang.blaze3d.platform.InputConstants
 import com.mojang.blaze3d.systems.RenderSystem
-import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.KeyMapping
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent
 import net.minecraftforge.client.event.RenderGuiEvent
@@ -14,7 +13,7 @@ import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.client.render.drawRect
 import ru.dbotthepony.mc.otm.client.render.is3DContext
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.network.ActivateAndroidFeaturePacket
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import kotlin.math.roundToInt

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

@@ -16,7 +16,10 @@ import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.TextAlign
 import ru.dbotthepony.mc.otm.client.render.drawAligned
 import ru.dbotthepony.mc.otm.client.render.drawArc
-import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.angleDifference
+import ru.dbotthepony.mc.otm.core.math.normalizeAngle
+import ru.dbotthepony.mc.otm.core.util.formatTickDuration
 import ru.dbotthepony.mc.otm.milliTimeD
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import ru.dbotthepony.mc.otm.network.SwitchAndroidFeaturePacket
@@ -206,8 +209,8 @@ object AndroidMenuKeyMapping : KeyMapping("key.otm.android_menu", KeyConflictCon
 				event.poseStack,
 				minecraft.window.guiScaledWidth / 2f,
 				minecraft.window.guiScaledHeight / 2f,
-				linearInterpolation(lastSelectProgressGlobal, size, size * 1.2f),
+				ru.dbotthepony.mc.otm.core.math.linearInterpolation(lastSelectProgressGlobal, size, size * 1.2f),
-				linearInterpolation(lastSelectProgressGlobal, size * 0.3f, size * 0.4f),
+				ru.dbotthepony.mc.otm.core.math.linearInterpolation(lastSelectProgressGlobal, size * 0.3f, size * 0.4f),
 
 				startDegree = lastSelectedDegree!!,
 				endDegree = lastSelectedDegree!! + degreePerSlice

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

@@ -27,7 +27,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.Panel2Widget
 import ru.dbotthepony.mc.otm.compat.InventoryScrollPacket
 import ru.dbotthepony.mc.otm.compat.cos.isCosmeticArmorScreen
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.integerDivisionUp
+import ru.dbotthepony.mc.otm.core.math.integerDivisionUp
 import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.network.MenuNetworkChannel
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures

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

@@ -21,8 +21,8 @@ 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.core.math.RGBAColor
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
 import ru.dbotthepony.mc.otm.core.ifPresentK
 import java.util.*
 import kotlin.math.ceil

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

@@ -12,8 +12,8 @@ import net.minecraft.client.renderer.RenderType
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import org.lwjgl.opengl.GL11.GL_ALWAYS
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
-import ru.dbotthepony.mc.otm.core.linearInterpolation
+import ru.dbotthepony.mc.otm.core.math.linearInterpolation
 import java.util.concurrent.ConcurrentHashMap
 
 sealed class AbstractMatterySprite {

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

@@ -10,7 +10,14 @@ import net.minecraft.network.chat.Component
 import net.minecraft.util.FormattedCharSequence
 import org.joml.Matrix4f
 import org.joml.Vector3f
-import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.IAngle
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.Vector
+import ru.dbotthepony.mc.otm.core.math.rotateAroundPoint
+import ru.dbotthepony.mc.otm.core.math.rotateAroundThis
+import ru.dbotthepony.mc.otm.core.math.times
+import ru.dbotthepony.mc.otm.core.math.translation
+import ru.dbotthepony.mc.otm.core.math.unaryMinus
 import kotlin.math.roundToInt
 
 val tesselator: Tesselator get() = Tesselator.getInstance()

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

@@ -17,7 +17,7 @@ import org.joml.Matrix4f
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.core.linearInterpolation
+import ru.dbotthepony.mc.otm.core.math.linearInterpolation
 import ru.dbotthepony.mc.otm.milliTime
 import java.lang.ref.WeakReference
 import kotlin.math.absoluteValue

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

@@ -12,7 +12,7 @@ import org.joml.Matrix4f
 import org.lwjgl.opengl.GL11.GL_ALWAYS
 import org.lwjgl.opengl.GL11.GL_LESS
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import java.util.*
 import kotlin.collections.ArrayDeque
 import kotlin.math.PI

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

@@ -8,12 +8,12 @@ import net.minecraft.client.renderer.GameRenderer
 import net.minecraftforge.client.event.RenderLevelStageEvent
 import org.lwjgl.opengl.GL11.GL_LESS
 import ru.dbotthepony.mc.otm.ServerConfig
-import ru.dbotthepony.mc.otm.core.Vector
+import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.core.component1
+import ru.dbotthepony.mc.otm.core.math.component1
-import ru.dbotthepony.mc.otm.core.component2
+import ru.dbotthepony.mc.otm.core.math.component2
-import ru.dbotthepony.mc.otm.core.component3
+import ru.dbotthepony.mc.otm.core.math.component3
-import ru.dbotthepony.mc.otm.core.linearInterpolation
+import ru.dbotthepony.mc.otm.core.math.linearInterpolation
-import ru.dbotthepony.mc.otm.core.rotateX
+import ru.dbotthepony.mc.otm.core.math.rotateX
 import ru.dbotthepony.mc.otm.network.ShockwaveEffectPacket
 import ru.dbotthepony.mc.otm.secondTimeD
 import kotlin.math.PI

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

@@ -5,6 +5,7 @@ import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSyntaxException
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
+import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
 
 enum class SpriteType {

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

@@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource
 import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.core.get
-import ru.dbotthepony.mc.otm.core.rotateY
+import ru.dbotthepony.mc.otm.core.math.rotateY
 import kotlin.math.PI
 
 abstract class BankRenderer<T : MatteryBlockEntity>(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer<T> {

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

@@ -17,7 +17,17 @@ import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.*
-import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.VECTOR_FORWARD
+import ru.dbotthepony.mc.otm.core.math.VECTOR_RIGHT
+import ru.dbotthepony.mc.otm.core.math.VECTOR_UP
+import ru.dbotthepony.mc.otm.core.math.Vector
+import ru.dbotthepony.mc.otm.core.math.asMutableAngle
+import ru.dbotthepony.mc.otm.core.math.asVector
+import ru.dbotthepony.mc.otm.core.math.minus
+import ru.dbotthepony.mc.otm.core.math.rotateAroundAxis
+import ru.dbotthepony.mc.otm.core.math.times
+import ru.dbotthepony.mc.otm.core.util.formatMatter
 import ru.dbotthepony.mc.otm.registry.MItems
 import kotlin.math.PI
 import kotlin.math.pow

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

@@ -1,7 +1,6 @@
 package ru.dbotthepony.mc.otm.client.render.blockentity
 
 import com.mojang.blaze3d.vertex.PoseStack
-import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
@@ -11,10 +10,10 @@ import ru.dbotthepony.mc.otm.block.EnergyCounterBlock
 import ru.dbotthepony.mc.otm.block.entity.EnergyCounterBlockEntity
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.*
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
-import ru.dbotthepony.mc.otm.core.asAngle
+import ru.dbotthepony.mc.otm.core.math.asAngle
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
-import ru.dbotthepony.mc.otm.core.times
+import ru.dbotthepony.mc.otm.core.math.times
 import kotlin.math.PI
 
 class EnergyCounterRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer<EnergyCounterBlockEntity> {

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

@@ -2,7 +2,6 @@
 package ru.dbotthepony.mc.otm.client.render.blockentity
 
 import com.mojang.blaze3d.vertex.*
-import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.blockentity.BeaconRenderer
@@ -20,6 +19,17 @@ import ru.dbotthepony.mc.otm.block.entity.WorkerState
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.core.*
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.VECTOR_DOWN
+import ru.dbotthepony.mc.otm.core.math.VECTOR_FORWARD
+import ru.dbotthepony.mc.otm.core.math.VECTOR_RIGHT
+import ru.dbotthepony.mc.otm.core.math.VECTOR_UP
+import ru.dbotthepony.mc.otm.core.math.Vector
+import ru.dbotthepony.mc.otm.core.math.asAngle
+import ru.dbotthepony.mc.otm.core.math.plus
+import ru.dbotthepony.mc.otm.core.math.rotateAroundAxis
+import ru.dbotthepony.mc.otm.core.math.times
+import ru.dbotthepony.mc.otm.core.util.formatMatter
 import kotlin.math.PI
 
 @Suppress("PrivatePropertyName")

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

@@ -16,12 +16,12 @@ import ru.dbotthepony.mc.otm.block.entity.WorkerState
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
 import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource
 import ru.dbotthepony.mc.otm.client.render.lockBlendFunc
-import ru.dbotthepony.mc.otm.core.component1
+import ru.dbotthepony.mc.otm.core.math.component1
-import ru.dbotthepony.mc.otm.core.component2
+import ru.dbotthepony.mc.otm.core.math.component2
-import ru.dbotthepony.mc.otm.core.component3
+import ru.dbotthepony.mc.otm.core.math.component3
 import ru.dbotthepony.mc.otm.core.get
-import ru.dbotthepony.mc.otm.core.normalizeAngleDeg
+import ru.dbotthepony.mc.otm.core.math.normalizeAngleDeg
-import ru.dbotthepony.mc.otm.core.rotateYDegrees
+import ru.dbotthepony.mc.otm.core.math.rotateYDegrees
 import ru.dbotthepony.mc.otm.isPaused
 
 class MatterReplicatorRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer<MatterReplicatorBlockEntity> {

src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/PlasmaProjectileRenderer.kt

@@ -9,9 +9,8 @@ import ru.dbotthepony.mc.otm.client.render.TextAlign
 import ru.dbotthepony.mc.otm.client.render.drawAligned
 import ru.dbotthepony.mc.otm.client.render.rotateAroundPoint
 import ru.dbotthepony.mc.otm.client.render.translation
-import ru.dbotthepony.mc.otm.core.Angle
+import ru.dbotthepony.mc.otm.core.math.Angle
 import ru.dbotthepony.mc.otm.entity.PlasmaProjectile
-import kotlin.math.PI
 
 class PlasmaProjectileRenderer(context: EntityRendererProvider.Context) : EntityRenderer<PlasmaProjectile>(context) {
 	override fun getTextureLocation(p_114482_: PlasmaProjectile): ResourceLocation {

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

@@ -28,12 +28,11 @@ import ru.dbotthepony.mc.otm.client.render.drawRect
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 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
-import ru.dbotthepony.mc.otm.registry.MRegistry
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.properties.Delegates

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

@@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
-import ru.dbotthepony.mc.otm.core.integerDivisionDown
+import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
 import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem
 import ru.dbotthepony.mc.otm.menu.DriveViewerMenu
 import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak

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

@@ -5,7 +5,7 @@ import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
 import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu
 
 class EnergyCounterScreen(menu: EnergyCounterMenu, inventory: Inventory, title: Component) : MatteryScreen<EnergyCounterMenu>(menu, inventory, title) {

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

@@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.LargeRectangleButtonPanel
 import ru.dbotthepony.mc.otm.client.setMousePos
 import ru.dbotthepony.mc.otm.client.shouldOpenVanillaInventory
-import ru.dbotthepony.mc.otm.core.integerDivisionDown
+import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
 import ru.dbotthepony.mc.otm.menu.ExoPackInventoryMenu
 import ru.dbotthepony.mc.otm.network.ExoSuitMenuOpen
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel

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

@@ -17,9 +17,9 @@ import ru.dbotthepony.mc.otm.client.screen.panels.buttons.SmallEnumRectangleButt
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 import ru.dbotthepony.mc.otm.core.asGetterSetter
-import ru.dbotthepony.mc.otm.core.integerDivisionDown
+import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
-import ru.dbotthepony.mc.otm.core.formatReadableNumber
+import ru.dbotthepony.mc.otm.core.util.formatReadableNumber
-import ru.dbotthepony.mc.otm.core.formatSiComponent
+import ru.dbotthepony.mc.otm.core.util.formatSiComponent
 import ru.dbotthepony.mc.otm.menu.ItemMonitorMenu
 import ru.dbotthepony.mc.otm.storage.ITEM_STORAGE
 import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak

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

@@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.client.render.WidgetLocation
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.integerDivisionDown
+import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
 import ru.dbotthepony.mc.otm.menu.MatterPanelMenu
 import ru.dbotthepony.mc.otm.menu.ReplicationRequestPacket
 import ru.dbotthepony.mc.otm.network.MenuNetworkChannel

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

@@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.client.screen
 
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
-import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap
 import it.unimi.dsi.fastutil.ints.Int2ObjectFunction
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
 import net.minecraft.ChatFormatting
@@ -21,7 +20,7 @@ import ru.dbotthepony.mc.otm.ClientConfig
 import ru.dbotthepony.mc.otm.client.moveMousePosScaled
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton
-import ru.dbotthepony.mc.otm.core.integerDivisionDown
+import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
 import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import java.util.Collections
 

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

@@ -5,7 +5,7 @@ import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.widget.HorizontalPowerGaugePanel
-import ru.dbotthepony.mc.otm.core.formatPower
+import ru.dbotthepony.mc.otm.core.util.formatPower
 
 import ru.dbotthepony.mc.otm.menu.StoragePowerSupplierMenu
 

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

@@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11
 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.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 
 abstract class AbstractSlotPanel<out S : MatteryScreen<*>> @JvmOverloads constructor(
 	screen: S,

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

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels
 import com.mojang.blaze3d.platform.InputConstants
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.core.linearInterpolation
+import ru.dbotthepony.mc.otm.core.math.linearInterpolation
 import ru.dbotthepony.mc.otm.milliTimeD
 import kotlin.math.roundToInt
 

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

@@ -16,10 +16,10 @@ import ru.dbotthepony.mc.otm.client.render.drawAligned
 import ru.dbotthepony.mc.otm.client.render.drawScaledAligned
 import ru.dbotthepony.mc.otm.client.render.sprite
 import ru.dbotthepony.mc.otm.client.render.render
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.formatTickDuration
+import ru.dbotthepony.mc.otm.core.util.formatTickDuration
-import ru.dbotthepony.mc.otm.core.integerDivisionDown
+import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
 import java.util.stream.Collectors
 
 open class EffectListPanel<out S : Screen> @JvmOverloads constructor(

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

@@ -3,10 +3,8 @@ package ru.dbotthepony.mc.otm.client.screen.panels
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.client.render.clearDepth
 import ru.dbotthepony.mc.otm.core.TextComponent
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
-import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 
 open class Label<out S : Screen> @JvmOverloads constructor(
 	screen: S,

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

@@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.client.render.TextAlign
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.client.render.drawAligned
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 
 open class ButtonPanel<out S : Screen>(
 	screen: S,

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

@@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.client.render.WidgetLocation
 import ru.dbotthepony.mc.otm.client.render.tesselator
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.formatMatterLevel
+import ru.dbotthepony.mc.otm.core.util.formatMatterLevel
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.nanoTime
 import kotlin.math.absoluteValue

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

@@ -6,7 +6,7 @@ import net.minecraft.network.chat.Component
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
-import ru.dbotthepony.mc.otm.core.formatPowerLevel
+import ru.dbotthepony.mc.otm.core.util.formatPowerLevel
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 
 open class PowerGaugePanel<out S : Screen> @JvmOverloads constructor(

src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt

@@ -25,7 +25,7 @@ import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_AC
 import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_INACTIVE
 import ru.dbotthepony.mc.otm.container.awareStream
 import ru.dbotthepony.mc.otm.container.stream
-import ru.dbotthepony.mc.otm.core.AwareItemStack
+import ru.dbotthepony.mc.otm.core.collect.AwareItemStack
 import ru.dbotthepony.mc.otm.menu.MatterySlot
 import java.util.stream.Stream
 

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

@@ -8,7 +8,7 @@ import net.minecraftforge.fml.ModList
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.container.awareStream
 import ru.dbotthepony.mc.otm.container.stream
-import ru.dbotthepony.mc.otm.core.AwareItemStack
+import ru.dbotthepony.mc.otm.core.collect.AwareItemStack
 import ru.dbotthepony.mc.otm.core.orNull
 import top.theillusivec4.curios.api.CuriosApi
 import top.theillusivec4.curios.common.inventory.CosmeticCurioSlot

src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt

@@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.client.render.TextAlign
 import ru.dbotthepony.mc.otm.client.render.drawAligned
 import ru.dbotthepony.mc.otm.client.screen.panels.AbstractSlotPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
-import ru.dbotthepony.mc.otm.core.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.registryName
 import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe

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

@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm.compat.mekanism
 
 import mekanism.api.math.FloatingLong
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import java.math.BigInteger
 
 private val LONG_OVERFLOW = BigInteger.valueOf(Long.MAX_VALUE) + BigInteger.valueOf(Long.MAX_VALUE) + BigInteger.TWO

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

@@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.capability.FlowDirection
 import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.isMekanismLoaded
-import ru.dbotthepony.mc.otm.core.Decimal
+import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.orNull
 import java.lang.ref.WeakReference
 import java.util.WeakHashMap