1 files changed, 48 insertions, 19 deletions

diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp
index 64b31c60b..dc6b32a44 100644
--- a/src/ByteBuffer.cpp
+++ b/src/ByteBuffer.cpp
@@ -27,7 +27,7 @@
 )
 	#define IS_LITTLE_ENDIAN
 #elif ( \
-	defined (__ARMEB__) || defined(__sparc) \
+	defined (__ARMEB__) || defined(__sparc) || defined(__powerpc__) || defined(__POWERPC__) \
 )
 	#define IS_BIG_ENDIAN
 #else
@@ -267,7 +267,7 @@ size_t cByteBuffer::GetReadableSpace(void) const
 	}
 	// Single readable space partition:
 	ASSERT(m_WritePos >= m_ReadPos);
-	return m_WritePos - m_ReadPos ;
+	return m_WritePos - m_ReadPos;
 }
 
 
@@ -489,6 +489,30 @@ bool cByteBuffer::ReadLEInt(int & a_Value)
 
 
 
+bool cByteBuffer::ReadPosition(int & a_BlockX, int & a_BlockY, int & a_BlockZ)
+{
+	Int64 Value;
+	if (!ReadBEInt64(Value))
+	{
+		return false;
+	}
+
+	// Convert the 64 received bits into 3 coords:
+	UInt32 BlockXRaw = (Value >> 38) & 0x03ffffff;  // Top 26 bits
+	UInt32 BlockYRaw = (Value >> 26) & 0x0fff;      // Middle 12 bits
+	UInt32 BlockZRaw = (Value & 0x03ffffff);        // Bottom 26 bits
+	
+	// If the highest bit in the number's range is set, convert the number into negative:
+	a_BlockX = ((BlockXRaw & 0x02000000) == 0) ? BlockXRaw : -(0x04000000 - (int)BlockXRaw);
+	a_BlockY = ((BlockYRaw & 0x0800) == 0)     ? BlockYRaw : -(0x0800     - (int)BlockYRaw);
+	a_BlockZ = ((BlockZRaw & 0x02000000) == 0) ? BlockZRaw : -(0x04000000 - (int)BlockZRaw);
+	return true;
+}
+
+
+
+
+
 bool cByteBuffer::WriteChar(char a_Value)
 {
 	CHECK_THREAD;
@@ -526,6 +550,19 @@ bool cByteBuffer::WriteBEShort(short a_Value)
 
 
 
+bool cByteBuffer::WriteBEUShort(unsigned short a_Value)
+{
+	CHECK_THREAD;
+	CheckValid();
+	PUTBYTES(2);
+	u_short Converted = htons((u_short)a_Value);
+	return WriteBuf(&Converted, 2);
+}
+
+
+
+
+
 bool cByteBuffer::WriteBEInt(int a_Value)
 {
 	CHECK_THREAD;
@@ -590,23 +627,6 @@ bool cByteBuffer::WriteBool(bool a_Value)
 
 
 
-bool cByteBuffer::WriteBEUTF16String16(const AString & a_Value)
-{
-	CHECK_THREAD;
-	CheckValid();
-	PUTBYTES(2);
-	AString UTF16BE;
-	UTF8ToRawBEUTF16(a_Value.data(), a_Value.size(), UTF16BE);
-	WriteBEShort((short)(UTF16BE.size() / 2));
-	PUTBYTES(UTF16BE.size());
-	WriteBuf(UTF16BE.data(), UTF16BE.size());
-	return true;
-}
-
-
-
-
-
 bool cByteBuffer::WriteVarInt(UInt32 a_Value)
 {
 	CHECK_THREAD;
@@ -661,6 +681,15 @@ bool cByteBuffer::WriteLEInt(int a_Value)
 
 
 
+bool cByteBuffer::WritePosition(int a_BlockX, int a_BlockY, int a_BlockZ)
+{
+	return WriteBEInt64(((Int64)a_BlockX & 0x3FFFFFF) << 38 | ((Int64)a_BlockY & 0xFFF) << 26 | ((Int64)a_BlockZ & 0x3FFFFFF));
+}
+
+
+
+
+
 bool cByteBuffer::ReadBuf(void * a_Buffer, size_t a_Count)
 {
 	CHECK_THREAD;