From d10ce72a0e5d916bdfe2d5b3abf95a06b853401a Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 4 Jan 2024 20:41:32 +0700 Subject: [PATCH] Post merge fixes for 1.19.3 --- build.gradle.kts | 2 +- .../dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt | 4 ++-- .../mc/otm/block/decorative/TritaniumTrapdoorBlock.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 653fc07ed..3f364740a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -161,7 +161,7 @@ dependencies { compileOnly(fg.deobf("curse.maven:resourceful-config-714059:${resourceful_config_id}")) compileOnly(fg.deobf("curse.maven:botarium-704113:${botarium_id}")) compileOnly(fg.deobf("curse.maven:ad-astra-635042:${ad_astra_id}")) - runtimeOnly(fg.deobf("curse.maven:worldedit-225608:${worldedit_id}")) + // runtimeOnly(fg.deobf("curse.maven:worldedit-225608:${worldedit_id}")) // runtimeOnly(fg.deobf("curse.maven:worldedit-225608:${worldedit_fileid}")) // runtimeOnly(fg.deobf("at.ridgo8.moreoverlays:MoreOverlays-updated:${more_overlays_version}")) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt index b4acfd1d3..f130ae04d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt @@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.block.decorative import net.minecraft.ChatFormatting import net.minecraft.core.BlockPos import net.minecraft.network.chat.Component +import net.minecraft.sounds.SoundEvents import net.minecraft.world.entity.Entity import net.minecraft.world.entity.monster.Zombie import net.minecraft.world.item.DyeColor @@ -11,7 +12,6 @@ import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.block.DoorBlock import net.minecraft.world.level.block.state.BlockState -import net.minecraft.world.level.block.state.properties.BlockSetType import net.minecraft.world.level.material.Material import net.minecraft.world.level.material.PushReaction import ru.dbotthepony.mc.otm.core.TranslatableComponent @@ -22,7 +22,7 @@ class TritaniumDoorBlock(val color: DyeColor?) : DoorBlock( .noOcclusion() .destroyTime(3f) .requiresCorrectToolForDrops(), - BlockSetType.IRON + SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN ) { override fun appendHoverText( p_49816_: ItemStack, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt index ec0e24043..3d1399c3a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt @@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.block.decorative import net.minecraft.ChatFormatting import net.minecraft.core.BlockPos import net.minecraft.network.chat.Component +import net.minecraft.sounds.SoundEvents import net.minecraft.world.entity.Entity import net.minecraft.world.entity.EntityType import net.minecraft.world.entity.monster.Zombie @@ -12,7 +13,6 @@ import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.block.TrapDoorBlock import net.minecraft.world.level.block.state.BlockState -import net.minecraft.world.level.block.state.properties.BlockSetType import net.minecraft.world.level.material.Material import ru.dbotthepony.mc.otm.core.TranslatableComponent @@ -22,7 +22,7 @@ class TritaniumTrapdoorBlock(val color: DyeColor?) : TrapDoorBlock( .noOcclusion().destroyTime(3f) .requiresCorrectToolForDrops() .isValidSpawn { _: BlockState, _: BlockGetter, _: BlockPos, _: EntityType<*>? -> false }, - BlockSetType.IRON + SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN ) { override fun appendHoverText( p_49816_: ItemStack,