Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines

This commit is contained in:
aidancbrady committed 2016-07-06 16:56:24 -04:00
1 parent 53a9204974
commit 95c0ad4a73
28 files changed
+295 -118

No files matched your search

@@ -30,11 +30,13 @@ import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.PacketHandler;
import mekanism.common.SideData;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.Upgrade;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.base.SoundWrapper;
import mekanism.common.block.BlockMachine.MachineType;
@@ -61,7 +63,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile, ITierUpgradeable
{
/** This Factory's tier. */
public FactoryTier tier;
@@ -174,8 +176,14 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
maxInfuse = BASE_MAX_INFUSE*tier.processes;
}
public void upgrade()
@Override
public boolean upgrade(BaseTier upgradeTier)
{
if(upgradeTier.ordinal() != tier.ordinal()+1 || tier == FactoryTier.ELITE)
{
return false;
}
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5+tier.ordinal()+1, 3);
@@ -244,6 +252,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
factory.markDirty();
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(factory), factory.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(factory)));
return true;
}
@Override