From ab135ace62d9f9b2e6664db28711ea8da0ab2c6e Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 23 Jan 2023 22:20:04 +0700
Subject: [PATCH] Move laboratory lamp to decorative package

---
 .../mc/otm/block/{ => decorative}/LaboratoryLamp.kt         | 6 ++++--
 src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt   | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename src/main/kotlin/ru/dbotthepony/mc/otm/block/{ => decorative}/LaboratoryLamp.kt (97%)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/LaboratoryLamp.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt
similarity index 97%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/block/LaboratoryLamp.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt
index a3ec37fbd..bd83db1d6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/LaboratoryLamp.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block
+package ru.dbotthepony.mc.otm.block.decorative
 
 import net.minecraft.ChatFormatting
 import net.minecraft.core.BlockPos
@@ -21,6 +21,7 @@ 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.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.get
 import ru.dbotthepony.mc.otm.core.math.plus
@@ -183,7 +184,8 @@ class LaboratoryLamp(val invertRedstone: Boolean) : Block(Properties.of(Material
 
 				if (shouldBeLit) {
 					if (targetState.isAir && targetState.block != MBlocks.LABORATORY_LAMP_LIGHT) {
-						level.setBlockAndUpdate(target, MBlocks.LABORATORY_LAMP_LIGHT.defaultBlockState().setValue(RotatableMatteryBlock.FACING_FULL, -facing))
+						level.setBlockAndUpdate(target, MBlocks.LABORATORY_LAMP_LIGHT.defaultBlockState().setValue(
+							RotatableMatteryBlock.FACING_FULL, -facing))
 					}
 				} else {
 					if (targetState.block == MBlocks.LABORATORY_LAMP_LIGHT) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
index 60f27f23d..f495dc588 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
@@ -37,14 +37,12 @@ import ru.dbotthepony.mc.otm.block.BlockSphereDebugger
 import ru.dbotthepony.mc.otm.block.ChemicalGeneratorBlock
 import ru.dbotthepony.mc.otm.block.EnergyCounterBlock
 import ru.dbotthepony.mc.otm.block.EnergyServoBlock
-import ru.dbotthepony.mc.otm.block.LaboratoryLamp
-import ru.dbotthepony.mc.otm.block.LaboratoryLampLight
+import ru.dbotthepony.mc.otm.block.decorative.LaboratoryLamp
+import ru.dbotthepony.mc.otm.block.decorative.LaboratoryLampLight
 import ru.dbotthepony.mc.otm.block.MatterCableBlock
 import ru.dbotthepony.mc.otm.block.PhantomAttractorBlock
 import ru.dbotthepony.mc.otm.block.PlatePressBlock
-import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.StorageCableBlock
-import ru.dbotthepony.mc.otm.block.TritaniumPressurePlate
 import ru.dbotthepony.mc.otm.block.decorative.EngineBlock
 import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
 import ru.dbotthepony.mc.otm.block.matter.MatterCapacitorBankBlock