From 36ec7855f0c5687ec862b5a85fd51019f60c86b3 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 10 Oct 2024 12:19:32 +0700 Subject: [PATCH] Move black hole generator controller block to blackhole subpackage --- .../{tech => blackhole}/BlackHoleGeneratorBlockEntity.kt | 6 +++--- .../mc/otm/block/tech/BlackHoleGeneratorBlock.kt | 2 +- .../kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/{tech => blackhole}/BlackHoleGeneratorBlockEntity.kt (97%) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BlackHoleGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BlackHoleGeneratorBlockEntity.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt index 2c1448264..01702455d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BlackHoleGeneratorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt @@ -1,15 +1,15 @@ -package ru.dbotthepony.mc.otm.block.entity.tech +package ru.dbotthepony.mc.otm.block.entity.blackhole import it.unimi.dsi.fastutil.objects.ObjectArrayList import it.unimi.dsi.fastutil.objects.ObjectArraySet import net.minecraft.core.BlockPos -import net.minecraft.core.SectionPos 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.state.BlockState import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity -import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity +import ru.dbotthepony.mc.otm.block.entity.tech.EnergyHatchBlockEntity +import ru.dbotthepony.mc.otm.block.entity.tech.MatterHatchBlockEntity import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.core.Multiblock import ru.dbotthepony.mc.otm.core.MultiblockBuilder diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt index fc722dfe9..857f013a5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.material.MapColor import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity -import ru.dbotthepony.mc.otm.block.entity.tech.BlackHoleGeneratorBlockEntity +import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleGeneratorBlockEntity import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.core.math.plus import ru.dbotthepony.mc.otm.core.math.times diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt index 75776fad2..61fd4e8c5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt @@ -10,6 +10,7 @@ import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent import ru.dbotthepony.mc.otm.block.entity.* import ru.dbotthepony.mc.otm.block.entity.tech.* import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity +import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleGeneratorBlockEntity import ru.dbotthepony.mc.otm.block.entity.cable.SimpleEnergyCableBlockEntity import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.block.entity.decorative.DevChestBlockEntity