diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index 37dbd49..a260e64 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -119,8 +119,5 @@ public class Blocks { } } } - - OreDictionary.registerOre("nuggetIron", slagironOre); - OreDictionary.registerOre("nuggetGold", slaggoldOre); } } diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index 4588e4c..c0d727f 100644 --- a/src/main/java/com/sosnitzka/taiga/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -48,6 +48,7 @@ public class Items { public static Item cryptogen_nugget = new BasicItem("cryptogen_nugget", PREFIX_NUGGET); public static Item fractoryte_nugget = new BasicItem("fractoryte_nugget", PREFIX_NUGGET); public static Item seismodium_nugget = new BasicItem("seismodium_nugget", PREFIX_NUGGET); + public static Item tiberium_nugget = new BasicItem("tiberium_nugget", PREFIX_NUGGET); public static Item terramite_nugget = new BasicItem("terramite_nugget", PREFIX_NUGGET); public static Item lumixyl_nugget = new BasicItem("lumixyl_nugget", PREFIX_NUGGET); public static Item solarium_nugget = new BasicItem("solarium_nugget", PREFIX_NUGGET); @@ -102,7 +103,7 @@ public class Items { public static Item bysmuidIngot = new BasicItem("bysmuid_ingot", PREFIX_INGOT); public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable"); - public static Item tiberiumShardStable = new BasicItem("tiberium_nugget", PREFIX_NUGGET); + public static void register() { Field[] declaredFields = Items.class.getDeclaredFields(); diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java index c352aa8..7a0006e 100644 --- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java @@ -26,15 +26,14 @@ public class BlockTiberium extends BasicBlock { @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; + if (random.nextBoolean()) { + return random.nextInt(10) + fortune; } else return 0; } @Override public int quantityDropped(IBlockState state, int fortune, Random random) { - return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 2, 4 + fortune)); + return (random.nextInt(3 + fortune) + 1); } @Override diff --git a/src/main/java/com/sosnitzka/taiga/recipes/Crafting.java b/src/main/java/com/sosnitzka/taiga/recipes/Crafting.java index b0fdbe4..97c612e 100644 --- a/src/main/java/com/sosnitzka/taiga/recipes/Crafting.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/Crafting.java @@ -1,9 +1,7 @@ package com.sosnitzka.taiga.recipes; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -13,8 +11,6 @@ import static slimeknights.tconstruct.shared.TinkerCommons.matNecroticBone; public class Crafting { public static void register() { GameRegistry.addShapelessRecipe(new ItemStack(fuel_brick), Items.COAL, Items.COAL, Items.COAL, lignite, lignite, lignite); - GameRegistry.addShapedRecipe(new ItemStack((tiberiumShardStable), 3), "STS", "TST", "STS", 'T', new ItemStack(tiberiumShardInstable), 'S', new ItemStack(Item.getItemFromBlock(Blocks.SAND))); - GameRegistry.addShapedRecipe(new ItemStack((tiberiumShardStable), 2), "GTG", "TGT", "GTG", 'T', new ItemStack(tiberiumShardInstable), 'G', new ItemStack(Item.getItemFromBlock(Blocks.GRAVEL))); GameRegistry.addShapelessRecipe(new ItemStack(luminar_dust), Items.REDSTONE, Items.GLOWSTONE_DUST); GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), luminar_dust, Items.BLAZE_POWDER); @@ -32,6 +28,5 @@ public class Crafting { GameRegistry.addShapelessRecipe(new ItemStack(spectrum_dust), matNecroticBone, glimmerstone_dust); - } } diff --git a/src/main/java/com/sosnitzka/taiga/recipes/Smelting.java b/src/main/java/com/sosnitzka/taiga/recipes/Smelting.java index e351b86..526d1f5 100644 --- a/src/main/java/com/sosnitzka/taiga/recipes/Smelting.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/Smelting.java @@ -4,7 +4,6 @@ package com.sosnitzka.taiga.recipes; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.apache.commons.lang3.RandomUtils; import static com.sosnitzka.taiga.Blocks.*; import static com.sosnitzka.taiga.Items.*; @@ -15,8 +14,8 @@ public class Smelting { GameRegistry.addSmelting(slaggoldOre, new ItemStack(slaggoldIngot), 1.0F); GameRegistry.addSmelting(slagironIngot, new ItemStack(iron_nugget), 0); GameRegistry.addSmelting(slaggoldIngot, new ItemStack(Items.GOLD_NUGGET), 0); - GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumShardStable), 0.2F); - GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardStable, 3), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (2F)); + GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F)); // Removed until TiC put its own ores back in. /* GameRegistry.addSmelting(titaniteOre, new ItemStack(titaniteIngot), RandomUtils.nextFloat(0F, 2F)); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java index ef8bf57..42c7269 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java @@ -20,7 +20,8 @@ import slimeknights.tconstruct.library.utils.TinkerUtil; import slimeknights.tconstruct.library.utils.ToolHelper; import static com.sosnitzka.taiga.Items.glimmerstone_dust; -import static com.sosnitzka.taiga.Items.tiberiumShardStable; +import static com.sosnitzka.taiga.Items.tiberiumShardInstable; +import static com.sosnitzka.taiga.Items.tiberium_nugget; public class TraitUncertain extends AbstractTrait { @@ -57,10 +58,10 @@ public class TraitUncertain extends AbstractTrait { i = new ItemStack(Items.GUNPOWDER, random.nextInt(4)); break; case 1: - i = new ItemStack(tiberiumShardStable, random.nextInt(4)); + i = new ItemStack(tiberiumShardInstable, random.nextInt(4)); break; case 2: - i = new ItemStack(tiberiumShardStable, random.nextInt(4)); + i = new ItemStack(tiberium_nugget, random.nextInt(12)); break; case 3: i = new ItemStack(glimmerstone_dust, random.nextInt(4));