Skip to content

Commit e01b41e

Browse files
committed
dependent over dependant
1 parent 1480c56 commit e01b41e

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/main/kotlin/com/lambda/interaction/construction/result/Dependable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ package com.lambda.interaction.construction.result
2020
import com.lambda.interaction.construction.simulation.SimInfo
2121

2222
interface Dependable {
23-
fun SimInfo.asDependant(buildResult: BuildResult): BuildResult
23+
fun SimInfo.asDependent(buildResult: BuildResult): BuildResult
2424
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import net.minecraft.util.math.Vec3d
2626
abstract class SimChecker<T : BuildResult> {
2727
val SafeContext.eye: Vec3d get() = player.eyePos
2828

29-
fun SimInfo.checkDependant(caller: Dependable?) {
29+
fun SimInfo.checkDependent(caller: Dependable?) {
3030
if (caller == null) {
3131
dependencyStack.clear()
3232
return
@@ -41,7 +41,7 @@ abstract class SimChecker<T : BuildResult> {
4141
dependencyStack
4242
.asReversed()
4343
.fold(result) { acc, dependable ->
44-
with(dependable) { asDependant(acc) }
44+
with(dependable) { asDependent(acc) }
4545
}
4646
)
4747
}

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakChecks.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ import net.minecraft.util.math.Vec3d
7171
import kotlin.math.pow
7272

7373
object BreakChecks : SimChecker<BreakResult>(), Dependable {
74-
override fun SimInfo.asDependant(buildResult: BuildResult) =
74+
override fun SimInfo.asDependent(buildResult: BuildResult) =
7575
BreakResult.Dependency(pos, buildResult)
7676

7777
context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
7878
fun SimInfo.checkBreaks(): Unit = with(automatedSafeContext) {
79-
checkDependant(dependable)
79+
checkDependent(dependable)
8080

8181
/* is a block that will be destroyed by breaking adjacent blocks */
8282
if (!breakConfig.breakWeakBlocks && state.block.hardness == 0f && !state.isAir && state.isNotEmpty) {

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PlaceChecks.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import net.minecraft.util.shape.VoxelShapes
6262
import kotlin.math.pow
6363

6464
object PlaceChecks : SimChecker<PlaceResult>(), Dependable {
65-
override fun SimInfo.asDependant(buildResult: BuildResult) =
65+
override fun SimInfo.asDependent(buildResult: BuildResult) =
6666
PlaceResult.Dependency(pos, buildResult)
6767

6868
context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
@@ -71,7 +71,7 @@ object PlaceChecks : SimChecker<PlaceResult>(), Dependable {
7171
state: BlockState = this.state,
7272
targetState: TargetState = this.targetState
7373
): Unit = with(automatedSafeContext) {
74-
checkDependant(dependable)
74+
checkDependent(dependable)
7575

7676
val statePromoting = state.block is SlabBlock &&
7777
targetState.matches(state, pos, preProcessing.ignore)

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PostProcessingChecks.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ import net.minecraft.util.math.Vec3d
5151
import kotlin.math.pow
5252

5353
object PostProcessingChecks : SimChecker<InteractResult>(), Dependable {
54-
override fun SimInfo.asDependant(buildResult: BuildResult) =
54+
override fun SimInfo.asDependent(buildResult: BuildResult) =
5555
InteractResult.Dependency(pos, buildResult)
5656

5757
context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
5858
fun SimInfo.checkPostProcessing(): Unit = with(automatedSafeContext) {
59-
checkDependant(dependable)
59+
checkDependent(dependable)
6060

6161
if (targetState !is TargetState.State) return@with
6262

0 commit comments

Comments
 (0)