Move sources and resources

8 files changed, 508 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java
new file mode 100644
index 0000000000..795fd18826
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java
@@ -0,0 +1,61 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+
+public abstract class GTPP_Worldgen{
+
+    public final String mWorldGenName;
+    public final boolean mEnabled;
+    private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<String, Boolean>();
+
+    public GTPP_Worldgen(String aName, List aList, boolean aDefault) {
+        mWorldGenName = aName;
+        mEnabled = sCustomWorldgenFile.get("worldgen", mWorldGenName, aDefault);
+        if (mEnabled) aList.add(this);
+    }
+
+    /**
+     * @param aWorld         The World Object
+     * @param aRandom        The Random Generator to use
+     * @param aBiome         The Name of the Biome (always != null)
+     * @param aDimensionType The Type of Worldgeneration to add. -1 = Nether, 0 = Overworld, +1 = End
+     * @param aChunkX        xCoord of the Chunk
+     * @param aChunkZ        zCoord of the Chunk
+     * @return if the Worldgeneration has been successfully completed
+     */
+    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+        return false;
+    }
+
+    /**
+     * @param aWorld         The World Object
+     * @param aRandom        The Random Generator to use
+     * @param aBiome         The Name of the Biome (always != null)
+     * @param aDimensionType The Type of Worldgeneration to add. -1 = Nether, 0 = Overworld, +1 = End
+     * @param aChunkX        xCoord of the Chunk
+     * @param aChunkZ        zCoord of the Chunk
+     * @return if the Worldgeneration has been successfully completed
+     */
+    public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+        return false;
+    }
+
+    public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) {
+        String aDimName = aWorld.provider.getDimensionName();
+        Boolean tAllowed = mDimensionMap.get(aDimName);
+        if (tAllowed == null) {
+            boolean tValue = sCustomWorldgenFile.get("worldgen.dimensions." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
+            mDimensionMap.put(aDimName, tValue);
+            return tValue;
+        }
+        return tAllowed;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java
new file mode 100644
index 0000000000..ca78a72e04
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import java.util.Collection;
+import java.util.Random;
+
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+
+public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore {
+    public GTPP_Worldgen_Boulder(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
+        super(aName, aDefault, aBlock, aBlockMeta, aDimensionType, aAmount, aSize, aProbability, aMinY, aMaxY, aBiomeList, aAllowToGenerateinVoid);
+    }
+
+    @Override
+    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
+            for (int i = 0; i < mAmount; i++) {
+                int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16);
+                Block tBlock = aWorld.getBlock(tX, tY - 7, tZ);
+                if (tBlock != null && tBlock.isOpaqueCube() && aWorld.getBlock(tX, tY - 6, tZ).isAir(aWorld, tX, tY - 6, tZ)) {
+                    float math_pi = CORE.PI;
+                    float var6 = aRandom.nextFloat() * math_pi;
+                    float var1b = mSize / 8.0F;
+                    float var3b = MathHelper.sin(var6) * var1b; float var4b = MathHelper.cos(var6) * var1b;
+                    float var8b = -2*var3b;float var9b = -2*var4b;
+                    int var10b = (tX + 8);int var11b = (tZ + 8);
+                    float var7 = (var10b + var3b);
+                    float var11 = (var11b + var4b);
+                    int var5b = aRandom.nextInt(3);int var6b = aRandom.nextInt(3);int var7b = var6b - var5b;
+                    float var15 = (tY + var5b - 2);
+                    float var12b = math_pi / mSize;
+
+                    for (int var19 = 0; var19 <= mSize; ++var19) {
+                        float var2b = var19 / mSize;
+                        float var20 = var7 + var8b * var2b;
+                        float var22 = var15 + var7b * var2b;
+                        float var24 = var11 + var9b * var2b;
+                        float var26 = aRandom.nextFloat() * mSize / 16.0F;
+                        float var28 = ((MathHelper.sin(var19 * var12b) + 1.0F) * var26 + 1.0F) / 2.0F;
+                        int var32 = MathHelper.floor_float(var20 - var28);
+                        int var33 = MathHelper.floor_float(var22 - var28);
+                        int var34 = MathHelper.floor_float(var24 - var28);
+                        int var35 = MathHelper.floor_float(var20 + var28);
+                        int var36 = MathHelper.floor_float(var22 + var28);
+                        int var37 = MathHelper.floor_float(var24 + var28);
+
+                        for (int var38 = var32; var38 <= var35; ++var38) {
+                            float var39 = (var38 + 0.5F - var20) / (var28);
+                            float var13b = var39 * var39;
+                            if (var13b < 1.0F) {
+                                for (int var41 = var33; var41 <= var36; ++var41) {
+                                    float var42 = (var41 + 0.5F - var22) / (var28);
+                                    float var14b = var13b + var42 * var42;
+                                    if (var14b < 1.0F) {
+                                        for (int var44 = var34; var44 <= var37; ++var44) {
+                                            float var45 = (var44 + 0.5F - var24) / (var28);
+                                            Block block = aWorld.getBlock(var38, var41, var44);
+                                            if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld.getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) || (block != null && !(block instanceof BlockContainer)))) {
+                                                aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
new file mode 100644
index 0000000000..7cd215aa4e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
@@ -0,0 +1,167 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Random;
+
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.loaders.misc.GT_Achievements;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+
+public class GTPP_Worldgen_GT_Ore_Layer
+extends GTPP_Worldgen {
+	public static ArrayList<GTPP_Worldgen_GT_Ore_Layer> sList = new ArrayList<GTPP_Worldgen_GT_Ore_Layer>();
+	public static int sWeight = 0;
+	public final short mMinY;
+	public final short mMaxY;
+	public final short mWeight;
+	public final short mDensity;
+	public final short mSize;
+	public short mPrimaryMeta;
+	public short mSecondaryMeta;
+	public short mBetweenMeta;
+	public short mSporadicMeta;
+	public final String mRestrictBiome;
+	public final boolean mDarkWorld;
+	public final String aTextWorldgen = "worldgen.gtpp.";
+
+	public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, boolean aOverworld, Materials aPrimary, Materials aSecondary, Materials aBetween, Materials aSporadic) {
+		super(aName, sList, aDefault);
+		this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
+		this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY));
+		this.mMaxY = ((short) Math.max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)));
+		this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
+		this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
+		this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
+		this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID));
+		this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID));
+		this.mBetweenMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID));
+		this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID));
+		this.mRestrictBiome = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
+
+		if (this.mEnabled) {
+			GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			sWeight += this.mWeight;            
+		}
+	}
+
+	public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity,
+			int aSize, Material aPrimary, Material aSecondary, Material aBetween,
+			Material aSporadic) {
+		super(aName, sList, aDefault);
+		this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Darkworld", true);
+		this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY));
+		this.mMaxY = ((short) Math.max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)));
+		this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
+		this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
+		this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
+		/*this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID));
+		this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID));
+		this.mBetweenMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID));
+		this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID));
+		 */this.mRestrictBiome = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
+
+		 if (this.mEnabled) {
+			 /* GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			 GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			 GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			 GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+			  */ sWeight += this.mWeight;            
+		 }
+	}
+
+	@Override
+	public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+		if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) {
+			return false; //Not the correct biome for ore mix
+		}
+		if (!isGenerationAllowed(aWorld, aDimensionType, ((aDimensionType == -1) && (false)) || ((aDimensionType == 0) && (this.mDarkWorld)) || ((aDimensionType == 1) && (false)) || ((aWorld.provider.getDimensionName().equals("Moon")) && (false)) || ((aWorld.provider.getDimensionName().equals("Mars")) && (false)) ? aDimensionType : aDimensionType ^ 0xFFFFFFFF)) {
+			return false;
+		}
+		int tMinY = this.mMinY + aRandom.nextInt(this.mMaxY - this.mMinY - 5);
+
+		int cX = aChunkX - aRandom.nextInt(this.mSize);
+		int eX = aChunkX + 16 + aRandom.nextInt(this.mSize);
+		for (int tX = cX; tX <= eX; tX++) {
+			int cZ = aChunkZ - aRandom.nextInt(this.mSize);
+			int eZ = aChunkZ + 16 + aRandom.nextInt(this.mSize);
+			for (int tZ = cZ; tZ <= eZ; tZ++) {
+				if (this.mSecondaryMeta > 0) {
+					for (int i = tMinY - 1; i < tMinY + 2; i++) {
+						if ((aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0) || (aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0)) {
+							setOreBlock(aWorld, tX, i, tZ, this.mSecondaryMeta, false);
+						}
+					}
+				}
+				if ((this.mBetweenMeta > 0) && ((aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0) || (aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0))) {
+					setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false);
+				}
+				if (this.mPrimaryMeta > 0) {
+					for (int i = tMinY + 3; i < tMinY + 6; i++) {
+						if ((aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0) || (aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0)) {
+							setOreBlock(aWorld, tX, i, tZ, this.mPrimaryMeta, false);
+						}
+					}
+				}
+				if ((this.mSporadicMeta > 0) && ((aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0) || (aRandom.nextInt(Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0))) {
+					setOreBlock(aWorld, tX, tMinY - 1 + aRandom.nextInt(7), tZ, this.mSporadicMeta, false);
+				}
+			}
+		}
+		if (GT_Values.D1) {
+			System.out.println("Generated Orevein: " + this.mWorldGenName+" "+aChunkX +" "+ aChunkZ);
+		}
+		return true;
+	}
+	private Method mSetOre = null;
+	private boolean setOreBlock(World world, int x, int y, int z, int secondarymeta, boolean bool){
+
+		if (mSetOre == null){
+			try {
+				mSetOre = GT_TileEntity_Ores.class.getMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class, boolean.class);
+			} 
+			catch (SecurityException | NoSuchMethodException e) {
+				try {
+					mSetOre = GT_TileEntity_Ores.class.getMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class);
+				} 
+				catch (SecurityException | NoSuchMethodException r) {}
+			}		
+		}
+
+		if (mSetOre != null) {
+			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+				try {
+					return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta, bool);
+				} 
+				catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
+					return false;
+				}
+			}
+			else {
+				try {
+					return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta);
+				} 
+				catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
+					return false;}
+			}
+		}
+		else {
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java
new file mode 100644
index 0000000000..aae3bdd48a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import static gtPlusPlus.xmod.gregtech.api.world.WorldGenUtils.mOresToRegister;
+
+import gtPlusPlus.core.material.Material;
+
+public class GTPP_Worldgen_Handler implements Runnable{
+
+	
+
+	@Override
+	public void run() {
+
+		for (GT_OreVein_Object ore : mOresToRegister){
+			generateNewVein(ore);
+		}
+
+	}
+	
+	
+
+	private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(final GT_OreVein_Object ore){
+		return generateNewVein(ore.mOreMixName, ore.minY, ore.maxY, ore.weight, ore.density, ore.size, ore.aPrimary, ore.aSecondary, ore.aBetween, ore.aSporadic);
+	}
+	
+	private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(String mOreMixName, int minY, int maxY, int weight, int density, int size,
+			Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic){
+		return new GTPP_Worldgen_GT_Ore_Layer(
+						"ore.mix."+mOreMixName, 	//String aName, 
+						true,						//boolean aDefault, 
+						minY, maxY,					//int aMinY, int aMaxY, 
+						weight,						//int aWeight, 
+						density,					//int aDensity, 
+						size, 						//int aSize,
+						aPrimary, 					//Materials aPrimary, 
+						aSecondary, 				//Materials aSecondary, 
+						aBetween, 					//Materials aBetween, 
+						aSporadic); 				//Materials aSporadic
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java
new file mode 100644
index 0000000000..2d7f817060
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java
@@ -0,0 +1,33 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import net.minecraft.block.Block;
+
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+
+public abstract class GTPP_Worldgen_Ore extends GTPP_Worldgen {
+    public final int mBlockMeta, mAmount, mSize, mMinY, mMaxY, mProbability, mDimensionType;
+    public final Block mBlock;
+    public final Collection<String> mBiomeList;
+    public final boolean mAllowToGenerateinVoid;
+    private final String aTextWorldgen = "worldgen.";
+
+    public GTPP_Worldgen_Ore(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
+        super(aName, HANDLER_GT.sCustomWorldgenList, aDefault);
+        mDimensionType = aDimensionType;
+        mBlock = aBlock;
+        mBlockMeta = Math.min(Math.max(aBlockMeta, 0), 15);
+        mProbability = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "Probability", aProbability);
+        mAmount = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "Amount", aAmount);
+        mSize = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "Size", aSize);
+        mMinY = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "MinHeight", aMinY);
+        mMaxY = sCustomWorldgenFile.get(aTextWorldgen + mWorldGenName, "MaxHeight", aMaxY);
+        if (aBiomeList == null) mBiomeList = new ArrayList<String>();
+        else mBiomeList = aBiomeList;
+        mAllowToGenerateinVoid = aAllowToGenerateinVoid;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java
new file mode 100644
index 0000000000..e66106ad4a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java
@@ -0,0 +1,75 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import java.util.Collection;
+import java.util.Random;
+
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+
+public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore {
+    public GTPP_Worldgen_Ore_Normal(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
+        super(aName, aDefault, aBlock, aBlockMeta, aDimensionType, aAmount, aSize, aProbability, aMinY, aMaxY, aBiomeList, aAllowToGenerateinVoid);
+    }
+
+    @Override
+    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
+            for (int i = 0; i < mAmount; i++) {
+                int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16);
+                if (mAllowToGenerateinVoid || aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) {
+                    float math_pi = CORE.PI;float var1b = mSize / 8.0F;
+                    float var6 = aRandom.nextFloat() * math_pi;
+                    float var3b = MathHelper.sin(var6) * var1b; float var4b = MathHelper.cos(var6) * var1b;
+                    float var8b = -2*var3b;float var9b = -2*var4b;
+                    int var10b = (tX + 8);int var11b = (tZ + 8);
+                    float var7 = (var10b + var3b);
+                    float var11 = (var11b + var4b);
+                    int var5b = aRandom.nextInt(3);int var6b = aRandom.nextInt(3);int var7b = var6b - var5b;
+                    float var15 = (tY + var5b - 2);
+                    float var12b = math_pi / mSize;
+
+                    for (int var19 = 0; var19 <= mSize; ++var19) {
+                        float var2b = var19 / mSize;
+                        float var20 = var7 + var8b * var2b;
+                        float var22 = var15 + var7b * var2b;
+                        float var24 = var11 + var9b * var2b;
+                        float var26 = aRandom.nextFloat() * mSize / 16.0F;
+                        float var28 = ((MathHelper.sin(var19 * var12b) + 1.0F) * var26 + 1.0F) / 2.0F;
+                        int var32 = MathHelper.floor_float(var20 - var28);
+                        int var33 = MathHelper.floor_float(var22 - var28);
+                        int var34 = MathHelper.floor_float(var24 - var28);
+                        int var35 = MathHelper.floor_float(var20 + var28);
+                        int var36 = MathHelper.floor_float(var22 + var28);
+                        int var37 = MathHelper.floor_float(var24 + var28);
+
+                        for (int var38 = var32; var38 <= var35; ++var38) {
+                            float var39 = (var38 + 0.5F - var20) / (var28);
+                            float var13b = var39 * var39;
+                            if (var13b < 1.0F) {
+                                for (int var41 = var33; var41 <= var36; ++var41) {
+                                    float var42 = (var41 + 0.5F - var22) / (var28);
+                                    float var14b = var13b + var42 * var42;
+                                    if (var14b < 1.0F) {
+                                        for (int var44 = var34; var44 <= var37; ++var44) {
+                                            float var45 = (var44 + 0.5F - var24) / (var28);
+                                            Block block = aWorld.getBlock(var38, var41, var44);
+                                            if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld.getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) || (block != null && (block.isReplaceableOreGen(aWorld, var38, var41, var44, Blocks.stone) || block.isReplaceableOreGen(aWorld, var38, var41, var44, Blocks.end_stone) || block.isReplaceableOreGen(aWorld, var38, var41, var44, Blocks.netherrack))))) {
+                                                aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java
new file mode 100644
index 0000000000..770083fee8
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java
@@ -0,0 +1,31 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import gtPlusPlus.core.material.Material;
+
+public class GT_OreVein_Object {
+
+	final String mOreMixName; 	//String aName, 
+	final int minY, maxY;		//int aMinY, int aMaxY, 
+	final int weight;			//int aWeight, 
+	final int density;			//int aDensity, 
+	final int size;				//int aSize,
+	final Material aPrimary; 	//Materials aPrimary, 
+	final Material aSecondary; 	//Materials aSecondary, 
+	final Material aBetween; 	//Materials aBetween, 
+	final Material aSporadic;	//Materials aSporadic
+	
+	GT_OreVein_Object(String mOreMixName, int minY, int maxY, int weight, int density, int size,
+			Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic){
+		this.mOreMixName = mOreMixName;
+		this.minY = minY;
+		this.maxY = maxY;
+		this.weight = weight;
+		this.density = density;
+		this.size = size;
+		this.aPrimary = aPrimary;
+		this.aSecondary = aSecondary;
+		this.aBetween = aBetween;
+		this.aSporadic = aSporadic;
+	}
+	
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java
new file mode 100644
index 0000000000..fd0738596a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java
@@ -0,0 +1,23 @@
+package gtPlusPlus.xmod.gregtech.api.world;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import gtPlusPlus.core.material.Material;
+
+public class WorldGenUtils {
+
+	static List<GT_OreVein_Object> mOresToRegister = new ArrayList<GT_OreVein_Object>();
+	
+	public static final void addNewOreMixForWorldgen(GT_OreVein_Object newVein){
+		mOresToRegister.add(newVein);
+	}
+	
+	public static boolean generateNewOreVeinObject(String mOreMixName, int minY, int maxY, int weight, int density, int size,
+			Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic){
+		GT_OreVein_Object newVein = new GT_OreVein_Object(mOreMixName, minY, maxY, weight, density, size, aPrimary, aSecondary, aBetween, aSporadic);
+		addNewOreMixForWorldgen(newVein);
+		return true;
+	}
+	
+}