Skip to content

Commit 3f685cf

Browse files
committed
Remove deprecations
1 parent 0eac940 commit 3f685cf

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

src/main/kotlin/com/lambda/gui/dsl/ImGuiBuilder.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,12 +1163,6 @@ object ImGuiBuilder {
11631163
block()
11641164
}
11651165

1166-
@ImGuiDsl
1167-
inline fun colorButton(descId: String, col: FloatArray, flags: Int = ImGuiColorEditFlags.None, size: ImVec2 = ImVec2(), block: ProcedureBlock = {}) {
1168-
if (ImGui.colorButton(descId, col, flags, size))
1169-
block()
1170-
}
1171-
11721166
/**
11731167
* Creates a tree node.
11741168
*

src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ import com.lambda.util.Communication.warn
5050
import com.lambda.util.item.ItemStackUtils.equal
5151
import com.lambda.util.math.distSq
5252
import com.lambda.util.player.copyPlayer
53+
import com.lambda.util.world.WorldUtils.hasFluid
54+
import com.lambda.util.world.WorldUtils.isLoaded
5355
import com.lambda.util.world.raycast.RayCastUtils.blockResult
5456
import net.minecraft.block.OperatorBlock
5557
import net.minecraft.block.pattern.CachedBlockPosition
@@ -96,7 +98,7 @@ object BuildSimulator {
9698
target: TargetState,
9799
build: BuildConfig
98100
): BuildResult? {/* the chunk is not loaded */
99-
if (!world.isChunkLoaded(pos)) {
101+
if (!isLoaded(pos)) {
100102
return BuildResult.ChunkNotLoaded(pos)
101103
}
102104

@@ -151,7 +153,7 @@ object BuildSimulator {
151153
val preprocessing = target.findProcessorForState()
152154

153155
preprocessing.sides.forEach { neighbor ->
154-
val hitPos = if (targetPosState.isAir || targetPosState.isLiquid) pos.offset(neighbor) else pos
156+
val hitPos = if (targetPosState.isAir || targetPosState.hasFluid) pos.offset(neighbor) else pos
155157
val hitSide = neighbor.opposite
156158

157159
val voxelShape = blockState(hitPos).getOutlineShape(world, hitPos)

src/main/kotlin/com/lambda/util/world/WorldUtils.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,24 @@ package com.lambda.util.world
2020
import com.lambda.context.SafeContext
2121
import com.lambda.util.extension.getBlockState
2222
import com.lambda.util.extension.getFluidState
23-
import com.lambda.util.world.WorldUtils.internalGetEntities
24-
import com.lambda.util.world.WorldUtils.internalGetFastEntities
2523
import net.minecraft.block.BlockState
2624
import net.minecraft.block.entity.BlockEntity
2725
import net.minecraft.entity.Entity
2826
import net.minecraft.fluid.Fluid
2927
import net.minecraft.fluid.FluidState
28+
import net.minecraft.util.math.BlockPos
3029
import net.minecraft.util.math.ChunkSectionPos
3130
import kotlin.math.ceil
3231
import kotlin.sequences.filter
3332

3433
object WorldUtils {
34+
fun SafeContext.isLoaded(pos: BlockPos) =
35+
world.chunkManager.isChunkLoaded(
36+
ChunkSectionPos.getSectionCoord(pos.x), ChunkSectionPos.getSectionCoord(pos.z)
37+
)
38+
39+
val BlockState.hasFluid get() = !fluidState.isEmpty
40+
3541
/**
3642
* Gets all entities of type [T] within a specified distance from a position.
3743
*

0 commit comments

Comments
 (0)