Changed ambiguous information of config

Removed deprecated stuff.
Removed 2016, Added 2017.

.gitignore

@@ -172,6 +172,7 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
+*.hprof
 
 # Forge
 run/

README.md

@@ -1,7 +1,9 @@
-![TAIGA IMAGE](http://www.sosnitzka.com/alt/files/taiga256.jpg)
+![TAIGA IMAGE](/taiga.png?raw=true)
 
 Tinkers Alloying Addon(TAIGA)
 ===============
+[![][cq img]][cq] [![][license img]][license]
+
 TAIGA is an addon for Tinkers Construct. It aims to find new minable ores, new alloys and a bunch of new tinker traits for them.
 
 Included:
@@ -60,3 +62,11 @@ Where to request or report issues:
 
 More? Join our community on mumble (ofsg.eu) for questions or to have a nice chat with us!
  
+#### License
+
+This project is licensed under the conditions of the GNU GPL 3.0.
+
+[license]:LICENSE
+[license img]:https://img.shields.io/github/license/zkaface/taiga.svg?style=flat-square
+[cq]:https://www.codacy.com/app/chefeificationful/TAIGA
+[cq img]:https://img.shields.io/codacy/69a9cf26620e4a159c99b62c264d64bb.svg?style=flat-square

src/main/java/com/sosnitzka/taiga/Alloys.java

@@ -15,6 +15,7 @@ public class Alloys {
     public static void register() {
         registerTinkerAlloy(new FluidStack(terraxFluid, 2), new FluidStack(karmesineFluid, 1), new FluidStack(oviumFluid, 1), new FluidStack(jauxumFluid, 1));
         registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(basaltFluid, 1));
+        registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(dilithiumFluid, 2));
         registerTinkerAlloy(new FluidStack(fractumFluid, 2), new FluidStack(triberiumFluid, 3), new FluidStack(TinkerFluids.obsidian, 3), new FluidStack(abyssumFluid, 1));
         registerTinkerAlloy(new FluidStack(violiumFluid, 2), new FluidStack(auroriumFluid, 3), new FluidStack(TinkerFluids.ardite, 2));
         registerTinkerAlloy(new FluidStack(proxiiFluid, 3), new FluidStack(prometheumFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(eezoFluid, 1));

src/main/java/com/sosnitzka/taiga/Blocks.java

@@ -5,6 +5,7 @@ import com.sosnitzka.taiga.blocks.BlockCobble;
 import com.sosnitzka.taiga.blocks.BlockMeteoriteRock;
 import com.sosnitzka.taiga.blocks.BlockTiberium;
 import com.sosnitzka.taiga.generic.BasicBlock;
+import com.sosnitzka.taiga.generic.BlockOre;
 import com.sosnitzka.taiga.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -23,7 +24,7 @@ public class Blocks {
 
 
     // blocks and ores spawned via worldgen
-    public static Block basaltBlock = new BasicBlock("basalt_block", Material.ROCK, 20.0f, 35.0f, DIAMOND, PREFIX_BLOCK);
+    public static Block basaltBlock = new BasicBlock("basalt_block", Material.ROCK, 20.0f, 35.0f, IRON, PREFIX_BLOCK);
     public static Block tiberiumOre = new BlockTiberium();
     public static Block auroriumOre = new BasicBlock("aurorium_ore", Material.ROCK, 15.0f, 12f, COBALT, 0.2f, PREFIX_ORE);
     public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 20.0f, 12f, DURANITE, 0.4f, PREFIX_ORE);
@@ -40,7 +41,7 @@ public class Blocks {
     public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 15.0f, 35.0f, COBALT, PREFIX_ORE);
 
     // Ore Castsee
-    public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK);
+    public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.GLASS, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK);
     public static Block auroriumBlock = new BasicBlock("aurorium_block", Material.ROCK, 15.0f, 15f, COBALT, PREFIX_BLOCK);
     public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 20.0f, 15f, DURANITE, 0.5f, PREFIX_BLOCK);
     public static Block duraniteBlock = new BasicBlock("duranite_block", Material.ROCK, 20.0f, 800f, DURANITE, PREFIX_BLOCK);
@@ -81,6 +82,11 @@ public class Blocks {
     public static Block blockMeteorite = new BlockMeteoriteRock("meteorite_block", Material.ROCK, 40f, 2000f, COBALT, 0.15f, PREFIX_BLOCK, blockMeteoriteCobble.getDefaultState());
     public static Block blockObsidiorite = new BlockMeteoriteRock("obsidiorite_block", Material.ROCK, 50f, 4000f, DURANITE, 0.2f, PREFIX_BLOCK, blockObsidioriteCobble.getDefaultState());
 
+    // Community
+
+    public static Block dilithiumOre = new BlockOre("dilithium_ore", Material.GLASS, 18f, 18f, DIAMOND, 0.73f, Items.dilithiumCrystal, 3, 10);
+    public static Block dilithiumBlock = new BasicBlock("dilithium_block", Material.GLASS, 18f, 18f, DIAMOND, 0.73f, PREFIX_ORE);
+
 
     /**
      * Registers all materials' ingots and nuggets <br>

src/main/java/com/sosnitzka/taiga/Fluids.java

@@ -14,7 +14,7 @@ import static com.sosnitzka.taiga.util.Utils.registerFluid;
 public class Fluids {
 
     public static BasicTinkerFluid basaltFluid = new BasicTinkerFluid("basalt_fluid", 0xFFe4ddc3, 550, 10, 6000);
-    public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000);
+    public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFFd4ff00, 400, 10, 8000);
     public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000);
     public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF372c49, 850, 10, 10000);
     public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 1400, 10, 10000);
@@ -29,7 +29,7 @@ public class Fluids {
     public static BasicTinkerFluid osramFluid = new BasicTinkerFluid("osram_fluid", 0xFFffbc90, 800, 10, 4000);
     public static BasicTinkerFluid abyssumFluid = new BasicTinkerFluid("abyssum_fluid", 0xFF21bcc2, 700, 10, 10000);
     public static BasicTinkerFluid eezoFluid = new BasicTinkerFluid("eezo_fluid", 0xFF58798a, 450, 0, 1000);
-    public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFFe4ff00, 550, 10, 9000);
+    public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFF66f136, 550, 10, 9000);
     public static BasicTinkerFluid fractumFluid = new BasicTinkerFluid("fractum_fluid", 0xFFd2c583, 750, 10, 10000);
     public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium_fluid", 0xFFbfb0e2, 850, 10, 10000);
     public static BasicTinkerFluid proxiiFluid = new BasicTinkerFluid("proxii_fluid", 0xFFcefde1, 750, 10, 10000);
@@ -52,6 +52,10 @@ public class Fluids {
     public static BasicTinkerFluid magmaFluid = new BasicTinkerFluid("magma_fluid", 0xFFffc000, 2000, 10, 5000);
     public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite_fluid", 0xFFCCFF00, 3100, 10, 5000);
 
+    // Community
+
+    public static BasicTinkerFluid dilithiumFluid = new BasicTinkerFluid("dilithium_fluid", 0xFF79aea6, 1500, 10, 5000);
+
     /**
      * Registers all materials' fluids <br>
      * Detailed summary: <br>
@@ -89,9 +93,13 @@ public class Fluids {
         TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 288);
         TinkerRegistry.registerMelting(Blocks.blockObsidiorite, meteoriteFluid, 288);
         TinkerRegistry.registerMelting(net.minecraft.init.Blocks.MAGMA, magmaFluid, 288);
+        TinkerRegistry.registerMelting(Items.dilithiumCrystal, dilithiumFluid, 72);
+        TinkerRegistry.registerMelting(Items.tiberiumCrystal, dilithiumFluid, 72);
+
 
         TinkerRegistry.registerSmelteryFuel(new FluidStack(magmaFluid, 50), 100);
         TinkerRegistry.registerSmelteryFuel(new FluidStack(nitroniteFluid, 100), 500);
+        TinkerRegistry.registerSmelteryFuel(new FluidStack(dilithiumFluid, 50), 100);
     }
 
 }

src/main/java/com/sosnitzka/taiga/Items.java

@@ -161,6 +161,12 @@ public class Items {
     public static Item obsidioriteDust = new BasicItem("obsidiorite_dust", PREFIX_DUST);
     public static Item obsidioriteNugget = new BasicItem("obsidiorite_nugget", PREFIX_NUGGET);
 
+    public static Item dilithiumIngot = new BasicItem("dilithium_ingot", PREFIX_INGOT);
+    public static Item dilithiumDust = new BasicItem("dilithium_dust", PREFIX_DUST);
+    public static Item dilithiumCrystal = new BasicItem("dilithium_crystal", PREFIX_CRYSTAL);
+    public static Item tiberiumCrystal = new BasicItem("tiberium_crystal", PREFIX_CRYSTAL);
+    public static Item dilithiumNugget = new BasicItem("dilithium_nugget", PREFIX_NUGGET);
+
     /**
      * Registers all materials' ingots and nuggets <br>
      * Detailed summary: <br>

src/main/java/com/sosnitzka/taiga/MaterialTraits.java

@@ -55,6 +55,10 @@ public class MaterialTraits {
     public static final AbstractTrait dev = new TraitDevelopement();
     public static final AbstractTrait carousel = new TraitCarousel();
     public static final AbstractTrait beserk = new TraitBeserk();
+    public static final AbstractTrait leveled1 = new TraitLeveled(1);
+    public static final AbstractTrait leveled2 = new TraitLeveled(2);
+    public static final AbstractTrait leveled3 = new TraitLeveled(3);
+    public static final AbstractTrait crushing = new TraitCrushing();
 
 
     /**
@@ -83,12 +87,9 @@ public class MaterialTraits {
     public static Material tritonite = new Material("tritonite", TextFormatting.GOLD).addTrait(whirl);
     public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE);
     public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow);
-    public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(pulverizing).addTrait(superheavy);
+    public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(superheavy).addTrait(crushing);
     public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater);
-    /**
+    public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk).addTrait(leveled1, MaterialTypes.EXTRA).addTrait(leveled2, MaterialTypes.HANDLE).addTrait(leveled3, MaterialTypes.HEAD); //.addTrait(dev);
-     * With Dev
-     **/
-    public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk); //.addTrait(dev);
     public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum);
     public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay);
     public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD);
@@ -96,7 +97,7 @@ public class MaterialTraits {
     public static Material astrium = new Material("astrium", TextFormatting.DARK_PURPLE).addTrait(ported);
     public static Material niob = new Material("niob", TextFormatting.RED).addTrait(reviving);
     public static Material yrdeen = new Material("yrdeen", TextFormatting.RED).addTrait(naturebound);
-    public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, MaterialTypes.HEAD).addTrait(cheap);
+    public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, MaterialTypes.HEAD).addTrait(pulverizing);
     public static Material obsidiorite = new Material("obsidiorite", obsidioriteFluid.getColor()).addTrait(alien);
 
     public static Material osram = new Material("osram", TextFormatting.GOLD);
@@ -105,5 +106,6 @@ public class MaterialTraits {
     public static Material ovium = new Material("ovium", TextFormatting.BLUE);
     public static Material jauxum = new Material("jauxum", TextFormatting.YELLOW);
     public static Material karmesine = new Material("karmesine", TextFormatting.RED);
+    public static Material dilithium = new Material("dilithium", TextFormatting.BLUE);
 
 }

src/main/java/com/sosnitzka/taiga/TAIGA.java

@@ -66,10 +66,13 @@ public class TAIGA {
         for (MaterialIntegration m : integrateList) {
             m.integrateRecipes();
         }
+
+
     }
 
     @EventHandler
     public void postInit(FMLPostInitializationEvent e) {
+        proxy.registerBookPages();
     }
 
     @EventHandler
@@ -114,17 +117,14 @@ public class TAIGA {
         integrateMaterial("Yrdeen", yrdeen, yrdeenFluid, 999, 9.1f, 3f, 1.35f, 150, 250, COBALT, shitty);
         integrateMaterial("Meteorite", meteorite, meteoriteFluid, 1500, 1.5f, 1.5f, .5f, 0, 0, OBSIDIAN, shitty);
         integrateMaterial("Obsidiorite", obsidiorite, obsidioriteFluid, 1500, .5f, .5f, 1, -100, 100, COBALT, shitty);
-        // when more traits / ideas are available
+
-        // integrateMaterial("Uru", uru, uruFluid, (552), 8.75f, 2.87f, 0.98f, -100, 200, DIAMOND);
-        // integrateMaterial("Osram", osram, osramFluid, 500, 5f, 3f, 0.8f, -50, 50, DIAMOND);
-        // integrateMaterial("Abyssum", abyssum, abyssumFluid, 100, 1f, 1f, 1f, 300, 300, DIAMOND);
         integrateOre("Osram", osramFluid);
         integrateOre("Abyssum", abyssumFluid);
         integrateOre("Iox", ioxFluid);
         integrateOre("Karmesine", karmesineFluid);
         integrateOre("Ovium", oviumFluid);
         integrateOre("Jauxum", jauxumFluid);
-
+        // Community Wishlist
-
+        integrateOre("Dilithium", dilithiumFluid);
     }
 }

src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java

@@ -49,6 +49,7 @@ public class TAIGAConfiguration {
     public static int OVIUM_VAL;
     public static int JAUXUM_VAL;
     public static int VIBRANIUM_VAL;
+    public static int DILITHIUM_VAL;
     public static int URU_VAL;
     public static int AURORIUM_VAL;
     public static int PALLADIUM_VAL;
@@ -93,31 +94,29 @@ public class TAIGAConfiguration {
 
         final int IRON_DEFAULT = 20;
         final int TIBERIUM_DEFAULT = 15;
-        final int PROMETHEUM_DEFAULT = 25;
+        final int PROMETHEUM_DEFAULT = 18;
         final int VALYRIUM_DEFAULT = 10;
+        final int DILITHIUM_DEFAULT = 12;
         final int OSRAM_DEFAULT = 1;
         final int DURANITE_DEFAULT = 1;
-        final int BASALT_DEFAULT = 10;
+        final int BASALT_DEFAULT = 12;
         final int EEZO_DEFAULT = 3;
         final int KARMESINE_DEFAULT = 8;
         final int JAUXUM_DEFAULT = 8;
         final int OVIUM_DEFAULT = 8;
-        final int VIBRANIUM_DEFAULT = 10;
+        final int VIBRANIUM_DEFAULT = 8;
         final int URU_DEFAULT = 1;
         final int AURORIUM_DEFAULT = 10;
         final int PALLADIUM_DEFAULT = 10;
         final int ABYSSUM_DEFAULT = 4;
 
-        final boolean FALSE = false;
-        final boolean TRUE = true;
 
-
+        Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Iron", false);
-        Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Iron Switch", FALSE);
+        ironSwitch.setComment("Switch additional ore on/off");
-        ironSwitch.setComment("Switch ore on/off");
         ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron");
 
-        Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Endstone Switch", TRUE);
+        Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Endstone", true);
-        endSwitch.setComment("Switch extra End on/off");
+        endSwitch.setComment("Switch additional endstone on/off");
         endSwitch.setLanguageKey("gui.taiga_configuration.gen_end");
 
         /*
@@ -142,37 +141,39 @@ public class TAIGAConfiguration {
          */
 
 
-        Property ironValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron", IRON_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property ironValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron", IRON_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         ironValueProp.setLanguageKey("gui.taiga_configuration.iron_multiplier");
-        Property basaltValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Basalt", BASALT_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property basaltValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Basalt", BASALT_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         basaltValueProp.setLanguageKey("gui.taiga_configuration.basalt_multiplier");
-        Property tiberiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Tiberium", TIBERIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property tiberiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Tiberium", TIBERIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         tiberiumValueProp.setLanguageKey("gui.taiga_configuration.tiberium_multiplier");
-        Property auroriumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Aurorium", AURORIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property auroriumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Aurorium", AURORIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         auroriumValueProp.setLanguageKey("gui.taiga_configuration.aurorium_multiplier");
-        Property prometheumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Prometheum", PROMETHEUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property prometheumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Prometheum", PROMETHEUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         prometheumValueProp.setLanguageKey("gui.taiga_configuration.prometheum_multiplier");
-        Property duraniteValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Duranite", DURANITE_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property duraniteValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Duranite", DURANITE_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         duraniteValueProp.setLanguageKey("gui.taiga_configuration.duranite_multiplier");
-        Property valyriumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Valyrium", VALYRIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property valyriumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Valyrium", VALYRIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         valyriumValueProp.setLanguageKey("gui.taiga_configuration.valyrium_multiplier");
-        Property vibraniumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium", VIBRANIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property vibraniumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium", VIBRANIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         vibraniumValueProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier");
-        Property karmesineValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property dilithiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Dilithium", DILITHIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        dilithiumValueProp.setLanguageKey("gui.taiga_configuration.dilithium_multiplier");
+        Property karmesineValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         karmesineValueProp.setLanguageKey("gui.taiga_configuration.karmesine_multiplier");
-        Property oviumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Ovium", OVIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property oviumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Ovium", OVIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         oviumValueProp.setLanguageKey("gui.taiga_configuration.ovium_multiplier");
-        Property jauxumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Jauxum", JAUXUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property jauxumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Jauxum", JAUXUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         jauxumValueProp.setLanguageKey("gui.taiga_configuration.jauxum_multiplier");
-        Property palladiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Palladium", PALLADIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property palladiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Palladium", PALLADIUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         palladiumValueProp.setLanguageKey("gui.taiga_configuration.palladium_multiplier");
-        Property uruValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Uru", URU_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property uruValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Uru", URU_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         uruValueProp.setLanguageKey("gui.taiga_configuration.uru_multiplier");
-        Property osramValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Osram", OSRAM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property osramValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Osram", OSRAM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         osramValueProp.setLanguageKey("gui.taiga_configuration.osram_multiplier");
-        Property abyssumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Abyssum", ABYSSUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property abyssumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Abyssum", ABYSSUM_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         abyssumValueProp.setLanguageKey("gui.taiga_configuration.abyssum_multiplier");
-        Property eezoValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Eezo", EEZO_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        Property eezoValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Eezo", EEZO_DEFAULT, "generation count per chunk", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
         eezoValueProp.setLanguageKey("gui.taiga_configuration.eezo_multiplier");
 
 
@@ -185,6 +186,7 @@ public class TAIGAConfiguration {
         propOrderOreGen.add(duraniteValueProp.getName());
         propOrderOreGen.add(valyriumValueProp.getName());
         propOrderOreGen.add(vibraniumValueProp.getName());
+        propOrderOreGen.add(dilithiumValueProp.getName());
         propOrderOreGen.add(karmesineValueProp.getName());
         propOrderOreGen.add(oviumValueProp.getName());
         propOrderOreGen.add(jauxumValueProp.getName());
@@ -197,8 +199,8 @@ public class TAIGAConfiguration {
 
 
         if (readFieldsFromConfig) {
-            ironGen = ironSwitch.getBoolean(FALSE);
+            ironGen = ironSwitch.getBoolean(false);
-            endGen = endSwitch.getBoolean(TRUE);
+            endGen = endSwitch.getBoolean(true);
             IRON_VAL = ironValueProp.getInt(IRON_DEFAULT);
             if (IRON_VAL > RESFAC_MAX_VALUE || IRON_VAL < RESFAC_MIN_VALUE) {
                 IRON_VAL = IRON_DEFAULT;
@@ -247,6 +249,10 @@ public class TAIGAConfiguration {
             if (VIBRANIUM_VAL > RESFAC_MAX_VALUE || VIBRANIUM_VAL < RESFAC_MIN_VALUE) {
                 VIBRANIUM_VAL = VIBRANIUM_DEFAULT;
             }
+            DILITHIUM_VAL = dilithiumValueProp.getInt(DILITHIUM_DEFAULT);
+            if (DILITHIUM_VAL > RESFAC_MAX_VALUE || DILITHIUM_VAL < RESFAC_MIN_VALUE) {
+                DILITHIUM_VAL = DILITHIUM_DEFAULT;
+            }
             URU_VAL = uruValueProp.getInt(URU_DEFAULT);
             if (URU_VAL > RESFAC_MAX_VALUE || URU_VAL < RESFAC_MIN_VALUE) {
                 URU_VAL = URU_DEFAULT;
@@ -266,6 +272,7 @@ public class TAIGAConfiguration {
         }
 
         ironSwitch.set(ironGen);
+        endSwitch.set(endGen);
         ironValueProp.set(IRON_VAL);
         tiberiumValueProp.set(TIBERIUM_VAL);
         prometheumValueProp.set(PROMETHEUM_VAL);
@@ -278,6 +285,7 @@ public class TAIGAConfiguration {
         oviumValueProp.set(OVIUM_VAL);
         jauxumValueProp.set(JAUXUM_VAL);
         vibraniumValueProp.set(VIBRANIUM_VAL);
+        dilithiumValueProp.set(DILITHIUM_VAL);
         uruValueProp.set(URU_VAL);
         auroriumValueProp.set(AURORIUM_VAL);
         palladiumValueProp.set(PALLADIUM_VAL);

src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java

@@ -43,8 +43,8 @@ public class TAIGAGuiFactory implements IModGuiFactory {
 
         private static List<IConfigElement> getConfigElements() {
             List<IConfigElement> list = new ArrayList<IConfigElement>();
-            list.add(new DummyConfigElement.DummyCategoryElement("Basics configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class));
+            list.add(new DummyConfigElement.DummyCategoryElement("Basic configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class));
-            list.add(new DummyConfigElement.DummyCategoryElement("Specific ore generation", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class));
+            list.add(new DummyConfigElement.DummyCategoryElement("Ore specific settings", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class));
             return list;
         }
 

src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java

@@ -39,7 +39,7 @@ public class BlockTiberium extends BasicBlock {
 
     @Override
     public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return Items.tiberiumDust;
+        return Items.tiberiumCrystal;
     }
 
     @Override

src/main/java/com/sosnitzka/taiga/book/ContentOre.java

@@ -0,0 +1,65 @@
+package com.sosnitzka.taiga.book;
+
+import com.google.common.collect.Lists;
+import slimeknights.mantle.client.book.data.BookData;
+import slimeknights.mantle.client.book.data.element.ItemStackData;
+import slimeknights.mantle.client.book.data.element.TextData;
+import slimeknights.mantle.client.gui.book.GuiBook;
+import slimeknights.mantle.client.gui.book.element.BookElement;
+import slimeknights.mantle.client.gui.book.element.ElementItem;
+import slimeknights.mantle.client.gui.book.element.ElementText;
+import slimeknights.tconstruct.library.book.TinkerPage;
+import slimeknights.tconstruct.library.client.CustomFontColor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ContentOre extends TinkerPage {
+
+    public static final transient int INPUT_X = 110;
+    public static final transient int INPUT_Y = 80;
+
+    public static final transient float ITEM_SCALE = 1.5F;
+
+    public String title = "Ore";
+    public int r, g, b;
+
+    public ItemStackData input;
+    public TextData[] description;
+    public String[] informations;
+
+    @Override
+    public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
+
+
+        TextData tdTitle = new TextData(title);
+        tdTitle.underlined = true;
+
+        addTitle(list, CustomFontColor.encodeColor(r, g, b) + title, true);
+
+        if (input != null && !input.id.equals("")) {
+            list.add(new ElementItem(INPUT_X, INPUT_Y, ITEM_SCALE * 2.5f, input.getItems(), input.action));
+        }
+
+        if (description != null && description.length > 0) {
+            list.add(new ElementText(0, 15, GuiBook.PAGE_WIDTH, GuiBook.PAGE_HEIGHT - 15, description));
+        }
+
+        int h = GuiBook.PAGE_WIDTH / 3 - 10;
+        if (informations.length > 0) {
+            TextData head = new TextData(parent.translate("modifier.informations"));
+            head.underlined = true;
+            list.add(new ElementText(10, 20 + h, GuiBook.PAGE_WIDTH / 2 - 5, GuiBook.PAGE_HEIGHT - h - 20, head));
+
+            List<TextData> effectData = Lists.newArrayList();
+            for (String e : informations) {
+                effectData.add(new TextData("\u25CF "));
+                effectData.add(new TextData(e));
+                effectData.add(new TextData("\n"));
+            }
+
+            list.add(new ElementText(10, 30 + h, GuiBook.PAGE_WIDTH / 2 + 5, GuiBook.PAGE_HEIGHT - h - 20, effectData));
+        }
+    }
+}

src/main/java/com/sosnitzka/taiga/generic/BlockOre.java

@@ -0,0 +1,62 @@
+package com.sosnitzka.taiga.generic;
+
+import net.minecraft.block.Block;
+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.world.Explosion;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.Random;
+
+import static slimeknights.tconstruct.TConstruct.random;
+
+public class BlockOre extends Block {
+
+    private Item dropItem;
+    private int itemAmount;
+    private int xpAmount;
+
+    public BlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, Item item, int amount, int xp) {
+        super(material);
+        setUnlocalizedName(name);
+        setRegistryName(name);
+        setHardness(hardness);
+        setResistance(resistance);
+        setHarvestLevel("pickaxe", harvest);
+        setLightLevel(lightLevel);
+        this.dropItem = item;
+        this.itemAmount = amount;
+        this.xpAmount = xp;
+
+    }
+
+    @Override
+    public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) {
+        return random.nextInt(xpAmount) + fortune;
+
+    }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    public int quantityDropped(IBlockState state, int fortune, Random random) {
+        return (random.nextInt(itemAmount + fortune) + 1);
+    }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+        return dropItem;
+    }
+
+    @Override
+    public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) {
+        if (!worldIn.isRemote) {
+            if (random.nextFloat() < 0.5) {
+                worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 4f + 1.5f, true, true);
+            }
+        }
+    }
+}

src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java

@@ -4,6 +4,7 @@ import com.sosnitzka.taiga.Blocks;
 import com.sosnitzka.taiga.Items;
 import com.sosnitzka.taiga.TAIGA;
 import com.sosnitzka.taiga.TAIGAConfiguration;
+import com.sosnitzka.taiga.book.ContentOre;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -16,6 +17,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fluids.Fluid;
+import slimeknights.mantle.client.book.repository.FileRepository;
+import slimeknights.tconstruct.library.book.TinkerBook;
 import slimeknights.tconstruct.library.client.MaterialRenderInfo;
 import slimeknights.tconstruct.library.client.texture.MetalTextureTexture;
 import slimeknights.tconstruct.library.materials.Material;
@@ -25,6 +28,7 @@ import java.lang.reflect.Field;
 
 import static com.sosnitzka.taiga.Fluids.*;
 import static com.sosnitzka.taiga.MaterialTraits.*;
+import static slimeknights.mantle.client.book.BookLoader.registerPageType;
 
 @SuppressWarnings("unused")
 public class ClientProxy extends CommonProxy {
@@ -35,6 +39,7 @@ public class ClientProxy extends CommonProxy {
 
     private static void registerItemModel(Item item) {
         Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
+
     }
 
     @Override
@@ -122,6 +127,13 @@ public class ClientProxy extends CommonProxy {
         TAIGAConfiguration.clientPreInit();
     }
 
+    @Override
+    public void registerBookPages() {
+
+        TinkerBook.INSTANCE.addRepository(new FileRepository("taiga:book"));
+        registerPageType("taigaore", ContentOre.class);
+    }
+
     public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition {
 
         public final Fluid fluid;

src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java

@@ -24,4 +24,7 @@ public class CommonProxy {
 
     public void registerServerCommands(FMLServerStartingEvent e) {
     }
+
+    public void registerBookPages() {
+    }
 }

src/main/java/com/sosnitzka/taiga/recipes/CraftingRegistry.java

@@ -1,7 +1,60 @@
 package com.sosnitzka.taiga.recipes;
 
+import com.sosnitzka.taiga.Blocks;
+import com.sosnitzka.taiga.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+
 public class CraftingRegistry {
+
     public static void register() {
+        convertion(Item.getItemFromBlock(Blocks.tiberiumBlock), Items.tiberiumIngot, Items.tiberiumNugget);
+        convertion(Item.getItemFromBlock(Blocks.auroriumBlock), Items.auroriumIngot, Items.auroriumNugget);
+        convertion(Item.getItemFromBlock(Blocks.prometheumBlock), Items.prometheumIngot, Items.prometheumNugget);
+        convertion(Item.getItemFromBlock(Blocks.duraniteBlock), Items.duraniteIngot, Items.duraniteNugget);
+        convertion(Item.getItemFromBlock(Blocks.valyriumBlock), Items.valyriumIngot, Items.valyriumNugget);
+        convertion(Item.getItemFromBlock(Blocks.vibraniumBlock), Items.vibraniumIngot, Items.vibraniumNugget);
+        convertion(Item.getItemFromBlock(Blocks.karmesineBlock), Items.karmesineIngot, Items.karmesineNugget);
+        convertion(Item.getItemFromBlock(Blocks.oviumBlock), Items.oviumIngot, Items.oviumNugget);
+        convertion(Item.getItemFromBlock(Blocks.jauxumBlock), Items.jauxumIngot, Items.jauxumNugget);
+        convertion(Item.getItemFromBlock(Blocks.palladiumBlock), Items.palladiumIngot, Items.palladiumNugget);
+        convertion(Item.getItemFromBlock(Blocks.uruBlock), Items.uruIngot, Items.uruNugget);
+        convertion(Item.getItemFromBlock(Blocks.osramBlock), Items.osramIngot, Items.osramNugget);
+        convertion(Item.getItemFromBlock(Blocks.eezoBlock), Items.eezoIngot, Items.eezoIngot);
+        convertion(Item.getItemFromBlock(Blocks.abyssumBlock), Items.abyssumIngot, Items.abyssumNugget);
+        convertion(Item.getItemFromBlock(Blocks.terraxBlock), Items.terraxIngot, Items.terraxNugget);
+        convertion(Item.getItemFromBlock(Blocks.triberiumBlock), Items.triberiumIngot, Items.triberiumNugget);
+        convertion(Item.getItemFromBlock(Blocks.fractumBlock), Items.fractumIngot, Items.fractumNugget);
+        convertion(Item.getItemFromBlock(Blocks.violiumBlock), Items.violiumIngot, Items.violiumNugget);
+        convertion(Item.getItemFromBlock(Blocks.proxiiBlock), Items.proxiiIngot, Items.proxiiNugget);
+        convertion(Item.getItemFromBlock(Blocks.tritoniteBlock), Items.tritoniteIngot, Items.tritoniteNugget);
+        convertion(Item.getItemFromBlock(Blocks.ignitzBlock), Items.ignitzIngot, Items.ignitzNugget);
+        convertion(Item.getItemFromBlock(Blocks.imperomiteBlock), Items.imperomiteIngot, Items.imperomiteNugget);
+        convertion(Item.getItemFromBlock(Blocks.solariumBlock), Items.solariumIngot, Items.solariumNugget);
+        convertion(Item.getItemFromBlock(Blocks.nihiliteBlock), Items.nihiliteIngot, Items.nihiliteNugget);
+        convertion(Item.getItemFromBlock(Blocks.adamantBlock), Items.adamantIngot, Items.adamantNugget);
+        convertion(Item.getItemFromBlock(Blocks.dyoniteBlock), Items.dyoniteIngot, Items.dyoniteNugget);
+        convertion(Item.getItemFromBlock(Blocks.nucleumBlock), Items.nucleumIngot, Items.nucleumNugget);
+        convertion(Item.getItemFromBlock(Blocks.lumixBlock), Items.lumixIngot, Items.lumixNugget);
+        convertion(Item.getItemFromBlock(Blocks.seismumBlock), Items.seismumIngot, Items.seismumNugget);
+        convertion(Item.getItemFromBlock(Blocks.astriumBlock), Items.astriumIngot, Items.astriumNugget);
+        convertion(Item.getItemFromBlock(Blocks.niobBlock), Items.niobIngot, Items.niobNugget);
+        convertion(Item.getItemFromBlock(Blocks.yrdeenBlock), Items.yrdeenIngot, Items.yrdeenNugget);
+        convertion(Item.getItemFromBlock(Blocks.ioxBlock), Items.ioxIngot, Items.ioxNugget);
+        convertion(Item.getItemFromBlock(Blocks.blockMeteorite), Items.meteoriteIngot, Items.meteoriteNugget);
+        convertion(Item.getItemFromBlock(Blocks.blockObsidiorite), Items.obsidioriteIngot, Items.obsidioriteNugget);
+        convertion(Item.getItemFromBlock(Blocks.dilithiumBlock), Items.dilithiumIngot, Items.dilithiumNugget);
+        //convertion(Item.getItemFromBlock(Blocks.), Items., Items.);
 
     }
+
+    public static void convertion(Item block, Item ingot, Item nugget) {
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block), "###", "###", "###", '#', new ItemStack(ingot)));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ingot), "###", "###", "###", '#', new ItemStack(nugget)));
+        GameRegistry.addShapelessRecipe(new ItemStack(ingot, 9), new ItemStack(block));
+        GameRegistry.addShapelessRecipe(new ItemStack(nugget, 9), new ItemStack(ingot));
+    }
+
 }

src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java

@@ -7,7 +7,5 @@ import net.minecraftforge.oredict.OreDictionary;
 public class SmeltingRegistry {
     public static void register() {
         ItemStack nugget_iron = OreDictionary.getOres("nuggetIron").get(OreDictionary.getOres("nuggetIron").size() - 1);
-        //GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (1F));
-        //GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F));
     }
 }

src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java

@@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait {
     @SubscribeEvent
     public void onXpDrop(LivingExperienceDropEvent event) {
         EntityPlayer player = event.getAttackingPlayer();
-        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
+        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() >= 0) {
             event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
         }
 
@@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait {
     @SubscribeEvent
     public void onBlockBreak(BlockEvent.BreakEvent event) {
         EntityPlayer player = event.getPlayer();
-        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
+        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() >= 0) {
             event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
         }
 

src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java

@@ -52,6 +52,7 @@ public class TraitCatcher extends AbstractTrait {
                 data.mobClass = target.getClass().getName();
                 data.mobName = target.getName();
                 data.write(tag);
+                if (p.getHeldItemMainhand() != null)
                     TagUtil.setExtraTag(p.getHeldItemMainhand(), tag);
                 p.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F);
                 target.setDropItemsWhenDead(false);
@@ -70,8 +71,6 @@ public class TraitCatcher extends AbstractTrait {
                 TagUtil.setEnchantEffect(tool, false);
             } else
                 TagUtil.setEnchantEffect(tool, true);
-
-
         }
     }
 

src/main/java/com/sosnitzka/taiga/traits/TraitCrushing.java

@@ -0,0 +1,35 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.event.world.BlockEvent;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+
+public class TraitCrushing extends AbstractTrait {
+
+    public TraitCrushing() {
+        super(TraitCrushing.class.getSimpleName().toLowerCase().substring(5), TextFormatting.GRAY);
+    }
+
+
+    @Override
+    public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent e) {
+        if (!e.getWorld().isRemote) {
+            IBlockState state = e.getState();
+            float f = random.nextFloat();
+            if (state.equals(Blocks.STONE.getDefaultState())) {
+                e.getDrops().clear();
+                if (f < .3f) {
+                    e.getDrops().add(new ItemStack(Blocks.SAND));
+                } else if (f < .6f) {
+                    e.getDrops().add(new ItemStack(Blocks.GRAVEL));
+                } else if (f <= .9f) {
+                    e.getDrops().add(new ItemStack(Blocks.COBBLESTONE));
+                } else e.getDrops().add(new ItemStack(Blocks.STONE));
+            }
+        }
+    }
+
+}

src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java

@@ -0,0 +1,16 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraftforge.common.MinecraftForge;
+import slimeknights.tconstruct.library.traits.AbstractTraitLeveled;
+
+
+public class TraitDeflection extends AbstractTraitLeveled {
+
+
+    public TraitDeflection(int levels) {
+        super(TraitDeflection.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+
+}

src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java

@@ -0,0 +1,16 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraftforge.common.MinecraftForge;
+import slimeknights.tconstruct.library.traits.AbstractTraitLeveled;
+
+
+public class TraitLeveled extends AbstractTraitLeveled {
+
+
+    public TraitLeveled(int levels) {
+        super(TraitLeveled.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+
+}

src/main/java/com/sosnitzka/taiga/traits/TraitPulverizing.java

@@ -29,7 +29,7 @@ public class TraitPulverizing extends AbstractTrait {
 
     @Override
     public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) {
-        if (random.nextFloat() < 0.9) {
+        if (random.nextFloat() < 0.6) {
             event.getDrops().clear();
         }
     }

src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java

@@ -20,7 +20,7 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;
 public class TraitSuperHeavy extends TraitProgressiveStats {
 
     protected static int TICK_PER_STAT = 50;
-    protected static float blockcount = 250f;
+    protected static float blockcount = 500f;
 
     public TraitSuperHeavy() {
         super(TraitSuperHeavy.class.getSimpleName().toLowerCase().substring(5), TextFormatting.DARK_GRAY);
@@ -33,7 +33,7 @@ public class TraitSuperHeavy extends TraitProgressiveStats {
         NBTTagCompound tag = TagUtil.getExtraTag(tool);
         Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
         if (data.brokenblocks == 0) return;
-        event.setNewSpeed(Math.max(event.getNewSpeed() - data.brokenblocks * event.getOriginalSpeed() / blockcount, 0.25f));
+        event.setNewSpeed(Math.max(event.getNewSpeed() - data.brokenblocks * event.getOriginalSpeed() / blockcount, 0.35f));
     }
 
     @Override

src/main/java/com/sosnitzka/taiga/util/Generator.java

@@ -198,6 +198,10 @@ public class Generator {
                     // we are in mid air, go down
                     while (world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) {
                         cPos = cPos.down();
+
+                        // if we are below 0, we might be in a void dim
+                        if (cPos.getY() < 0)
+                            break;
                     }
                 }
                 if (!validSurface.contains(Item.getItemFromBlock(world.getBlockState(cPos.down()).getBlock())))

src/main/java/com/sosnitzka/taiga/util/Utils.java

@@ -28,6 +28,7 @@ public class Utils {
     public static String PREFIX_ORE = "ore";
     public static String PREFIX_BLOCK = "block";
     public static String PREFIX_DUST = "dust";
+    public static String PREFIX_CRYSTAL = "crystal";
 
     /**
      * Registers the block and its corresponding item (block as item in inventory)

src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java

@@ -55,7 +55,8 @@ public class MeteorWorldSaveData extends WorldSavedData {
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
         if (nbt.hasKey("posData") && !nbt.getString("posData").isEmpty()) {
-            posList = new Gson().fromJson(nbt.getString("posData"), new TypeToken<List<BlockPos>>(){}.getType());
+            posList = new Gson().fromJson(nbt.getString("posData"), new TypeToken<List<BlockPos>>() {
+            }.getType());
         }
     }
 

src/main/java/com/sosnitzka/taiga/world/WorldGen.java

@@ -9,7 +9,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.fml.common.IWorldGenerator;
-import slimeknights.tconstruct.gadgets.block.BlockStoneTorch;
 
 import java.util.Random;
 
@@ -20,11 +19,10 @@ import static com.sosnitzka.taiga.TAIGAConfiguration.*;
 @SuppressWarnings("unchecked")
 public class WorldGen implements IWorldGenerator {
     private void nether(Random random, int x, int z, World world) {
-        Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35);
+        Generator.generateOre(tiberiumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 32, 128, 10, 35);
-        Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4);
+        Generator.generateOre(prometheumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 32, 2, 4);
-        Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4);
+        Generator.generateOre(valyriumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 128, 2, 4);
         Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15);
-
     }
 
     private void world(Random random, int x, int z, World world) {
@@ -34,8 +32,9 @@ public class WorldGen implements IWorldGenerator {
         Generator.generateOreStoneVariant(karmesineOre.getDefaultState(), BlockStone.EnumType.ANDESITE, random, x, z, world, KARMESINE_VAL);
         Generator.generateOreStoneVariant(oviumOre.getDefaultState(), BlockStone.EnumType.DIORITE, random, x, z, world, OVIUM_VAL);
         Generator.generateOreStoneVariant(jauxumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z, world, JAUXUM_VAL);
-        Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 100, 0, 64, 2, 9, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT));
+        Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 100, 0, 64, 2, 6, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT));
-        Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 25, 0, 128, 1, 5, null);
+        Generator.generateOre(dilithiumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, DILITHIUM_VAL, 100, 0, 64, 2, 8, newArrayList(Biomes.DESERT, Biomes.DESERT_HILLS, Biomes.MUTATED_DESERT, Biomes.OCEAN, Biomes.DEEP_OCEAN, Biomes.FROZEN_OCEAN, Biomes.BEACH));
+        Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 15, 0, 128, 1, 5, null);
         if (ironGen) {
             Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, IRON_VAL, 0, 32, 2, 8);
         }
@@ -44,9 +43,9 @@ public class WorldGen implements IWorldGenerator {
     private void end(Random random, int x, int z, World world) {
         Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, URU_VAL, 2, 0, 96, 3);
         if (endGen)
-            Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 100, 3, 64, 3, 8, null);
+            Generator.generateOre(Blocks.AIR.getDefaultState(), Blocks.END_STONE.getDefaultState(), null, null, random, x, z, world, 1, 100, 3, 64, 3, 8, null);
-        Generator.generateOre(Blocks.END_STONE.getDefaultState(), auroriumOre.getDefaultState(), random, x, z, world, AURORIUM_VAL, 32, 48, 2, 4);
+        Generator.generateOre(auroriumOre.getDefaultState(), Blocks.END_STONE.getDefaultState(), random, x, z, world, AURORIUM_VAL, 32, 48, 2, 4);
-        Generator.generateOre(Blocks.END_STONE.getDefaultState(), palladiumOre.getDefaultState(), random, x, z, world, PALLADIUM_VAL, 48, 64, 2, 4);
+        Generator.generateOre(palladiumOre.getDefaultState(), Blocks.END_STONE.getDefaultState(), random, x, z, world, PALLADIUM_VAL, 48, 64, 2, 4);
         Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, ABYSSUM_VAL, 4, 64);
     }
 

src/main/resources/assets/taiga/blockstates/dilithium_block.json

@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/dilithium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}

src/main/resources/assets/taiga/blockstates/dilithium_ore.json

@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/dilithium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}

src/main/resources/assets/taiga/blockstates/fluid_block.json

@@ -18,6 +18,13 @@
         }
       }
     ],
+    "dilithium_fluid": [
+      {
+        "custom": {
+          "fluid": "dilithium_fluid"
+        }
+      }
+    ],
     "nitronite_fluid": [
       {
         "custom": {

src/main/resources/assets/taiga/book/de_DE/language.lang

@@ -0,0 +1,2 @@
+index_title=TAIGA
+modifier.informations=Informationen

src/main/resources/assets/taiga/book/de_DE/ore/abyssum.json

@@ -0,0 +1,18 @@
+{
+  "title": "Abyssum",
+  "r": 33,
+  "g": 188,
+  "b": 194,
+  "input": {
+    "id": "taiga:abyssum_ore"
+  },
+  "description": [
+    {
+      "text": "Wie schon bei Eezo entsteht Abyssum durch Sonnenstürme, die bis ins End reichen. Das aufgeladenen Void fusioniert dabei mit Endstein zu Abyssum und setzt sich, da keine Bedrockbarriere existiert an den Boden der Enderinseln ab."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Achtung: Stürze nicht ins Void"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/aurorium.json

@@ -0,0 +1,18 @@
+{
+  "title": "Aurorium",
+  "r": 239,
+  "g": 174,
+  "b": 148,
+  "input": {
+    "id": "taiga:aurorium_ore"
+  },
+  "description": [
+    {
+      "text": "Aurorium ist nicht sehr häufig im Ende zu finden, aber mit ein wenig Fleiß und Geduld findet man genug. Aktuell besitzt Aurorium keine gesonderen Features."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Selten"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/basalt.json

@@ -0,0 +1,19 @@
+{
+  "title": "Basalt",
+  "r": 220,
+  "g": 220,
+  "b": 220,
+  "input": {
+    "id": "taiga:basalt_block"
+  },
+  "description": [
+    {
+      "text": "Basalt entsteht bei hohen Temperaturen und sondert sich als Schlacke ab. Da es leichter ist, als Stein, schwimmt es auf der Lava, sodass man beim Abbau vorsichtig sein muss. Man nutzt Basalt zur Stabilisierung von Tiberium."
+    }
+  ],
+  "informations": [
+    "Level: Iron",
+    "Swims on lava",
+    "Used for some alloys"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/dilithium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Dilithium",
+  "r": 121,
+  "g": 174,
+  "b": 166,
+  "input": {
+    "id": "taiga:dilithium_ore"
+  },
+  "description": [
+    {
+      "text": "Wo es Sand gibt, ist Dilithium nicht weit entfernt. Man nutzt es, um Tiberium zu stabilisieren, wobei es selbst viel eigene Energie besitzt. Es kann explodieren, aber auch als Wärmequelle genutzt werden."
+    }
+  ],
+  "informations": [
+    "Level: Diamant",
+    "Vorsicht: Kann bei Explosionen eine Kettenreaktion auslösen",
+    "Orte: Wüsten, Strände, Ozene"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/duranite.json

@@ -0,0 +1,19 @@
+{
+  "title": "Duranite",
+  "r": 172,
+  "g": 221,
+  "b": 235,
+  "input": {
+    "id": "taiga:duranite_ore"
+  },
+  "description": [
+    {
+      "text": "Vor langer Zeit stürzten brennende Meteoriten vom Himmel. Die Reibungshitze war so groß, dass sie die Metalle im inneren zusammenschmolz und einen enorm harten Klumpen Duranite erzeugte."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Sehr selten",
+    "Eingeschlossen in Meteoriten"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/eezo.json

@@ -0,0 +1,19 @@
+{
+  "title": "Element Zero",
+  "r": 56,
+  "g": 89,
+  "b": 106,
+  "input": {
+    "id": "taiga:eezo_ore"
+  },
+  "description": [
+    {
+      "text": "Hin und wieder erzeugen Sonnenstürme enorm starke Magnetwellen, die bis unter die Erdoberfläche reichen. Das Void wird davon in Wallung versetzt und reicht selten bis an den Bedrock, wo es zu Element Zero fusioniert."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Selten",
+    "Achtung: Beim Abbau nicht ins Void stürzen"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/jauxum.json

@@ -0,0 +1,18 @@
+{
+  "title": "Jauxum",
+  "r": 104,
+  "g": 198,
+  "b": 99,
+  "input": {
+    "id": "taiga:jauxum_ore"
+  },
+  "description": [
+    {
+      "text": "Jauxum ist eines der drei etherischen Erze. Zusammen mit Karmesine und Ovium erzeugt es beim verschmelzen die Verbindung Terrax."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Entsteht in Granit"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/karmesine.json

@@ -0,0 +1,18 @@
+{
+  "title": "Karmesin",
+  "r": 235,
+  "g": 72,
+  "b": 74,
+  "input": {
+    "id": "taiga:karmesine_ore"
+  },
+  "description": [
+    {
+      "text": "Karmesin ist eines der drei etherischen Erze. Zusammen mit Jauxum und Ovium erzeugt es beim verschmelzen die Verbindung Terrax."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Entsteht in andensit"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/meteorite.json

@@ -0,0 +1,19 @@
+{
+  "title": "Meteorit",
+  "r": 35,
+  "g": 35,
+  "b": 35,
+  "input": {
+    "id": "taiga:meteorite_block"
+  },
+  "description": [
+    {
+      "text": "Man muss Geduld aufbringen, um Meteoriten zu finden. Vor vielen tausend Jahren stürzten sie vom Himmel. Die meisten von ihnen liegen unter der Erde begraben, entsprechend aufwändig gestaltet die Suche."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Manchmal zerbröselt es beim Abbau",
+    "Liegt häufig unterirdisch"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/obsidiorite.json

@@ -0,0 +1,20 @@
+{
+  "title": "Obsidiorit",
+  "r": 34,
+  "g": 72,
+  "b": 83,
+  "input": {
+    "id": "taiga:obsidiorite_block"
+  },
+  "description": [
+    {
+      "text": "Obsidiorit findet man im Ende ziemlich häufig. Scheinbar entstanden die kubischen Meteoriten im Void und schweben seither im Ende umher. Man muss fliegen können oder Treppen bauen, um sie abzubauen."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Manchmal brechen sie nicht vollständig",
+    "Sehr hart",
+    "Schweben im Ende"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/osram.json

@@ -0,0 +1,19 @@
+{
+  "title": "Osram",
+  "r": 255,
+  "g": 188,
+  "b": 144,
+  "input": {
+    "id": "taiga:osram_ore"
+  },
+  "description": [
+    {
+      "text": "Osram entstand, als Glimmersteinpartikel unter hohem Druck und enormen Temperaturen schmolz. Dieses seltene Erz kann man in den vielen Lavaseen des Nethers entdecken."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Schwimmt in Nether-Lavaseen",
+    "Es ist hart und heiß"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/ovium.json

@@ -0,0 +1,18 @@
+{
+  "title": "Ovium",
+  "r": 125,
+  "g": 119,
+  "b": 195,
+  "input": {
+    "id": "taiga:ovium_ore"
+  },
+  "description": [
+    {
+      "text": "Ovium ist eines der drei etherischen Erze. Zusammen mit Jauxum und Karmesin erzeugt es beim verschmelzen die Verbindung Terrax."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Entsteht in Diorit"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/palladium.json

@@ -0,0 +1,20 @@
+{
+  "title": "Palladium",
+  "r": 238,
+  "g": 135,
+  "b": 54,
+  "input": {
+    "id": "taiga:palladium_ore"
+  },
+  "description": [
+    {
+      "text": "Palladium ist ein kristallines Erz, welches im Ende auftaucht. Die im Ende vorherrschende Strahlung wird durch Palladium erzeugt. Es glüht und zerfällt auf Grund seiner Radioaktivität."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Gefährlich radioaktiv",
+    "Leuchtet im Dunkeln",
+    "Kristallin"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/prometheum.json

@@ -0,0 +1,20 @@
+{
+  "title": "Prometheum",
+  "r": 55,
+  "g": 44,
+  "b": 73,
+  "input": {
+    "id": "taiga:prometheum_ore"
+  },
+  "description": [
+    {
+      "text": "Manche Wissenschaftler glauben, dass Prometheum durch den hohen Druck in den Tiefen des Nethers entsteht. Abgebaut, beginnt es radioaktiv zu strahlen und zerfällt nach und nach."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Zerfällt allmählich",
+    "Leuchtet im Dunkeln",
+    "dY: ~16"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/tiberium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Tiberium",
+  "r": 212,
+  "g": 255,
+  "b": 0,
+  "input": {
+    "id": "taiga:tiberium_ore"
+  },
+  "description": [
+    {
+      "text": "Wenn man den Nether erforscht fallen die vielen Tiberiumadern auf. Dieses kristalline Erz ist äußerst instabil und gefährlich. Es kann urplötzlich explodieren und benötigt daher einen Stabilisator für den weiteren Nutzen."
+    }
+  ],
+  "informations": [
+    "Level: Stone",
+    "Explosiv",
+    "Kristallin"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/uru.json

@@ -0,0 +1,19 @@
+{
+  "title": "Uru",
+  "r": 191,
+  "g": 185,
+  "b": 240,
+  "input": {
+    "id": "taiga:uru_ore"
+  },
+  "description": [
+    {
+      "text": "Die Legenden besagen, dass nur Götter in der Lage waren, Uru zu schmelzen. Große, mythische Waffen, wie der Hammer Mjolnir sollen daraus geschmiedet worden sein. Man findet es in den schwebenden Meteoriten aus Obsidiorit."
+    }
+  ],
+  "informations": [
+    "Level: Valyrium",
+    "Mystisches Erz",
+    "Aufzufinden in den schwebenden Kuboiden im Ende"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/valyrium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Valyrium",
+  "r": 232,
+  "g": 92,
+  "b": 49,
+  "input": {
+    "id": "taiga:valyrium_ore"
+  },
+  "description": [
+    {
+      "text": "Die alten Valyrer waren die Ersten, die das seltene Metall, wass sie Valyium nanntne, entdeckten. Es ist im Nether zu finden, aber überaus selten."
+    }
+  ],
+  "informations": [
+    "Level: Valyrium",
+    "Sehr selten",
+    "Y: 0 - 128"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/ore/vibranium.json

@@ -0,0 +1,20 @@
+{
+  "title": "Vibranium",
+  "r": 186,
+  "g": 210,
+  "b": 217,
+  "input": {
+    "id": "taiga:vibranium_ore"
+  },
+  "description": [
+    {
+      "text": "Vibranium ist eins der seltensten Erze der Welt. Stimmen sagen, dass man es in Wüsten und Bergen öfter finden kann. Wer es abbaut, muss wegen seiner Zusammensetzung aber acht geben, um sich nicht selbst zu verletzen"
+    }
+  ],
+  "informations": [
+    "Level: Vibranium",
+    "Sehr selten",
+    "Häufiger in Wüsten und Bergen",
+    "Es vibriert"
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/taiga/firstwords.json

@@ -0,0 +1,11 @@
+{
+  "title": "Neue Erze",
+  "image": {
+    "file": "taiga:textures/book/ores.png"
+  },
+  "text": [
+    {
+      "text": "TAIGA fügt viele neue Blöcke und Erze hinzu, die nach und nach zu besseren Legierungen verschmolzen werden können. Auf den nächsten Seiten lernst du die Erze von TAIGA kennen."
+    }
+  ]
+}

src/main/resources/assets/taiga/book/de_DE/taiga/intro.json

@@ -0,0 +1,11 @@
+{
+  "title": "TAIGA: Tinkers' Alloying Addon",
+  "image": {
+    "file": "taiga:textures/logo.png"
+  },
+  "text": [
+    {
+      "text": "Danke für die installation von TAIGA - einer Modifikation mit vielen neuen Lategame-Materialien. Bitte lies weiter um mehr über die Modifikation und ihre Features zu erfahren."
+    }
+  ]
+}

src/main/resources/assets/taiga/book/en_US/language.lang

@@ -0,0 +1,2 @@
+index_title=TAIGA
+modifier.informations=Informations

src/main/resources/assets/taiga/book/en_US/ore/abyssum.json

@@ -0,0 +1,18 @@
+{
+  "title": "Abyssum",
+  "r": 33,
+  "g": 188,
+  "b": 194,
+  "input": {
+    "id": "taiga:abyssum_ore"
+  },
+  "description": [
+    {
+      "text": "Just like eezo, abyssum accrues from solar storms which are affecting the end. The magnetized void fuses with endstone and absorbs a lot of energy. Because there is no bedrock, abyssum is found at the bottom of ender islands."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Caution: Don't fall into the void"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/aurorium.json

@@ -0,0 +1,18 @@
+{
+  "title": "Aurorium",
+  "r": 239,
+  "g": 174,
+  "b": 148,
+  "input": {
+    "id": "taiga:aurorium_ore"
+  },
+  "description": [
+    {
+      "text": "Aurorium ore is very uncommon in the end, but you can find a lot of it if you are patient enough. Aurorium has no more features yet."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Uncommon"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/basalt.json

@@ -0,0 +1,19 @@
+{
+  "title": "Basalt",
+  "r": 220,
+  "g": 220,
+  "b": 220,
+  "input": {
+    "id": "taiga:basalt_block"
+  },
+  "description": [
+    {
+      "text": "This is basalt. Basalt is a block, which can be found in the overworld at the top of lava lakes. If you don't want to fall into the lava you have to mine it carefully. Try to build some blocks underneath to be on the safe side."
+    }
+  ],
+  "informations": [
+    "Level: Iron",
+    "Swims on lava",
+    "Used for some alloys"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/dilithium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Dilithium",
+  "r": 121,
+  "g": 174,
+  "b": 166,
+  "input": {
+    "id": "taiga:dilithium_ore"
+  },
+  "description": [
+    {
+      "text": "When you find a lot of sand, dilithium propably is not far away. You can use dilithium as a stabilizer for tiberium. It holds so much energy that you can use it as a hot fuel source."
+    }
+  ],
+  "informations": [
+    "Level: Diamond",
+    "Caution: Explosions cause more explosions",
+    "Location: Deserts, Beaches, Oceans"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/duranite.json

@@ -0,0 +1,19 @@
+{
+  "title": "Duranite",
+  "r": 172,
+  "g": 221,
+  "b": 235,
+  "input": {
+    "id": "taiga:duranite_ore"
+  },
+  "description": [
+    {
+      "text": "A long time ago, meteorites fell from the sky. The friction heat and the pressure formed duranite ore inside the meteorites. Its natural form is very hard and you will need some time to break that ore."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Very rare",
+    "Found in meteorites"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/eezo.json

@@ -0,0 +1,19 @@
+{
+  "title": "Element Zero",
+  "r": 56,
+  "g": 89,
+  "b": 106,
+  "input": {
+    "id": "taiga:eezo_ore"
+  },
+  "description": [
+    {
+      "text": "Sometimes the world is exposed by solar storms and strong magnetism. This particularly affects the void which then begins to oscillate. Sometimes single peaks reach bedrock and fuse to this rare element."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Rare",
+    "Caution: Don't fall into the void"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/jauxum.json

@@ -0,0 +1,18 @@
+{
+  "title": "Jauxum",
+  "r": 104,
+  "g": 198,
+  "b": 99,
+  "input": {
+    "id": "taiga:jauxum_ore"
+  },
+  "description": [
+    {
+      "text": "Jauxum is one of the three etherical ores. You can find it in natural granite veins. For using jauxum in alloys you need to bind it with karmesine and ovium."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Appears in granite"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/karmesine.json

@@ -0,0 +1,18 @@
+{
+  "title": "Karmesine",
+  "r": 235,
+  "g": 72,
+  "b": 74,
+  "input": {
+    "id": "taiga:karmesine_ore"
+  },
+  "description": [
+    {
+      "text": "Karmesine is one of the three etherical ores. You can find it in natural andesite veins. For using karmesine in alloys you need to bind it with jauxum and ovium."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Appears in andensite"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/meteorite.json

@@ -0,0 +1,18 @@
+{
+  "title": "Meteorite",
+  "r": 35,
+  "g": 35,
+  "b": 35,
+  "input": {
+    "id": "taiga:meteorite_block"
+  },
+  "description": [
+    {
+      "text": "You have to be patient, to find meteorite in your surroundings. Many thounsands years ago they fell from the sky. Most of them are buried under dirt and grass and you have to dig a lot."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Will be cracked sometimes"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/obsidiorite.json

@@ -0,0 +1,20 @@
+{
+  "title": "Obsidiorite",
+  "r": 34,
+  "g": 72,
+  "b": 83,
+  "input": {
+    "id": "taiga:obsidiorite_block"
+  },
+  "description": [
+    {
+      "text": "Obsidiorite is a very common block in the end. It seems that it came from the void and cooled down in cube shapes floating in the ender sky. You need to build stairs to reach that cubes."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Will be cracked sometimes",
+    "Hard to break",
+    "Floating in the sky"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/osram.json

@@ -0,0 +1,19 @@
+{
+  "title": "Osram",
+  "r": 255,
+  "g": 188,
+  "b": 144,
+  "input": {
+    "id": "taiga:osram_ore"
+  },
+  "description": [
+    {
+      "text": "With high pressure and the heat of hellfire osram ore originited from molten glowstone fragments. The rare ore is found swimming in the giant lava lakes of the nether caves."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Swims in nether lava lakes",
+    "It's very hard and very hot"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/ovium.json

@@ -0,0 +1,18 @@
+{
+  "title": "Ovium",
+  "r": 125,
+  "g": 119,
+  "b": 195,
+  "input": {
+    "id": "taiga:ovium_ore"
+  },
+  "description": [
+    {
+      "text": "Ovium is one of the three etherical ores. You can find it in natural diorite veins. For using ovium in alloys you need to bind it with jauxum and karmesine."
+    }
+  ],
+  "informations": [
+    "Level: Cobalt",
+    "Appears in diorite"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/palladium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Palladium",
+  "r": 238,
+  "g": 135,
+  "b": 54,
+  "input": {
+    "id": "taiga:palladium_ore"
+  },
+  "description": [
+    {
+      "text": "Palladium is a crystalline ore found in the end. Its glow is caused by its natural radioactivity, and is able to hurt you if you take it up (next taiga versions...)."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Dangerously radioactive",
+    "Glows in the Dark"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/prometheum.json

@@ -0,0 +1,20 @@
+{
+  "title": "Prometheum",
+  "r": 55,
+  "g": 44,
+  "b": 73,
+  "input": {
+    "id": "taiga:prometheum_ore"
+  },
+  "description": [
+    {
+      "text": "Some scientists believe that prometheum ore emerges naturally, caused by the heavy pressure and the heat it has to absorb in the depth of the nether. It is kind of glowing and has a radioactive decay."
+    }
+  ],
+  "informations": [
+    "Level: Duranite",
+    "Has a natural decay",
+    "Glows in the dark",
+    "dY: ~16"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/tiberium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Tiberium",
+  "r": 212,
+  "g": 255,
+  "b": 0,
+  "input": {
+    "id": "taiga:tiberium_ore"
+  },
+  "description": [
+    {
+      "text": "If you explore the nether, you will often discover tiberium ore. Be careful when you try to break the ores. Tiberium crystals are unstable, full of energy, and can cause heavy explosions."
+    }
+  ],
+  "informations": [
+    "Level: Stone",
+    "Explosive",
+    "Drops crystals"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/uru.json

@@ -0,0 +1,19 @@
+{
+  "title": "Uru",
+  "r": 191,
+  "g": 185,
+  "b": 240,
+  "input": {
+    "id": "taiga:uru_ore"
+  },
+  "description": [
+    {
+      "text": "Legends say, that just the gods were able to melt down uru ore. They say they to have forged mystical weapons out of uru. Mjolnir has been one of them. Uru is found inside of the floating obsidiorite cuboids."
+    }
+  ],
+  "informations": [
+    "Level: Valyrium",
+    "Mystical ore",
+    "Found in floating obsidiorite cubes"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/valyrium.json

@@ -0,0 +1,19 @@
+{
+  "title": "Valyrium",
+  "r": 232,
+  "g": 92,
+  "b": 49,
+  "input": {
+    "id": "taiga:valyrium_ore"
+  },
+  "description": [
+    {
+      "text": "The old valyrian people were the first who discovered this unique kind of metal which they called valyrium. It is very rare and hard to find in the surroundings of the nether."
+    }
+  ],
+  "informations": [
+    "Level: Valyrium",
+    "Very rare",
+    "Y: 0 - 128"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/ore/vibranium.json

@@ -0,0 +1,20 @@
+{
+  "title": "Vibranium",
+  "r": 186,
+  "g": 210,
+  "b": 217,
+  "input": {
+    "id": "taiga:vibranium_ore"
+  },
+  "description": [
+    {
+      "text": "Vibranium is the rarest ore you are able to find. Some people say, you can find more of it it Deserts and Extreme Hill Biomes. Breaking it will cause more damage than usually expected."
+    }
+  ],
+  "informations": [
+    "Level: Vibranium",
+    "Super rare",
+    "More often in Deserts and Extreme Hills",
+    "Vibrating"
+  ]
+}

src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json

@@ -0,0 +1,11 @@
+{
+  "title": "New ores",
+  "image": {
+    "file": "taiga:textures/book/ores.png"
+  },
+  "text": [
+    {
+      "text": "TAIGA adds various new blocks and ores. To get higher tiers, stats and traits you need to alloy them wisely. On the next Pages you will learn where to get these new materials and what else you need to know."
+    }
+  ]
+}

src/main/resources/assets/taiga/book/en_US/taiga/intro.json

@@ -0,0 +1,11 @@
+{
+  "title": "TAIGA: Tinkers' Alloying Addon",
+  "image": {
+    "file": "taiga:textures/logo.png"
+  },
+  "text": [
+    {
+      "text": "Thank you for downloading TAIGA. TAIGA is an addon for Tinker's Construct with a lot of end game materials. On the next pages you will see and learn how to find the new added Ores and what other features you can find in TAIGA."
+    }
+  ]
+}

src/main/resources/assets/taiga/book/index.json

@@ -0,0 +1,11 @@
+[
+  {
+    "name": "index_title",
+    "data": "sections/intro.json",
+    "icon": {
+      "item": {
+        "id": "taiga:ignitz_block"
+      }
+    }
+  }
+]

src/main/resources/assets/taiga/book/sections/intro.json

@@ -0,0 +1,102 @@
+[
+  {
+    "name": "intro",
+    "type": "image with text below",
+    "data": "taiga/intro.json"
+  },
+  {
+    "name": "firstwords",
+    "type": "image with text below",
+    "data": "taiga/firstwords.json"
+  },
+  {
+    "name": "abyssum",
+    "type": "taigaore",
+    "data": "ore/abyssum.json"
+  },
+  {
+    "name": "aurorium",
+    "type": "taigaore",
+    "data": "ore/aurorium.json"
+  },
+  {
+    "name": "basalt",
+    "type": "taigaore",
+    "data": "ore/basalt.json"
+  },
+  {
+    "name": "dilithium",
+    "type": "taigaore",
+    "data": "ore/dilithium.json"
+  },
+  {
+    "name": "duranite",
+    "type": "taigaore",
+    "data": "ore/duranite.json"
+  },
+  {
+    "name": "eezo",
+    "type": "taigaore",
+    "data": "ore/eezo.json"
+  },
+  {
+    "name": "jauxum",
+    "type": "taigaore",
+    "data": "ore/jauxum.json"
+  },
+  {
+    "name": "karmesine",
+    "type": "taigaore",
+    "data": "ore/karmesine.json"
+  },
+  {
+    "name": "meteorite",
+    "type": "taigaore",
+    "data": "ore/meteorite.json"
+  },
+  {
+    "name": "obsidiorite",
+    "type": "taigaore",
+    "data": "ore/obsidiorite.json"
+  },
+  {
+    "name": "osram",
+    "type": "taigaore",
+    "data": "ore/osram.json"
+  },
+  {
+    "name": "ovium",
+    "type": "taigaore",
+    "data": "ore/ovium.json"
+  },
+  {
+    "name": "palladium",
+    "type": "taigaore",
+    "data": "ore/palladium.json"
+  },
+  {
+    "name": "prometheum",
+    "type": "taigaore",
+    "data": "ore/prometheum.json"
+  },
+  {
+    "name": "tiberium",
+    "type": "taigaore",
+    "data": "ore/tiberium.json"
+  },
+  {
+    "name": "uru",
+    "type": "taigaore",
+    "data": "ore/uru.json"
+  },
+  {
+    "name": "valyrium",
+    "type": "taigaore",
+    "data": "ore/valyrium.json"
+  },
+  {
+    "name": "vibranium",
+    "type": "taigaore",
+    "data": "ore/vibranium.json"
+  }
+]

src/main/resources/assets/taiga/lang/en_US.lang

@@ -1,4 +1,7 @@
+modifier.informations=Informations
+
 material.basalt.name=Basalt
+material.dilithium.name=Dilithium
 material.tiberium.name=Tiberium
 material.aurorium.name=Aurorium
 material.prometheum.name=Prometheum
@@ -38,6 +41,7 @@ material.magma.name=Magma
 material.nitronite.name=Nitronit
 
 tile.basalt_block.name=Basalt Block
+tile.dilithium_block.name=Dilithium Block
 tile.tiberium_block.name=Tiberium Block
 tile.aurorium_block.name=Aurorium Block
 tile.prometheum_block.name=Prometheum Block
@@ -79,8 +83,10 @@ tile.meteoritecobble_block.name=Meteorite Cobble Block
 tile.obsidioritecobble_block.name=Meteorite Cobble Block
 
 
+
 tile.basalt_ore.name=Basalt Ore
 tile.tiberium_ore.name=Tiberium Ore
+tile.dilithium_ore.name=Dilithium Ore
 tile.aurorium_ore.name=Aurorium Ore
 tile.prometheum_ore.name=Prometheum Ore
 tile.duranite_ore.name=Duranite Ore
@@ -118,8 +124,12 @@ tile.obsidiorite_ore.name=Obsidiorite Ore
 tile.magma_ore.name=Magma Ore
 tile.nitronite_ore.name=Nitronite Ore
 
+item.dilithium_crystal.name=Dilithium Crystal
+item.tiberium_crystal.name=Tiberium Crystal
+
 
 item.basalt_nugget.name=Basalt Nugget
+item.dilithium_nugget.name=Dilithium Nugget
 item.tiberium_nugget.name=Tiberium Nugget
 item.aurorium_nugget.name=Aurorium Nugget
 item.prometheum_nugget.name=Prometheum Nugget
@@ -162,6 +172,7 @@ item.iron_nugget.name=Iron Nugget
 
 item.basalt_dust.name=Basalt Dust
 item.tiberium_dust.name=Tiberium Dust
+item.dilithium_dust.name=Dilithium Dust
 item.aurorium_dust.name=Aurorium Dust
 item.prometheum_dust.name=Prometheum Dust
 item.duranite_dust.name=Duranite Dust
@@ -201,6 +212,7 @@ item.nitronite_dust.name=Nitronite Dust
 
 item.basalt_ingot.name=Basalt Ingot
 item.tiberium_ingot.name=Tiberium Ingot
+item.dilithium_ingot.name=Dilithium Ingot
 item.aurorium_ingot.name=Aurorium Ingot
 item.prometheum_ingot.name=Prometheum Ingot
 item.duranite_ingot.name=Duranite Ingot
@@ -240,6 +252,7 @@ item.nitronite_ingot.name=Nitronite Ingot
 
 fluid.tconstruct.basalt_fluid.name=Basalt Fluid
 fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid
+fluid.tconstruct.dilithium_fluid.name=Dilithium Fluid
 fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid
 fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid
 fluid.tconstruct.duranite_fluid.name=Duranite Fluid

src/main/resources/assets/taiga/models/item/dilithium_crystal.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/crystal/dilithium"
+  }
+}

src/main/resources/assets/taiga/models/item/dilithium_dust.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/dilithium"
+  }
+}

src/main/resources/assets/taiga/models/item/dilithium_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/dilithium"
+  }
+}

src/main/resources/assets/taiga/models/item/dilithium_nugget.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/dilithium"
+  }
+}

src/main/resources/assets/taiga/models/item/tiberium_crystal.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/crystal/tiberium"
+  }
+}