Move block classes to subpackages

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

@@ -4,7 +4,6 @@ import net.minecraft.core.Direction
 import net.minecraft.data.recipes.ShapedRecipeBuilder
 import net.minecraft.data.recipes.ShapelessRecipeBuilder
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.item.DyeColor
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.level.block.Block
@@ -19,6 +18,9 @@ import net.minecraftforge.forge.event.lifecycle.GatherDataEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.block.*
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
+import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
+import ru.dbotthepony.mc.otm.block.matter.PatternStorageBlock
+import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock
 import ru.dbotthepony.mc.otm.data.LootTableBasicAppender
 import ru.dbotthepony.mc.otm.datagen.blocks.BatteryBankProvider
 import ru.dbotthepony.mc.otm.datagen.blocks.MatterBankProvider

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

@@ -6,7 +6,7 @@ import net.minecraft.world.level.block.state.BlockState
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import net.minecraft.world.item.ItemStack
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
-import ru.dbotthepony.mc.otm.block.PatternStorageBlock
+import ru.dbotthepony.mc.otm.block.matter.PatternStorageBlock
 import net.minecraft.nbt.CompoundTag
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.items.CapabilityItemHandler

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -16,7 +16,8 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.items.CapabilityItemHandler
-import ru.dbotthepony.mc.otm.block.MatterBottlerBlock
+import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
+import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.MethodsReturnNonnullByDefault
 import net.minecraft.core.BlockPos
@@ -17,6 +17,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.block.BatteryBankBlock
+import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler
 import ru.dbotthepony.mc.otm.capability.matter.MatterDirection

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -24,6 +24,7 @@ import net.minecraft.network.chat.TranslatableComponent
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.level.Level
 import net.minecraftforge.common.capabilities.Capability
+import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
 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/MatterRecyclerBlockEntity.kt

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -14,6 +14,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.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.storage
 
 import net.minecraft.MethodsReturnNonnullByDefault
 import net.minecraft.core.BlockPos
@@ -12,7 +12,8 @@ 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.block.DriveViewerBlock
+import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
+import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -12,6 +12,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.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.storage
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap
 import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap
@@ -22,6 +22,7 @@ import net.minecraftforge.items.IItemHandler
 import ru.dbotthepony.mc.otm.*
 import ru.dbotthepony.mc.otm.block.CableBlock
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.ItemFilter
@@ -38,7 +39,6 @@ import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.storage.*
 import java.lang.ref.WeakReference
 import java.math.BigInteger
-import java.util.*
 import java.util.stream.Stream
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap

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

@@ -1,6 +1,5 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.storage
 
-import it.unimi.dsi.fastutil.longs.LongAVLTreeSet
 import it.unimi.dsi.fastutil.longs.LongArraySet
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -23,11 +22,11 @@ import net.minecraftforge.items.IItemHandler
 import ru.dbotthepony.mc.otm.*
 import ru.dbotthepony.mc.otm.block.CableBlock
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.*
 import ru.dbotthepony.mc.otm.container.ItemFilter
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
 import ru.dbotthepony.mc.otm.core.plus
-import ru.dbotthepony.mc.otm.core.toImpreciseFraction
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.GraphNodeListener
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
@@ -38,9 +37,7 @@ import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.storage.*
 import java.math.BigInteger
-import java.util.*
 import java.util.stream.Stream
-import kotlin.collections.HashSet
 
 abstract class AbstractStorageImportExport<T>(
 	blockType: BlockEntityType<*>,
@@ -361,7 +358,9 @@ class StorageExporterBlockEntity(blockPos: BlockPos, blockState: BlockState) :
 					continue
 				}
 
-				val exportAmountA = items.extractStack(stack.first, stack.second.count.coerceAtMost(MAX_MOVE_PER_OPERATION), true).count
+				val exportAmountA = items.extractStack(stack.first, stack.second.count.coerceAtMost(
+					MAX_MOVE_PER_OPERATION
+				), true).count
 
 				if (exportAmountA == BigInteger.ZERO) {
 					continue

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.entity
+package ru.dbotthepony.mc.otm.block.entity.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -14,6 +14,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.block.entity.MatteryPoweredBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.capability.transferInner

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.MethodsReturnNonnullByDefault
 import javax.annotation.ParametersAreNonnullByDefault
@@ -11,13 +11,14 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.entity.BlockEntity
-import ru.dbotthepony.mc.otm.block.entity.MatterBottlerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BooleanProperty
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -11,7 +11,9 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.MatterCapacitorBankBlockEntity
+import ru.dbotthepony.mc.otm.block.BatteryBankBlock
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 
 class MatterCapacitorBankBlock : RotatableMatteryBlock(), EntityBlock {

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.MethodsReturnNonnullByDefault
 import javax.annotation.ParametersAreNonnullByDefault
@@ -7,7 +7,7 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.entity.BlockEntity
-import ru.dbotthepony.mc.otm.block.entity.MatterDecomposerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterDecomposerBlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.state.StateDefinition
@@ -16,6 +16,7 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import com.google.common.collect.ImmutableMap
 import net.minecraft.world.level.block.EntityBlock
@@ -6,7 +6,7 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.entity.BlockEntity
-import ru.dbotthepony.mc.otm.block.entity.MatterPanelBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterPanelBlockEntity
 import net.minecraft.world.phys.shapes.VoxelShape
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.level.BlockGetter
@@ -15,6 +15,7 @@ import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.properties.EnumProperty
+import ru.dbotthepony.mc.otm.block.MatteryBlock
 
 class MatterPanelBlock : MatteryBlock(), EntityBlock {
 	override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity {

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -13,7 +13,8 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.MatterRecyclerBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -13,7 +13,8 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.MatterReplicatorBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -13,7 +13,8 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.MatterScannerBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -12,6 +12,7 @@ import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BooleanProperty
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.PatternStorageBlockEntity
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -11,7 +11,8 @@ import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.DriveRackBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.storage.DriveRackBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -15,7 +15,8 @@ import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BooleanProperty
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.DriveViewerBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.storage.DriveViewerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -11,7 +11,8 @@ import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.ItemMonitorBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.world.item.context.BlockPlaceContext
@@ -16,7 +16,10 @@ 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.addPreWorldTickerOnce
-import ru.dbotthepony.mc.otm.block.entity.StorageBusBlockEntity
+import ru.dbotthepony.mc.otm.block.CableBlock
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.StorageCableBlock
+import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 import ru.dbotthepony.mc.otm.unaryMinus
@@ -45,12 +48,14 @@ class StorageBusBlock : RotatableMatteryBlock(), EntityBlock {
 	override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
 		super.createBlockStateDefinition(builder)
 
-		builder.add(CableBlock.CONNECTION_SOUTH,
+		builder.add(
-				CableBlock.CONNECTION_WEST,
+			CableBlock.CONNECTION_SOUTH,
-				CableBlock.CONNECTION_EAST,
+			CableBlock.CONNECTION_WEST,
-				CableBlock.CONNECTION_NORTH,
+			CableBlock.CONNECTION_EAST,
-				CableBlock.CONNECTION_UP,
+			CableBlock.CONNECTION_NORTH,
-				CableBlock.CONNECTION_DOWN)
+			CableBlock.CONNECTION_UP,
+			CableBlock.CONNECTION_DOWN
+		)
 	}
 
 	override fun <T : BlockEntity?> getTicker(

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.world.item.context.BlockPlaceContext
@@ -16,8 +16,11 @@ 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.addPreWorldTickerOnce
-import ru.dbotthepony.mc.otm.block.entity.StorageExporterBlockEntity
+import ru.dbotthepony.mc.otm.block.CableBlock
-import ru.dbotthepony.mc.otm.block.entity.StorageImporterBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.StorageCableBlock
+import ru.dbotthepony.mc.otm.block.entity.storage.StorageExporterBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 import ru.dbotthepony.mc.otm.unaryMinus
@@ -42,12 +45,14 @@ class StorageImporterBlock : RotatableMatteryBlock(), EntityBlock {
 	override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
 		super.createBlockStateDefinition(builder)
 
-		builder.add(CableBlock.CONNECTION_SOUTH,
+		builder.add(
+			CableBlock.CONNECTION_SOUTH,
 			CableBlock.CONNECTION_WEST,
 			CableBlock.CONNECTION_EAST,
 			CableBlock.CONNECTION_NORTH,
 			CableBlock.CONNECTION_UP,
-			CableBlock.CONNECTION_DOWN)
+			CableBlock.CONNECTION_DOWN
+		)
 	}
 
 	override fun <T : BlockEntity?> getTicker(
@@ -131,12 +136,14 @@ class StorageExporterBlock : RotatableMatteryBlock(), EntityBlock {
 	override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
 		super.createBlockStateDefinition(builder)
 
-		builder.add(CableBlock.CONNECTION_SOUTH,
+		builder.add(
+			CableBlock.CONNECTION_SOUTH,
 			CableBlock.CONNECTION_WEST,
 			CableBlock.CONNECTION_EAST,
 			CableBlock.CONNECTION_NORTH,
 			CableBlock.CONNECTION_UP,
-			CableBlock.CONNECTION_DOWN)
+			CableBlock.CONNECTION_DOWN
+		)
 	}
 
 	override fun <T : BlockEntity?> getTicker(

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

@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.storage
 
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -11,7 +11,8 @@ import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
-import ru.dbotthepony.mc.otm.block.entity.StoragePowerSupplierBlockEntity
+import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
+import ru.dbotthepony.mc.otm.block.entity.storage.StoragePowerSupplierBlockEntity
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.shapes.BlockShapes
 

src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.DriveRackBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.DriveRackBlockEntity
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class DriveRackMenu @JvmOverloads constructor(

src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt

@@ -5,7 +5,7 @@ import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraftforge.energy.CapabilityEnergy
-import ru.dbotthepony.mc.otm.block.entity.DriveViewerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.DriveViewerBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive
 import ru.dbotthepony.mc.otm.container.ItemFilter

src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.block.entity.ItemMonitorBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.menu.data.INetworkedItemViewSupplier
 import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.block.entity.MatterBottlerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.menu.widget.BooleanPlayerInputWidget
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt

@@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.menu
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.MatterCapacitorBankBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity
 import ru.dbotthepony.mc.otm.core.ImpreciseFraction
-import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
 

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu
 
 import kotlin.jvm.JvmOverloads
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.MatterDecomposerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterDecomposerBlockEntity
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import net.minecraft.world.SimpleContainer

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.kt

@@ -5,7 +5,7 @@ import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraftforge.network.PacketDistributor
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.block.entity.MatterPanelBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterPanelBlockEntity
 import ru.dbotthepony.mc.otm.capability.matter.MatterTask
 import ru.dbotthepony.mc.otm.capability.matter.PatternState
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphListener

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterRecyclerMenu.kt

@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.block.entity.MatterRecyclerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
 import ru.dbotthepony.mc.otm.item.MatterDustItem
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu
 
 import kotlin.jvm.JvmOverloads
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.MatterReplicatorBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import net.minecraft.world.SimpleContainer

src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt

@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu
 
 import kotlin.jvm.JvmOverloads
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.MatterScannerBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import net.minecraft.world.SimpleContainer

src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt

@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm.menu
 
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.StorageBusBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity
 import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot
 import ru.dbotthepony.mc.otm.menu.widget.BooleanPlayerInputWidget
 import ru.dbotthepony.mc.otm.registry.MMenus

src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt

@@ -1,8 +1,7 @@
 package ru.dbotthepony.mc.otm.menu
 
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.StorageBusBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.StorageExporterBlockEntity
-import ru.dbotthepony.mc.otm.block.entity.StorageExporterBlockEntity
 import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot
 import ru.dbotthepony.mc.otm.menu.widget.BooleanPlayerInputWidget
 import ru.dbotthepony.mc.otm.registry.MMenus

src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt

@@ -1,9 +1,7 @@
 package ru.dbotthepony.mc.otm.menu
 
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.StorageBusBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity
-import ru.dbotthepony.mc.otm.block.entity.StorageExporterBlockEntity
-import ru.dbotthepony.mc.otm.block.entity.StorageImporterBlockEntity
 import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot
 import ru.dbotthepony.mc.otm.menu.widget.BooleanPlayerInputWidget
 import ru.dbotthepony.mc.otm.registry.MMenus

src/main/kotlin/ru/dbotthepony/mc/otm/menu/StoragePowerSupplierMenu.kt

@@ -1,10 +1,8 @@
 package ru.dbotthepony.mc.otm.menu
 
 import net.minecraft.world.entity.player.Inventory
-import ru.dbotthepony.mc.otm.block.entity.StorageImporterBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.storage.StoragePowerSupplierBlockEntity
-import ru.dbotthepony.mc.otm.block.entity.StoragePowerSupplierBlockEntity
 import ru.dbotthepony.mc.otm.menu.data.ImpreciseFractionDataContainer
-import ru.dbotthepony.mc.otm.menu.widget.BooleanPlayerInputWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class StoragePowerSupplierMenu @JvmOverloads constructor(

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

@@ -11,6 +11,8 @@ import ru.dbotthepony.mc.otm.block.entity.*
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlockEntityExplosionDebugger
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlockEntitySphereDebugger
+import ru.dbotthepony.mc.otm.block.entity.matter.*
+import ru.dbotthepony.mc.otm.block.entity.storage.*
 import ru.dbotthepony.mc.otm.client.render.BlackHoleRenderer
 import ru.dbotthepony.mc.otm.client.render.EnergyCounterRenderer
 import ru.dbotthepony.mc.otm.client.render.GravitationStabilizerRenderer

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

@@ -17,6 +17,8 @@ import net.minecraftforge.registries.DeferredRegister
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.block.*
+import ru.dbotthepony.mc.otm.block.matter.*
+import ru.dbotthepony.mc.otm.block.storage.*
 
 
 object MBlocks {

src/main/kotlin/ru/dbotthepony/mc/otm/storage/API.kt

@@ -49,7 +49,8 @@ interface IStorageStack {
 	}
 }
 
-inline fun <reified T : IStorageStack> T.key(): T {
+@Suppress("UNCHECKED_CAST")
+fun <T : IStorageStack> T.key(): T {
 	return copy().also { it.count = BigInteger.ONE } as T
 }