Skip to content

Commit c74c9fc

Browse files
committed
Remove silly redundant class
1 parent d9cd471 commit c74c9fc

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import dev.latvian.mods.kubejs.block.callback.BlockStateRotateCallback;
99
import dev.latvian.mods.kubejs.block.callback.CanBeReplacedCallback;
1010
import dev.latvian.mods.kubejs.block.callback.EntityFallenOnBlockCallback;
11-
import dev.latvian.mods.kubejs.block.callback.EntityInsideBlockCallback;
1211
import dev.latvian.mods.kubejs.block.callback.EntityBlockCallback;
1312
import dev.latvian.mods.kubejs.block.callback.RandomTickCallback;
1413
import dev.latvian.mods.kubejs.block.drop.BlockDropSupplier;
@@ -102,7 +101,7 @@ public abstract class BlockBuilder extends ModelledBuilderBase<Block> {
102101
public transient Consumer<BlockStateModifyCallback> defaultStateModification;
103102
public transient Consumer<BlockStateModifyPlacementCallback> placementStateModification;
104103
public transient Predicate<CanBeReplacedCallback> canBeReplacedFunction;
105-
public transient Consumer<EntityInsideBlockCallback> insideCallback;
104+
public transient Consumer<EntityBlockCallback> insideCallback;
106105
public transient Consumer<EntityBlockCallback> stepOnCallback;
107106
public transient Consumer<EntityFallenOnBlockCallback> fallOnCallback;
108107
public transient Consumer<AfterEntityFallenOnBlockCallback> afterFallenOnCallback;
@@ -690,7 +689,7 @@ public BlockBuilder canBeReplaced(Predicate<CanBeReplacedCallback> callbackJS) {
690689
This is called every tick for every entity inside the block, so be careful what you do here.
691690
This will only be called if the entity's bounding box overlaps with the block's collision.
692691
""")
693-
public BlockBuilder entityInside(Consumer<EntityInsideBlockCallback> callbackJS) {
692+
public BlockBuilder entityInside(Consumer<EntityBlockCallback> callbackJS) {
694693
insideCallback = callbackJS;
695694
return this;
696695
}

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

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import dev.latvian.mods.kubejs.block.callback.BlockStateRotateCallback;
1212
import dev.latvian.mods.kubejs.block.callback.CanBeReplacedCallback;
1313
import dev.latvian.mods.kubejs.block.callback.EntityFallenOnBlockCallback;
14-
import dev.latvian.mods.kubejs.block.callback.EntityInsideBlockCallback;
1514
import dev.latvian.mods.kubejs.block.callback.EntityBlockCallback;
1615
import dev.latvian.mods.kubejs.block.callback.RandomTickCallback;
1716
import dev.latvian.mods.kubejs.block.entity.KubeBlockEntity;
@@ -258,7 +257,7 @@ public Optional<SoundEvent> getPickupSound() {
258257
@Override
259258
protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) {
260259
if (blockBuilder.insideCallback != null) {
261-
var callbackJS = new EntityInsideBlockCallback(level, entity, pos, state);
260+
var callbackJS = new EntityBlockCallback(level, entity, pos, state);
262261
safeCallback(level, blockBuilder.insideCallback, callbackJS, "Error while an entity was inside a custom block ");
263262
} else {
264263
super.entityInside(state, level, pos, entity);

0 commit comments

Comments
 (0)