From f51221f5ac273ef47d25ee4272d467fcc9a2aa5e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 23:56:25 -0400 Subject: [PATCH] Implemented custom resistance for Refined Obsidian --- .../mekanism/common/block/BlockBasic.java | 16 ++++++++++- .../boiler/SynchronizedBoilerData.java | 2 -- .../common/tile/TileEntityBoilerCasing.java | 28 +------------------ 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 4505152fe..dd2299c0b 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -49,6 +49,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.item.EntityItem; @@ -117,7 +118,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { super(Material.iron); setHardness(5F); - setResistance(10F); + setResistance(20F); setCreativeTab(Mekanism.tabMekanism); blockType = type; } @@ -164,6 +165,19 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } } } + + @Override + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { + BasicType type = BasicType.get(this, world.getBlockMetadata(x, y, z)); + + if(type == BasicType.REFINED_OBSIDIAN) + { + return 4000F; + } + + return blockResistance; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index eda394981..a22be07e3 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -48,8 +48,6 @@ public class SynchronizedBoilerData extends SynchronizedData implements IFluidContainerManager, IHeatTransfer +public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ public Set valveViewing = new HashSet(); @@ -217,7 +215,6 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock