Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-16 17:53:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' into mc1.16/dev

Browse source
This commit is contained in:
simibubi 2021-02-06 22:43:01 +01:00
commit a8d04cc152
4 changed files with 6 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -40,4 +40,3 @@ local.properties
# PDT-specific
.buildpath
src/generated/resources/.cache/cache

48
src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
View file

@ -380,38 +380,6 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
.isHorizontal())
return false;
// BlockState stateBelow = world.getBlockState(pos.down());
// if (stateBelow.getBlock() instanceof FunnelBlock) {
// if (stateBelow.method_28500(BrassFunnelBlock.POWERED).orElse(false))
// return false;
// if (stateBelow.get(BrassFunnelBlock.FACING) != Direction.UP)
// return false;
// ItemStack remainder = FunnelBlock.tryInsert(world, pos.down(), item, simulate);
// if (!simulate)
// setItem(remainder);
// return remainder.isEmpty();
// }
//
// DirectBeltInputBehaviour directInput =
// TileEntityBehaviour.get(world, pos.down(), DirectBeltInputBehaviour.TYPE);
// if (directInput != null) {
// if (!directInput.canInsertFromSide(Direction.UP))
// return false;
// ItemStack remainder = directInput.handleInsertion(item, Direction.UP, simulate);
// if (!simulate)
// setItem(remainder);
// return remainder.isEmpty();
// }
//
// if (!capBelow.isPresent())
// capBelow = grabCapability(Direction.DOWN);
// if (capBelow.isPresent()) {
// ItemStack remainder = ItemHandlerHelper.insertItemStacked(capBelow.orElse(null), item, simulate);
// if (!simulate)
// setItem(ItemStack.EMPTY);
// return remainder.isEmpty();
// }
if (Block.hasSolidSideOnTop(world, pos.down()))
return false;
@ -430,15 +398,6 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
private boolean handleUpwardOutput(boolean simulate) {
BlockState stateAbove = world.getBlockState(pos.up());
// if (stateAbove.getBlock() instanceof FunnelBlock) {
// boolean powered = stateAbove.method_28500(BrassFunnelBlock.POWERED).orElse(false);
// if (!powered && stateAbove.get(BrassFunnelBlock.FACING) == Direction.DOWN) {
// ItemStack remainder = FunnelBlock.tryInsert(world, pos.up(), item, simulate);
// if (remainder.isEmpty()) {
// if (!simulate)
// setItem(remainder);
// return true;
// }
if (world == null)
return false;
@ -509,9 +468,12 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
if (world == null)
return LazyOptional.empty();
TileEntity te = world.getTileEntity(pos);
if (te == null
|| (te instanceof ChuteTileEntity) && (side != Direction.DOWN || !(te instanceof SmartChuteTileEntity)))
if (te == null)
return LazyOptional.empty();
if (te instanceof ChuteTileEntity) {
if (side != Direction.DOWN || !(te instanceof SmartChuteTileEntity) || getItemMotion() > 0)
return LazyOptional.empty();
}
return te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite());
}

2
src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteTileEntity.java
View file

@ -21,7 +21,7 @@ public class SmartChuteTileEntity extends ChuteTileEntity {
@Override
protected boolean canAcceptItem(ItemStack stack) {
return super.canAcceptItem(stack) && canCollectItemsFromBelow();
return super.canAcceptItem(stack) && canCollectItemsFromBelow() && filtering.test(stack);
}
@Override

1
src/main/java/com/simibubi/create/content/schematics/filtering/SchematicInstances.java
View file

@ -9,7 +9,6 @@ import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.simibubi.create.content.schematics.SchematicWorld;
import com.simibubi.create.content.schematics.item.SchematicItem;
import com.simibubi.create.foundation.utility.Debug;
import com.simibubi.create.foundation.utility.WorldAttached;
import net.minecraft.item.ItemStack;