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

Some number tweaks.

Browse source
This commit is contained in:
Technus 2016-11-01 00:24:28 +01:00
parent 8155db316e
commit 02cbc57444
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1531,8 +1531,8 @@ public class GT_Utility {
if(GT_Proxy.chunkData.containsKey(tPos)){ if(GT_Proxy.chunkData.containsKey(tPos)){
tInts = GT_Proxy.chunkData.get(tPos); tInts = GT_Proxy.chunkData.get(tPos);
if(tInts.length>0){ if(tInts.length>0){
int type=tInts[0]>>24; int type=tInts[0]>>27;
int amnt=tInts[0]-(type<<24)-sub; int amnt=tInts[0]-(type<<27)-sub;
if(type==0){//update old thing //IGNORES SAVE - chunk must be updated if(type==0){//update old thing //IGNORES SAVE - chunk must be updated
//here i don't care about type it will be added //here i don't care about type it will be added
if(amnt<=0) tInts[0] = 0; if(amnt<=0) tInts[0] = 0;
@ -1540,8 +1540,8 @@ public class GT_Utility {
return setUndergroundOilFromOld(aWorld,aX,aZ,tPos,tInts);//compatibility thing return setUndergroundOilFromOld(aWorld,aX,aZ,tPos,tInts);//compatibility thing
} }
if(save){//obvious? if(save){//obvious?
if(amnt<=0) tInts[0] = type << 24; if(amnt<=0) tInts[0] = type << 27;
else tInts[0] = (type << 24) + amnt; else tInts[0] = (type << 27) + amnt;
GT_Proxy.chunkData.remove(tPos); GT_Proxy.chunkData.remove(tPos);
GT_Proxy.chunkData.put(tPos, tInts); GT_Proxy.chunkData.put(tPos, tInts);
} }
@ -1569,10 +1569,8 @@ public class GT_Utility {
private static FluidStack setUndergroundOil(World aWorld, int aX, int aZ,ChunkPosition tPos,int[] tInts) { private static FluidStack setUndergroundOil(World aWorld, int aX, int aZ,ChunkPosition tPos,int[] tInts) {
XSTR tRandom = new XSTR((aWorld.getSeed() + (aX / 6) + (7 * (aZ / 6)))); XSTR tRandom = new XSTR((aWorld.getSeed() + (aX / 6) + (7 * (aZ / 6))));
int type=tRandom.nextInt(5);//type slowly changes int type=tRandom.nextInt(5);//type slowly changes
int amnt=tRandom.nextInt(50);//Big value slowly changes int amnt = (int) (Math.pow(2+tRandom.nextInt(48)+(new XSTR()).nextDouble(), 5))>>5;// /32 upped a bit
tRandom = new XSTR();//small value is rapid changing,hence regen the seed from time //max is 51^5/32 roughly uses 24 bits
amnt = (int) (Math.pow(amnt+tRandom.nextDouble(), 5) / 100);
//max is 51^5/100 roughly uses 22 bits
FluidStack tFluidStack; FluidStack tFluidStack;
switch (type) {//0 is old system switch (type) {//0 is old system
case 1: case 1:
@ -1592,12 +1590,13 @@ public class GT_Utility {
tFluidStack=new FluidStack(Materials.NatruralGas.mGas,amnt);//5 tFluidStack=new FluidStack(Materials.NatruralGas.mGas,amnt);//5
} }
tInts[0]=(type<<24)+amnt; tInts[0]=(type<<27)+amnt;//here since the switch changes type
GT_Proxy.chunkData.put(tPos, tInts); GT_Proxy.chunkData.put(tPos, tInts);
return tFluidStack; return tFluidStack;
} }
private static FluidStack setUndergroundOilFromOld(World aWorld, int aX, int aZ,ChunkPosition tPos,int[] tInts) { private static FluidStack setUndergroundOilFromOld(World aWorld, int aX, int aZ,ChunkPosition tPos,int[] tInts) {
//max was 51^5/100 roughly uses 22 bits
FluidStack tFluidStack; FluidStack tFluidStack;
int type=new Random((aWorld.getSeed() + (aX / 6) + (7 * (aZ / 6)))).nextInt(4);//Get old type of fluid int type=new Random((aWorld.getSeed() + (aX / 6) + (7 * (aZ / 6)))).nextInt(4);//Get old type of fluid
//this gives value from 0 to 3 :D //this gives value from 0 to 3 :D
@ -1619,7 +1618,7 @@ public class GT_Utility {
type=4; type=4;
tFluidStack = new FluidStack(Materials.Oil.mFluid,tInts[0]); tFluidStack = new FluidStack(Materials.Oil.mFluid,tInts[0]);
} }
tInts[0]+=type<<24; tInts[0]+=type<<27;
GT_Proxy.chunkData.remove(tPos); GT_Proxy.chunkData.remove(tPos);
GT_Proxy.chunkData.put(tPos, tInts); GT_Proxy.chunkData.put(tPos, tInts);
return tFluidStack; return tFluidStack;