From 2ff4c24f13d5db8bb9b96d056ac9fea3a6e373bf Mon Sep 17 00:00:00 2001 From: CoderJoe Date: Sun, 15 Mar 2026 00:28:50 -0500 Subject: [PATCH 1/2] Move utility blocks from power package to utility package SmallDrill, AutoSmelter, CobblestoneFactory, and ObsidianFactory are machines that consume power but are not power infrastructure. Move them to com.coderjoe.atlas.utility.block and their tests to com.coderjoe.atlas.utility to better reflect their purpose. --- src/main/kotlin/com/coderjoe/atlas/Atlas.kt | 8 ++++---- .../kotlin/com/coderjoe/atlas/power/PowerBlockData.kt | 2 +- .../kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt | 8 ++++---- .../com/coderjoe/atlas/power/PowerBlockPersistence.kt | 2 +- .../atlas/{power => utility}/block/AutoSmelter.kt | 2 +- .../atlas/{power => utility}/block/CobblestoneFactory.kt | 2 +- .../atlas/{power => utility}/block/ObsidianFactory.kt | 2 +- .../coderjoe/atlas/{power => utility}/block/SmallDrill.kt | 2 +- src/test/kotlin/com/coderjoe/atlas/TestHelper.kt | 8 ++++---- .../kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockDialogTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockInitializerTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockLogicTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt | 2 +- .../kotlin/com/coderjoe/atlas/power/PowerMergerTest.kt | 2 +- .../coderjoe/atlas/power/PowerNetworkIntegrationTest.kt | 2 +- .../coderjoe/atlas/{power => utility}/AutoSmelterTest.kt | 6 ++++-- .../atlas/{power => utility}/CobblestoneFactoryTest.kt | 5 +++-- .../atlas/{power => utility}/ObsidianFactoryTest.kt | 5 +++-- .../atlas/{power => utility}/SmallDrillMiningTest.kt | 5 +++-- 20 files changed, 38 insertions(+), 33 deletions(-) rename src/main/kotlin/com/coderjoe/atlas/{power => utility}/block/AutoSmelter.kt (99%) rename src/main/kotlin/com/coderjoe/atlas/{power => utility}/block/CobblestoneFactory.kt (99%) rename src/main/kotlin/com/coderjoe/atlas/{power => utility}/block/ObsidianFactory.kt (99%) rename src/main/kotlin/com/coderjoe/atlas/{power => utility}/block/SmallDrill.kt (99%) rename src/test/kotlin/com/coderjoe/atlas/{power => utility}/AutoSmelterTest.kt (98%) rename src/test/kotlin/com/coderjoe/atlas/{power => utility}/CobblestoneFactoryTest.kt (97%) rename src/test/kotlin/com/coderjoe/atlas/{power => utility}/ObsidianFactoryTest.kt (97%) rename src/test/kotlin/com/coderjoe/atlas/{power => utility}/SmallDrillMiningTest.kt (98%) diff --git a/src/main/kotlin/com/coderjoe/atlas/Atlas.kt b/src/main/kotlin/com/coderjoe/atlas/Atlas.kt index fb38c0a..2d1ab48 100644 --- a/src/main/kotlin/com/coderjoe/atlas/Atlas.kt +++ b/src/main/kotlin/com/coderjoe/atlas/Atlas.kt @@ -188,14 +188,14 @@ class Atlas : JavaPlugin() { private fun powerDescriptors(): Map { return listOf( com.coderjoe.atlas.power.block.SmallSolarPanel.descriptor, - com.coderjoe.atlas.power.block.SmallDrill.descriptor, + com.coderjoe.atlas.utility.block.SmallDrill.descriptor, com.coderjoe.atlas.power.block.SmallBattery.descriptor, com.coderjoe.atlas.power.block.PowerCable.descriptor, com.coderjoe.atlas.power.block.LavaGenerator.descriptor, - com.coderjoe.atlas.power.block.AutoSmelter.descriptor, + com.coderjoe.atlas.utility.block.AutoSmelter.descriptor, com.coderjoe.atlas.power.block.MultiPowerCable.descriptor, - com.coderjoe.atlas.power.block.CobblestoneFactory.descriptor, - com.coderjoe.atlas.power.block.ObsidianFactory.descriptor, + com.coderjoe.atlas.utility.block.CobblestoneFactory.descriptor, + com.coderjoe.atlas.utility.block.ObsidianFactory.descriptor, com.coderjoe.atlas.power.block.PowerMerger.descriptor, ).associateBy { it.baseBlockId } } diff --git a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockData.kt b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockData.kt index 9d602d2..fd9c8eb 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockData.kt +++ b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockData.kt @@ -1,6 +1,6 @@ package com.coderjoe.atlas.power -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import org.bukkit.Location import org.bukkit.block.BlockFace diff --git a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt index 3d6d3c7..9e0e5b7 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt +++ b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt @@ -2,16 +2,16 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.core.AtlasBlockDialog import com.coderjoe.atlas.core.BlockRegistry -import com.coderjoe.atlas.power.block.AutoSmelter -import com.coderjoe.atlas.power.block.CobblestoneFactory import com.coderjoe.atlas.power.block.LavaGenerator import com.coderjoe.atlas.power.block.MultiPowerCable -import com.coderjoe.atlas.power.block.ObsidianFactory import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.PowerMerger import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.AutoSmelter +import com.coderjoe.atlas.utility.block.CobblestoneFactory +import com.coderjoe.atlas.utility.block.ObsidianFactory +import com.coderjoe.atlas.utility.block.SmallDrill import io.papermc.paper.dialog.Dialog import io.papermc.paper.registry.data.dialog.ActionButton import io.papermc.paper.registry.data.dialog.DialogBase diff --git a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockPersistence.kt b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockPersistence.kt index b8c1fa8..fee4085 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockPersistence.kt +++ b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockPersistence.kt @@ -1,7 +1,7 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.core.BlockPersistence -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import org.bukkit.plugin.java.JavaPlugin class PowerBlockPersistence(plugin: JavaPlugin) { diff --git a/src/main/kotlin/com/coderjoe/atlas/power/block/AutoSmelter.kt b/src/main/kotlin/com/coderjoe/atlas/utility/block/AutoSmelter.kt similarity index 99% rename from src/main/kotlin/com/coderjoe/atlas/power/block/AutoSmelter.kt rename to src/main/kotlin/com/coderjoe/atlas/utility/block/AutoSmelter.kt index 60ae981..460e697 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/block/AutoSmelter.kt +++ b/src/main/kotlin/com/coderjoe/atlas/utility/block/AutoSmelter.kt @@ -1,4 +1,4 @@ -package com.coderjoe.atlas.power.block +package com.coderjoe.atlas.utility.block import com.coderjoe.atlas.core.BlockDescriptor import com.coderjoe.atlas.core.PlacementType diff --git a/src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneFactory.kt b/src/main/kotlin/com/coderjoe/atlas/utility/block/CobblestoneFactory.kt similarity index 99% rename from src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneFactory.kt rename to src/main/kotlin/com/coderjoe/atlas/utility/block/CobblestoneFactory.kt index f6d3130..7210a1f 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneFactory.kt +++ b/src/main/kotlin/com/coderjoe/atlas/utility/block/CobblestoneFactory.kt @@ -1,4 +1,4 @@ -package com.coderjoe.atlas.power.block +package com.coderjoe.atlas.utility.block import com.coderjoe.atlas.atlasInfo import com.coderjoe.atlas.core.BlockDescriptor diff --git a/src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianFactory.kt b/src/main/kotlin/com/coderjoe/atlas/utility/block/ObsidianFactory.kt similarity index 99% rename from src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianFactory.kt rename to src/main/kotlin/com/coderjoe/atlas/utility/block/ObsidianFactory.kt index 2fc36d0..f001a97 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianFactory.kt +++ b/src/main/kotlin/com/coderjoe/atlas/utility/block/ObsidianFactory.kt @@ -1,4 +1,4 @@ -package com.coderjoe.atlas.power.block +package com.coderjoe.atlas.utility.block import com.coderjoe.atlas.atlasInfo import com.coderjoe.atlas.core.BlockDescriptor diff --git a/src/main/kotlin/com/coderjoe/atlas/power/block/SmallDrill.kt b/src/main/kotlin/com/coderjoe/atlas/utility/block/SmallDrill.kt similarity index 99% rename from src/main/kotlin/com/coderjoe/atlas/power/block/SmallDrill.kt rename to src/main/kotlin/com/coderjoe/atlas/utility/block/SmallDrill.kt index 0f70016..c716fc1 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/block/SmallDrill.kt +++ b/src/main/kotlin/com/coderjoe/atlas/utility/block/SmallDrill.kt @@ -1,4 +1,4 @@ -package com.coderjoe.atlas.power.block +package com.coderjoe.atlas.utility.block import com.coderjoe.atlas.core.BlockDescriptor import com.coderjoe.atlas.core.PlacementType diff --git a/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt b/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt index 14f7428..5ac8de6 100644 --- a/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt +++ b/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt @@ -12,16 +12,16 @@ import com.coderjoe.atlas.fluid.block.FluidPump import com.coderjoe.atlas.power.PowerBlock import com.coderjoe.atlas.power.PowerBlockFactory import com.coderjoe.atlas.power.PowerBlockRegistry -import com.coderjoe.atlas.power.block.AutoSmelter -import com.coderjoe.atlas.power.block.CobblestoneFactory import com.coderjoe.atlas.power.block.LavaGenerator import com.coderjoe.atlas.power.block.MultiPowerCable -import com.coderjoe.atlas.power.block.ObsidianFactory import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.PowerMerger import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.AutoSmelter +import com.coderjoe.atlas.utility.block.CobblestoneFactory +import com.coderjoe.atlas.utility.block.ObsidianFactory +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.transport.TransportBlock import com.coderjoe.atlas.transport.TransportBlockFactory import com.coderjoe.atlas.transport.TransportBlockRegistry diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt index 6a012eb..806581c 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt @@ -3,7 +3,7 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt index 6def8c0..f296fde 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt @@ -3,7 +3,7 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel import net.kyori.adventure.text.Component import net.kyori.adventure.text.TextComponent diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt index 27b4476..0581010 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt @@ -3,7 +3,7 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt index c868554..7ae5bad 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt @@ -4,7 +4,7 @@ import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel import io.mockk.every import org.bukkit.block.BlockFace diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt index baa3887..ceab994 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt @@ -3,7 +3,7 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerMergerTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerMergerTest.kt index 73f1821..7f4afe0 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerMergerTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerMergerTest.kt @@ -135,7 +135,7 @@ class PowerMergerTest { TestHelper.addToRegistry(registry, merger, "power_merger_north") // Consumer to the north (facing direction) that pulls from adjacent - val consumer = com.coderjoe.atlas.power.block.SmallDrill(TestHelper.createLocation(0.0, 64.0, -1.0), BlockFace.DOWN) + val consumer = com.coderjoe.atlas.utility.block.SmallDrill(TestHelper.createLocation(0.0, 64.0, -1.0), BlockFace.DOWN) TestHelper.addToRegistry(registry, consumer, "small_drill_down") // The merger stores power; downstream blocks pull from it via their own update diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt index a619dde..9069566 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt @@ -4,7 +4,7 @@ import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel import io.mockk.every import io.mockk.mockk diff --git a/src/test/kotlin/com/coderjoe/atlas/power/AutoSmelterTest.kt b/src/test/kotlin/com/coderjoe/atlas/utility/AutoSmelterTest.kt similarity index 98% rename from src/test/kotlin/com/coderjoe/atlas/power/AutoSmelterTest.kt rename to src/test/kotlin/com/coderjoe/atlas/utility/AutoSmelterTest.kt index 8a67fe8..458eb82 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/AutoSmelterTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/utility/AutoSmelterTest.kt @@ -1,8 +1,10 @@ -package com.coderjoe.atlas.power +package com.coderjoe.atlas.utility import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate -import com.coderjoe.atlas.power.block.AutoSmelter +import com.coderjoe.atlas.power.PowerBlockFactory +import com.coderjoe.atlas.power.PowerBlockRegistry +import com.coderjoe.atlas.utility.block.AutoSmelter import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/src/test/kotlin/com/coderjoe/atlas/power/CobblestoneFactoryTest.kt b/src/test/kotlin/com/coderjoe/atlas/utility/CobblestoneFactoryTest.kt similarity index 97% rename from src/test/kotlin/com/coderjoe/atlas/power/CobblestoneFactoryTest.kt rename to src/test/kotlin/com/coderjoe/atlas/utility/CobblestoneFactoryTest.kt index f51bb67..65e678b 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/CobblestoneFactoryTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/utility/CobblestoneFactoryTest.kt @@ -1,11 +1,12 @@ -package com.coderjoe.atlas.power +package com.coderjoe.atlas.utility import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.fluid.FluidBlockRegistry import com.coderjoe.atlas.fluid.FluidType import com.coderjoe.atlas.fluid.block.FluidPipe -import com.coderjoe.atlas.power.block.CobblestoneFactory +import com.coderjoe.atlas.power.PowerBlockRegistry +import com.coderjoe.atlas.utility.block.CobblestoneFactory import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/com/coderjoe/atlas/power/ObsidianFactoryTest.kt b/src/test/kotlin/com/coderjoe/atlas/utility/ObsidianFactoryTest.kt similarity index 97% rename from src/test/kotlin/com/coderjoe/atlas/power/ObsidianFactoryTest.kt rename to src/test/kotlin/com/coderjoe/atlas/utility/ObsidianFactoryTest.kt index 46571c6..28c174c 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/ObsidianFactoryTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/utility/ObsidianFactoryTest.kt @@ -1,11 +1,12 @@ -package com.coderjoe.atlas.power +package com.coderjoe.atlas.utility import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.fluid.FluidBlockRegistry import com.coderjoe.atlas.fluid.FluidType import com.coderjoe.atlas.fluid.block.FluidPipe -import com.coderjoe.atlas.power.block.ObsidianFactory +import com.coderjoe.atlas.power.PowerBlockRegistry +import com.coderjoe.atlas.utility.block.ObsidianFactory import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/com/coderjoe/atlas/power/SmallDrillMiningTest.kt b/src/test/kotlin/com/coderjoe/atlas/utility/SmallDrillMiningTest.kt similarity index 98% rename from src/test/kotlin/com/coderjoe/atlas/power/SmallDrillMiningTest.kt rename to src/test/kotlin/com/coderjoe/atlas/utility/SmallDrillMiningTest.kt index c2ac424..efdf372 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/SmallDrillMiningTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/utility/SmallDrillMiningTest.kt @@ -1,9 +1,10 @@ -package com.coderjoe.atlas.power +package com.coderjoe.atlas.utility import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate -import com.coderjoe.atlas.power.block.SmallDrill +import com.coderjoe.atlas.power.PowerBlockRegistry import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import io.mockk.every import io.mockk.mockk import io.mockk.verify From a2bc12b86d5f4301de23227d9afb2e48d4c22a32 Mon Sep 17 00:00:00 2001 From: CoderJoe Date: Sun, 15 Mar 2026 00:31:36 -0500 Subject: [PATCH 2/2] Move SmallDrill import statements to the utility package in test files --- src/test/kotlin/com/coderjoe/atlas/TestHelper.kt | 8 ++++---- .../kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockDialogTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockInitializerTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockLogicTest.kt | 2 +- .../com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt | 2 +- .../coderjoe/atlas/power/PowerNetworkIntegrationTest.kt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt b/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt index 5ac8de6..de43305 100644 --- a/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt +++ b/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt @@ -18,14 +18,14 @@ import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.PowerMerger import com.coderjoe.atlas.power.block.SmallBattery import com.coderjoe.atlas.power.block.SmallSolarPanel -import com.coderjoe.atlas.utility.block.AutoSmelter -import com.coderjoe.atlas.utility.block.CobblestoneFactory -import com.coderjoe.atlas.utility.block.ObsidianFactory -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.transport.TransportBlock import com.coderjoe.atlas.transport.TransportBlockFactory import com.coderjoe.atlas.transport.TransportBlockRegistry import com.coderjoe.atlas.transport.block.ConveyorBelt +import com.coderjoe.atlas.utility.block.AutoSmelter +import com.coderjoe.atlas.utility.block.CobblestoneFactory +import com.coderjoe.atlas.utility.block.ObsidianFactory +import com.coderjoe.atlas.utility.block.SmallDrill import io.mockk.every import io.mockk.mockk import io.mockk.unmockkAll diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt index 806581c..3ca17bf 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDataTest.kt @@ -3,8 +3,8 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt index f296fde..0a61790 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockDialogTest.kt @@ -3,8 +3,8 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import net.kyori.adventure.text.Component import net.kyori.adventure.text.TextComponent import org.bukkit.block.BlockFace diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt index 0581010..066be77 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockInitializerTest.kt @@ -3,8 +3,8 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt index 7ae5bad..9b06cfe 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockLogicTest.kt @@ -4,8 +4,8 @@ import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import io.mockk.every import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt index ceab994..0651669 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerBlockPersistenceTest.kt @@ -3,8 +3,8 @@ package com.coderjoe.atlas.power import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import org.bukkit.block.BlockFace import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertDoesNotThrow diff --git a/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt index 9069566..8f66af1 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/PowerNetworkIntegrationTest.kt @@ -4,8 +4,8 @@ import com.coderjoe.atlas.TestHelper import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery -import com.coderjoe.atlas.utility.block.SmallDrill import com.coderjoe.atlas.power.block.SmallSolarPanel +import com.coderjoe.atlas.utility.block.SmallDrill import io.mockk.every import io.mockk.mockk import org.bukkit.Material