From 18bd88e7f98bb62d704d933341599bbb7b2ce3c7 Mon Sep 17 00:00:00 2001
From: Robert Sosnitzka <robert.sosnitzka@gmail.com>
Date: Sun, 1 Jan 2017 21:39:02 +0100
Subject: Added Dilithium Ore and assigned crystals. Added some Book pages as a
 test (need to be fixed before next release). Removed deprecated stuff.
 Removed 2016, Added 2017.

---
 src/main/java/com/sosnitzka/taiga/Blocks.java      |  8 ++-
 src/main/java/com/sosnitzka/taiga/Fluids.java      | 12 ++++-
 src/main/java/com/sosnitzka/taiga/Items.java       |  6 +++
 .../java/com/sosnitzka/taiga/MaterialTraits.java   |  5 +-
 src/main/java/com/sosnitzka/taiga/TAIGA.java       |  5 ++
 .../com/sosnitzka/taiga/TAIGAConfiguration.java    | 10 ++++
 .../com/sosnitzka/taiga/blocks/BlockTiberium.java  |  2 +-
 .../java/com/sosnitzka/taiga/generic/BlockOre.java | 62 ++++++++++++++++++++++
 .../com/sosnitzka/taiga/proxy/ClientProxy.java     |  1 +
 .../sosnitzka/taiga/recipes/SmeltingRegistry.java  |  2 -
 .../sosnitzka/taiga/traits/TraitDeflection.java    | 16 ++++++
 .../com/sosnitzka/taiga/traits/TraitLeveled.java   | 16 ++++++
 src/main/java/com/sosnitzka/taiga/util/Utils.java  |  1 +
 .../java/com/sosnitzka/taiga/world/WorldGen.java   |  4 +-
 14 files changed, 141 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/sosnitzka/taiga/generic/BlockOre.java
 create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java
 create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java

(limited to 'src/main/java')

diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java
index c3863e5..0a38c3e 100644
--- a/src/main/java/com/sosnitzka/taiga/Blocks.java
+++ b/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;
@@ -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>
diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java
index 444d8a1..2d62a77 100644
--- a/src/main/java/com/sosnitzka/taiga/Fluids.java
+++ b/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", 0xEEEEEEEE, 2500, 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);
     }
 
 }
diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java
index be68acc..4655d73 100644
--- a/src/main/java/com/sosnitzka/taiga/Items.java
+++ b/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>
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
index bc1a72a..bb1e57a 100644
--- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
+++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
@@ -55,6 +55,9 @@ 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);
 
 
     /**
@@ -88,7 +91,7 @@ public class MaterialTraits {
     /**
      * With Dev
      **/
-    public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk); //.addTrait(dev);
+    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);
     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);
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java
index c8c0bfb..f22bb15 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -125,5 +125,10 @@ public class TAIGA {
         integrateOre("Karmesine", karmesineFluid);
         integrateOre("Ovium", oviumFluid);
         integrateOre("Jauxum", jauxumFluid);
+        // Community Wishlist
+        integrateOre("Dilithium", dilithiumFluid);
+
+
+
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
index 8216e00..e5bb638 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
+++ b/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;
@@ -95,6 +96,7 @@ public class TAIGAConfiguration {
         final int TIBERIUM_DEFAULT = 15;
         final int PROMETHEUM_DEFAULT = 25;
         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;
@@ -158,6 +160,8 @@ public class TAIGAConfiguration {
         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);
         vibraniumValueProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier");
+        Property dilithiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Dilithium", DILITHIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        dilithiumValueProp.setLanguageKey("gui.taiga_configuration.dilithium_multiplier");
         Property karmesineValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_DEFAULT, "value for generation", 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);
@@ -185,6 +189,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());
@@ -247,6 +252,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;
@@ -278,6 +287,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);
diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
index 069cd37..18d92a0 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
+++ b/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
diff --git a/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java
new file mode 100644
index 0000000..55737c3
--- /dev/null
+++ b/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);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
index 75ff267..b2d03be 100644
--- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
+++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
@@ -37,6 +37,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
diff --git a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
index 70eb7cb..21b12df 100644
--- a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
+++ b/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));
     }
 }
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java
new file mode 100644
index 0000000..bc2107d
--- /dev/null
+++ b/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);
+    }
+
+
+}
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java b/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java
new file mode 100644
index 0000000..da40dea
--- /dev/null
+++ b/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);
+    }
+
+
+}
diff --git a/src/main/java/com/sosnitzka/taiga/util/Utils.java b/src/main/java/com/sosnitzka/taiga/util/Utils.java
index 6a508c6..b4e8bf5 100644
--- a/src/main/java/com/sosnitzka/taiga/util/Utils.java
+++ b/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)
diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
index bd5c614..4a10999 100644
--- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
+++ b/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;
 
@@ -34,7 +33,8 @@ 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(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, 25, 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);
-- 
cgit v1.2.3