diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 64c34c1e..80f9bc14 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -119,6 +119,8 @@ enderio.darkGrindingBall.tooltip.detailed.line2=Main Output enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output enderio.darkGrindingBall.tooltip.detailed.line4=Power Reduction +tile.blockReinforcedObsidian.name=Reinforced Obsidian +tile.blockReinforcedObsidian.tooltip.common.line1=Wither Proof //Quartz / Glass tile.blockFusedQuartz.name=Fused Quartz diff --git a/resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png b/resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png new file mode 100644 index 00000000..060f2efe Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 1d065132..289d49ba 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -25,6 +25,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.block.BlockDarkSteelPressurePlate; +import crazypants.enderio.block.BlockReinforcedObsidian; import crazypants.enderio.conduit.BlockConduitBundle; import crazypants.enderio.conduit.ConduitRecipes; import crazypants.enderio.conduit.facade.BlockConduitFacade; @@ -198,6 +199,7 @@ public class EnderIO { //Blocks public static BlockDarkSteelPressurePlate blockDarkSteelPressurePlate; public static BlockEndermanSkull blockEndermanSkull; + public static BlockReinforcedObsidian blockReinforcedObsidian; //Fluids public static Fluid fluidNutrientDistillation; @@ -286,6 +288,7 @@ public class EnderIO { blockKillerJoe = BlockKillerJoe.create(); blockDarkSteelPressurePlate = BlockDarkSteelPressurePlate.create(); + blockReinforcedObsidian = BlockReinforcedObsidian.create(); blockFusedQuartz = BlockFusedQuartz.create(); itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 542222c2..7581a2fc 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -63,6 +63,7 @@ public enum ModObject { //Blocks blockDarkSteelPressurePlate, + blockReinforcedObsidian, // Painter blockPainter, diff --git a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java new file mode 100644 index 00000000..f599f1c0 --- /dev/null +++ b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java @@ -0,0 +1,43 @@ +package crazypants.enderio.block; + +import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.machine.painter.TileEntityPaintedBlock; +import crazypants.enderio.material.BlockFusedQuartz; + +public class BlockReinforcedObsidian extends BlockEio implements IResourceTooltipProvider { + + public static BlockReinforcedObsidian create() { + BlockReinforcedObsidian result = new BlockReinforcedObsidian(); + result.init(); + return result; + } + + private BlockReinforcedObsidian() { + super(ModObject.blockReinforcedObsidian.unlocalisedName, null, Material.rock); + setHardness(50.0F); + setResistance(2000.0F); + setStepSound(soundTypePiston); + } + + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { + return false; + } + + public MapColor getMapColor(int p_149728_1_) { + return MapColor.obsidianColor; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } +} diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 929d2986..44de6fb0 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -147,6 +147,9 @@ public class MaterialRecipes { } else { GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); } + + ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); + GameRegistry.addShapedRecipe(reinfObs , "dbd", "bob", "dbd", 'd', darkSteel, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); }