DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Move laboratory lamp to decorative package

Browse Source
This commit is contained in:
DBotThePony 2023-01-23 22:20:04 +07:00
parent 95189b7eaf
commit ab135ace62
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/ru/dbotthepony/mc/otm/block/LaboratoryLamp.kt → src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.block package ru.dbotthepony.mc.otm.block.decorative
import net.minecraft.ChatFormatting import net.minecraft.ChatFormatting
import net.minecraft.core.BlockPos 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.Shapes
import net.minecraft.world.phys.shapes.VoxelShape import net.minecraft.world.phys.shapes.VoxelShape
import ru.dbotthepony.mc.otm.ServerConfig 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.TranslatableComponent
import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.core.get
import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.core.math.plus
@ -183,7 +184,8 @@ class LaboratoryLamp(val invertRedstone: Boolean) : Block(Properties.of(Material
if (shouldBeLit) { if (shouldBeLit) {
if (targetState.isAir && targetState.block != MBlocks.LABORATORY_LAMP_LIGHT) { 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 { } else {
if (targetState.block == MBlocks.LABORATORY_LAMP_LIGHT) { if (targetState.block == MBlocks.LABORATORY_LAMP_LIGHT) {

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

@ -37,14 +37,12 @@ import ru.dbotthepony.mc.otm.block.BlockSphereDebugger
import ru.dbotthepony.mc.otm.block.ChemicalGeneratorBlock import ru.dbotthepony.mc.otm.block.ChemicalGeneratorBlock
import ru.dbotthepony.mc.otm.block.EnergyCounterBlock import ru.dbotthepony.mc.otm.block.EnergyCounterBlock
import ru.dbotthepony.mc.otm.block.EnergyServoBlock import ru.dbotthepony.mc.otm.block.EnergyServoBlock
import ru.dbotthepony.mc.otm.block.LaboratoryLamp import ru.dbotthepony.mc.otm.block.decorative.LaboratoryLamp
import ru.dbotthepony.mc.otm.block.LaboratoryLampLight import ru.dbotthepony.mc.otm.block.decorative.LaboratoryLampLight
import ru.dbotthepony.mc.otm.block.MatterCableBlock import ru.dbotthepony.mc.otm.block.MatterCableBlock
import ru.dbotthepony.mc.otm.block.PhantomAttractorBlock import ru.dbotthepony.mc.otm.block.PhantomAttractorBlock
import ru.dbotthepony.mc.otm.block.PlatePressBlock 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.StorageCableBlock
import ru.dbotthepony.mc.otm.block.TritaniumPressurePlate
import ru.dbotthepony.mc.otm.block.decorative.EngineBlock import ru.dbotthepony.mc.otm.block.decorative.EngineBlock
import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
import ru.dbotthepony.mc.otm.block.matter.MatterCapacitorBankBlock import ru.dbotthepony.mc.otm.block.matter.MatterCapacitorBankBlock