Added compatibility for 1.12 instruments on 1.8 - 1.11 servers via resource pack.

Fixed issue #4

Author: koca2000

Instruments-1-12.zip

@@ -6,7 +6,7 @@
 
     <groupId>com.xxmicloxx</groupId>
     <artifactId>NoteBlockAPI</artifactId>
-    <version>1.1.9</version>
+    <version>1.2.0</version>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>

pom.xml

@@ -2,6 +2,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -111,4 +112,14 @@ public static void playSound(Player p, Location location, Sound sound, SoundCate
 			e.printStackTrace();
 		}
 	}
+	
+	public static ArrayList<CustomInstrument> get1_12Instruments(){
+		ArrayList<CustomInstrument> instruments = new ArrayList<>();
+		instruments.add(new CustomInstrument((byte) 0, "Guitar", "guitar.ogg", (byte) 0, (byte) 0));
+		instruments.add(new CustomInstrument((byte) 0, "Flute", "flute.ogg", (byte) 0, (byte) 0));
+		instruments.add(new CustomInstrument((byte) 0, "Bell", "bell.ogg", (byte) 0, (byte) 0));
+		instruments.add(new CustomInstrument((byte) 0, "Chime", "icechime.ogg", (byte) 0, (byte) 0));
+		instruments.add(new CustomInstrument((byte) 0, "Xylophone", "xylobone.ogg", (byte) 0, (byte) 0));
+		return instruments;
+	}
 }

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

@@ -7,6 +7,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 
 import org.bukkit.Bukkit;
@@ -29,6 +31,7 @@ public static Song parse(InputStream inputStream) {
 
     private static Song parse(InputStream inputStream, File decodeFile) {
         HashMap<Integer, Layer> layerHashMap = new HashMap<Integer, Layer>();
+        byte biggestInstrumentIndex = -1;
         try {
             DataInputStream dis = new DataInputStream(inputStream);
             short length = readShort(dis);
@@ -64,7 +67,11 @@ private static Song parse(InputStream inputStream, File decodeFile) {
                     }
                     layer += jumpLayers;
                     //System.out.println("Layer: " + layer);
-                    setNote(layer, tick, dis.readByte() /* instrument */, dis.readByte() /* note */, layerHashMap);
+                    byte instrument = dis.readByte();
+                    if (instrument > biggestInstrumentIndex){
+                    	biggestInstrumentIndex = instrument;
+                    }
+                    setNote(layer, tick, instrument /* instrument */, dis.readByte() /* note */, layerHashMap);
                 }
             }
             for (int i = 0; i < songHeight; i++) {
@@ -84,6 +91,13 @@ private static Song parse(InputStream inputStream, File decodeFile) {
             for (int i = 0; i < custom; i++) {
                 customInstruments[i] = new CustomInstrument((byte)i, readString(dis), readString(dis), dis.readByte(), dis.readByte());
             }
+            
+            if (Instrument.isCustomInstrument((byte) (biggestInstrumentIndex - custom))){
+            	ArrayList<CustomInstrument> ci = CompatibilityUtils.get1_12Instruments();
+            	ci.addAll(Arrays.asList(customInstruments));
+            	customInstruments = ci.toArray(customInstruments);
+            }
+            
             return new Song(speed, layerHashMap, songHeight, length, title, author, description, decodeFile, customInstruments);
         } catch (FileNotFoundException e) {
             e.printStackTrace();

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

@@ -1,7 +1,7 @@
 name: NoteBlockAPI
 
 main: com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain
-version: 1.1.9
+version: 1.2.0
 
 description: a developer interface to play nbs-files ingame
 authors: [xxmicloxx, michidk, koca2000, Luck]