Added nuggets + json files. F

Removed unnecessary lignite ores.
Fixed oreDict

10 files changed, 63 insertions, 62 deletions

diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java
index 2d08473..1ba105c 100644
--- a/src/main/java/com/sosnitzka/taiga/Fluids.java
+++ b/src/main/java/com/sosnitzka/taiga/Fluids.java
@@ -5,10 +5,13 @@ import com.sosnitzka.taiga.generic.BasicTinkerFluid;
 import com.sosnitzka.taiga.util.Utils;
 import net.minecraft.init.Blocks;
 import net.minecraftforge.fluids.FluidRegistry;
+import slimeknights.tconstruct.shared.TinkerFluids;
 import slimeknights.tconstruct.smeltery.block.BlockMolten;
 
 import java.lang.reflect.Field;
 
+import static com.sosnitzka.taiga.Blocks.slaggoldOre;
+import static com.sosnitzka.taiga.Blocks.slagironOre;
 import static com.sosnitzka.taiga.Items.*;
 import static com.sosnitzka.taiga.util.Utils.registerFluid;
 import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting;
@@ -81,6 +84,7 @@ public class Fluids {
         }
     }
 
+
     static void registerfromItem() {
         registerMelting(radiant_pearl, radiant_enderium, 72);
         registerMelting(glimmer_pearl, glimming_enderium, 72);
@@ -92,5 +96,9 @@ public class Fluids {
         registerMelting(Blocks.OBSIDIAN, FluidRegistry.LAVA, 432);
         registerMelting(Blocks.NETHERRACK, FluidRegistry.LAVA, 48);
         registerMelting(Blocks.STONE, FluidRegistry.LAVA, 144);
+        registerMelting(slaggoldOre, TinkerFluids.gold, 16);
+        registerMelting(slagironOre, TinkerFluids.iron, 16);
+        registerMelting(slagironIngot, TinkerFluids.iron, 24);
+        registerMelting(slaggoldIngot, TinkerFluids.gold, 24);
     }
 }
diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java
index 99e4e45..4588e4c 100644
--- a/src/main/java/com/sosnitzka/taiga/Items.java
+++ b/src/main/java/com/sosnitzka/taiga/Items.java
@@ -3,10 +3,7 @@ package com.sosnitzka.taiga;
 
 import com.google.common.base.Joiner;
 import com.sosnitzka.taiga.generic.BasicItem;
-import com.sosnitzka.taiga.items.ItemIronNugget;
 import com.sosnitzka.taiga.items.ItemLignite;
-import com.sosnitzka.taiga.items.ItemSlaggoldIngot;
-import com.sosnitzka.taiga.items.ItemSlagironIngot;
 import net.minecraft.item.Item;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
@@ -19,14 +16,47 @@ import static com.sosnitzka.taiga.util.Utils.PREFIX_INGOT;
 import static com.sosnitzka.taiga.util.Utils.PREFIX_NUGGET;
 
 public class Items {
-    public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot();
+
     public static Item lignite = new ItemLignite("lignite", "lignite");
-    public static Item lignite2 = new ItemLignite("lignite", "lignite2");
-    public static Item lignite3 = new ItemLignite("lignite", "lignite3");
-    public static ItemIronNugget iron_nugget = new ItemIronNugget();
-    public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot();
+    public static Item iron_nugget = new BasicItem("iron_nugget", PREFIX_NUGGET);
+    public static Item slaggoldIngot = new BasicItem("slaggold_ingot");
+    public static Item slagironIngot = new BasicItem("slagiron_ingot");
     public static Item fuel_brick = new BasicItem("fuel_brick");
 
+    //Nuggets
+    public static Item titanite_nugget = new BasicItem("titanite_nugget", PREFIX_NUGGET);
+    public static Item adamantite_nugget = new BasicItem("adamantite_nugget", PREFIX_NUGGET);
+    public static Item arcanite_nugget = new BasicItem("arcanite_nugget", PREFIX_NUGGET);
+    public static Item violium_nugget = new BasicItem("violium_nugget", PREFIX_NUGGET);
+    public static Item bismuth_nugget = new BasicItem("bismuth_nugget", PREFIX_NUGGET);
+    public static Item eternite_nugget = new BasicItem("eternite_nugget", PREFIX_NUGGET);
+    public static Item ignitite_nugget = new BasicItem("ignitite_nugget", PREFIX_NUGGET);
+    public static Item karmesine_nugget = new BasicItem("karmesine_nugget", PREFIX_NUGGET);
+    public static Item meteorite_nugget = new BasicItem("meteorite_nugget", PREFIX_NUGGET);
+    public static Item mindorite_nugget = new BasicItem("mindorite_nugget", PREFIX_NUGGET);
+    public static Item mythril_nugget = new BasicItem("mythril_nugget", PREFIX_NUGGET);
+    public static Item palladium_nugget = new BasicItem("palladium_nugget", PREFIX_NUGGET);
+    public static Item prometheum_nugget = new BasicItem("prometheum_nugget", PREFIX_NUGGET);
+    // NAH! public static Item tiberium_nugget = new BasicItem("tiberium_nugget", PREFIX_NUGGET);
+    public static Item vibranium_nugget = new BasicItem("vibranium_nugget", PREFIX_NUGGET);
+    public static Item rubium_nugget = new BasicItem("rubium_nugget", PREFIX_NUGGET);
+    public static Item astrium_nugget = new BasicItem("astrium_nugget", PREFIX_NUGGET);
+    public static Item nitronite_nugget = new BasicItem("nitronite_nugget", PREFIX_NUGGET);
+    public static Item proxideum_nugget = new BasicItem("proxideum_nugget", PREFIX_NUGGET);
+    public static Item noctunyx_nugget = new BasicItem("noctunyx_nugget", PREFIX_NUGGET);
+    public static Item imperomite_nugget = new BasicItem("imperomite_nugget", PREFIX_NUGGET);
+    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 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);
+    public static Item dyonite_nugget = new BasicItem("dyonite_nugget", PREFIX_NUGGET);
+    public static Item ultranite_nugget = new BasicItem("ultranite_nugget", PREFIX_NUGGET);
+    public static Item nucleum_nugget = new BasicItem("nucleum_nugget", PREFIX_NUGGET);
+    public static Item aegisalt_nugget = new BasicItem("aegisalt_nugget", PREFIX_NUGGET);
+    public static Item bysmuid_nugget = new BasicItem("bysmuid_nugget", PREFIX_NUGGET);
+
     public static Item glimmercoal = new BasicItem("glimmercoal");
     public static Item radiant_pearl = new BasicItem("radiant_pearl");
     public static Item glimmer_pearl = new BasicItem("glimmer_pearl");
@@ -82,7 +112,6 @@ public class Items {
                 try {
                     Item item = (Item) field.get(targetType);
                     GameRegistry.register(item);
-
                     if (item instanceof BasicItem) {
                         if (((BasicItem) item).isOreDict()) {
                             String oreDictName;
@@ -102,10 +131,6 @@ public class Items {
                 }
             }
         }
-
-        OreDictionary.registerOre("nuggetIron", iron_nugget);
-        OreDictionary.registerOre("ingotIron", slagironIngot);
-        OreDictionary.registerOre("ingotGold", slaggoldIngot);
     }
 
 }
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java
index 5405a27..7a8e8cd 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -40,17 +40,19 @@ public class TAIGA {
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) {
         Items.register();
-        Fluids.register();
         Blocks.register();
+        Fluids.register();
         Fluids.registerfromItem();
         Alloys.register();
 
         // ARCANE ORES
         registerTinkerMaterial("Tiberium", tiberium, tiberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, OBSIDIAN, false, true);
+
         registerTinkerMaterial("Rubium", rubium, rubiumFluid, 351, 5.15f, 7.00f, 1.05f, -100, 250, COBALT, false, true);
         registerTinkerMaterial("Prometheum", prometheum, prometheumFluid, 539, 3.6f, 6.60f, 0.90f, 0, 150, TITANITE, false, true);
         registerTinkerMaterial("Arcanite", arcanite, arcaniteFluid, 698, 4.3f, 7.88f, 0.85f, -50, 150, METEORITE, false, true);
         // SOLIDE ORES
+
         registerTinkerMaterial("Titanite", titanite, titaniteFluid, 811, 4.8f, 6.40f, 1.00f, -50, 150, TITANITE, false, true);
         registerTinkerMaterial("Meteorite", meteorite, meteoriteFluid, 823, 6.1f, 6.83f, 1.20f, -50, 200, METEORITE, false, true);
         registerTinkerMaterial("Vibranium", vibranium, vibraniumFluid, 917, 7.45f, 7.17f, 1.15f, 50, 150, VIBRANIUM, false, true);
@@ -111,6 +113,7 @@ public class TAIGA {
         TinkerRegistry.addMaterialStats(material, new HeadMaterialStats(headDura, headSpeed, headAttack, headLevel));
         TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura));
         TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra));
+
         material.setFluid(fluid).setCraftable(craft).setCastable(cast);
 
         proxy.setRenderInfo(material);
diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java
index 827411e..dd55df1 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java
@@ -12,8 +12,6 @@ import net.minecraft.world.World;
 import java.util.Random;
 
 import static com.sosnitzka.taiga.Items.lignite;
-import static com.sosnitzka.taiga.Items.lignite2;
-import static com.sosnitzka.taiga.Items.lignite3;
 
 public class BlockLignite extends BasicBlock {
 
@@ -37,12 +35,6 @@ public class BlockLignite extends BasicBlock {
 
     @Override
     public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        int r = RANDOM.nextInt(3);
-        if (r == 0) {
             return lignite;
-        } else if (r == 1) {
-            return lignite2;
-        } else
-            return lignite3;
     }
 }
diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemIronNugget.java b/src/main/java/com/sosnitzka/taiga/items/ItemIronNugget.java
deleted file mode 100644
index d9e2463..0000000
--- a/src/main/java/com/sosnitzka/taiga/items/ItemIronNugget.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.sosnitzka.taiga.items;
-
-import com.sosnitzka.taiga.generic.BasicItem;
-
-public class ItemIronNugget extends BasicItem {
-
-    public ItemIronNugget() {
-        super("iron_nugget");
-    }
-}
diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java b/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java
new file mode 100644
index 0000000..f054d9a
--- /dev/null
+++ b/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java
@@ -0,0 +1,11 @@
+package com.sosnitzka.taiga.items;
+
+import com.sosnitzka.taiga.generic.BasicItem;
+
+public class ItemNugget extends BasicItem {
+
+    public ItemNugget(String name) {
+        super(name);
+    }
+
+}
diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemSlaggoldIngot.java b/src/main/java/com/sosnitzka/taiga/items/ItemSlaggoldIngot.java
deleted file mode 100644
index ee3c685..0000000
--- a/src/main/java/com/sosnitzka/taiga/items/ItemSlaggoldIngot.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.sosnitzka.taiga.items;
-
-import com.sosnitzka.taiga.generic.BasicItem;
-
-public class ItemSlaggoldIngot extends BasicItem {
-
-    public ItemSlaggoldIngot() {
-        super("slaggold_ingot");
-    }
-}
diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemSlagironIngot.java b/src/main/java/com/sosnitzka/taiga/items/ItemSlagironIngot.java
deleted file mode 100644
index b3d08a9..0000000
--- a/src/main/java/com/sosnitzka/taiga/items/ItemSlagironIngot.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.sosnitzka.taiga.items;
-
-import com.sosnitzka.taiga.generic.BasicItem;
-
-public class ItemSlagironIngot extends BasicItem {
-
-    public ItemSlagironIngot() {
-        super("slagiron_ingot");
-    }
-}
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java
index 65b15ad..d4db53a 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java
@@ -25,8 +25,6 @@ public class TraitSofty extends AbstractTrait {
             ToolHelper.healTool(tool, random.nextInt(10), player);
         }
     }
-
-
 }
 
 
diff --git a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java
index 3b8a78e..4951e45 100644
--- a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java
+++ b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java
@@ -13,17 +13,11 @@ public class FuelHandler implements IFuelHandler {
         if (fuel.getItem().equals(lignite)) {
             return 200 * 6;
         }
-        if (fuel.getItem().equals(lignite2)) {
-            return 200 * 4;
-        }
-        if (fuel.getItem().equals(lignite3)) {
-            return 200 * 8;
-        }
         if (fuel.getItem().equals(fuel_brick)) {
-            return 200 * 16;
+            return 200 * 50;
         }
         if (fuel.getItem().equals(glimmercoal)) {
-            return (random.nextInt(32) + 32) * 200;
+            return (random.nextInt(20) + 40) * 200;
         }
         return 0;
     }