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 bb75430c5..efc9f60e2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -12,17 +12,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import net.minecraft.world.item.crafting.RecipeType import net.minecraft.world.level.BlockGetter -import net.minecraft.world.level.block.AnvilBlock -import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.DoorBlock -import net.minecraft.world.level.block.DropExperienceBlock -import net.minecraft.world.level.block.IronBarsBlock -import net.minecraft.world.level.block.LiquidBlock -import net.minecraft.world.level.block.SlabBlock -import net.minecraft.world.level.block.SoundType -import net.minecraft.world.level.block.StairBlock -import net.minecraft.world.level.block.TrapDoorBlock -import net.minecraft.world.level.block.WallBlock +import net.minecraft.world.level.block.* import net.minecraft.world.level.block.state.BlockBehaviour import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.properties.BlockSetType @@ -200,7 +190,7 @@ object MBlocks { val LABORATORY_LAMP_INVERTED: Block by registry.register(MNames.LABORATORY_LAMP_INVERTED) { LaboratoryLamp(true) } val LABORATORY_LAMP_LIGHT: Block by registry.register(MNames.LABORATORY_LAMP_LIGHT) { LaboratoryLampLight() } val DANGER_STRIPE_BLOCK: Block by registry.register(MNames.DANGER_STRIPE_BLOCK) { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).explosionResistance(6f).destroyTime(1.5f).requiresCorrectToolForDrops()) } - val METAL_BEAM: Block by registry.register(MNames.METAL_BEAM) { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops()) } + val METAL_BEAM: Block by registry.register(MNames.METAL_BEAM) { RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops()) } val ENGINE: Block by registry.register(MNames.ENGINE) { EngineBlock() } val HOLO_SIGN: Block by registry.register(MNames.HOLO_SIGN) { HoloSignBlock() } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png new file mode 100644 index 000000000..28561cce0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png new file mode 100644 index 000000000..7bbb062ca Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_1.png b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_1.png new file mode 100644 index 000000000..6b0808067 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png b/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png new file mode 100644 index 000000000..70af31185 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/storage_cable — копия.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png index a887f7040..0e67a500b 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror.png index 66386cc52..d8ec7e35d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png index 52bb150ec..2cb48fd63 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png differ