Skip to content

Fix FunnelBlockEntityMixin for Create 6.0.9 #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Starior wants to merge 1 commit into from
Closed

Fix FunnelBlockEntityMixin for Create 6.0.9 #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/main/java/fr/iglee42/createqualityoflife/mixins/FunnelBlockEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,28 @@ public class FunnelBlockEntityMixin{
@Shadow
private WeakReference<Entity> lastObserved;

@Inject(method = "activateExtractor",at = @At(value = "INVOKE", target = "Lcom/simibubi/create/foundation/blockEntity/behaviour/inventory/InvManipulationBehaviour;extract(Lcom/simibubi/create/foundation/item/ItemHelper$ExtractionCountMode;I)Lnet/minecraft/world/item/ItemStack;",ordinal = 1),locals = LocalCapture.CAPTURE_FAILSOFT,cancellable = true)
private void qol$addPickupDelayIfFromLinker(CallbackInfo ci, BlockState blockState, Direction facing, boolean trackingEntityPresent, AABB area, int amountToExtract, ItemHelper.ExtractionCountMode mode){
if (invManipulation.blockEntity.getLevel().getBlockEntity(invManipulation.getTarget().getConnectedPos()) instanceof InventoryLinkerBlockEntity)
for (Entity entity : invManipulation.blockEntity.getLevel().getEntities(null, area.inflate(1))) {
if (entity instanceof Player) {
lastObserved = new WeakReference<>(entity);
ci.cancel();
return;
@Shadow
private AABB getEntityOverflowScanningArea() {
return null;
}

@Inject(method = "activateExtractor",at = @At(value = "INVOKE", target = "Lcom/simibubi/create/foundation/blockEntity/behaviour/inventory/InvManipulationBehaviour;extract(Lcom/simibubi/create/foundation/item/ItemHelper$ExtractionCountMode;I)Lnet/minecraft/world/item/ItemStack;",ordinal = 1, shift = At.Shift.BEFORE),cancellable = true,remap = false)
private void qol$addPickupDelayIfFromLinker(CallbackInfo ci){
FunnelBlockEntity self = (FunnelBlockEntity)(Object)this;
if (invManipulation != null && invManipulation.blockEntity != null && invManipulation.getTarget() != null) {
if (invManipulation.blockEntity.getLevel().getBlockEntity(invManipulation.getTarget().getConnectedPos()) instanceof InventoryLinkerBlockEntity) {
AABB area = getEntityOverflowScanningArea();
if (area != null && self.getLevel() != null) {
for (Entity entity : self.getLevel().getEntities(null, area.inflate(1))) {
if (entity instanceof Player) {
lastObserved = new WeakReference<>(entity);
ci.cancel();
return;
}
}
}
}
}
}

}
Loading