Merge branch 'development' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-04-25 16:08:06 +01:00
commit 0cb18773aa
1288 files changed
+11316 -7212

No files matched your search

@@ -47,8 +47,10 @@ import mekanism.common.recipe.inputs.InfusionInput;
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
import mekanism.common.recipe.machines.BasicMachineRecipe;
import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
import mekanism.common.security.ISecurityTile;
import mekanism.common.tile.component.TileComponentConfig;
import mekanism.common.tile.component.TileComponentEjector;
import mekanism.common.tile.component.TileComponentSecurity;
import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.InventoryUtils;
@@ -61,7 +63,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile
{
/** This Factory's tier. */
public FactoryTier tier;
@@ -131,6 +133,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
public TileComponentUpgrade upgradeComponent;
public TileComponentEjector ejectorComponent;
public TileComponentConfig configComponent;
public TileComponentSecurity securityComponent = new TileComponentSecurity(this);
public TileEntityFactory()
{
@@ -215,6 +218,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
factory.ejectorComponent.setOutputData(TransmissionType.ITEM, factory.configComponent.getOutputs(TransmissionType.ITEM).get(4));
factory.recipeType = recipeType;
factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
factory.securityComponent.readFrom(securityComponent);
for(int i = 0; i < tier.processes+5; i++)
{
@@ -1186,4 +1190,10 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
{
return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getName();
}
@Override
public TileComponentSecurity getSecurity()
{
return securityComponent;
}
}