diff --git a/Merge.bat b/Merge.bat index 208307fc..d313d286 100644 --- a/Merge.bat +++ b/Merge.bat @@ -1,5 +1,5 @@ git checkout master git pull -git checkout 1.6.4 +git checkout 1.7 git merge master --no-ff --no-commit pause \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index 0fee5394..af3eb144 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; @@ -241,6 +242,20 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork 0) { + foundFluid = true; + } + } + } + if(!foundFluid) { + return false; + } + FluidStack drained = extTank.drain(dir.getOpposite(), couldDrain, true); if(drained == null || drained.amount <= 0) { return false; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index ef32d94d..8a2cc3e6 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -133,6 +133,20 @@ public class LiquidConduit extends AbstractTankConduit { IFluidHandler extTank = getTankContainer(getLocation().getLocation(dir)); if(extTank != null) { + + boolean foundFluid = false; + FluidTankInfo[] info = extTank.getTankInfo(dir.getOpposite()); + if(info != null) { + for (FluidTankInfo inf : info) { + if(inf != null && inf.fluid != null && inf.fluid.amount > 0) { + foundFluid = true; + } + } + } + if(!foundFluid) { + return; + } + FluidStack couldDrain = extTank.drain(dir.getOpposite(), MAX_EXTRACT_PER_TICK, false); if(couldDrain != null && couldDrain.amount > 0 && canFill(dir, couldDrain.getFluid())) { int used = pushLiquid(dir, couldDrain, true, network == null ? -1 : network.getNextPushToken()); diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 7bc2879c..64ccde68 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -169,12 +169,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return PowerHandlerUtil.createHandler(CAPACITORS[subtype], this, Type.PIPE); } - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - recievedTicks = null; - } - @Override public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { rsModes.put(dir, mode); @@ -384,6 +378,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return super.onNeighborBlockChange(blockId); } + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + recievedTicks = null; + } + @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 273c00a0..6cda1656 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -250,21 +250,26 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - if(!world.isRemote && (!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop")))) { + if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileCapacitorBank) { TileCapacitorBank cb = (TileCapacitorBank) te; cb.onBreakBlock(); - ItemStack itemStack = - BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); + // If we are not in Creative or blockCapBankAllwaysDrop is set to true, allow the item drop. + // This option allows creative players to pick up broken capacitor banks + + if(!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop"))) { + ItemStack itemStack = + BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } } } return super.removedByPlayer(world, player, x, y, z); diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 30e65297..cd7d023a 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -773,6 +773,17 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe mb[i] = new BlockCoord(blocks.get(i)); } + TileCapacitorBank secondary = blocks.get(1); + maxInput = maxOutput = -1; + + if (secondary.maxInput != secondary.maxIO) { + maxInput = secondary.maxInput; + } + + if (secondary.maxOutput != secondary.maxIO) { + maxOutput = secondary.maxOutput; + } + for (TileCapacitorBank cb : blocks) { cb.setMultiblock(mb); } @@ -799,8 +810,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe if(cb != null) { cb.maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); cb.maxIO = BASE_CAP.getMaxEnergyExtracted(); - cb.maxInput = cb.maxIO; - cb.maxOutput = cb.maxIO; + cb.maxInput = Math.min(cb.maxInput, cb.maxIO); + cb.maxOutput = Math.min(cb.maxOutput, cb.maxIO); cb.storedEnergy = powerPerBlock; cb.updatePowerHandler(); cb.multiblockDirty = true; @@ -833,14 +844,14 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe storedEnergy = totalStored; maxStoredEnergy = totalCap; maxIO = totalIO; - maxInput = maxIO; - maxOutput = maxIO; + maxInput = maxInput < 0 ? maxIO : Math.min(maxInput, maxIO); + maxOutput = maxOutput < 0 ? maxIO : Math.min(maxOutput, maxIO); for (BlockCoord bc : multiblock) { TileCapacitorBank cb = getCapBank(bc); - if(cb != null) { + if(cb != null && cb != this) { cb.maxIO = totalIO; - cb.maxInput = maxIO; - cb.maxOutput = maxIO; + cb.maxInput = maxInput; + cb.maxOutput = maxOutput; } }