From 3f7d824e734ff215ec90e1dbbdaa8c36d26bfb9c Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Thu, 26 Nov 2020 18:36:30 +1300
Subject: [PATCH] Revert

---
 .../reflection/ReflectionManager.java         | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
index 1769b8ad..59fe2b11 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
@@ -74,8 +74,7 @@ public class ReflectionManager {
     private static Enum[] enumGamemode;
     private static Method getNmsEntityMethod;
     private static Enum[] enumItemSlots;
-    private static Enum[] craftSounds;
-    private static Field craftSound;
+    private static Method soundGetMethod;
     private static Constructor vector3FConstructor;
     private static Method enumDirectionFrom;
     private static Constructor villagerDataConstructor;
@@ -138,9 +137,7 @@ public class ReflectionManager {
             enumGamemode = (Enum[]) getNmsClass("EnumGamemode").getEnumConstants();
             getNmsEntityMethod = getCraftMethod("entity.CraftEntity", "getHandle");
             enumItemSlots = (Enum[]) getNmsClass("EnumItemSlot").getEnumConstants();
-            craftSounds = (Enum[]) getCraftClass("CraftSound").getEnumConstants();
-            craftSound =  getCraftClass("CraftSound").getDeclaredField("minecraftKey");
-            craftSound.setAccessible(true);
+            soundGetMethod = getCraftMethod("CraftSound", "getSound", Sound.class);
             vector3FConstructor = getNmsConstructor("Vector3f", float.class, float.class, float.class);
             enumDirectionFrom = getNmsMethod("EnumDirection", "fromType1", int.class);
             getBlockData = getNmsMethod(getNmsClass("Block"), "getBlockData");
@@ -1060,15 +1057,9 @@ public class ReflectionManager {
 
     public static Object getSoundString(Sound sound) {
         try {
-            for (Enum e : craftSounds) {
-                if (!e.name().equals(sound.name())) {
-                    continue;
-                }
-
-                return craftSound.get(e);
-            }
-        } catch (IllegalAccessException illegalAccessException) {
-            illegalAccessException.printStackTrace();
+            return soundGetMethod.invoke(null, sound);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
         }
 
         return null;