Merge pull request #5 from GTNewHorizons/small_ores

+added support for small ores in space

6 files changed, 37 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index eadc77d870..e0aa21c8c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,4 @@ GalacticGregU.iml
 GalacticGregU.ipr
 GalacticGregU.iws
 *.bat
-gradlew
-libs/
+gradlew
\ No newline at end of file
diff --git a/build.properties b/build.properties
index cd1b98b9bd..bf3fcf651c 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,3 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1614
-galactigreg.version=1.7.10-0.9.8
+galactigreg.version=1.7.10-0.9.9
diff --git a/libs/gregtech-5.09.30.02-dev.jar b/libs/gregtech-5.09.32.30-dev.jar
index 2334b8c96c..cb4de4d534 100644
--- a/libs/gregtech-5.09.30.02-dev.jar
+++ b/libs/gregtech-5.09.32.30-dev.jar
diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java
index a3be499ffd..cb46d2351b 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java
@@ -36,6 +36,21 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen {
 		
 		GalacticGreg.Logger.trace("Initialized new OreLayer: %s", pName);
 	}
+	
+	public GT_Worldgen_GT_Ore_SmallPieces_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pAmount, short pPrimary)
+	{
+		super(pName, GalacticGreg.smallOreWorldgenList, pDefault);
+		
+		mMinY = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MinHeight", pMinY));
+		mMaxY = ((short) Math.max(this.mMinY + 1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY)));
+		mAmount = ((short) Math.max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Amount", pAmount)));
+		mMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Ore", pPrimary));
+
+		_mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName);
+		_mDynWorldConfig.InitDynamicConfig();
+		
+		GalacticGreg.Logger.trace("Initialized new OreLayer: %s", pName);
+	}
 
 	/**
 	 * Check if *this* orelayer is enabled for pDimensionDef
diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
index 2328305f62..9fdb07a91a 100644
--- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
+++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
@@ -18,7 +18,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 
-@Mod(modid = GalacticGreg.MODID, version = GalacticGreg.VERSION, dependencies = "required-after:GalacticraftCore; required-after:gregtech;", acceptableRemoteVersions="*")
+@Mod(modid = GalacticGreg.MODID, version = GalacticGreg.VERSION, dependencies = "required-after:GalacticraftCore; required-after:gregtech@5.09.32.30;", acceptableRemoteVersions="*")
 public class GalacticGreg {
 	public static final List<GT_Worldgen_GT_Ore_SmallPieces_Space> smallOreWorldgenList = new ArrayList();
 	public static final List<GT_Worldgen_GT_Ore_Layer_Space> oreVeinWorldgenList = new ArrayList();
diff --git a/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java b/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java
index 5e65b7d12d..66d6a207e3 100644
--- a/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java
+++ b/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java
@@ -3,6 +3,7 @@ package bloodasp.galacticgreg;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.common.GT_Worldgen_GT_Ore_Layer;
+import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces;
 
 public class WorldGenGaGT
   implements Runnable
@@ -12,7 +13,7 @@ public class WorldGenGaGT
 	public void run() {
 		new GT_Worldgenerator_Space();
 		
-		new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.copper", true, 60, 120, 32, Materials.Copper);
+	 /*new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.copper", true, 60, 120, 32, Materials.Copper);
 	 new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.tin", true, 60, 120, 32, Materials.Tin);
 	 new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.bismuth", true, 80, 120, 8, Materials.Bismuth);
 	 new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.coal", true, 60, 100, 24, Materials.Coal);
@@ -47,7 +48,21 @@ public class WorldGenGaGT
 	 new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.foolsruby", true, 5, 250, 1, Materials.FoolsRuby);
 	 new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.garnetred", true, 5, 250, 1, Materials.GarnetRed);
 	 new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.garnetyellow", true, 5, 250, 1, Materials.GarnetYellow);
-				
+				*/
+		/*
+		  * This part here enables every GT Small Ore for Space Dims.
+		  */
+		for (int k=0;k<GT_Worldgen_GT_Ore_SmallPieces.sList.size();++k) {
+	         new GT_Worldgen_GT_Ore_SmallPieces_Space(
+	        		 GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mWorldGenName,
+	        		 GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mEnabled,
+	        		 GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMinY,
+	        		 GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMaxY,
+	        		 GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mAmount,
+	        		 GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMeta
+	                 );
+	     }
+		
 	 /*
 	  * This part here enables every GT Ore for Space Dims.
 	  */
@@ -67,7 +82,7 @@ public class WorldGenGaGT
                  );
      }
   
-  int f = 0;
+ /* int f = 0;
   for (int j = GregTech_API.sWorldgenFile.get("worldgen", "AmountOfCustomSmallOreSlots", 16); f < j; f++) {
  new GT_Worldgen_GT_Ore_SmallPieces_Space("ore.small.custom." + (f < 10 ? "0" : "") + f, false, 0, 0, 0, Materials._NULL);
   }
@@ -76,6 +91,7 @@ public class WorldGenGaGT
   for (int j = GregTech_API.sWorldgenFile.get("worldgen", "AmountOfCustomLargeVeinSlots", 16); i < j; i++) {
 	  new GT_Worldgen_GT_Ore_Layer_Space("ore.mix.custom." + (i < 10 ? "0" : "") + i, false, 0, 0, 0, 0, 0, Materials._NULL, Materials._NULL, Materials._NULL, Materials._NULL);
   }
+  */
 	}
   
 }