mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-27 23:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2597 from lcy0x1/funnel-fix

Browse source 
- Fixed backlog on belts not actively extracted by funnels that were blocked while the items accumulated
This commit is contained in:
simibubi 2022-03-03 15:07:32 +01:00 committed by GitHub
commit 21ad6125f5
Failed to generate hash of commit
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java
View file

@ -58,10 +58,10 @@ public class BeltInventory {
belt.setChanged(); belt.setChanged();
belt.sendData(); belt.sendData();
} }
if (belt.getSpeed() == 0) if (belt.getSpeed() == 0)
return; return;
// Reverse item collection if belt just reversed // Reverse item collection if belt just reversed
if (beltMovementPositive != belt.getDirectionAwareBeltMovementSpeed() > 0) { if (beltMovementPositive != belt.getDirectionAwareBeltMovementSpeed() > 0) {
beltMovementPositive = !beltMovementPositive; beltMovementPositive = !beltMovementPositive;
@ -107,7 +107,7 @@ public class BeltInventory {
// Don't move if held by processing (client) // Don't move if held by processing (client)
if (world.isClientSide && currentItem.locked) if (world.isClientSide && currentItem.locked)
continue; continue;
// Don't move if held by external components // Don't move if held by external components
if (currentItem.lockedExternally) { if (currentItem.lockedExternally) {
currentItem.lockedExternally = false; currentItem.lockedExternally = false;
@ -149,7 +149,12 @@ public class BeltInventory {
if (currentItem.locked) if (currentItem.locked)
continue; continue;
} }
// Belt Funnels
if (BeltFunnelInteractionHandler.checkForFunnels(this, currentItem, nextOffset))
continue;
if (noMovement) if (noMovement)
continue; continue;
@ -157,10 +162,6 @@ public class BeltInventory {
if (BeltTunnelInteractionHandler.flapTunnelsAndCheckIfStuck(this, currentItem, nextOffset)) if (BeltTunnelInteractionHandler.flapTunnelsAndCheckIfStuck(this, currentItem, nextOffset))
continue; continue;
// Belt Funnels
if (BeltFunnelInteractionHandler.checkForFunnels(this, currentItem, nextOffset))
continue;
// Horizontal Crushing Wheels // Horizontal Crushing Wheels
if (BeltCrusherInteractionHandler.checkForCrushers(this, currentItem, nextOffset)) if (BeltCrusherInteractionHandler.checkForCrushers(this, currentItem, nextOffset))
continue; continue;
@ -243,7 +244,7 @@ public class BeltInventory {
belt.sendData(); belt.sendData();
return false; return false;
} }
if (noMovement) if (noMovement)
return false; return false;
@ -449,5 +450,5 @@ public class BeltInventory {
public List<TransportedItemStack> getTransportedItems() { public List<TransportedItemStack> getTransportedItems() {
return items; return items;
} }
} }