Add Multipart::canIntersectWith

This commit is contained in:
Shadowfacts 2019-01-05 14:04:46 -05:00
parent 3351522bd3
commit fd737cfd23
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
3 changed files with 29 additions and 1 deletions

View File

@ -106,7 +106,7 @@ public abstract class AbstractContainerBlockEntity extends BlockEntity implement
VoxelShape newShape = partState.getBoundingShape(null); VoxelShape newShape = partState.getBoundingShape(null);
for (Entry e : parts) { for (Entry e : parts) {
VoxelShape existingShape = e.state.getBoundingShape(e); VoxelShape existingShape = e.state.getBoundingShape(e);
if (ShapeUtils.intersect(newShape, existingShape)) { if (ShapeUtils.intersect(newShape, existingShape) && !(partState.canIntersectWith(e.state) && e.state.canIntersectWith(partState))) {
return false; return false;
} }
} }

View File

@ -95,6 +95,20 @@ public abstract class Multipart {
@Deprecated @Deprecated
public abstract VoxelShape getBoundingShape(MultipartState state, /*@Nullable*/ MultipartView view); public abstract VoxelShape getBoundingShape(MultipartState state, /*@Nullable*/ MultipartView view);
/**
* Determines if this multipart can be placed in the same block as another part, even if their bounding boxes intersect.
*
* Can be overriden, should only be called via {@link MultipartState#canIntersectWith(MultipartState)}
*
* @param self The state for this part.
* @param other The other part that already exists.
* @return If the multiparts can coexist.
*/
@Deprecated
public boolean canIntersectWith(MultipartState self, MultipartState other) {
return false;
}
/** /**
* @return The loot table ID used for to determine the drops by the default {@link Multipart#getDroppedStacks(MultipartView, LootContext.Builder)} implementation. * @return The loot table ID used for to determine the drops by the default {@link Multipart#getDroppedStacks(MultipartView, LootContext.Builder)} implementation.
*/ */
@ -146,6 +160,9 @@ public abstract class Multipart {
/** /**
* Called after this multipart (and it's entity, if there is one) has been added to the container. * Called after this multipart (and it's entity, if there is one) has been added to the container.
*
* Can be overriden, should only be called via {@link MultipartState#onPartAdded(MultipartView)}
*
* @param view The view of this part. * @param view The view of this part.
*/ */
@Deprecated @Deprecated
@ -154,6 +171,9 @@ public abstract class Multipart {
/** /**
* Called <b>after</b> this part has been removed from its container. * Called <b>after</b> this part has been removed from its container.
*
* Can be overriden, should only be called via {@link MultipartState#onPartRemoved(MultipartView)}
*
* @param view The view of this part. * @param view The view of this part.
* The multipart entity and container in this view are still present, but the part is no longer in the container. * The multipart entity and container in this view are still present, but the part is no longer in the container.
*/ */

View File

@ -41,6 +41,14 @@ public class MultipartState extends AbstractPropertyContainer<Multipart, Multipa
return owner.getBoundingShape(this, view); return owner.getBoundingShape(this, view);
} }
/**
* @see Multipart#canIntersectWith(MultipartState, MultipartState)
*/
public boolean canIntersectWith(MultipartState other) {
//noinspection deprecation
return owner.canIntersectWith(this, other);
}
/** /**
* @see Multipart#getDroppedStacks(MultipartView, LootContext.Builder) * @see Multipart#getDroppedStacks(MultipartView, LootContext.Builder)
*/ */