No commit message

BinaryReaderDotNet

@@ -8,12 +8,14 @@ import java.nio.ByteOrder;
  * A java class that is capable for parsing .net BinaryWriter encoded files.
  * Some methods are not implemented as I have not need for them. Enjoy!
  * @author robbiev
+ * fork @author jaymarvels
  *
  */
 public class BinaryReaderDotNet extends FilterInputStream {
 
 	public BinaryReaderDotNet(InputStream in) {
 		super(in);
+		setPosition(0);
 	}
 
 	/**
@@ -22,10 +24,12 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	 * @throws IOException
 	 */
 	public int readInt32() throws IOException {
+		incrementPosition(4);
 		return ByteBuffer.wrap(this.readBytes(4))
 				.order(ByteOrder.LITTLE_ENDIAN)
 				.getInt()
 		;
+
 	}
 
 	/**
@@ -34,6 +38,7 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	 * @throws IOException
 	 */
 	public long readUInt32() throws IOException {
+		incrementPosition(4);
 		return this.readInt32() & 0xFFFFFFFFL;
 	}
 
@@ -43,6 +48,7 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	 * @throws IOException
 	 */
 	public int readInt16() throws IOException {
+		incrementPosition(2);
 		return ByteBuffer.wrap(this.readBytes(2))
 				.order(ByteOrder.LITTLE_ENDIAN)
 				.getShort()
@@ -55,15 +61,30 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	 * @throws IOException
 	 */
 	public int readUInt16() throws IOException {
+		incrementPosition(2);
 		return this.readInt16() & 0xFFFF;
 	}
 
+	/**
+	 * Reads a 2-byte signed integer from the current stream and advances the current position of the stream by two bytes. Returns a 32-bit int as there are not 16-bit ints in java.
+	 * @return
+	 * @throws IOException
+	 */
+	public short readShort() throws IOException {
+		incrementPosition(2);
+		return ByteBuffer.wrap(this.readBytes(2))
+				.order(ByteOrder.LITTLE_ENDIAN)
+				.getShort()
+		;
+	}
+
 	/**
 	 * Reads a string from the current stream. The string is prefixed with the length, encoded as an integer seven bits at a time.
 	 * @return
 	 * @throws IOException
 	 */
 	public String readString() throws IOException {
+		incrementPosition(this.getStringLength());
 		return new String(this.readBytes(this.getStringLength()));
     }
 
@@ -73,6 +94,7 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	 * @throws IOException
 	 */
 	public boolean readBoolean() throws IOException {
+		incrementPosition(1);
 		return this.readBytes(1)[0] != 0;
 	}
 
@@ -82,6 +104,7 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	 * @throws IOException
 	 */
 	public float readSingle() throws IOException {
+		incrementPosition(4);
 		return ByteBuffer.wrap(this.readBytes(4))
 				.order(ByteOrder.LITTLE_ENDIAN)
 				.getFloat()
@@ -112,6 +135,20 @@ public class BinaryReaderDotNet extends FilterInputStream {
         }
         return count;
     }
+
+    /**
+     * Read a single byte.
+	 * @return
+	 * @throws IOException
+	 */
+	public byte readByte() throws IOException {
+		incrementPosition(1);
+		return ByteBuffer.wrap(this.readBytes(1))
+				.order(ByteOrder.LITTLE_ENDIAN)
+				.get()
+				;
+	}
+
 
     /**
      * Read an arbitrary number of bytes.
@@ -122,6 +159,25 @@ public class BinaryReaderDotNet extends FilterInputStream {
 	public byte[] readBytes(int length) throws IOException {
 		byte[] bytes = new byte[length];
 		this.read(bytes);
+		incrementPosition(length);
 		return bytes;
 	}
-}
+
+	private void incrementPosition(int increment)
+	{
+		setPosition(getPosition()+ increment);
+	}
+
+	private int position;
+
+	public int getPosition(){
+		return position;
+	}
+	private void setPosition(int position){
+		this.position = position;
+	}
+
+
+
+
+}