diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 1ee49eba..08fcea6c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -207,6 +207,7 @@ enderio.vibrantCrystal.name=Vibrant Crystal enderio.enderCrystal.name=Ender Crystal enderio.attractorCrystal.name=Enticing Crystal enderio.weatherCrystal.name=Weather Crystal + enderio.darkGrindingBall.name=Dark Steel Ball enderio.electricalGrindingBall.name=Electrical Steel Ball enderio.energeticGrindingBall.name=Energetic Alloy Ball @@ -216,6 +217,7 @@ enderio.conductiveGrindingBall.name=Conductive Iron Ball enderio.pulsatingGrindingBall.name=Pulsating Iron Ball enderio.soulariumGrindingBall.name=Soularium Ball enderio.endSteelGrindingBall.name=End Steel Ball + enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball enderio.darkGrindingBall.tooltip.detailed.line2=Main Output enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output @@ -250,6 +252,23 @@ enderio.darkSteel.name=Dark Steel enderio.soularium.name=Soularium enderio.endSteel.name=End Steel enderio.endSteelNugget.name=End Steel Nugget + +enderio.crudeSteel.name=Crude Steel +enderio.crystallineAlloy.name=Crystalline Alloy +enderio.melodicAlloy.name=Melodic Alloy +enderio.stellarAlloy.name=Stellar Alloy +enderio.crystallinePinkSlime.name=Crystalline Pink Slime +enderio.energeticSilver.name=Energetic Silver +enderio.vividAlloy.name=Vivid Alloy + +enderio.crudeSteelGrindingBall.name=Crude Steel Grinding Ball +enderio.crystallineAlloyGrindingBall.name=Crystalline Alloy Grinding Ball +enderio.melodicAlloyGrindingBall.name=Melodic Alloy Grinding Ball +enderio.stellarAlloyGrindingBall.name=Stellar Alloy Grinding Ball +enderio.crystallinePinkSlimeGrindingBall.name=Crystalline Pink Slime Grinding Ball +enderio.energeticSilverGrindingBall.name=Energetic Silver Grinding Ball +enderio.vividAlloyGrindingBall.name=Vivid Alloy Grinding Ball + enderio.precientCrystal.name=Precient Crystal enderio.pulsatingPowder.name=Grains of Piezallity enderio.vibrantPowder.name=Grains of Vibrancy @@ -280,6 +299,14 @@ tile.enderio.darkSteel.name=Dark Steel Block tile.enderio.soularium.name=Soularium Block tile.enderio.endSteel.name=End Steel Block +tile.enderio.crudeSteel.name=Crude Steel Block +tile.enderio.crystallineAlloy.name=Crystalline Alloy Block +tile.enderio.melodicAlloy.name=Melodic Alloy Block +tile.enderio.stellarAlloy.name=Stellar Alloy Block +tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block +tile.enderio.energeticSilver.name=Energetic Silver Block +tile.enderio.vividAlloy.name=Vivid Alloy Block + //Powder / Ingot enderio.powderCoal.name=Coal Powder enderio.powderIron.name=Iron Powder diff --git a/resources/assets/enderio/textures/blocks/crudeSteelBlock.png b/resources/assets/enderio/textures/blocks/crudeSteelBlock.png new file mode 100644 index 00000000..ca38b79e Binary files /dev/null and b/resources/assets/enderio/textures/blocks/crudeSteelBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png b/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png new file mode 100644 index 00000000..c05650fc Binary files /dev/null and b/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png b/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png new file mode 100644 index 00000000..1b537a48 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta b/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta new file mode 100644 index 00000000..268857fc --- /dev/null +++ b/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta @@ -0,0 +1,23 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 500 + }, + { + "index": 0, + "time": 100 + }, + { + "index": 1, + "time": 20 + }, + { + "index": 0, + "time": 100 + } + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/energeticSilverBlock.png b/resources/assets/enderio/textures/blocks/energeticSilverBlock.png new file mode 100644 index 00000000..9bf79db7 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/energeticSilverBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png b/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png new file mode 100644 index 00000000..bcbbbfd6 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png b/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png new file mode 100644 index 00000000..ac48462e Binary files /dev/null and b/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/vividAlloyBlock.png b/resources/assets/enderio/textures/blocks/vividAlloyBlock.png new file mode 100644 index 00000000..09e938ad Binary files /dev/null and b/resources/assets/enderio/textures/blocks/vividAlloyBlock.png differ diff --git a/resources/assets/enderio/textures/items/crudeSteel.png b/resources/assets/enderio/textures/items/crudeSteel.png new file mode 100644 index 00000000..99e4c255 Binary files /dev/null and b/resources/assets/enderio/textures/items/crudeSteel.png differ diff --git a/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png b/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png new file mode 100644 index 00000000..00a9ca04 Binary files /dev/null and b/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/crystallineAlloy.png b/resources/assets/enderio/textures/items/crystallineAlloy.png new file mode 100644 index 00000000..f0dbf54d Binary files /dev/null and b/resources/assets/enderio/textures/items/crystallineAlloy.png differ diff --git a/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png b/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png new file mode 100644 index 00000000..089b93e0 Binary files /dev/null and b/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlime.png b/resources/assets/enderio/textures/items/crystallinePinkSlime.png new file mode 100644 index 00000000..6950b506 Binary files /dev/null and b/resources/assets/enderio/textures/items/crystallinePinkSlime.png differ diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta b/resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta new file mode 100644 index 00000000..268857fc --- /dev/null +++ b/resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta @@ -0,0 +1,23 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 500 + }, + { + "index": 0, + "time": 100 + }, + { + "index": 1, + "time": 20 + }, + { + "index": 0, + "time": 100 + } + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png b/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png new file mode 100644 index 00000000..37f56a64 Binary files /dev/null and b/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingball.png.mcmeta b/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingball.png.mcmeta new file mode 100644 index 00000000..268857fc --- /dev/null +++ b/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingball.png.mcmeta @@ -0,0 +1,23 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 500 + }, + { + "index": 0, + "time": 100 + }, + { + "index": 1, + "time": 20 + }, + { + "index": 0, + "time": 100 + } + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/energeticSilver.png b/resources/assets/enderio/textures/items/energeticSilver.png new file mode 100644 index 00000000..0f53e620 Binary files /dev/null and b/resources/assets/enderio/textures/items/energeticSilver.png differ diff --git a/resources/assets/enderio/textures/items/energeticSilverGrindingBall.png b/resources/assets/enderio/textures/items/energeticSilverGrindingBall.png new file mode 100644 index 00000000..e2cb897f Binary files /dev/null and b/resources/assets/enderio/textures/items/energeticSilverGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/melodicAlloy.png b/resources/assets/enderio/textures/items/melodicAlloy.png new file mode 100644 index 00000000..889b8a64 Binary files /dev/null and b/resources/assets/enderio/textures/items/melodicAlloy.png differ diff --git a/resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png b/resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png new file mode 100644 index 00000000..0cf4906e Binary files /dev/null and b/resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/stellarAlloy.png b/resources/assets/enderio/textures/items/stellarAlloy.png new file mode 100644 index 00000000..eb8ec64c Binary files /dev/null and b/resources/assets/enderio/textures/items/stellarAlloy.png differ diff --git a/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png b/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png new file mode 100644 index 00000000..f2d7682d Binary files /dev/null and b/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/vividAlloy.png b/resources/assets/enderio/textures/items/vividAlloy.png new file mode 100644 index 00000000..daa57de6 Binary files /dev/null and b/resources/assets/enderio/textures/items/vividAlloy.png differ diff --git a/resources/assets/enderio/textures/items/vividAlloyGrindingBall.png b/resources/assets/enderio/textures/items/vividAlloyGrindingBall.png new file mode 100644 index 00000000..e15b0609 Binary files /dev/null and b/resources/assets/enderio/textures/items/vividAlloyGrindingBall.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index c6c198b8..51b833be 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -152,6 +152,9 @@ import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; import crazypants.enderio.material.MaterialRecipes; import crazypants.enderio.material.OreDictionaryPreferences; +import crazypants.enderio.material.endergy.BlockIngotStorageEndergy; +import crazypants.enderio.material.endergy.ItemAlloyEndergy; +import crazypants.enderio.material.endergy.ItemGrindingBallEndergy; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.rail.BlockEnderRail; import crazypants.enderio.teleport.ItemTravelStaff; @@ -195,13 +198,16 @@ public class EnderIO { // Materials public static ItemCapacitor itemBasicCapacitor; public static ItemAlloy itemAlloy; - public static ItemAlloy itemGrindingBall; + public static ItemGrindingBall itemGrindingBall; + public static ItemAlloyEndergy itemAlloyEndergy; + public static ItemGrindingBallEndergy itemGrindingBallEndergy; public static BlockFusedQuartz blockFusedQuartz; public static ItemFusedQuartzFrame itemFusedQuartzFrame; public static ItemMachinePart itemMachinePart; public static ItemPowderIngot itemPowderIngot; public static ItemMaterial itemMaterial; public static BlockIngotStorage blockIngotStorage; + public static BlockIngotStorageEndergy blockIngotStorageEndergy; public static BlockDarkSteelBars blockDarkIronBars; public static BlockSoulariumBars blockSoulariumBars; public static BlockEndSteelBars blockEndSteelBars; @@ -456,6 +462,8 @@ public class EnderIO { itemMaterial = ItemMaterial.create(); itemAlloy = ItemAlloy.create(); itemGrindingBall = ItemGrindingBall.create(); + itemAlloyEndergy = ItemAlloyEndergy.create(); + itemGrindingBallEndergy = ItemGrindingBallEndergy.create(); itemPowderIngot = ItemPowderIngot.create(); registerFluids(); @@ -470,6 +478,7 @@ public class EnderIO { itemSoulVessel = ItemSoulVessel.create(); blockIngotStorage = BlockIngotStorage.create(); + blockIngotStorageEndergy = BlockIngotStorageEndergy.create(); blockDarkIronBars = BlockDarkSteelBars.create(); blockSoulariumBars = BlockSoulariumBars.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 626c4b58..af6636db 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -31,7 +31,9 @@ public enum ModObject { // Materials itemBasicCapacitor, itemAlloy, + itemAlloyEndergy, itemGrindingBall, + itemGrindingBallEndergy, itemMaterial, itemMachinePart, itemPowderIngot, @@ -88,6 +90,7 @@ public enum ModObject { blockDarkSteelLadder, blockReinforcedObsidian, blockIngotStorage, + blockIngotStorageEndergy, // Painter blockPainter, diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index bc82d090..e35c7974 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -45,6 +45,7 @@ public class ItemFilter implements IInventory, IItemFilter { boolean sticky = false; FuzzyMode fuzzyMode = FuzzyMode.DISABLED; + int numItems; ItemStack[] items; final List oreIds; @@ -74,6 +75,7 @@ public class ItemFilter implements IInventory, IItemFilter { public ItemFilter(int numItems, boolean isAdvanced) { this.isAdvanced = isAdvanced; + this.numItems = numItems; items = new ItemStack[numItems]; oreIds = new ArrayList(numItems); for(int i=0;i oreIngots = new ArrayList(); + private final List oreBlocks = new ArrayList(); + private final float hardness; + + private AlloyEndergy(String baseName, float hardness, String oreDictName) { + this.unlocalisedName = "enderio." + baseName; + this.iconKey = "enderio:" + baseName; + if(oreDictName != null) { + this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); + this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + } + this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); + this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); + this.hardness = hardness; + } + + private AlloyEndergy(String baseName, float hardness) { + this(baseName, hardness, null); + } + + public float getHardness() { + return hardness; + } + + public ItemStack getStackIngot() { + return getStackIngot(1); + } + + public ItemStack getStackIngot(int size) { + return new ItemStack(EnderIO.itemAlloyEndergy, size, ordinal()); + } + + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBallEndergy, size, ordinal()); + } + + public ItemStack getStackBlock() { + return getStackBlock(1); + } + + public ItemStack getStackBlock(int size) { + return new ItemStack(EnderIO.blockIngotStorageEndergy, size, ordinal()); + } + + public String getOreIngot() { + return oreIngots.get(0); + } + + public String getOreBlock() { + return oreBlocks.get(0); + } + + public List getOreIngots() { + return oreIngots; + } + + public List getOreBlocks() { + return oreBlocks; + } + +} diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java new file mode 100644 index 00000000..c55b5e87 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java @@ -0,0 +1,105 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; + +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.EnderIO; +import crazypants.enderio.ModObject; + +public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedTooltipProvider { + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public static BlockIngotStorageEndergy create() { + BlockIngotStorageEndergy res = new BlockIngotStorageEndergy(); + res.init(); + return res; + } + + private BlockIngotStorageEndergy() { + super(ModObject.blockIngotStorageEndergy.unlocalisedName, null, Material.iron); + setStepSound(soundTypeMetal); + } + + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemIngotStorageEndergy.class, ModObject.blockIngotStorageEndergy.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[AlloyEndergy.values().length]; + for (AlloyEndergy alloy : AlloyEndergy.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, AlloyEndergy.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 AlloyEndergy.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 + } + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + return true; + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java new file mode 100644 index 00000000..b976917f --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java @@ -0,0 +1,39 @@ +package crazypants.enderio.material.endergy; + +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 BlockItemIngotStorageEndergy extends ItemBlock { + + public BlockItemIngotStorageEndergy(Block block) { + super(block); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return "tile." + AlloyEndergy.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 (AlloyEndergy alloy : AlloyEndergy.values()) { + list.add(new ItemStack(this, 1, alloy.ordinal())); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java new file mode 100644 index 00000000..77f84ea7 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java @@ -0,0 +1,86 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemAlloyEndergy extends Item { + + static final boolean useNuggets = false; + + protected final IIcon[] icons; + protected final int numItems; + + public static ItemAlloyEndergy create() { + ItemAlloyEndergy alloy = new ItemAlloyEndergy(); + alloy.init(); + return alloy; + } + + protected ItemAlloyEndergy() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemAlloyEndergy.unlocalisedName); + + numItems = AlloyEndergy.values().length; + if(useNuggets) { + numItems = numItems * 2; + } + icons = new IIcon[numItems]; + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemAlloyEndergy.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) { + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey); + } + if(useNuggets) { + for (int i = 0; i < numAlloys; i++) { + icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "Nugget"); + } + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + if(i < AlloyEndergy.values().length) { + return AlloyEndergy.values()[i].unlocalisedName; + } else { + return AlloyEndergy.values()[i - AlloyEndergy.values().length].unlocalisedName + "Nugget"; + } + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < numItems; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java new file mode 100644 index 00000000..46cb0766 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java @@ -0,0 +1,50 @@ +package crazypants.enderio.material.endergy; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class ItemGrindingBallEndergy extends ItemAlloyEndergy { + + public static ItemGrindingBallEndergy create() { + ItemGrindingBallEndergy ball = new ItemGrindingBallEndergy(); + ball.init(); + return ball; + } + + private ItemGrindingBallEndergy() { + setUnlocalizedName(ModObject.itemGrindingBallEndergy.unlocalisedName); + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBallEndergy.unlocalisedName); + + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey+"GrindingBall"); + + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return AlloyEndergy.values()[i].unlocalisedName+"GrindingBall"; + } +}