xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-02-24 15:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2165 from abel1502/abel-conv-ejector-fix

Browse Source 
Fix interaction between conveyor ejector and conveyor splitter
This commit is contained in:
HbmMods 2025-05-23 08:10:48 +02:00 committed by GitHub
commit 051938a3cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java
View File

@ -1,6 +1,8 @@
package com.hbm.tileentity.network; package com.hbm.tileentity.network;
import api.hbm.conveyor.IConveyorBelt; import api.hbm.conveyor.IConveyorBelt;
import api.hbm.conveyor.IEnterableBlock;
import com.hbm.entity.item.EntityMovingItem; import com.hbm.entity.item.EntityMovingItem;
import com.hbm.inventory.container.ContainerCraneExtractor; import com.hbm.inventory.container.ContainerCraneExtractor;
import com.hbm.inventory.gui.GUICraneExtractor; import com.hbm.inventory.gui.GUICraneExtractor;
@ -117,12 +119,7 @@ public class TileEntityCraneExtractor extends TileEntityCraneBase implements IGU
inv.decrStackSize(index, toSend); inv.decrStackSize(index, toSend);
stack.stackSize = toSend; stack.stackSize = toSend;
EntityMovingItem moving = new EntityMovingItem(worldObj); sendItem(stack, belt, outputSide);
Vec3 pos = Vec3.createVectorHelper(xCoord + 0.5 + outputSide.offsetX * 0.55, yCoord + 0.5 + outputSide.offsetY * 0.55, zCoord + 0.5 + outputSide.offsetZ * 0.55);
Vec3 snap = belt.getClosestSnappingPosition(worldObj, xCoord + outputSide.offsetX, yCoord + outputSide.offsetY, zCoord + outputSide.offsetZ, pos);
moving.setPosition(snap.xCoord, snap.yCoord, snap.zCoord);
moving.setItemStack(stack);
worldObj.spawnEntityInWorld(moving);
hasSent = true; hasSent = true;
break; break;
} }
@ -142,12 +139,7 @@ public class TileEntityCraneExtractor extends TileEntityCraneBase implements IGU
decrStackSize(i, toSend); decrStackSize(i, toSend);
stack.stackSize = toSend; stack.stackSize = toSend;
EntityMovingItem moving = new EntityMovingItem(worldObj); sendItem(stack, belt, outputSide);
Vec3 pos = Vec3.createVectorHelper(xCoord + 0.5 + outputSide.offsetX * 0.55, yCoord + 0.5 + outputSide.offsetY * 0.55, zCoord + 0.5 + outputSide.offsetZ * 0.55);
Vec3 snap = belt.getClosestSnappingPosition(worldObj, xCoord + outputSide.offsetX, yCoord + outputSide.offsetY, zCoord + outputSide.offsetZ, pos);
moving.setPosition(snap.xCoord, snap.yCoord, snap.zCoord);
moving.setItemStack(stack);
worldObj.spawnEntityInWorld(moving);
break; break;
} }
} }
@ -159,6 +151,24 @@ public class TileEntityCraneExtractor extends TileEntityCraneBase implements IGU
} }
} }
private void sendItem(ItemStack stack, IConveyorBelt belt, ForgeDirection outputSide) {
EntityMovingItem moving = new EntityMovingItem(worldObj);
Vec3 pos = Vec3.createVectorHelper(xCoord + 0.5 + outputSide.offsetX * 0.55, yCoord + 0.5 + outputSide.offsetY * 0.55, zCoord + 0.5 + outputSide.offsetZ * 0.55);
Vec3 snap = belt.getClosestSnappingPosition(worldObj, xCoord + outputSide.offsetX, yCoord + outputSide.offsetY, zCoord + outputSide.offsetZ, pos);
moving.setPosition(snap.xCoord, snap.yCoord, snap.zCoord);
moving.setItemStack(stack);
worldObj.spawnEntityInWorld(moving);
if (belt instanceof IEnterableBlock) {
IEnterableBlock enterable = (IEnterableBlock) belt;
if(enterable.canItemEnter(worldObj, xCoord + outputSide.offsetX, yCoord + outputSide.offsetY, zCoord + outputSide.offsetZ, outputSide.getOpposite(), moving)) {
enterable.onItemEnter(worldObj, xCoord + outputSide.offsetX, yCoord + outputSide.offsetY, zCoord + outputSide.offsetZ, outputSide.getOpposite(), moving);
moving.setDead();
}
}
}
@Override @Override
public void serialize(ByteBuf buf) { public void serialize(ByteBuf buf) {
super.serialize(buf); super.serialize(buf);