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

Add Dimension BlackList

Browse source 
Add Other Dimension Oil Generating
Save Amount for Other Dimension
This commit is contained in:
Maxime Legkiy 2017-02-07 04:44:35 +03:00
parent 00834b6c4b
commit 2d3310718a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1525,11 +1525,14 @@ public class GT_Utility {
public static boolean getUndergroundOilSpawns(int aDimensionId) { public static boolean getUndergroundOilSpawns(int aDimensionId) {
if (Math.abs(aDimensionId)==1) return false; //If Nether or End... //Black list
if (DimensionManager.getProvider(aDimensionId).getClass().getName().contains("net.minecraft.world.WorldProviderHell")) return false;
if (DimensionManager.getProvider(aDimensionId).getClass().getName().contains("net.minecraft.world.WorldProviderEnd")) return false;
//Use settings
if (GT_Mod.gregtechproxy.mUndergroundOilOverworld && aDimensionId==0) return true; //Overworld if (GT_Mod.gregtechproxy.mUndergroundOilOverworld && aDimensionId==0) return true; //Overworld
if (GT_Mod.gregtechproxy.mUndergroundOilInRealDimension && isRealDimension(aDimensionId)) return true; //Other real world if (GT_Mod.gregtechproxy.mUndergroundOilInRealDimension && isRealDimension(aDimensionId)) return true; //Other real world
return false; //If other planets... return false; //If other planets...
} }
@ -1543,7 +1546,7 @@ public class GT_Utility {
if (!getUndergroundOilSpawns(aWorld.provider.dimensionId)) if (!getUndergroundOilSpawns(aWorld.provider.dimensionId))
return null; return null;
Random tRandom = new Random((aWorld.getSeed() + (getScaleСoordinates(aX,96)) + (7 * (getScaleСoordinates(aZ,96))))); Random tRandom = new Random((aWorld.getSeed() + aWorld.provider.dimensionId * 2 + (getScaleСoordinates(aX,96)) + (7 * (getScaleСoordinates(aZ,96)))));
int oil = tRandom.nextInt(3); int oil = tRandom.nextInt(3);
double amount = tRandom.nextInt(GT_Mod.gregtechproxy.mUndergroundOilMaxAmount) + tRandom.nextDouble(); double amount = tRandom.nextInt(GT_Mod.gregtechproxy.mUndergroundOilMaxAmount) + tRandom.nextDouble();
oil = tRandom.nextInt(4); oil = tRandom.nextInt(4);
@ -1567,7 +1570,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(getScaleСoordinates(aX,16), 1, getScaleСoordinates(aZ,16)); ChunkPosition tPos = new ChunkPosition(getScaleСoordinates(aX,16), aWorld.provider.dimensionId+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);