Merge branch 'unstable' into advminer2_improvements

1 files changed, 96 insertions, 79 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index f3013a767e..642fc5d9a4 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -53,10 +53,13 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
+import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -73,6 +76,9 @@ import java.util.*;
 import java.util.Map.Entry;
 
 import static gregtech.api.enums.GT_Values.*;
+import static gregtech.common.GT_Proxy.GTPOLLUTION;
+import static gregtech.common.GT_Proxy.dimensionWiseChunkData;
+import static gregtech.common.GT_UndergroundOil.undergroundOil;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -95,6 +101,14 @@ public class GT_Utility {
         GregTech_API.sItemStackMappings.add(sFilledContainerToData);
         GregTech_API.sItemStackMappings.add(sEmptyContainerToFluidToData);
     }
+    
+    public static int safeInt(long number, int margin){
+        return number>Integer.MAX_VALUE-margin ? Integer.MAX_VALUE-margin :(int)number;
+    }
+
+    public static int safeInt(long number){
+        return number>GT_Values.V[GT_Values.V.length-1] ? safeInt(GT_Values.V[GT_Values.V.length-1],1) : number<Integer.MIN_VALUE ? Integer.MIN_VALUE : (int)number;
+}
 
     public static Field getPublicField(Object aObject, String aField) {
         Field rField = null;
@@ -1531,70 +1545,70 @@ public class GT_Utility {
     	return (int)Math.floor(aValue / aScale);
     }
 
-    public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ) {
-    	return getUndergroundOil(aWorld, aX, aZ, false);
-    }
-
-    public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ, boolean needConsumeOil) {
-
-    	if (GT_Mod.gregtechproxy.mUndergroundOil.CheckBlackList(aWorld.provider.dimensionId))
-    		return null;
-
-        Random tRandom = new Random((aWorld.getSeed() + aWorld.provider.dimensionId * 2 + (getScaleCoordinates(aX,96)) + (7 * (getScaleCoordinates(aZ,96)))));
-        int tAmount = 0;
-        int tFluidId = 0;
-        int tDecreasePerOperationAmount = 5;
-        Fluid tFluid = null;
-//        System.out.println("Dimension: "+GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(aWorld.provider.dimensionId).Dimension);
-        try {
-            GT_UO_Fluid uoFluid = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(aWorld.provider.dimensionId).getRandomFluid(tRandom);
-            if (uoFluid != null)
-            {
-            	tFluid = uoFluid.getFluid();
-            	tAmount = uoFluid.getRandomAmount(tRandom);
-            	tDecreasePerOperationAmount = uoFluid.DecreasePerOperationAmount;
-            	if (tFluid != null)
-            		tFluidId = tFluid.getID();
-                //System.out.println("Fluid: ("+tFluidId+")"+tFluid.getName()+" Amount:"+tAmount);
-            }
-			
-		} catch (Exception e) {
-	        tAmount = 0;
-	        tFluidId = 0;
-		}
-
-        try {
-        ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16));
-        int[] tInts = new int[3];
-    	if(GT_Proxy.chunkData.containsKey(tPos)){
-    		tInts = GT_Proxy.chunkData.get(tPos);
-    		if(tInts.length>0){
-    			if(tInts[0]>0){tAmount = tInts[0];}
-    		}
-    		if(tInts.length>2){
-    			if(tInts[2]>0&&tInts[2]!=tFluidId)
-    			{
-    				tFluidId = tInts[2];
-    				tFluid = FluidRegistry.getFluid(tFluidId);
-    			}
-    		}
-    		GT_Proxy.chunkData.remove(tPos);
-    	}
-
-    	if (needConsumeOil && tAmount >= 5000)
-    		tAmount = tAmount - tDecreasePerOperationAmount;
-
-    	tInts[0] = tAmount;
-    	tInts[2] = tFluidId;
-    	GT_Proxy.chunkData.put(tPos, tInts);
-		} catch (Exception e) {
-			System.out.println("getUndergroundOil() - Error put data");
-		}
-    	if (tFluid!=null)
-    		return new FluidStack(tFluid, tAmount);
-    	return null;
-    }
-
+//    public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ) {
+//    	return getUndergroundOil(aWorld, aX, aZ, false);
+//    }
+//
+//    public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ, boolean needConsumeOil) {
+//
+//    	if (GT_Mod.gregtechproxy.mUndergroundOil.CheckBlackList(aWorld.provider.dimensionId))
+//    		return null;
+//
+//        Random tRandom = new Random((aWorld.getSeed() + aWorld.provider.dimensionId * 2 + (getScaleCoordinates(aX,96)) + (7 * (getScaleCoordinates(aZ,96)))));
+//        int tAmount = 0;
+//        int tFluidId = 0;
+//        int tDecreasePerOperationAmount = 5;
+//        Fluid tFluid = null;
+////        System.out.println("Dimension: "+GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(aWorld.provider.dimensionId).Dimension);
+//        try {
+//            GT_UO_Fluid uoFluid = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(aWorld.provider.dimensionId).getRandomFluid(tRandom);
+//            if (uoFluid != null)
+//            {
+//            	tFluid = uoFluid.getFluid();
+//            	tAmount = uoFluid.getRandomAmount(tRandom);
+//            	tDecreasePerOperationAmount = uoFluid.DecreasePerOperationAmount;
+//            	if (tFluid != null)
+//            		tFluidId = tFluid.getID();
+//                //System.out.println("Fluid: ("+tFluidId+")"+tFluid.getName()+" Amount:"+tAmount);
+//            }
+//			
+//		} catch (Exception e) {
+//	        tAmount = 0;
+//	        tFluidId = 0;
+//		}
+//
+//        try {
+//        ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16));
+//        int[] tInts = new int[3];
+//    	if(GT_Proxy.chunkData.containsKey(tPos)){
+//    		tInts = GT_Proxy.chunkData.get(tPos);
+//    		if(tInts.length>0){
+//    			if(tInts[0]>0){tAmount = tInts[0];}
+//    		}
+//    		if(tInts.length>2){
+//    			if(tInts[2]>0&&tInts[2]!=tFluidId)
+//    			{
+//    				tFluidId = tInts[2];
+//    				tFluid = FluidRegistry.getFluid(tFluidId);
+//    			}
+//    		}
+//    		GT_Proxy.chunkData.remove(tPos);
+//    	}
+//
+//    	if (needConsumeOil && tAmount >= 5000)
+//    		tAmount = tAmount - tDecreasePerOperationAmount;
+//
+//    	tInts[0] = tAmount;
+//    	tInts[2] = tFluidId;
+//    	GT_Proxy.chunkData.put(tPos, tInts);
+//		} catch (Exception e) {
+//			System.out.println("getUndergroundOil() - Error put data");
+//		}
+//    	if (tFluid!=null)
+//    		return new FluidStack(tFluid, tAmount);
+//    	return null;
+//    }
+    
     public static int getCoordinateScan(ArrayList<String> aList, EntityPlayer aPlayer, World aWorld, int aScanLevel, int aX, int aY, int aZ, int aSide, float aClickX, float aClickY, float aClickZ) {
         if (aList == null) return 0;
 
@@ -1783,22 +1797,25 @@ public class GT_Utility {
                 if (D1) e.printStackTrace(GT_Log.err);
             }
         }
-        if (aPlayer.capabilities.isCreativeMode&&GT_Values.D1) {
-            FluidStack tFluid = getUndergroundOil(aWorld, aX, aZ);
+        
+        if (aPlayer.capabilities.isCreativeMode && GT_Values.D1) {
+            FluidStack tFluid = undergroundOil(aWorld.getChunkFromBlockCoords(aX,aZ),-1);//-# to only read
             if (tFluid!=null)
-            	tList.add("Oil in Chunk: " + tFluid.amount + " " + tFluid.getLocalizedName());
-        }
-//        if(aPlayer.capabilities.isCreativeMode){
-        	ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16));
-        	if(GT_Proxy.chunkData.containsKey(tPos)){
-        		int[] tPollution = GT_Proxy.chunkData.get(tPos);
-        		if(tPollution.length>1){
-        		tList.add("Pollution in Chunk: "+tPollution[1]);
-        		}else{
-        			tList.add("No Pollution in Chunk");
-        		}
-        	}
-//        }
+            	tList.add(EnumChatFormatting.GOLD+tFluid.getLocalizedName()+EnumChatFormatting.RESET+": " +EnumChatFormatting.YELLOW+ tFluid.amount +EnumChatFormatting.RESET+" L");
+            else
+                tList.add(EnumChatFormatting.GOLD+"Nothing"+EnumChatFormatting.RESET+": " +EnumChatFormatting.YELLOW+ '0' +EnumChatFormatting.RESET+" L");
+        }
+//      if(aPlayer.capabilities.isCreativeMode){
+        int[] chunkData = GT_Proxy.dimensionWiseChunkData.get(aWorld.provider.dimensionId).get(aWorld.getChunkFromBlockCoords(aX,aZ).getChunkCoordIntPair());
+        if(chunkData !=null){
+            if(chunkData[GTPOLLUTION]>0){
+                tList.add("Pollution in Chunk: "+EnumChatFormatting.RED+chunkData[GTPOLLUTION]+EnumChatFormatting.RESET+" gibbl");
+            }else{
+                tList.add(EnumChatFormatting.GREEN+"No Pollution in Chunk! HAYO!"+EnumChatFormatting.RESET);
+            }
+        }else{
+            tList.add(EnumChatFormatting.GREEN+"No Pollution in Chunk! HAYO!"+EnumChatFormatting.RESET);
+}
 
         try {
             if (tBlock instanceof IDebugableBlock) {