+ Added more new ore veins.

% Tweaked some ore veins.
% Tweaked size of debug tool's area clear to double.
$ Fixed an issue that broke tooltips.
$ Quite a lot of back-end work for ore generation in the dark dimension.
$ Fixed improper generation of the GT++ WorldGen configuration file.
$ Fixed ore vein densities.
$ Fixed ore veins not generating as expected.

2 files changed, 26 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 3884920c96..0f90d61312 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -15,6 +15,7 @@ import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
@@ -483,6 +484,28 @@ public class Material {
 	public final ItemStack getOre(final int stacksize){
 		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ore"+Utils.sanitizeString(this.getUnlocalizedName()), stacksize);
 	}
+	public final Block getOreBlock(final int stacksize){
+		Logger.DEBUG_MATERIALS("Trying to get ore block for "+this.getLocalizedName()+". Looking for '"+"ore"+Utils.sanitizeString(this.getUnlocalizedName())+"'.");
+		try{
+			ItemStack a1 = getOre(1);
+			Item a2 = a1.getItem();
+			Block a3 = Block.getBlockFromItem(a2);
+
+			Logger.DEBUG_MATERIALS("[Invalid Ore] Is a1 valid? "+(a1 != null));
+			Logger.DEBUG_MATERIALS("[Invalid Ore] Is a2 valid? "+(a2 != null));
+			Logger.DEBUG_MATERIALS("[Invalid Ore] Is a3 valid? "+(a3 != null));
+			
+		Block x = Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ore"+Utils.sanitizeString(this.unlocalizedName), stacksize).getItem());
+		if (x != null){
+			return x;
+		}
+		}
+		catch (Throwable t){
+			t.printStackTrace();
+		}
+		Logger.MATERIALS("Failed getting the Ore Block for "+this.getLocalizedName()+".");
+		return Blocks.stone;
+	}
 	public final ItemStack getCrushed(final int stacksize){
 		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushed"+this.unlocalizedName, stacksize);
 	}
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index 6428c0dd4f..22e43a0aef 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -188,7 +188,7 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
 					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().IRON, 1),
+					new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().SILICON, 7),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 14),
@@ -209,7 +209,7 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
 					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
-					new MaterialStack(ELEMENT.getInstance().IRON, 2),
+					new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3),
 					new MaterialStack(ELEMENT.getInstance().SILICON, 4),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 9),
@@ -223,7 +223,7 @@ public final class ORES {
 			1500,
 			50,
 			75,
-			0, //Radiation
+			1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
@@ -280,19 +280,6 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
 			});
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
 	public static final Material POLYCRASE = new Material(
 			"Polycrase", //Material Name
 			MaterialState.ORE, //State