mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
This commit is contained in:
1 parent
5fdc677926
commit
38490db21d
5 files changed
+9
-4
No files matched your search
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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++)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user