diff --git a/src/main/java/com/jozufozu/flywheel/api/backend/Engine.java b/src/main/java/com/jozufozu/flywheel/api/backend/Engine.java index 3e9b7bd59..78c1f5c52 100644 --- a/src/main/java/com/jozufozu/flywheel/api/backend/Engine.java +++ b/src/main/java/com/jozufozu/flywheel/api/backend/Engine.java @@ -2,6 +2,8 @@ package com.jozufozu.flywheel.api.backend; import java.util.List; +import org.jetbrains.annotations.NotNull; + import com.jozufozu.flywheel.api.event.RenderContext; import com.jozufozu.flywheel.api.event.RenderStage; import com.jozufozu.flywheel.api.instance.Instance; @@ -65,6 +67,6 @@ public interface Engine extends InstancerProvider { * @param pos The position of the block. * @param instances The instances associated with the BE at this position. */ - record CrumblingBlock(int progress, BlockPos pos, List instances) { + record CrumblingBlock(int progress, BlockPos pos, List<@NotNull Instance> instances) { } } diff --git a/src/main/java/com/jozufozu/flywheel/api/instance/Instancer.java b/src/main/java/com/jozufozu/flywheel/api/instance/Instancer.java index 52e10f425..7d6032a9d 100644 --- a/src/main/java/com/jozufozu/flywheel/api/instance/Instancer.java +++ b/src/main/java/com/jozufozu/flywheel/api/instance/Instancer.java @@ -1,5 +1,7 @@ package com.jozufozu.flywheel.api.instance; +import org.jetbrains.annotations.Nullable; + /** * An instancer is how you interact with an instanced model. *

@@ -31,11 +33,13 @@ public interface Instancer { *

* If the given instance is already owned by this instancer, this method does nothing. *
+ * If the given instance is {@code null}, this method does nothing. + *
* If the given instance was created by a different backend, the behavior of this method is undefined. * * @param instance The instance to steal. */ - void stealInstance(I instance); + void stealInstance(@Nullable I instance); /** * Populate arr with new instances of this model. diff --git a/src/main/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java b/src/main/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java index 3436a303c..fea46e61d 100644 --- a/src/main/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java +++ b/src/main/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java @@ -2,6 +2,8 @@ package com.jozufozu.flywheel.api.visual; import java.util.function.Consumer; +import org.jetbrains.annotations.Nullable; + import com.jozufozu.flywheel.api.instance.Instance; import net.minecraft.world.level.block.entity.BlockEntity; @@ -10,8 +12,10 @@ public interface BlockEntityVisual extends Visual { /** * Collect all instances that should render with a crumbling overlay * when the block corresponding to this visual is being broken. + *
+ * Passing {@code null} to the consumer has no effect. * * @param consumer A consumer to provide instances to. */ - void collectCrumblingInstances(Consumer consumer); + void collectCrumblingInstances(Consumer<@Nullable Instance> consumer); } diff --git a/src/main/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java index 7ea5b263e..6cfe224a8 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java @@ -36,6 +36,10 @@ public abstract class AbstractInstancer implements Instancer @Override public void stealInstance(I instance) { + if (instance == null) { + return; + } + var instanceHandle = instance.handle(); if (!(instanceHandle instanceof InstanceHandleImpl handle)) { diff --git a/src/main/java/com/jozufozu/flywheel/impl/visualization/VisualizationManagerImpl.java b/src/main/java/com/jozufozu/flywheel/impl/visualization/VisualizationManagerImpl.java index c09ca4d7c..be0c09a4a 100644 --- a/src/main/java/com/jozufozu/flywheel/impl/visualization/VisualizationManagerImpl.java +++ b/src/main/java/com/jozufozu/flywheel/impl/visualization/VisualizationManagerImpl.java @@ -230,7 +230,11 @@ public class VisualizationManagerImpl implements VisualizationManager { List instances = new ArrayList<>(); - visual.collectCrumblingInstances(instances::add); + visual.collectCrumblingInstances(instance -> { + if (instance != null) { + instances.add(instance); + } + }); if (instances.isEmpty()) { // The visual doesn't want to render anything crumbling.