diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index e5c37419..eb321ac7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -82,7 +82,6 @@ enderio.itemMeConduit.name=ME Conduit //Materials enderio.itemMaterial.name=Materials enderio.silicon.name=Silicon -enderio.darkSteel.name=Dark Steel enderio.conduitBinder.name=Conduit Binder enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget @@ -140,7 +139,18 @@ enderio.phasedGold.name=Vibrant Alloy enderio.redstoneAlloy.name=Redstone Alloy enderio.conductiveIron.name=Conductive Iron enderio.phasedIron.name=Pulsating Iron -enderio.vibrantNugget.name=Vibrant Nugget +enderio.vibrantNugget.name=Vibrant Alloy Nugget +enderio.darkSteel.name=Dark Steel + +tile.blockIngotStorage.name=Ingot Storage +tile.enderio.electricalSteel.name=Electrical Steel Block +tile.enderio.energeticAlloy.name=Energetic Alloy Block +tile.enderio.phasedGold.name=Vibrant Alloy Block +tile.enderio.redstoneAlloy.name=Redstone Alloy Block +tile.enderio.conductiveIron.name=Conductive Iron Block +tile.enderio.phasedIron.name=Pulsating Iron Block +tile.enderio.vibrantNugget.name=Vibrant Nugget Block +tile.enderio.darkSteel.name=Dark Steel Block //Powder / Ingot enderio.powderCoal.name=Coal Powder diff --git a/resources/assets/enderio/textures/blocks/conductiveIronBlock.png b/resources/assets/enderio/textures/blocks/conductiveIronBlock.png new file mode 100644 index 00000000..ea1b84a2 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/conductiveIronBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/darkSteelBlock.png b/resources/assets/enderio/textures/blocks/darkSteelBlock.png new file mode 100644 index 00000000..c3cc42a9 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/darkSteelBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/electricalSteelBlock.png b/resources/assets/enderio/textures/blocks/electricalSteelBlock.png new file mode 100644 index 00000000..4c96d352 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/electricalSteelBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/energeticAlloyBlock.png b/resources/assets/enderio/textures/blocks/energeticAlloyBlock.png new file mode 100644 index 00000000..63285ed7 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/energeticAlloyBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/phasedGoldBlock.png b/resources/assets/enderio/textures/blocks/phasedGoldBlock.png new file mode 100644 index 00000000..dc9fecc1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/phasedGoldBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/phasedIronBlock.png b/resources/assets/enderio/textures/blocks/phasedIronBlock.png new file mode 100644 index 00000000..875de671 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/phasedIronBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png b/resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png new file mode 100644 index 00000000..bfd565d2 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 289d49ba..97a08fb3 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -98,6 +98,7 @@ import crazypants.enderio.machine.wireless.BlockWirelessCharger; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockDarkIronBars; import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.BlockIngotStorage; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.material.ItemFusedQuartzFrame; @@ -136,6 +137,7 @@ public class EnderIO { public static ItemMachinePart itemMachinePart; public static ItemPowderIngot itemPowderIngot; public static ItemMaterial itemMaterial; + public static BlockIngotStorage blockIngotStorage; public static BlockDarkIronBars blockDarkIronBars; // Enderface @@ -359,6 +361,8 @@ public class EnderIO { itemConduitProbe = ItemConduitProbe.create(); itemMagnet = ItemMagnet.create(); + + blockIngotStorage = BlockIngotStorage.create(); blockDarkIronBars = BlockDarkIronBars.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 7581a2fc..9385f247 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -64,6 +64,7 @@ public enum ModObject { //Blocks blockDarkSteelPressurePlate, blockReinforcedObsidian, + blockIngotStorage, // Painter blockPainter, diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index 973d07f1..ac7949f5 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -1,21 +1,30 @@ package crazypants.enderio.material; +import org.apache.commons.lang3.StringUtils; + public enum Alloy { - ELECTRICAL_STEEL("electricalSteel"), - ENERGETIC_ALLOY("energeticAlloy"), - PHASED_GOLD("phasedGold"), - REDSTONE_ALLOY("redstoneAlloy"), - CONDUCTIVE_IRON("conductiveIron"), - PHASED_IRON("phasedIron"), - DARK_STEEL("darkSteel"); + ELECTRICAL_STEEL("electricalSteel", 6.0f), + ENERGETIC_ALLOY("energeticAlloy", 7.0f), + PHASED_GOLD("phasedGold", 4.0f), + REDSTONE_ALLOY("redstoneAlloy", 1.0f), + CONDUCTIVE_IRON("conductiveIron", 5.2f), + PHASED_IRON("phasedIron", 7.0f), + DARK_STEEL("darkSteel", 10.0f); public final String unlocalisedName; public final String iconKey; + public final String oredictName; + private final float hardness; - private Alloy(String iconKey) { - this.unlocalisedName = "enderio." + iconKey; - this.iconKey = "enderio:" + iconKey; + private Alloy(String baseName, float hardness) { + this.unlocalisedName = "enderio." + baseName; + this.iconKey = "enderio:" + baseName; + this.oredictName = "ingot" + StringUtils.capitalize(baseName); + this.hardness = hardness; } + public float getHardness() { + return hardness; + } } diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java new file mode 100644 index 00000000..9769e125 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -0,0 +1,70 @@ +package crazypants.enderio.material; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; + +public class BlockIngotStorage extends BlockEio { + + @SideOnly(Side.CLIENT) + private IIcon[] icons = new IIcon[Alloy.values().length]; + + public static BlockIngotStorage create() { + BlockIngotStorage res = new BlockIngotStorage(); + res.init(); + return res; + } + + private BlockIngotStorage() { + super(ModObject.blockIngotStorage.unlocalisedName, null, Material.iron); + setStepSound(soundTypeMetal); + } + + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemIngotStorage.class, ModObject.blockIngotStorage.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + for (Alloy alloy : Alloy.values()) { + icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, Alloy.values().length - 1); + return icons[meta]; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + return Alloy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance + } +} diff --git a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java index 65202989..9551dc79 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java @@ -16,10 +16,10 @@ public class BlockItemDarkIronBars extends ItemBlock { super(block); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @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/BlockItemIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java new file mode 100644 index 00000000..33f73123 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java @@ -0,0 +1,39 @@ +package crazypants.enderio.material; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockItemIngotStorage extends ItemBlock { + + public BlockItemIngotStorage(Block block) { + super(block); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return "tile." + Alloy.values()[stack.getItemDamage()].unlocalisedName; + } + + @Override + public int getMetadata(int damage) { + return damage; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (Alloy alloy : Alloy.values()) { + list.add(new ItemStack(this, 1, alloy.ordinal())); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java index d766e295..a3d34569 100644 --- a/src/main/java/crazypants/enderio/material/ItemAlloy.java +++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java @@ -78,5 +78,4 @@ public class ItemAlloy extends Item { par3List.add(new ItemStack(par1, 1, j)); } } - } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 50692a58..d76510aa 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -2,6 +2,8 @@ package crazypants.enderio.material; import java.util.ArrayList; +import org.apache.commons.lang3.StringUtils; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -28,14 +30,12 @@ public class MaterialRecipes { OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); - OreDictionary.registerOre("ingotConductiveIron", new ItemStack(EnderIO.itemAlloy, 1, Alloy.CONDUCTIVE_IRON.ordinal())); - OreDictionary.registerOre("ingotElectricalSteel", new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal())); - OreDictionary.registerOre("ingotEnergeticAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.ENERGETIC_ALLOY.ordinal())); - OreDictionary.registerOre("ingotRedstoneAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal())); - OreDictionary.registerOre("ingotRedAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal())); - OreDictionary.registerOre("ingotVibrantAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal())); - OreDictionary.registerOre("ingotPulsatingIron", new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal())); - OreDictionary.registerOre("ingotDarkSteel", new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal())); + for (Alloy alloy : Alloy.values()) { + OreDictionary.registerOre(alloy.oredictName, new ItemStack(EnderIO.itemAlloy, 1, alloy.ordinal())); + } + + OreDictionary.registerOre("nuggetPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Material.PHASED_IRON_NUGGET.ordinal())); + OreDictionary.registerOre("nuggetVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_NUGGET.ordinal())); OreDictionary.registerOre("glass", Blocks.glass); OreDictionary.registerOre("stickWood", Items.stick); @@ -46,6 +46,7 @@ public class MaterialRecipes { ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); OreDictionary.registerOre("glass", pureGlass); + OreDictionary.registerOre("blockGlass", pureGlass); OreDictionary.registerOre("glassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); //Skulls @@ -152,7 +153,10 @@ public class MaterialRecipes { ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); GameRegistry.addShapedRecipe(reinfObs , "dbd", "bob", "dbd", 'd', darkSteel, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); } - + + for (Alloy alloy : Alloy.values()) { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal()), "iii", "iii", "iii", 'i', alloy.oredictName)); + } } public static void addOreDictionaryRecipes() {