diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java index 076b519..811b920 100644 --- a/src/main/java/blocks/BlockTiberiumOre.java +++ b/src/main/java/blocks/BlockTiberiumOre.java @@ -1,11 +1,39 @@ package blocks; import blocks.category.BasicBlockOreGlow; +import main.ZCompression; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import java.util.Random; public class BlockTiberiumOre extends BasicBlockOreGlow { public BlockTiberiumOre() { super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 0.66f); } + + @Override + public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) { + Random rand = world instanceof World ? ((World) world).rand : new Random(); + int r = RANDOM.nextInt(11); + if (r > 7) { + return MathHelper.getRandomIntegerInRange(rand, 0, 10) + fortune; + } else return 0; + } + + @Override + public int quantityDropped(IBlockState state, int fortune, Random random) { + return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 1, 3 + fortune)); + } + + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return ZCompression; + } } diff --git a/src/main/java/items/BasicItem.java b/src/main/java/items/BasicItem.java index 628bc37..9ae4ca2 100644 --- a/src/main/java/items/BasicItem.java +++ b/src/main/java/items/BasicItem.java @@ -4,7 +4,7 @@ import net.minecraft.item.Item; public class BasicItem extends Item { - BasicItem(String name) { + public BasicItem(String name) { setUnlocalizedName(name); setRegistryName(name); } diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index f26aba1..fe0b152 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -8,7 +8,6 @@ import main.util.recipes.Crafting; import main.util.recipes.Smelting; import main.world.ZWorldGen; import net.minecraft.block.Block; -import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; @@ -89,6 +88,10 @@ public class ZCompression { public void preInit(FMLPreInitializationEvent e) { //Items + BasicItem tiberiumShardInstable = new BasicItem("tiberiumShardInstable"); + GameRegistry.register(tiberiumShardInstable); + + GameRegistry.register(slagironIngot); GameRegistry.register(fuel_brick); GameRegistry.register(slaggoldIngot); @@ -114,6 +117,7 @@ public class ZCompression { //Blocks + registerBlockWithItem(aardiumOre); registerBlockWithItem(adamantiteOre); registerBlockWithItem(arcaniteOre); @@ -175,37 +179,37 @@ public class ZCompression { registerTinkerFluid("Arcanite", arcaniteFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Aardium", aardiumFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Adamantite", adamantiteFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Axiidian", axiidianFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Bismuth", bismuthFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Eternite", eterniteFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Ignitite", ignititeFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Karmesine", karmesineFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Meteorite", meteoriteFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Mindorite", mindoriteFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Mythril", mythrilFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Palladium", palladiumFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Prometheum", prometheumFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Tiberium", tiberiumFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Vibranium", vibraniumFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); registerTinkerFluid("Yrdean", yrdeanFluid, true); - aardiumFluid.setTemperature(200).setRarity(EnumRarity.RARE).setLuminosity(10).setViscosity(4000); + aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000); } @@ -225,6 +229,7 @@ public class ZCompression { } private void registerOreDict() { + OreDictionary.registerOre("oreAardium", aardiumOre); OreDictionary.registerOre("ingotAardium", aardiumIngot); OreDictionary.registerOre("oreArcanite", arcaniteOre); @@ -258,7 +263,6 @@ public class ZCompression { OreDictionary.registerOre("oreYrdean", yrdeanOre); OreDictionary.registerOre("ingotYrdean", yrdeanIngot); - } private void registerFluid(Fluid fluid) {