From 078b3dba9a571f0578d4e7924cbc011bdc1deb58 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 30 Mar 2025 15:32:32 +0700 Subject: [PATCH] Move Multiblock subpackage to root --- .../dbotthepony/mc/otm/mixin/BlockEntityMixin.java | 2 +- .../otm/block/entity/MultiblockTestBlockEntity.kt | 6 +++--- .../blackhole/BlackHoleGeneratorBlockEntity.kt | 8 ++++---- .../block/entity/tech/EnergyHatchBlockEntity.kt | 3 +-- .../entity/tech/EnergyInterfaceBlockEntity.kt | 7 +++---- .../entity/tech/FlywheelBatteryBlockEntity.kt | 14 +++++--------- .../otm/block/entity/tech/ItemHatchBlockEntity.kt | 2 +- .../block/entity/tech/MatterHatchBlockEntity.kt | 3 +-- .../mc/otm/client/render/MultiblockRendering.kt | 4 ++-- .../mc/otm/menu/tech/BlackHoleGeneratorMenu.kt | 2 +- .../mc/otm/{core => }/multiblock/BlockEntitySet.kt | 4 ++-- .../mc/otm/{core => }/multiblock/BlockEntityTag.kt | 2 +- .../mc/otm/{core => }/multiblock/BlockPredicate.kt | 2 +- .../multiblock/GlobalBlockEntityRemovalListener.kt | 2 +- .../otm/{core => }/multiblock/IMultiblockAccess.kt | 2 +- .../{core => }/multiblock/IMultiblockListener.kt | 2 +- .../otm/{core => }/multiblock/IMultiblockNode.kt | 2 +- .../{core => }/multiblock/MultiblockListenerSet.kt | 2 +- .../otm/{core => }/multiblock/MultiblockStatus.kt | 2 +- .../mc/otm/{core => }/multiblock/NodeStatus.kt | 2 +- .../otm/{core => }/multiblock/ShapedMultiblock.kt | 11 +++++++---- .../multiblock/ShapedMultiblockBuilder.kt | 5 +---- .../multiblock/ShapedMultiblockFactory.kt | 2 +- .../mc/otm/{core => }/multiblock/Strategy.kt | 2 +- 24 files changed, 43 insertions(+), 50 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/BlockEntitySet.kt (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/BlockEntityTag.kt (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/BlockPredicate.kt (98%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/GlobalBlockEntityRemovalListener.kt (96%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/IMultiblockAccess.kt (97%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/IMultiblockListener.kt (76%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/IMultiblockNode.kt (82%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/MultiblockListenerSet.kt (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/MultiblockStatus.kt (91%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/NodeStatus.kt (54%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/ShapedMultiblock.kt (98%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/ShapedMultiblockBuilder.kt (98%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/ShapedMultiblockFactory.kt (96%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{core => }/multiblock/Strategy.kt (93%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java index baeaf78c9..b2a36d849 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import ru.dbotthepony.mc.otm.core.multiblock.GlobalBlockEntityRemovalListener; +import ru.dbotthepony.mc.otm.multiblock.GlobalBlockEntityRemovalListener; // because i know // someone diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt index 696ce3ba3..0160e5c8e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt @@ -6,9 +6,9 @@ import net.minecraft.world.level.block.Blocks import net.minecraft.world.level.block.entity.FurnaceBlockEntity import net.minecraft.world.level.block.entity.HopperBlockEntity import net.minecraft.world.level.block.state.BlockState -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus -import ru.dbotthepony.mc.otm.core.multiblock.multiblockEntity -import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.multiblockEntity +import ru.dbotthepony.mc.otm.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.registry.game.MBlocks diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt index 84c9bba76..b3f4eccae 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt @@ -25,15 +25,15 @@ import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.config.ServerConfig import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.multiblock.ShapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.ShapedMultiblock import ru.dbotthepony.mc.otm.core.getBlockStateNow import ru.dbotthepony.mc.otm.core.immutableList import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus -import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.core.otmRandom import ru.dbotthepony.mc.otm.core.util.InvalidableLazy import ru.dbotthepony.mc.otm.menu.tech.BlackHoleGeneratorMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt index 733cdb3ea..1de795f0c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.Capabilities @@ -19,7 +18,7 @@ import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag import ru.dbotthepony.mc.otm.menu.tech.EnergyHatchMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt index 8b8185fdd..fdc9d1f45 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.Capabilities @@ -21,9 +20,9 @@ import ru.dbotthepony.mc.otm.capability.moveEnergy import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag -import ru.dbotthepony.mc.otm.core.multiblock.IMultiblockAccess -import ru.dbotthepony.mc.otm.core.multiblock.IMultiblockListener +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.IMultiblockAccess +import ru.dbotthepony.mc.otm.multiblock.IMultiblockListener import ru.dbotthepony.mc.otm.core.otmRandom import ru.dbotthepony.mc.otm.core.util.InvalidableLazy import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt index 13fee1bae..026bf26b3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt @@ -4,30 +4,26 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectFunction import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Reference2IntMap import net.minecraft.core.BlockPos -import net.minecraft.core.SectionPos import net.minecraft.core.Vec3i import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.Blocks import net.minecraft.world.level.block.state.BlockState -import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.getBlockStateNow import ru.dbotthepony.mc.otm.core.getChunkNow import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus -import ru.dbotthepony.mc.otm.core.multiblock.ShapedMultiblock -import ru.dbotthepony.mc.otm.core.multiblock.ShapedMultiblockFactory -import ru.dbotthepony.mc.otm.core.multiblock.Strategy -import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.ShapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.ShapedMultiblockFactory +import ru.dbotthepony.mc.otm.multiblock.Strategy +import ru.dbotthepony.mc.otm.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.data.FlywheelMaterials import ru.dbotthepony.mc.otm.menu.tech.FlywheelBatteryMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt index 848bb0138..3bd4fec1f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt @@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag import ru.dbotthepony.mc.otm.menu.tech.ItemHatchMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt index 032d2685b..15bc70495 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.Capabilities @@ -18,7 +17,7 @@ import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag import ru.dbotthepony.mc.otm.menu.tech.MatterHatchMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt index 327032fc9..b335936c2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt @@ -15,8 +15,8 @@ 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.minus -import ru.dbotthepony.mc.otm.core.multiblock.IMultiblockAccess -import ru.dbotthepony.mc.otm.core.multiblock.NodeStatus +import ru.dbotthepony.mc.otm.multiblock.IMultiblockAccess +import ru.dbotthepony.mc.otm.multiblock.NodeStatus private val UNKNOWN = RGBAColor.YELLOW.copy(alpha = 0.5f) private val VALID = RGBAColor.DARK_GREEN.copy(alpha = 0.5f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt index 56e4f2a6e..4a7cac4da 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu.tech import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleGeneratorBlockEntity -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.DecimalInputWithFeedback diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntitySet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntitySet.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntitySet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntitySet.kt index 9e47845f9..c59e29756 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntitySet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntitySet.kt @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap import net.minecraft.world.level.block.entity.BlockEntity -import java.util.Collections +import java.util.* class BlockEntitySet(private val listener: GlobalBlockEntityRemovalListener, val tag: BlockEntityTag) { private val items = Reference2IntOpenHashMap() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntityTag.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntityTag.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntityTag.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntityTag.kt index ee723d051..f247f3fe6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntityTag.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntityTag.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import net.minecraft.world.level.block.entity.BlockEntity import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockPredicate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockPredicate.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockPredicate.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockPredicate.kt index 5dc8d8346..0b7f82f4c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockPredicate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockPredicate.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableSet import net.minecraft.core.BlockPos diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/GlobalBlockEntityRemovalListener.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/GlobalBlockEntityRemovalListener.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/GlobalBlockEntityRemovalListener.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/GlobalBlockEntityRemovalListener.kt index 4d4b2af79..8c2f5f138 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/GlobalBlockEntityRemovalListener.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/GlobalBlockEntityRemovalListener.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import net.minecraft.world.level.Level import net.minecraft.world.level.block.entity.BlockEntity diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockAccess.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockAccess.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockAccess.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockAccess.kt index 553c01a21..62f04257b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockAccess.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockAccess.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import it.unimi.dsi.fastutil.objects.Reference2IntMap import net.minecraft.core.BlockPos diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockListener.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockListener.kt similarity index 76% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockListener.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockListener.kt index cf751d8d1..2314bb1db 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockListener.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockListener.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock interface IMultiblockListener { fun onAddedToMultiblock(multiblock: IMultiblockAccess) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockNode.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockNode.kt similarity index 82% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockNode.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockNode.kt index 191c8a578..338fe3c86 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockNode.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockNode.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import net.minecraft.core.BlockPos import net.minecraft.world.level.block.state.BlockState diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockListenerSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockListenerSet.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockListenerSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockListenerSet.kt index 1b4050b31..b1ad34462 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockListenerSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockListenerSet.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockStatus.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockStatus.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockStatus.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockStatus.kt index c5967765c..3f9b01044 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockStatus.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockStatus.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock enum class MultiblockStatus { /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/NodeStatus.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/NodeStatus.kt similarity index 54% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/NodeStatus.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/NodeStatus.kt index 0634d57c6..e013b91ee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/NodeStatus.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/NodeStatus.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock enum class NodeStatus { UNKNOWN, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblock.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblock.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblock.kt index b64e544e0..ab07ab9e8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblock.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap @@ -36,7 +36,8 @@ import kotlin.collections.HashMap /** * [close] MUST be called when multiblock goes out of scope */ -class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMultiblockAccess, ISynchable, Closeable, GlobalBlockEntityRemovalListener { +class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMultiblockAccess, ISynchable, Closeable, + GlobalBlockEntityRemovalListener { override var isValid: MultiblockStatus = MultiblockStatus.INVALID private set @@ -69,8 +70,10 @@ class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMulti override val hasRemotes: Boolean get() = remotes.isNotEmpty() - private inner class Config(override val currentDirection: Direction, val pos: BlockPos, parts: Collection) : IMultiblockAccess, ISynchable, GlobalBlockEntityRemovalListener, Comparable { - private inner class Part private constructor(override val pos: BlockPos, val prototype: ShapedMultiblockFactory.Part, val chunkPos: ChunkPos) : Comparable, IMultiblockNode { + private inner class Config(override val currentDirection: Direction, val pos: BlockPos, parts: Collection) : IMultiblockAccess, ISynchable, + GlobalBlockEntityRemovalListener, Comparable { + private inner class Part private constructor(override val pos: BlockPos, val prototype: ShapedMultiblockFactory.Part, val chunkPos: ChunkPos) : Comparable, + IMultiblockNode { constructor(pos: BlockPos, prototype: ShapedMultiblockFactory.Part) : this(pos, prototype, ChunkPos(pos)) var index = -1 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockBuilder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockBuilder.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockBuilder.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockBuilder.kt index 0fde89cc3..f38a2813f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockBuilder.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockBuilder.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet @@ -6,15 +6,12 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.ObjectArraySet import net.minecraft.core.BlockPos import net.minecraft.core.Direction -import net.minecraft.core.SectionPos import net.minecraft.core.Vec3i import net.minecraft.tags.TagKey import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState -import net.minecraft.world.level.chunk.status.ChunkStatus import ru.dbotthepony.mc.otm.core.collect.collect import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.getBlockStateNow import ru.dbotthepony.mc.otm.core.math.RelativeSide import ru.dbotthepony.mc.otm.core.math.plus import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockFactory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockFactory.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockFactory.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockFactory.kt index b39ca1bce..7a81183a0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockFactory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockFactory.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/Strategy.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/Strategy.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/Strategy.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/Strategy.kt index 0cde129fc..0fced2e22 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/Strategy.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/Strategy.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock enum class Strategy { /**