Merge pull request #305 from Naomi-alt/master

Update instruments.json from 1.13 onward
PrismarineJS · Jul 6, 2020 · 6e5241d · 6e5241d
2 parents ba77385 + 16daba7
commit 6e5241d
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 30 deletions.
diff --git a/data/pc/1.13.2/instruments.json b/data/pc/1.13.2/instruments.json
@@ -5,23 +5,23 @@
   },
   {
     "id": 1,
-    "name": "doubleBass"
+    "name": "basedrum"
   },
   {
     "id": 2,
-    "name": "snareDrum"
+    "name": "snare"
   },
   {
     "id": 3,
-    "name": "sticks"
+    "name": "hat"
   },
   {
     "id": 4,
-    "name": "bassDrum"
+    "name": "bass"
   },
   {
     "id": 5,
-    "name": "xylophone"
+    "name": "flute"
   },
   {
     "id": 6,
@@ -37,6 +37,6 @@
   },
   {
     "id": 9,
-    "name": "flute"
+    "name": "xylophone"
   }
 ]
diff --git a/data/pc/1.13/instruments.json b/data/pc/1.13/instruments.json
@@ -5,23 +5,23 @@
   },
   {
     "id": 1,
-    "name": "doubleBass"
+    "name": "basedrum"
   },
   {
     "id": 2,
-    "name": "snareDrum"
+    "name": "snare"
   },
   {
     "id": 3,
-    "name": "sticks"
+    "name": "hat"
   },
   {
     "id": 4,
-    "name": "bassDrum"
+    "name": "bass"
   },
   {
     "id": 5,
-    "name": "xylophone"
+    "name": "flute"
   },
   {
     "id": 6,
@@ -37,6 +37,6 @@
   },
   {
     "id": 9,
-    "name": "flute"
+    "name": "xylophone"
   }
 ]
diff --git a/data/pc/1.14.4/instruments.json b/data/pc/1.14.4/instruments.json
@@ -5,23 +5,23 @@
   },
   {
     "id": 1,
-    "name": "doubleBass"
+    "name": "basedrum"
   },
   {
     "id": 2,
-    "name": "snareDrum"
+    "name": "snare"
   },
   {
     "id": 3,
-    "name": "sticks"
+    "name": "hat"
   },
   {
     "id": 4,
-    "name": "bassDrum"
+    "name": "bass"
   },
   {
     "id": 5,
-    "name": "xylophone"
+    "name": "flute"
   },
   {
     "id": 6,
@@ -37,6 +37,6 @@
   },
   {
     "id": 9,
-    "name": "flute"
+    "name": "xylophone"
   }
 ]
diff --git a/data/pc/1.15.2/instruments.json b/data/pc/1.15.2/instruments.json
@@ -5,23 +5,23 @@
   },
   {
     "id": 1,
-    "name": "doubleBass"
+    "name": "basedrum"
   },
   {
     "id": 2,
-    "name": "snareDrum"
+    "name": "snare"
   },
   {
     "id": 3,
-    "name": "sticks"
+    "name": "hat"
   },
   {
     "id": 4,
-    "name": "bassDrum"
+    "name": "bass"
   },
   {
     "id": 5,
-    "name": "xylophone"
+    "name": "flute"
   },
   {
     "id": 6,
@@ -37,6 +37,30 @@
   },
   {
     "id": 9,
-    "name": "flute"
+    "name": "xylophone"
+  },
+  {
+    "id": 10,
+    "name": "iron_xylophone"
+  },
+  {
+    "id": 11,
+    "name": "cow_bell"
+  },
+  {
+    "id": 12,
+    "name": "didgeridoo"
+  },
+  {
+    "id": 13,
+    "name": "bit"
+  },
+  {
+    "id": 14,
+    "name": "banjo"
+  },
+  {
+    "id": 15,
+    "name": "pling"
   }
 ]
diff --git a/data/pc/1.16.1/instruments.json b/data/pc/1.16.1/instruments.json
@@ -5,23 +5,23 @@
   },
   {
     "id": 1,
-    "name": "doubleBass"
+    "name": "basedrum"
   },
   {
     "id": 2,
-    "name": "snareDrum"
+    "name": "snare"
   },
   {
     "id": 3,
-    "name": "sticks"
+    "name": "hat"
   },
   {
     "id": 4,
-    "name": "bassDrum"
+    "name": "bass"
   },
   {
     "id": 5,
-    "name": "xylophone"
+    "name": "flute"
   },
   {
     "id": 6,
@@ -37,6 +37,30 @@
   },
   {
     "id": 9,
-    "name": "flute"
+    "name": "xylophone"
+  },
+  {
+    "id": 10,
+    "name": "iron_xylophone"
+  },
+  {
+    "id": 11,
+    "name": "cow_bell"
+  },
+  {
+    "id": 12,
+    "name": "didgeridoo"
+  },
+  {
+    "id": 13,
+    "name": "bit"
+  },
+  {
+    "id": 14,
+    "name": "banjo"
+  },
+  {
+    "id": 15,
+    "name": "pling"
   }
 ]