A few minor fixes, added Ultimate Tier Installer texture
This commit is contained in:
parent
71fbf0a2bd
commit
38024f98ad
4 changed files with 5 additions and 4 deletions
|
@ -105,7 +105,7 @@ public class GeneratorsCommonProxy implements IGuiProvider
|
|||
generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt();
|
||||
generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble();
|
||||
generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble();
|
||||
generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserRate", 8000).getInt();
|
||||
generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserFlowRate", 32000).getInt();
|
||||
|
||||
if(Mekanism.configuration.hasChanged())
|
||||
{
|
||||
|
|
|
@ -157,7 +157,7 @@ public class MekanismGenerators implements IModule
|
|||
" I ", "IFI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Generator, 1, 10), Character.valueOf('F'), Blocks.iron_bars
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 13), new Object[] {
|
||||
"STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('E'), Items.bucket
|
||||
"STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('B'), Items.bucket
|
||||
}));
|
||||
|
||||
//Reactor Recipes
|
||||
|
|
|
@ -22,6 +22,7 @@ import mekanism.common.security.ISecurityTile;
|
|||
import mekanism.common.tile.TileEntityBasicBlock;
|
||||
import mekanism.common.tile.TileEntityContainerBlock;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.common.tile.TileEntityMultiblock;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.SecurityUtils;
|
||||
|
@ -669,7 +670,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB
|
|||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
|
||||
ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z));
|
||||
|
||||
if(itemStack.stackTagCompound == null)
|
||||
if(itemStack.stackTagCompound == null && !(tileEntity instanceof TileEntityMultiblock))
|
||||
{
|
||||
itemStack.setTagCompound(new NBTTagCompound());
|
||||
}
|
||||
|
@ -696,7 +697,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB
|
|||
electricItem.setEnergy(itemStack, ((TileEntityElectricBlock)tileEntity).electricityStored);
|
||||
}
|
||||
|
||||
if(tileEntity instanceof TileEntityContainerBlock)
|
||||
if(tileEntity instanceof TileEntityContainerBlock && ((TileEntityContainerBlock)tileEntity).handleInventory())
|
||||
{
|
||||
ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem();
|
||||
inventory.setInventory(((TileEntityContainerBlock)tileEntity).getInventory(), itemStack);
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 15 KiB |
Loading…
Reference in a new issue