From fafde83d4cc77ba2af31d4eae1b731d748f229ed Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Fri, 5 Aug 2016 15:46:45 +0200 Subject: [PATCH] Changed explosion size, cause users struggling with that piece of shit. Iron_nugget is replaced with oreDict Item when not loaded via TAIGA. --- .../java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java | 4 +++- src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java index fdfc5b1..f1a0ef0 100644 --- a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java @@ -4,6 +4,7 @@ package com.sosnitzka.taiga.recipes; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; import static com.sosnitzka.taiga.Blocks.*; import static com.sosnitzka.taiga.Items.*; @@ -11,7 +12,8 @@ import static com.sosnitzka.taiga.Items.*; public class SmeltingRegistry { public static void register() { GameRegistry.addSmelting(slagironOre, new ItemStack(slagironIngot), 1.0F); - GameRegistry.addSmelting(slagironIngot, new ItemStack(iron_nugget), 0); + ItemStack nugget_iron = OreDictionary.getOres("nuggetIron").get(OreDictionary.getOres("nuggetIron").size() - 1); + GameRegistry.addSmelting(slagironIngot, nugget_iron, 0); GameRegistry.addSmelting(slaggoldIngot, new ItemStack(Items.GOLD_NUGGET), 0); GameRegistry.addSmelting(slaggoldOre, new ItemStack(slaggoldIngot), 1.0F); GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (2F)); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java index 6df01db..31efa85 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java @@ -66,6 +66,6 @@ public class TraitInstable extends AbstractTrait { } private void explode(World w, Entity e, double x, double y, double z) { - w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 35, random.nextBoolean(), true); + w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 5, random.nextBoolean(), true); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java index 42c7269..f91031f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java @@ -74,6 +74,6 @@ public class TraitUncertain extends AbstractTrait { } private void explode(World w, Entity e, double x, double y, double z) { - w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 5, random.nextBoolean(), true); + w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 4, random.nextBoolean(), true); } }