[1.2] Material rework (#60)

* Developement tests for nbt data in traits

* Lot of trait changes and better balancing

* Traits reworked a bit, new traits added.

* First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections.

* Few fixes in traits and new trait "catcher"

* Small fix, needs workaround

* fixed some catch issues

* Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version.

* Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids

* Some minor changes in Traits, Registry and Utils.

* Iron_nugget is replaced with oreDict Item when not loaded via TAIGA.

* Beginning of new material  integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now.

* Some Small changes in names, registry and recipes

* Some weird stuff I don't remember :D

* fixed some things I missed while merging

* Rollback to something

* More Stuff

* fixed some merging stuff

* Fixed some misspelled names. Actually working with lots of restrictions.

* Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work.

* Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget...

* Fixed integration of materials without tools.

* changed IMC to direct lib calls

* removed more IMC, removed redundant code

* some reformatting

* Alloy integration reworked, needs to be balanced.

* updated deps, renamed some func's, added duplicate material check

* some more renaming

* some reformatting, fixed wrong import, fixed string cmp's

* Added images for blocks, ingots, nuggets and dust. Json changes do not work yet.

* some reformatting

* Removed old json files. Placeholder needed.

* Fixed block json, items not working yet.

* Fixed my own derp (missing json files)

* Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP

* Changed some generator stuff, not working properly right now!

* rewrote offset generation, added some debug command, fixed some stuff

* fixed on-surface-generation, made dependencies more flexible

* reverted gen-weight back to its normal value

* Meteor generator implemented.

* fixed generating on ground

* optimized a thing

* Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy.

* Some changes in generation of ores, not ready yet.

* Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing.

* Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant.

* some cleanup in Generator class, added meteor world save handler

* Added Textures. Added blockstates and item models. Fixed fluid rendering.

* renamed world save data file to be little more specific, removed a unused method

* some preps for the upcoming release

* First attempt of well balancing material stats. Renamed TiberiumX to Triberium.

* Final changes... ready for beta testing

* Added missing alloys.

* Corrected balancing of ore generation. Still WIP

* removed some last debug out

* one last reformat

2 files changed, 2 insertions, 80 deletions

diff --git a/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java
index 72d4fe2..ed366d9 100644
--- a/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java
+++ b/src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java
@@ -1,76 +1,7 @@
 package com.sosnitzka.taiga.recipes;
 
-
-import net.minecraft.block.Block;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-
-import static com.sosnitzka.taiga.Blocks.*;
-import static com.sosnitzka.taiga.Items.*;
-import static slimeknights.tconstruct.shared.TinkerCommons.matNecroticBone;
-
 public class CraftingRegistry {
     public static void register() {
-        GameRegistry.addShapelessRecipe(new ItemStack(fuel_brick), Items.COAL, Items.COAL, Items.COAL, lignite, lignite, lignite);
-
-        GameRegistry.addShapelessRecipe(new ItemStack(luminar_dust), Items.REDSTONE, Items.GLOWSTONE_DUST);
-        GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), luminar_dust, Items.BLAZE_POWDER);
-        GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), Items.REDSTONE, Items.GLOWSTONE_DUST, Items.BLAZE_POWDER);
-
-        GameRegistry.addShapelessRecipe(new ItemStack(glimmercoal), Items.COAL, glimmerstone_dust);
-        GameRegistry.addShapelessRecipe(new ItemStack(glimmercoal), lignite, glimmerstone_dust);
-
-        GameRegistry.addShapelessRecipe(new ItemStack(radiant_pearl), Items.ENDER_PEARL, luminar_dust, new ItemStack(Items.DYE, 1, 4));
-        GameRegistry.addShapelessRecipe(new ItemStack(glimmer_pearl), Items.ENDER_PEARL, glimmerstone_dust);
-        GameRegistry.addShapelessRecipe(new ItemStack(energy_pearl), Items.ENDER_PEARL, luminar_dust, Items.GUNPOWDER);
-
-        GameRegistry.addShapelessRecipe(new ItemStack(nitro_brick), fuel_brick, Items.GUNPOWDER, Items.BLAZE_POWDER);
-        GameRegistry.addShapelessRecipe(new ItemStack(anthracite_dust), matNecroticBone, Items.COAL, Items.GUNPOWDER);
-        GameRegistry.addShapelessRecipe(new ItemStack(spectrum_dust), matNecroticBone, glimmerstone_dust);
-
-        registerMetalRecipes(arcaniteIngot, arcanite_nugget, arcaniteBlock);
-        registerMetalRecipes(tiberiumIngot, tiberium_nugget, tiberiumBlock);
-        registerMetalRecipes(prometheumIngot, prometheum_nugget, prometheumBlock);
-        registerMetalRecipes(rubiumIngot, rubium_nugget, rubiumBlock);
-        registerMetalRecipes(violiumIngot, violium_nugget, violiumBlock);
-        registerMetalRecipes(bismuthIngot, bismuth_nugget, bismuthBlock);
-        registerMetalRecipes(karmesineIngot, karmesine_nugget, karmesineBlock);
-        registerMetalRecipes(mindoriteIngot, mindorite_nugget, mindoriteBlock);
-        registerMetalRecipes(titaniteIngot, titanite_nugget, titaniteBlock);
-        registerMetalRecipes(meteoriteIngot, meteorite_nugget, meteoriteBlock);
-        registerMetalRecipes(adamantiteIngot, adamantite_nugget, adamantiteBlock);
-        registerMetalRecipes(vibraniumIngot, vibranium_nugget, vibraniumBlock);
-        registerMetalRecipes(ignititeIngot, ignitite_nugget, ignititeBlock);
-        registerMetalRecipes(palladiumIngot, palladium_nugget, palladiumBlock);
-        registerMetalRecipes(eterniteIngot, eternite_nugget, eterniteBlock);
-        registerMetalRecipes(mythrilIngot, mythril_nugget, mythrilBlock);
-        registerMetalRecipes(imperomiteIngot, imperomite_nugget, imperomiteBlock);
-        registerMetalRecipes(fractoryteIngot, fractoryte_nugget, fractoryteBlock);
-        registerMetalRecipes(noctunyxIngot, noctunyx_nugget, noctunyxBlock);
-        registerMetalRecipes(nitroniteIngot, nitronite_nugget, nitroniteBlock);
-        registerMetalRecipes(cryptogenIngot, cryptogen_nugget, cryptogenBlock);
-        registerMetalRecipes(seismodiumIngot, seismodium_nugget, seismodiumBlock);
-        registerMetalRecipes(aegisaltIngot, aegisalt_nugget, aegisaltBlock);
-        registerMetalRecipes(ultraniteIngot, ultranite_nugget, ultraniteBlock);
-        registerMetalRecipes(bysmuidIngot, bysmuid_nugget, bysmuidBlock);
-        registerMetalRecipes(nucleumIngot, nucleum_nugget, nucleumBlock);
-        registerMetalRecipes(lumixylIngot, lumixyl_nugget, lumixylBlock);
-        registerMetalRecipes(dyoniteIngot, dyonite_nugget, dyoniteBlock);
-        registerMetalRecipes(terramiteIngot, terramite_nugget, terramiteBlock);
-        registerMetalRecipes(solariumIngot, solarium_nugget, solariumBlock);
-        registerMetalRecipes(astriumIngot, astrium_nugget, astriumBlock);
-        registerMetalRecipes(proxideumIngot, proxideum_nugget, proxideumBlock);
-    }
-
-    private static void registerMetalRecipes(Item ingot, Item nugget, Block block) {
-
-        GameRegistry.addShapelessRecipe(new ItemStack(nugget, 9), new ItemStack(ingot));
-        GameRegistry.addShapelessRecipe(new ItemStack(ingot, 9), new ItemStack(block));
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block), "###", "###", "###", '#', new ItemStack(ingot)));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ingot), "###", "###", "###", '#', new ItemStack(nugget)));
     }
 }
diff --git a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
index f1a0ef0..70eb7cb 100644
--- a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
+++ b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
@@ -1,22 +1,13 @@
 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.*;
-
 public class SmeltingRegistry {
     public static void register() {
-        GameRegistry.addSmelting(slagironOre, new ItemStack(slagironIngot), 1.0F);
         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));
-        GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F));
+        //GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (1F));
+        //GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F));
     }
 }