Skip to content

Commit d9cd471

Browse files
committed
Rename class and clarify info
1 parent 5d82657 commit d9cd471

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import dev.latvian.mods.kubejs.block.callback.CanBeReplacedCallback;
1010
import dev.latvian.mods.kubejs.block.callback.EntityFallenOnBlockCallback;
1111
import dev.latvian.mods.kubejs.block.callback.EntityInsideBlockCallback;
12-
import dev.latvian.mods.kubejs.block.callback.EntitySteppedOnBlockCallback;
12+
import dev.latvian.mods.kubejs.block.callback.EntityBlockCallback;
1313
import dev.latvian.mods.kubejs.block.callback.RandomTickCallback;
1414
import dev.latvian.mods.kubejs.block.drop.BlockDropSupplier;
1515
import dev.latvian.mods.kubejs.block.drop.BlockDrops;
@@ -103,7 +103,7 @@ public abstract class BlockBuilder extends ModelledBuilderBase<Block> {
103103
public transient Consumer<BlockStateModifyPlacementCallback> placementStateModification;
104104
public transient Predicate<CanBeReplacedCallback> canBeReplacedFunction;
105105
public transient Consumer<EntityInsideBlockCallback> insideCallback;
106-
public transient Consumer<EntitySteppedOnBlockCallback> stepOnCallback;
106+
public transient Consumer<EntityBlockCallback> stepOnCallback;
107107
public transient Consumer<EntityFallenOnBlockCallback> fallOnCallback;
108108
public transient Consumer<AfterEntityFallenOnBlockCallback> afterFallenOnCallback;
109109
public transient Consumer<BlockExplodedCallback> explodedCallback;
@@ -688,7 +688,7 @@ public BlockBuilder canBeReplaced(Predicate<CanBeReplacedCallback> callbackJS) {
688688
@Info("""
689689
Set what happens when an entity is inside the block
690690
This is called every tick for every entity inside the block, so be careful what you do here.
691-
This will never be called if the block is a solid full cube.
691+
This will only be called if the entity's bounding box overlaps with the block's collision.
692692
""")
693693
public BlockBuilder entityInside(Consumer<EntityInsideBlockCallback> callbackJS) {
694694
insideCallback = callbackJS;
@@ -699,7 +699,7 @@ public BlockBuilder entityInside(Consumer<EntityInsideBlockCallback> callbackJS)
699699
Set what happens when an entity steps on the block
700700
This is called every tick for every entity standing on the block, so be careful what you do here.
701701
""")
702-
public BlockBuilder steppedOn(Consumer<EntitySteppedOnBlockCallback> callbackJS) {
702+
public BlockBuilder steppedOn(Consumer<EntityBlockCallback> callbackJS) {
703703
stepOnCallback = callbackJS;
704704
return this;
705705
}

src/main/java/dev/latvian/mods/kubejs/block/callback/AfterEntityFallenOnBlockCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import net.minecraft.world.level.BlockGetter;
77
import net.minecraft.world.phys.Vec3;
88

9-
public class AfterEntityFallenOnBlockCallback extends EntitySteppedOnBlockCallback {
9+
public class AfterEntityFallenOnBlockCallback extends EntityBlockCallback {
1010
private boolean hasChangedVelocity;
1111

1212
public AfterEntityFallenOnBlockCallback(BlockGetter blockGetter, Entity entity) {

src/main/java/dev/latvian/mods/kubejs/block/callback/EntitySteppedOnBlockCallback.java renamed to src/main/java/dev/latvian/mods/kubejs/block/callback/EntityBlockCallback.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import net.minecraft.world.level.Level;
88
import net.minecraft.world.level.block.state.BlockState;
99

10-
public class EntitySteppedOnBlockCallback {
10+
public class EntityBlockCallback {
1111
protected final Level level;
1212
protected final Entity entity;
1313
protected final LevelBlock block;
1414
protected final BlockState state;
1515

16-
public EntitySteppedOnBlockCallback(Level level, Entity entity, BlockPos pos, BlockState state) {
16+
public EntityBlockCallback(Level level, Entity entity, BlockPos pos, BlockState state) {
1717
this.level = level;
1818
this.entity = entity;
1919
this.block = level.kjs$getBlock(pos);

src/main/java/dev/latvian/mods/kubejs/block/callback/EntityFallenOnBlockCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.minecraft.world.level.Level;
88
import net.minecraft.world.level.block.state.BlockState;
99

10-
public class EntityFallenOnBlockCallback extends EntitySteppedOnBlockCallback {
10+
public class EntityFallenOnBlockCallback extends EntityBlockCallback {
1111
private final float fallHeight;
1212

1313
public EntityFallenOnBlockCallback(Level level, Entity entity, BlockPos pos, BlockState state, float fallHeight) {

src/main/java/dev/latvian/mods/kubejs/block/callback/EntityInsideBlockCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minecraft.world.level.Level;
66
import net.minecraft.world.level.block.state.BlockState;
77

8-
public class EntityInsideBlockCallback extends EntitySteppedOnBlockCallback {
8+
public class EntityInsideBlockCallback extends EntityBlockCallback {
99

1010
public EntityInsideBlockCallback(Level level, Entity entity, BlockPos pos, BlockState state) {
1111
super(level, entity, pos, state);

src/main/java/dev/latvian/mods/kubejs/block/custom/BasicKubeBlock.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import dev.latvian.mods.kubejs.block.callback.CanBeReplacedCallback;
1313
import dev.latvian.mods.kubejs.block.callback.EntityFallenOnBlockCallback;
1414
import dev.latvian.mods.kubejs.block.callback.EntityInsideBlockCallback;
15-
import dev.latvian.mods.kubejs.block.callback.EntitySteppedOnBlockCallback;
15+
import dev.latvian.mods.kubejs.block.callback.EntityBlockCallback;
1616
import dev.latvian.mods.kubejs.block.callback.RandomTickCallback;
1717
import dev.latvian.mods.kubejs.block.entity.KubeBlockEntity;
1818
import dev.latvian.mods.kubejs.script.ScriptType;
@@ -268,7 +268,7 @@ protected void entityInside(BlockState state, Level level, BlockPos pos, Entity
268268
@Override
269269
public void stepOn(Level level, BlockPos blockPos, BlockState blockState, Entity entity) {
270270
if (blockBuilder.stepOnCallback != null) {
271-
var callbackJS = new EntitySteppedOnBlockCallback(level, entity, blockPos, blockState);
271+
var callbackJS = new EntityBlockCallback(level, entity, blockPos, blockState);
272272
safeCallback(level, blockBuilder.stepOnCallback, callbackJS, "Error while an entity stepped on custom block ");
273273
} else {
274274
super.stepOn(level, blockPos, blockState, entity);

0 commit comments

Comments
 (0)