From 6e96bfece7305b971b723f2ce8434807f656fae4 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@inria.fr>
Date: Tue, 9 Jul 2019 01:05:42 +0200
Subject: [PATCH] 1.12 support also

---
 .classpath                                   | 2 +-
 export.jardesc                               | 2 +-
 src/me/cwang/discosheep/BasicDiscoParty.java | 6 +++---
 src/me/cwang/discosheep/PentatonicParty.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.classpath b/.classpath
index ac3eea8..152028f 100644
--- a/.classpath
+++ b/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="resources"/>
-	<classpathentry kind="lib" path="D:/Dropbox/Pandacube/Dev/spigot-1.14.3.jar"/>
+	<classpathentry kind="lib" path="D:/Dropbox/Pandacube/Dev/spigot-1.12.jar"/>
 	<classpathentry kind="lib" path="lib"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/export.jardesc b/export.jardesc
index b8d8b95..5ed4b15 100644
--- a/export.jardesc
+++ b/export.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="DiscoSheep/DiscoSheep.jar"/>
+    <jar path="DiscoSheep/DiscoSheep-2.0-MC1.12.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/DiscoSheep/export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/src/me/cwang/discosheep/BasicDiscoParty.java b/src/me/cwang/discosheep/BasicDiscoParty.java
index ace5dc8..4b83575 100644
--- a/src/me/cwang/discosheep/BasicDiscoParty.java
+++ b/src/me/cwang/discosheep/BasicDiscoParty.java
@@ -212,13 +212,13 @@ public class BasicDiscoParty extends AbstractParty {
      */
     @Override
     protected void playSounds() {
-        partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_BASS, volumeMultiplier * 0.75f, 1.0f);
+        partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BASS, volumeMultiplier * 0.75f, 1.0f);
         if (this.state % 2 == 0) {
-            partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_SNARE, volumeMultiplier * 0.8f, 1.0f);
+            partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_SNARE, volumeMultiplier * 0.8f, 1.0f);
         }
 
         if ((this.state + 1) % 8 == 0) {
-            partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_HAT, volumeMultiplier * 1.0f, 1.0f);
+            partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_HAT, volumeMultiplier * 1.0f, 1.0f);
         }
     }
 
diff --git a/src/me/cwang/discosheep/PentatonicParty.java b/src/me/cwang/discosheep/PentatonicParty.java
index 414f256..65fc566 100644
--- a/src/me/cwang/discosheep/PentatonicParty.java
+++ b/src/me/cwang/discosheep/PentatonicParty.java
@@ -31,6 +31,6 @@ public class PentatonicParty extends DiscoDecorator {
     @Override
     protected void playSounds() {
         super.playSounds();
-        getLocation().getWorld().playSound(getLocation(), Sound.BLOCK_NOTE_BLOCK_HARP, getVolumeMultiplier() * 1.0f, getPentatonicNote());
+        getLocation().getWorld().playSound(getLocation(), Sound.BLOCK_NOTE_HARP, getVolumeMultiplier() * 1.0f, getPentatonicNote());
     }
 }