From 72d2b0148851d19903f78da3f04ff2e4a7a04f50 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Thu, 31 Mar 2016 21:37:24 -0400 Subject: [PATCH] Obsidian upgrade gives blast resistance --- build.gradle | 2 +- .../storagedrawers/block/BlockDrawers.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4622de2..7a945fd 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.9.5" +version = "1.7.10-1.9.6" group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 398cb8e..4fe5c36 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -16,6 +16,7 @@ import com.jaquadro.minecraft.storagedrawers.core.ModItems; import com.jaquadro.minecraft.storagedrawers.core.handlers.GuiHandler; import com.jaquadro.minecraft.storagedrawers.item.ItemPersonalKey; import com.jaquadro.minecraft.storagedrawers.item.ItemTrim; +import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade; import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; @@ -651,6 +652,22 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return new ItemStack(Item.getItemFromBlock(this), 1, metadata); } + @Override + public float getExplosionResistance (Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + TileEntityDrawers tile = getTileEntity(world, x, y, z); + if (tile != null) { + for (int slot = 0; slot < 5; slot++) { + ItemStack stack = tile.getUpgrade(slot); + if (stack == null || !(stack.getItem() instanceof ItemUpgrade) || stack.getItemDamage() != 4) + continue; + + return 1000; + } + } + + return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); + } + @Override public TileEntityDrawers createNewTileEntity (World world, int meta) { return new TileEntityDrawersStandard();