diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 1e4c5a5c7..8eb2870c2 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -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 diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 4664ad06c..f0d6a066a 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -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(); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index aacf4298a..a40e30e03 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -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) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index 26b7f77b0..4ce381b37 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -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++) { diff --git a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java index 4f13cde8b..ae96b19f8 100644 --- a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java @@ -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;