Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Add Underground Oil Spawn Dimensions

Browse source 
Fix bug reduction oil around coordinates 0 0
Add value MaxAmount in GregTech.cfg
This commit is contained in:
Maxime Legkiy 2017-02-07 02:52:26 +03:00
parent d703850358
commit 00834b6c4b
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/gregtech/api/util/GT_Utility.java
View file

@ -2,6 +2,7 @@ package gregtech.api.util;
import cofh.api.transport.IItemDuct; import cofh.api.transport.IItemDuct;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API; import gregtech.api.GregTech_API;
import gregtech.api.damagesources.GT_DamageSources; import gregtech.api.damagesources.GT_DamageSources;
import gregtech.api.enchants.Enchantment_Radioactivity; import gregtech.api.enchants.Enchantment_Radioactivity;
@ -1518,22 +1519,35 @@ public class GT_Utility {
return false; return false;
} }
public static int getScaleСoordinates(double aValue, int aScale) {
return (int)Math.floor(aValue / aScale);
}
public static boolean getUndergroundOilSpawns(int aDimensionId) {
if (Math.abs(aDimensionId)==1) return false; //If Nether or End...
if (GT_Mod.gregtechproxy.mUndergroundOilOverworld && aDimensionId==0) return true; //Overworld
if (GT_Mod.gregtechproxy.mUndergroundOilInRealDimension && isRealDimension(aDimensionId)) return true; //Other real world
return false; //If other planets...
}
public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ) { public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ) {
return getUndergroundOil(aWorld, aX, aZ, false); return getUndergroundOil(aWorld, aX, aZ, false);
} }
public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ, boolean needConsumeOil) { public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ, boolean needConsumeOil) {
if (aWorld.provider.dimensionId!=0) if (!getUndergroundOilSpawns(aWorld.provider.dimensionId))
{
return null; return null;
}
Random tRandom = new Random((aWorld.getSeed() + ((int)Math.floor(aX / 96.d)) + (7 * ((int)Math.floor(aZ / 96.d))))); Random tRandom = new Random((aWorld.getSeed() + (getScaleСoordinates(aX,96)) + (7 * (getScaleСoordinates(aZ,96)))));
int oil = tRandom.nextInt(3); int oil = tRandom.nextInt(3);
double amount = tRandom.nextInt(50) + tRandom.nextDouble(); double amount = tRandom.nextInt(GT_Mod.gregtechproxy.mUndergroundOilMaxAmount) + tRandom.nextDouble();
oil = tRandom.nextInt(4); oil = tRandom.nextInt(4);
// System.out.println("Oil: "+((int)Math.floor(aX/96.d))+" "+((int)Math.floor(aZ/96.d))+" "+oil+" "+amount+"dd"); // System.out.println("Oil: "+(getScaleСoordinates(aX,96))+" "+(getScaleСoordinates(aX,96))+" "+oil+" "+amount);
// amount = 40; // amount = 40;
Fluid tFluid = null; Fluid tFluid = null;
switch (oil) { switch (oil) {
@ -1553,7 +1567,7 @@ public class GT_Utility {
tFluid = Materials.Oil.mFluid; tFluid = Materials.Oil.mFluid;
} }
int tAmount = (int) (Math.pow(amount, 5) / 100); int tAmount = (int) (Math.pow(amount, 5) / 100);
ChunkPosition tPos = new ChunkPosition(aX/16, 1, aZ/16); ChunkPosition tPos = new ChunkPosition(getScaleСoordinates(aX,16), 1, getScaleСoordinates(aZ,16));
int[] tInts = new int[2]; int[] tInts = new int[2];
if(GT_Proxy.chunkData.containsKey(tPos)){ if(GT_Proxy.chunkData.containsKey(tPos)){
tInts = GT_Proxy.chunkData.get(tPos); tInts = GT_Proxy.chunkData.get(tPos);