Support for OpenNoteBlockStudio 3.7.0 #37

Author: koca2000

src/main/java/com/xxmicloxx/NoteBlockAPI/NBSDecoder.java

@@ -74,7 +74,7 @@ private static Song parse(InputStream inputStream, File songFile) {
 			short songHeight = readShort(dataInputStream);
 			String title = readString(dataInputStream);
 			String author = readString(dataInputStream);
-			readString(dataInputStream);
+			readString(dataInputStream); // original author
 			String description = readString(dataInputStream);
 			float speed = readShort(dataInputStream) / 100f;
 			dataInputStream.readBoolean(); // auto-save
@@ -86,6 +86,11 @@ private static Song parse(InputStream inputStream, File songFile) {
 			readInt(dataInputStream); // blocks added
 			readInt(dataInputStream); // blocks removed
 			readString(dataInputStream); // .mid/.schematic file name
+			if (nbsversion >= 4) {
+				dataInputStream.readByte(); // loop on/off
+				dataInputStream.readByte(); // max loop count
+				readShort(dataInputStream); // loop start tick
+			}
 			short tick = -1;
 			while (true) {
 				short jumpTicks = readShort(dataInputStream); // jumps till next tick
@@ -108,8 +113,17 @@ private static Song parse(InputStream inputStream, File songFile) {
 					if (firstcustominstrumentdiff > 0 && instrument >= firstcustominstrument){
 						instrument += firstcustominstrumentdiff;
 					}
+
+					byte key = dataInputStream.readByte();
+
+					if (nbsversion >= 4) {
+						dataInputStream.readByte(); // note block velocity
+						dataInputStream.readByte(); // note block panning
+						readShort(dataInputStream); // note block pitch
+					}
+
 					setNote(layer, tick, instrument /* instrument */,
-							dataInputStream.readByte() /* note */, layerHashMap);
+							key/* note */, layerHashMap);
 				}
 			}
 
@@ -121,9 +135,13 @@ private static Song parse(InputStream inputStream, File songFile) {
 				Layer layer = layerHashMap.get(i);
 
 				String name = readString(dataInputStream);
+				if (nbsversion >= 4){
+					dataInputStream.readByte(); // layer lock
+				}
+
 				byte volume = dataInputStream.readByte();
 				if (nbsversion >= 2){
-					dataInputStream.readByte();
+					dataInputStream.readByte(); // layer stereo
 				}
 				if (layer != null) {
 					layer.setName(name);

src/main/java/com/xxmicloxx/NoteBlockAPI/utils/NBSDecoder.java

@@ -77,7 +77,7 @@ private static Song parse(InputStream inputStream, File songFile) {
 			short songHeight = readShort(dataInputStream);
 			String title = readString(dataInputStream);
 			String author = readString(dataInputStream);
-			readString(dataInputStream);
+			readString(dataInputStream); // original author
 			String description = readString(dataInputStream);
 			float speed = readShort(dataInputStream) / 100f;
 			dataInputStream.readBoolean(); // auto-save
@@ -89,6 +89,11 @@ private static Song parse(InputStream inputStream, File songFile) {
 			readInt(dataInputStream); // blocks added
 			readInt(dataInputStream); // blocks removed
 			readString(dataInputStream); // .mid/.schematic file name
+			if (nbsversion >= 4) {
+				dataInputStream.readByte(); // loop on/off
+				dataInputStream.readByte(); // max loop count
+				readShort(dataInputStream); // loop start tick
+			}
 			short tick = -1;
 			while (true) {
 				short jumpTicks = readShort(dataInputStream); // jumps till next tick
@@ -111,8 +116,17 @@ private static Song parse(InputStream inputStream, File songFile) {
 					if (firstcustominstrumentdiff > 0 && instrument >= firstcustominstrument){
 						instrument += firstcustominstrumentdiff;
 					}
+
+					byte key = dataInputStream.readByte();
+
+					if (nbsversion >= 4) {
+						dataInputStream.readByte(); // note block velocity
+						dataInputStream.readByte(); // note block panning
+						readShort(dataInputStream); // note block pitch
+					}
+
 					setNote(layer, tick, instrument /* instrument */, 
-							dataInputStream.readByte() /* note */, layerHashMap);
+							 key/* note */, layerHashMap);
 				}
 			}
 
@@ -124,9 +138,13 @@ private static Song parse(InputStream inputStream, File songFile) {
 				Layer layer = layerHashMap.get(i);
 
 				String name = readString(dataInputStream);
+				if (nbsversion >= 4){
+					dataInputStream.readByte(); // layer lock
+				}
+
 				byte volume = dataInputStream.readByte();
-				if (nbsversion >= 2){//layerstereo
-					dataInputStream.readByte();
+				if (nbsversion >= 2){
+					dataInputStream.readByte(); // layer stereo
 				}
 				if (layer != null) {
 					layer.setName(name);