move configs to config subpackage

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

@@ -35,6 +35,8 @@ import ru.dbotthepony.mc.otm.client.render.blockentity.BatteryBankRenderer;
 import ru.dbotthepony.mc.otm.client.render.blockentity.MatterBatteryBankRenderer;
 import ru.dbotthepony.mc.otm.compat.mekanism.QIOKt;
 import ru.dbotthepony.mc.otm.compat.mekanism.TooltipsKt;
+import ru.dbotthepony.mc.otm.config.ClientConfig;
+import ru.dbotthepony.mc.otm.config.ServerConfig;
 import ru.dbotthepony.mc.otm.core.math.Decimal;
 import ru.dbotthepony.mc.otm.item.ItemTritaniumArmor;
 import ru.dbotthepony.mc.otm.item.QuantumBatteryItem;

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

@@ -4,6 +4,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList
 import net.minecraft.resources.ResourceLocation
 import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.registries.IForgeRegistry
+import ru.dbotthepony.mc.otm.config.getValue
 import java.util.LinkedList
 
 abstract class ObservedConfigList<V : Any>(val parent: ForgeConfigSpec.ConfigValue<MutableList<String>>, private val allowNulls: Boolean = false) : AbstractMutableList<V>(), RandomAccess {

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

@@ -26,7 +26,7 @@ import net.minecraftforge.event.ForgeEventFactory
 import net.minecraftforge.event.entity.living.LivingDeathEvent
 import ru.dbotthepony.mc.otm.NULLABLE_MINECRAFT_SERVER
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.android.AndroidActiveFeature
 import ru.dbotthepony.mc.otm.android.AndroidResearchManager
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability

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

@@ -5,10 +5,10 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraftforge.event.entity.living.LivingHurtEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
 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.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures

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

@@ -9,7 +9,7 @@ import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.item.ItemEntity
 import net.minecraftforge.network.NetworkEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.android.AndroidResearchManager
 import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability

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

@@ -8,9 +8,9 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundSource
 import net.minecraftforge.network.NetworkEvent
-import ru.dbotthepony.mc.otm.ClientConfig
+import ru.dbotthepony.mc.otm.config.ClientConfig
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.android.AndroidResearchManager
 import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability

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

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.android.feature
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerPlayer
 import net.minecraftforge.event.entity.living.LivingHurtEvent
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.android.AndroidFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures

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

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.android.feature
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.world.effect.MobEffectInstance
 import net.minecraft.world.effect.MobEffects
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact

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

@@ -13,7 +13,7 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.monster.warden.Warden
 import net.minecraftforge.network.NetworkEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.android.AndroidResearchManager
 import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability

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

@@ -20,7 +20,7 @@ import net.minecraft.world.level.material.Material
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.get
 import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom

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

@@ -17,7 +17,7 @@ import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity

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

@@ -17,7 +17,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.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.FlowDirection

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

@@ -17,7 +17,7 @@ import net.minecraftforge.common.ForgeConfigSpec.ConfigValue
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.FlowDirection

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

@@ -16,7 +16,7 @@ import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.FlowDirection

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

@@ -16,7 +16,7 @@ import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.capability.energy.BlockEnergyStorageImpl

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

@@ -13,7 +13,7 @@ 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.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.capability.MatteryCapability

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.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock

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

@@ -25,7 +25,7 @@ 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.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability

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

@@ -24,6 +24,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.storage.AbstractStorageImportExport.Companion.FILTER_KEY
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.container.ItemFilter
 import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom

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

@@ -23,6 +23,8 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.container.ItemFilter
 import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom

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.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability

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

@@ -16,7 +16,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.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.block.IDroppableContainer
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.core.TranslatableComponent

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

@@ -46,6 +46,7 @@ import ru.dbotthepony.mc.otm.android.AndroidResearchType
 import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature
 import ru.dbotthepony.mc.otm.capability.energy.AndroidPowerSource
 import ru.dbotthepony.mc.otm.client.minecraft
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.stream
 import ru.dbotthepony.mc.otm.core.*

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

@@ -13,8 +13,8 @@ import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
-import ru.dbotthepony.mc.otm.VerboseBalanceValues
+import ru.dbotthepony.mc.otm.config.VerboseBalanceValues
 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.capability.FlowDirection
 import ru.dbotthepony.mc.otm.core.math.Decimal
@@ -196,19 +196,23 @@ open class WorkerEnergyStorage(
 
 	constructor(
 		listener: () -> Unit,
-		values: ConciseBalanceValues) : this(listener, values::capacity, values::throughput, values::throughput)
+		values: ConciseBalanceValues
+	) : this(listener, values::capacity, values::throughput, values::throughput)
 
 	constructor(
 		listener: BlockEntity,
-		values: ConciseBalanceValues) : this(listener::setChanged, values::capacity, values::throughput, values::throughput)
+		values: ConciseBalanceValues
+	) : this(listener::setChanged, values::capacity, values::throughput, values::throughput)
 
 	constructor(
 		listener: () -> Unit,
-		values: VerboseBalanceValues) : this(listener, values::capacity, values::receive, values::extract)
+		values: VerboseBalanceValues
+	) : this(listener, values::capacity, values::receive, values::extract)
 
 	constructor(
 		listener: BlockEntity,
-		values: VerboseBalanceValues) : this(listener::setChanged, values::capacity, values::receive, values::extract)
+		values: VerboseBalanceValues
+	) : this(listener::setChanged, values::capacity, values::receive, values::extract)
 
 	constructor(
 		listener: BlockEntity,
@@ -244,19 +248,23 @@ open class GeneratorEnergyStorage(
 
 	constructor(
 		listener: () -> Unit,
-		values: ConciseBalanceValues) : this(listener, values::capacity, values::throughput, values::throughput)
+		values: ConciseBalanceValues
+	) : this(listener, values::capacity, values::throughput, values::throughput)
 
 	constructor(
 		listener: BlockEntity,
-		values: ConciseBalanceValues) : this(listener::setChanged, values::capacity, values::throughput, values::throughput)
+		values: ConciseBalanceValues
+	) : this(listener::setChanged, values::capacity, values::throughput, values::throughput)
 
 	constructor(
 		listener: () -> Unit,
-		values: VerboseBalanceValues) : this(listener, values::capacity, values::receive, values::extract)
+		values: VerboseBalanceValues
+	) : this(listener, values::capacity, values::receive, values::extract)
 
 	constructor(
 		listener: BlockEntity,
-		values: VerboseBalanceValues) : this(listener::setChanged, values::capacity, values::receive, values::extract)
+		values: VerboseBalanceValues
+	) : this(listener::setChanged, values::capacity, values::receive, values::extract)
 
 	constructor(
 		listener: BlockEntity,
@@ -292,19 +300,23 @@ open class CapacitorEnergyStorage(
 
 	constructor(
 		listener: () -> Unit,
-		values: ConciseBalanceValues) : this(listener, values::capacity, values::throughput, values::throughput)
+		values: ConciseBalanceValues
+	) : this(listener, values::capacity, values::throughput, values::throughput)
 
 	constructor(
 		listener: BlockEntity,
-		values: ConciseBalanceValues) : this(listener::setChanged, values::capacity, values::throughput, values::throughput)
+		values: ConciseBalanceValues
+	) : this(listener::setChanged, values::capacity, values::throughput, values::throughput)
 
 	constructor(
 		listener: () -> Unit,
-		values: VerboseBalanceValues) : this(listener, values::capacity, values::receive, values::extract)
+		values: VerboseBalanceValues
+	) : this(listener, values::capacity, values::receive, values::extract)
 
 	constructor(
 		listener: BlockEntity,
-		values: VerboseBalanceValues) : this(listener::setChanged, values::capacity, values::receive, values::extract)
+		values: VerboseBalanceValues
+	) : this(listener::setChanged, values::capacity, values::receive, values::extract)
 
 	constructor(
 		listener: BlockEntity,

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

@@ -3,8 +3,8 @@ package ru.dbotthepony.mc.otm.capability.matter
 import net.minecraft.nbt.CompoundTag
 import net.minecraftforge.common.util.INBTSerializable
 import net.minecraftforge.common.util.LazyOptional
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
-import ru.dbotthepony.mc.otm.VerboseBalanceValues
+import ru.dbotthepony.mc.otm.config.VerboseBalanceValues
 import ru.dbotthepony.mc.otm.capability.FlowDirection
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.nbt.set

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

@@ -12,7 +12,7 @@ import net.minecraftforge.client.event.MovementInputUpdateEvent
 import net.minecraftforge.client.event.ScreenEvent
 import net.minecraftforge.client.event.ScreenEvent.MouseDragged
 import net.minecraftforge.client.event.ScreenEvent.MouseScrolled
-import ru.dbotthepony.mc.otm.ClientConfig
+import ru.dbotthepony.mc.otm.config.ClientConfig
 import ru.dbotthepony.mc.otm.android.feature.JumpBoostFeature
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.matteryPlayer

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

@@ -7,7 +7,7 @@ import com.mojang.blaze3d.vertex.VertexFormat
 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.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.math.Vector
 import ru.dbotthepony.mc.otm.core.math.component1
 import ru.dbotthepony.mc.otm.core.math.component2

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

@@ -17,7 +17,7 @@ import net.minecraftforge.client.event.ContainerScreenEvent.Render.Foreground
 import net.minecraftforge.common.MinecraftForge
 import org.lwjgl.opengl.GL11
 import org.lwjgl.opengl.GL13
-import ru.dbotthepony.mc.otm.ClientConfig
+import ru.dbotthepony.mc.otm.config.ClientConfig
 import ru.dbotthepony.mc.otm.client.moveMousePosScaled
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel

src/main/kotlin/ru/dbotthepony/mc/otm/config/BatteryBalanceValues.kt

@@ -0,0 +1,7 @@
+package ru.dbotthepony.mc.otm.config
+
+import ru.dbotthepony.mc.otm.core.math.Decimal
+
+interface BatteryBalanceValues : VerboseBalanceValues {
+	val initialBatteryLevel: Decimal
+}

src/main/kotlin/ru/dbotthepony/mc/otm/config/ClientConfig.kt

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm
+package ru.dbotthepony.mc.otm.config
 
 import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.fml.ModLoadingContext

src/main/kotlin/ru/dbotthepony/mc/otm/config/ConciseBalanceValues.kt

@@ -0,0 +1,8 @@
+package ru.dbotthepony.mc.otm.config
+
+import ru.dbotthepony.mc.otm.core.math.Decimal
+
+interface ConciseBalanceValues {
+	val capacity: Decimal
+	val throughput: Decimal
+}

src/main/kotlin/ru/dbotthepony/mc/otm/config/ConfigExt.kt

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm
+package ru.dbotthepony.mc.otm.config
 
 import net.minecraftforge.common.ForgeConfigSpec
 import kotlin.reflect.KProperty

src/main/kotlin/ru/dbotthepony/mc/otm/config/ObservedConfigValue.kt

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm
+package ru.dbotthepony.mc.otm.config
 
 import net.minecraftforge.common.ForgeConfigSpec.ConfigValue
 import org.apache.logging.log4j.LogManager

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm
+package ru.dbotthepony.mc.otm.config
 
 import net.minecraftforge.common.ForgeConfigSpec
 import net.minecraftforge.fml.ModLoadingContext
@@ -16,21 +16,6 @@ import ru.dbotthepony.mc.otm.core.math.defineDecimal
 import ru.dbotthepony.mc.otm.item.EnergySwordItem
 import ru.dbotthepony.mc.otm.registry.MNames
 
-interface VerboseBalanceValues {
-	val capacity: Decimal
-	val receive: Decimal
-	val extract: Decimal
-}
-
-interface BatteryBalanceValues : VerboseBalanceValues {
-	val initialBatteryLevel: Decimal
-}
-
-interface ConciseBalanceValues {
-	val capacity: Decimal
-	val throughput: Decimal
-}
-
 object ServerConfig {
 	private val specBuilder = ForgeConfigSpec.Builder()
 	@Suppress("JoinDeclarationAndAssignment")

src/main/kotlin/ru/dbotthepony/mc/otm/config/VerboseBalanceValues.kt

@@ -0,0 +1,9 @@
+package ru.dbotthepony.mc.otm.config
+
+import ru.dbotthepony.mc.otm.core.math.Decimal
+
+interface VerboseBalanceValues {
+	val capacity: Decimal
+	val receive: Decimal
+	val extract: Decimal
+}

src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Decimal.kt

@@ -6,7 +6,7 @@ import net.minecraft.nbt.StringTag
 import net.minecraft.nbt.Tag
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraftforge.common.ForgeConfigSpec
-import ru.dbotthepony.mc.otm.ObservedConfigValue
+import ru.dbotthepony.mc.otm.config.ObservedConfigValue
 import ru.dbotthepony.mc.otm.core.util.readDouble
 import ru.dbotthepony.mc.otm.core.util.readVarIntLE
 import ru.dbotthepony.mc.otm.core.util.writeDouble

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

@@ -15,7 +15,7 @@ import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.item.UseAnim
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.core.TranslatableComponent

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

@@ -14,8 +14,8 @@ import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.common.capabilities.ICapabilityProvider
-import ru.dbotthepony.mc.otm.BatteryBalanceValues
+import ru.dbotthepony.mc.otm.config.BatteryBalanceValues
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.capability.energy.EnergyCapacitorItem
 import ru.dbotthepony.mc.otm.capability.energy.ItemEnergyStorageImpl

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

@@ -6,7 +6,7 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.level.Level
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.matter.IMatterItem

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

@@ -5,7 +5,7 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Tier
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.material.Material
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 
 class MatteryAxeItem(pTier: Tier, pAttackDamageModifier: Float, pAttackSpeedModifier: Float,  pProperties: Properties) : AxeItem(pTier, pAttackDamageModifier, pAttackSpeedModifier, pProperties) {
 	override fun getDestroySpeed(pStack: ItemStack, pState: BlockState): Float {

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

@@ -28,6 +28,7 @@ import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.getBarColor
 import ru.dbotthepony.mc.otm.capability.energy.getBarWidth
 import ru.dbotthepony.mc.otm.compat.mekanism.Mattery2MekanismEnergyWrapper
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.readDecimal

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

@@ -9,9 +9,9 @@ import net.minecraft.world.item.Rarity
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.ICapabilityProvider
-import ru.dbotthepony.mc.otm.ConciseBalanceValues
+import ru.dbotthepony.mc.otm.config.ConciseBalanceValues
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.capability.energy.EnergyProducerItem
 import ru.dbotthepony.mc.otm.capability.energy.ItemEnergyStorageImpl

src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt

@@ -8,7 +8,6 @@ import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParseException
 import com.google.gson.JsonSyntaxException
-import com.mojang.blaze3d.platform.InputConstants
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.context.CommandContext
 import it.unimi.dsi.fastutil.objects.Object2BooleanFunction
@@ -52,8 +51,7 @@ import net.minecraftforge.registries.DeferredRegister
 import net.minecraftforge.registries.ForgeRegistries
 import net.minecraftforge.server.command.EnumArgument
 import org.apache.logging.log4j.LogManager
-import org.lwjgl.glfw.GLFW
+import ru.dbotthepony.mc.otm.config.ClientConfig
-import ru.dbotthepony.mc.otm.ClientConfig
 import ru.dbotthepony.mc.otm.MINECRAFT_SERVER
 import ru.dbotthepony.mc.otm.NULLABLE_MINECRAFT_SERVER
 import ru.dbotthepony.mc.otm.OverdriveThatMatters

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt

@@ -14,7 +14,7 @@ import net.minecraftforge.eventbus.api.IEventBus
 import net.minecraftforge.registries.DeferredRegister
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.ServerConfig
+import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.collect.SupplierList
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.item.*