Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

3 files changed, 23 insertions, 23 deletions

diff --git a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
index ffad72868c..657e9353c6 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
+++ b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
@@ -18,7 +18,7 @@ public class GT_UO_Dimension {
 	private int maxChance;
 	public String Dimension = "null";
 
-	public GT_UO_Dimension(ConfigCategory aConfigCategory) {
+	public GT_UO_Dimension(ConfigCategory aConfigCategory) {//TODO CONFIGURE
 		fFluids = HashBiMap.create();
 		if (aConfigCategory.containsKey("Dimension"))
 		{
@@ -35,18 +35,14 @@ public class GT_UO_Dimension {
 	}
 	
 	public GT_UO_Fluid getRandomFluid (Random aRandom) {
-		int random = aRandom.nextInt(3);
-		random = aRandom.nextInt(1000);
-		int step = 0;
+		int random = aRandom.nextInt(1000);
 		for (BiMap.Entry<String, GT_UO_Fluid> fl : fFluids.entrySet()) {
 			int chance = fl.getValue().Chance*1000/maxChance;
 			if (random<=chance) return fl.getValue();
 			//System.out.println("GT UO "+fl.getValue().Registry+" Chance:"+chance+" Random:"+random);
 			random-=chance;
 		}
-
 		return null;
-
 	}
 
 }
diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
index 89340132be..ce3bdc51cb 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
+++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
@@ -2,9 +2,9 @@ package gregtech.api.objects;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-
 import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.util.GT_Log;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.Configuration;
@@ -48,15 +48,16 @@ public class GT_UO_DimensionList {
 		fConfig.get(Category, "MaxAmount", aMaxAmount).getInt(aMaxAmount);
 		fConfig.get(Category, "Chance", aChance).getInt(aChance);
 		fConfig.get(Category, "DecreasePerOperationAmount", aDecreasePerOperationAmount).getInt(aDecreasePerOperationAmount);
+									//IT IS IN BUCKETS!!!
 	}
 	
 	public void SetDafultValues() {
-		SetConfigValues("Overworld", "0", "gas_natural_gas", "gas_natural_gas", 0, 625, 20, 5);
-		SetConfigValues("Overworld", "0", "liquid_light_oil", "liquid_light_oil", 0, 625, 20, 5);
+		SetConfigValues("Overworld", "0", "gas_natural_gas", "gas_natural_gas", 0, 625, 20, 7);
+		SetConfigValues("Overworld", "0", "liquid_light_oil", "liquid_light_oil", 0, 625, 20, 6);
 		SetConfigValues("Overworld", "0", "liquid_medium_oil", "liquid_medium_oil", 0, 625, 20, 5);
-		SetConfigValues("Overworld", "0", "liquid_heavy_oil", "liquid_heavy_oil", 0, 625, 20, 5);
+		SetConfigValues("Overworld", "0", "liquid_heavy_oil", "liquid_heavy_oil", 0, 625, 20, 4);
 		SetConfigValues("Overworld", "0", "oil", "oil", 0, 625, 20, 5);
-		SetConfigValues("Moon", "Moon", "helium-3", "helium-3", 0, 375, 100, 5);
+		SetConfigValues("Moon", "Moon", "helium-3", "helium-3", 24, 128, 100, 1);
 	}
 	
 	public void getConfig(Configuration aConfig, String aCategory) {
@@ -65,7 +66,7 @@ public class GT_UO_DimensionList {
 		if (!fConfig.hasCategory(fCategory))
 			SetDafultValues();
 
-		fConfig.setCategoryComment(fCategory, "Config Undeground Fluids (Delete this Category for regenerate)");
+		fConfig.setCategoryComment(fCategory, "Config Underground Fluids (Delete this Category for regenerate)");
 		fConfig.setCategoryComment(fCategory+".Default", "Set Default Generating (Use this Category for Default settings)");
 		fConfig.setCategoryComment(fCategory+".Overworld", "Set Overworld Generating");
 		fConfig.setCategoryComment(fCategory+".Moon", "Set Moon Generating");
diff --git a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java b/src/main/java/gregtech/api/objects/GT_UO_Fluid.java
index c2d9b70bd2..5eea9c323f 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java
+++ b/src/main/java/gregtech/api/objects/GT_UO_Fluid.java
@@ -9,6 +9,10 @@ import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
+import java.util.Random;
+
+import static gregtech.common.GT_UndergroundOil.DIVIDER;
+
 public class GT_UO_Fluid {
 	public String Registry = "null";
 	public int MaxAmount = 0;
@@ -19,27 +23,27 @@ public class GT_UO_Fluid {
 	public GT_UO_Fluid(ConfigCategory aConfigCategory) {
 		if (aConfigCategory.containsKey("Registry"))
 		{
-			aConfigCategory.get("Registry").comment = "Fluid registry";
+			aConfigCategory.get("Registry").comment = "Fluid registry name";
 			Registry = aConfigCategory.get("Registry").getString();
 		}
 		if (aConfigCategory.containsKey("MaxAmount"))
 		{
-			aConfigCategory.get("MaxAmount").comment = "Max amount generation (per operation Amount)";
+			aConfigCategory.get("MaxAmount").comment = "Max amount generation (per operation, sets the VeinData) 80000 MAX";
 			MaxAmount = aConfigCategory.get("MaxAmount").getInt(0);
 		}
 		if (aConfigCategory.containsKey("MinAmount"))
 		{
-			aConfigCategory.get("MinAmount").comment = "Max amount generation (per operation Amount)";
+			aConfigCategory.get("MinAmount").comment = "Min amount generation (per operation, sets the VeinData) 0 MIN";
 			MinAmount = aConfigCategory.get("MinAmount").getInt(0);
 		}
 		if (aConfigCategory.containsKey("Chance"))
 		{
-			aConfigCategory.get("Chance").comment = "Chance generating";
+			aConfigCategory.get("Chance").comment = "Chance generating (weighted chance!, there will be a fluid in chunk always!)";
 			Chance = aConfigCategory.get("Chance").getInt(0);
 		}
 		if (aConfigCategory.containsKey("DecreasePerOperationAmount"))
 		{
-			aConfigCategory.get("DecreasePerOperationAmount").comment = "Decrease per operation Amount (X/5000L per operation)";
+			aConfigCategory.get("DecreasePerOperationAmount").comment = "Decrease per operation (actual fluid gained works like (Litre)VeinData/5000)";
 			DecreasePerOperationAmount = aConfigCategory.get("DecreasePerOperationAmount").getInt(5);
 		}
 		//System.out.println("GT UO "+aConfigCategory.getName()+" Fluid:"+Registry+" Max:"+MaxAmount+" Min:"+MinAmount+" Chance:"+Chance);
@@ -53,11 +57,10 @@ public class GT_UO_Fluid {
 		}
 	}
 	
-	public int getRandomAmount(Random aRandom){
-		int r1 = (int)Math.round(Math.pow((MaxAmount-MinAmount)*500000.d, 0.2));
-		int r2 = (int)Math.floor(Math.pow(MinAmount*500000.d, 0.2));
-        double amount = aRandom.nextInt(r1)+r2+aRandom.nextDouble();
-        return (int) (Math.pow(amount, 5) / 100);
+	public int getRandomAmount(Random aRandom){//generates some random ass number that correlates to extraction speeds
+		int div = (int)Math.floor(Math.pow((MaxAmount-MinAmount)*100.d*DIVIDER, 0.2d));
+		int min = (int)Math.floor(Math.pow(MinAmount*100.d*DIVIDER, 0.2d));
+        double amount = min+aRandom.nextInt(div)+aRandom.nextDouble();
+        return (int) (Math.pow(amount, 5) / 100);//reverses the computation above
 	}
-
 }
\ No newline at end of file