Merge pull request #2 from GTNewHorizons/experimental

5.09.33.57

1 files changed, 20 insertions, 11 deletions

diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
index 2c67d74150..7f717c1a47 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
@@ -1,38 +1,47 @@
 package gregtech.api.net;
 
 import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import gregtech.common.GT_Pollution;
+import gregtech.common.GT_Client;
+import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.IBlockAccess;
 
+import java.nio.ByteBuffer;
+
 public class GT_Packet_Pollution extends GT_Packet {
-    private int mPollution;
+    private ChunkCoordIntPair chunk;
+    private int pollution;
 
     public GT_Packet_Pollution() {
         super(true);
     }
 
-    public GT_Packet_Pollution(int aPollution) {
+    public GT_Packet_Pollution(ChunkCoordIntPair chunk, int pollution) {
         super(false);
-        mPollution = aPollution;
+        this.chunk = chunk;
+        this.pollution = pollution;
     }
 
     @Override
     public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(4);
-        tOut.writeInt(mPollution);
-        return tOut.toByteArray();
+        return ByteBuffer
+                .allocate(12)
+                .putInt(chunk.chunkXPos)
+                .putInt(chunk.chunkZPos)
+                .putInt(pollution)
+                .array();
     }
 
     @Override
     public GT_Packet decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Pollution(aData.readInt());
+        return new GT_Packet_Pollution(
+                new ChunkCoordIntPair(aData.readInt(), aData.readInt()),
+                aData.readInt()
+        );
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
-    	GT_Pollution.mPlayerPollution = mPollution;
+        GT_Client.recieveChunkPollutionPacket(chunk, pollution);
     }
 
     @Override