1 files changed, 22 insertions, 14 deletions

diff --git a/src/main/java/gregtech/api/net/GT_Packet_Sound.java b/src/main/java/gregtech/api/net/GT_Packet_Sound.java
index 5490d0d390..be66400609 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Sound.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_Sound.java
@@ -1,12 +1,16 @@
 package gregtech.api.net;
 
 import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
+import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
 import net.minecraft.world.IBlockAccess;
 
-public class GT_Packet_Sound extends GT_Packet {
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class GT_Packet_Sound extends GT_Packet_New {
     private int mX, mZ;
     private short mY;
     private String mSoundName;
@@ -27,19 +31,23 @@ public class GT_Packet_Sound extends GT_Packet {
     }
 
     @Override
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(10);
-        tOut.writeUTF(mSoundName);
-        tOut.writeFloat(mSoundStrength);
-        tOut.writeFloat(mSoundPitch);
-        tOut.writeInt(mX);
-        tOut.writeShort(mY);
-        tOut.writeInt(mZ);
-        return tOut.toByteArray();
+    public void encode(ByteBuf aOut) {
+        DataOutput tOut = new ByteBufOutputStream(aOut);
+        try {
+            tOut.writeUTF(mSoundName);
+            tOut.writeFloat(mSoundStrength);
+            tOut.writeFloat(mSoundPitch);
+            tOut.writeInt(mX);
+            tOut.writeShort(mY);
+            tOut.writeInt(mZ);
+        } catch (IOException e) {
+            // this really shouldn't happen, but whatever
+            e.printStackTrace(GT_Log.err);
+        }
     }
 
     @Override
-    public GT_Packet decode(ByteArrayDataInput aData) {
+    public GT_Packet_New decode(ByteArrayDataInput aData) {
         return new GT_Packet_Sound(aData.readUTF(), aData.readFloat(), aData.readFloat(), aData.readInt(), aData.readShort(), aData.readInt());
     }
 
@@ -52,4 +60,4 @@ public class GT_Packet_Sound extends GT_Packet {
     public byte getPacketID() {
         return 1;
     }
-}
\ No newline at end of file
+}