tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes

Browse source
This commit is contained in:
aidancbrady 2016-05-28 02:01:21 -04:00
parent 5fdc677926
commit 38490db21d
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/api/MekanismConfig.java
View file

@ -64,7 +64,7 @@ public class MekanismConfig
public static double energyPerHeat = 1000;
public static double maxEnergyPerSteam = 100;
public static double superheatingHeatTransfer = 10000;
public static double heatPerFuelTick = 1;
public static double heatPerFuelTick = 4;
}
public static class client

2
src/main/java/mekanism/common/CommonProxy.java
View file

@ -296,7 +296,7 @@ public class CommonProxy implements IGuiProvider
general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble();
general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble();
general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble();
general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 1D).getDouble();
general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble();
general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean();
general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean();

5
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -1080,6 +1080,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
{
MachineType type = MachineType.get(blockType, world.getBlockMetadata(x, y, z));
if(type == null)
{
return;
}
switch(type)
{

2
src/main/java/mekanism/common/tile/TileEntityPersonalChest.java
View file

@ -84,7 +84,7 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements
else {
if(INV == null)
{
INV = new int[55];
INV = new int[54];
for(int i = 0; i < INV.length; i++)
{

2
src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java
View file

@ -40,7 +40,7 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer
public void renderAModelAt(TileEntityTurbineCasing tileEntity, double x, double y, double z, float partialTick)
{
if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null)
if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.complex != null)
{
RenderTurbineRotor.internalRender = true;
Coord4D coord = tileEntity.structure.complex;