diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 1b25c4a6..0668e9a3 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -54,6 +54,8 @@ enderio.darkSteel.name=Dark Steel enderio.conduitBinder.name=Conduit Binder enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget +tile.blockDarkIronBars.name=Dark Iron Bars +enderio.blastResistant=Blast Resistant //Fluids fluid.nutrient_distillation=Nutrient Distillation diff --git a/resources/assets/enderio/textures/blocks/blockDarkIronBars.png b/resources/assets/enderio/textures/blocks/blockDarkIronBars.png new file mode 100644 index 00000000..dcf4600a Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockDarkIronBars.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index a33ba602..82c999c1 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -72,6 +72,7 @@ import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; import crazypants.enderio.material.Alloy; +import crazypants.enderio.material.BlockDarkIronBars; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; @@ -107,6 +108,7 @@ public class EnderIO { public static ItemMachinePart itemMachinePart; public static ItemPowderIngot itemPowderIngot; public static ItemMaterial itemMaterial; + public static BlockDarkIronBars blockDarkIronBars; // Enderface public static BlockEnderIO blockEnderIo; @@ -289,6 +291,8 @@ public class EnderIO { itemConduitProbe = ItemConduitProbe.create(); itemMagnet = ItemMagnet.create(); + + blockDarkIronBars = BlockDarkIronBars.create(); itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index c129f257..9c124221 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -27,6 +27,7 @@ public enum ModObject { itemPowderIngot, blockFusedQuartz, itemFusedQuartzFrame, + blockDarkIronBars, // Machines blockStirlingGenerator, diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 69d20299..a1dca6d2 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -12,6 +12,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.tank.BlockTank; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; @@ -28,6 +29,7 @@ public class MachineRecipes { ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); ItemStack pulCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); ItemStack electricSteel = new ItemStack(EnderIO.itemAlloy,1,Alloy.ELECTRICAL_STEEL.ordinal()); + ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); //stirling gen ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); @@ -44,12 +46,19 @@ public class MachineRecipes { ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); Object glassSides; if(Config.useHardRecipes) { - glassSides = fusedQuartz; + glassSides = "glassHardened"; } else { glassSides = "glass"; } GameRegistry.addRecipe(new ShapedOreRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz)); + //Tanks + ItemStack basicTank = new ItemStack(EnderIO.blockTank,1,0); + GameRegistry.addRecipe(new ShapedOreRecipe(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', Items.iron_ingot, 'b', Blocks.iron_bars)); + + ItemStack advTank = new ItemStack(EnderIO.blockTank,1,1); + GameRegistry.addRecipe(new ShapedOreRecipe(advTank, "ibi", "bgb", "ibi", 'g', "glassHardened", 'i', darkSteel, 'b', EnderIO.blockDarkIronBars)); + //mill ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0); if(Config.useHardRecipes) { diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index 87a503a9..f9d11a57 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -6,10 +6,12 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -234,6 +236,17 @@ public boolean isOpaqueCube() { public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { } + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, 1); + if(meta == 1) { + return 2000; + } else { + return super.getExplosionResistance(par1Entity); + } + } + @Override @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { @@ -250,6 +263,9 @@ public boolean isOpaqueCube() { @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { TooltipAddera.addDetailedTooltipFromResources(list, itemstack); + if(itemstack.getItemDamage() == 1) { + list.add(EnumChatFormatting.ITALIC + Lang.localize("blastResistant")); + } } @Override diff --git a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java new file mode 100644 index 00000000..ada8777a --- /dev/null +++ b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java @@ -0,0 +1,33 @@ +package crazypants.enderio.material; + +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.painter.BlockItemPaintedFence; +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; + +public class BlockDarkIronBars extends BlockPane { + + public static BlockDarkIronBars create() { + BlockDarkIronBars res = new BlockDarkIronBars(); + res.init(); + return res; + } + + public BlockDarkIronBars() { + super("enderio:blockDarkIronBars", "enderio:blockDarkIronBars", Material.iron, true); + setResistance(2000.0F); //TNT Proof + setHardness(5.0F); + setStepSound(soundTypeMetal); + setBlockName(ModObject.blockDarkIronBars.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + protected void init() { + GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, ModObject.blockDarkIronBars.unlocalisedName); + } + + + +} diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index cdf429a9..653bbe48 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -6,6 +6,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.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -69,6 +70,17 @@ public class BlockFusedQuartz extends BlockEio { GameRegistry.registerTileEntity(teClass, name + "TileEntity"); } } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, 1); + if(meta == 0) { + return 2000; + } else { + return super.getExplosionResistance(par1Entity); + } + } @Override public boolean renderAsNormalBlock() { diff --git a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java new file mode 100644 index 00000000..2be522e8 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java @@ -0,0 +1,26 @@ +package crazypants.enderio.material; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.util.Lang; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +public class BlockItemDarkIronBars extends ItemBlock { + + public BlockItemDarkIronBars(Block block) { + super(block); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + par3List.add(Lang.localize("blastResistant")); + } + +} diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java index 46eef4a1..f6de920e 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java @@ -2,13 +2,19 @@ package crazypants.enderio.material; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import crazypants.enderio.EnderIOTab; +import crazypants.util.Lang; public class ItemFusedQuartz extends ItemBlockWithMetadata { @@ -31,4 +37,16 @@ public class ItemFusedQuartz extends ItemBlockWithMetadata { par3List.add(new ItemStack(par1, 1, j)); } } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + int meta = par1ItemStack.getItemDamage(); + meta = MathHelper.clamp_int(meta, 0, BlockFusedQuartz.Type.values().length - 1); + if(meta == 0) { + par3List.add(Lang.localize("blastResistant")); + } + } + + } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 63b78b0f..4e5c2028 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -99,6 +99,10 @@ public class MaterialRecipes { ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); GameRegistry.addShapedRecipe(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); + //Dark Iron Bars + ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); + GameRegistry.addShapedRecipe(diBars, "ddd", "ddd", " ", 'd', darkSteel); + // Fused Quartz Frame GameRegistry.addRecipe(new ShapedOreRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood")); GameRegistry.addRecipe(new ShapedOreRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"));