mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 22:43:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
simibubi 2020-12-19 18:34:51 +01:00
commit 59b033f3be
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java
View File

@ -58,6 +58,9 @@ public abstract class FluidTransportBehaviour extends TileEntityBehaviour {
World world = getWorld();
BlockPos pos = getPos();
boolean onClient = world.isRemote;
if (interfaces == null)
return;
Collection<PipeConnection> connections = interfaces.values();
// Do not provide a lone pipe connection with its own flow input

7
src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java
View File

@ -119,7 +119,9 @@ public class BasinTileEntity extends SmartTileEntity {
inputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.INPUT, this, 2, 1000, true)
.whenFluidUpdates(() -> contentsChanged = true);
outputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 2, 1000, true).forbidInsertion();
outputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 2, 1000, true)
.whenFluidUpdates(() -> contentsChanged = true)
.forbidInsertion();
behaviours.add(inputTank);
behaviours.add(outputTank);
@ -251,7 +253,8 @@ public class BasinTileEntity extends SmartTileEntity {
newFacing = test;
}
if (preferredSpoutput != null && BasinBlock.canOutputTo(world, pos, preferredSpoutput) && preferredSpoutput != Direction.UP)
if (preferredSpoutput != null && BasinBlock.canOutputTo(world, pos, preferredSpoutput)
&& preferredSpoutput != Direction.UP)
newFacing = preferredSpoutput;
if (newFacing != currentFacing)

3
src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java
View File

@ -6,6 +6,7 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllShapes;
import com.simibubi.create.AllTileEntities;
import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
import com.simibubi.create.content.contraptions.wrench.IWrenchable;
import com.simibubi.create.foundation.block.ITE;
import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
@ -34,7 +35,7 @@ import net.minecraftforge.items.ItemStackHandler;
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
public class DepotBlock extends Block implements ITE<DepotTileEntity> {
public class DepotBlock extends Block implements ITE<DepotTileEntity>, IWrenchable {
public DepotBlock(Properties p_i48440_1_) {
super(p_i48440_1_);