Improve matching for dynamic Enums

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCBiomeType.java

@@ -55,10 +55,11 @@ public static void build() {
 		ArrayList<Biome> counted = new ArrayList<>();
 		for(MCVanillaBiomeType v : MCVanillaBiomeType.values()) {
 			if(v.existsInCurrent()) {
-				Biome type = getBukkitType(v);
-				if(type == null) {
-					CHLog.GetLogger().e(CHLog.Tags.RUNTIME, "Could not find a matching biome type for " + v.name()
-							+ ". This is an error, please report this to the bug tracker.", Target.UNKNOWN);
+				Biome type;
+				try {
+					type = getBukkitType(v);
+				} catch (IllegalArgumentException | NoSuchFieldError ex) {
+					CHLog.GetLogger().w(CHLog.Tags.RUNTIME, "Could not find a Bukkit BiomeType for " + v.name(), Target.UNKNOWN);
 					continue;
 				}
 				BukkitMCBiomeType wrapper = new BukkitMCBiomeType(v, type);
@@ -146,10 +147,6 @@ private static Biome getBukkitType(MCVanillaBiomeType v) {
 					return Biome.MUTATED_MESA_ROCK;
 			}
 		}
-		try {
-			return Biome.valueOf(v.name());
-		} catch (IllegalArgumentException iae) {
-			return null;
-		}
+		return Biome.valueOf(v.name());
 	}
 }

src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCEntityType.java

@@ -32,10 +32,11 @@ public static void build() {
 		ArrayList<EntityType> counted = new ArrayList<>();
 		for(MCVanillaEntityType v : MCVanillaEntityType.values()) {
 			if(v.existsInCurrent()) {
-				EntityType type = getBukkitType(v);
-				if(type == null) {
-					CHLog.GetLogger().e(CHLog.Tags.RUNTIME, "Could not find a matching entity type for " + v.name()
-							+ ". This is an error, please report this to the bug tracker.", Target.UNKNOWN);
+				EntityType type;
+				try {
+					type = getBukkitType(v);
+				} catch (IllegalArgumentException | NoSuchFieldError ex) {
+					CHLog.GetLogger().w(CHLog.Tags.RUNTIME, "Could not find a Bukkit EntityType for " + v.name(), Target.UNKNOWN);
 					continue;
 				}
 				BukkitMCEntityType wrapper = new BukkitMCEntityType(type, v);
@@ -89,16 +90,12 @@ public static BukkitMCEntityType valueOfConcrete(String test) {
 	}
 
 	// Add exceptions here
-	public static EntityType getBukkitType(MCVanillaEntityType v) {
+	private static EntityType getBukkitType(MCVanillaEntityType v) {
 		switch(v) {
 			case ENDER_EYE:
 				return EntityType.ENDER_SIGNAL;
 		}
-		try {
-			return EntityType.valueOf(v.name());
-		} catch (IllegalArgumentException iae) {
-			return null;
-		}
+		return EntityType.valueOf(v.name());
 	}
 
 	// This is here because it shouldn't be getting changed from API

src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCSound.java

@@ -54,10 +54,11 @@ public static void build() {
 		ArrayList<Sound> counted = new ArrayList<>();
 		for(MCVanillaSound v : MCVanillaSound.values()) {
 			if(v.existsInCurrent()) {
-				Sound sound = getBukkitType(v);
-				if(sound == null) {
-					CHLog.GetLogger().e(CHLog.Tags.RUNTIME, "Could not find a matching sound for " + v.name()
-							+ ". This is an error, please report this to the bug tracker.", Target.UNKNOWN);
+				Sound sound;
+				try {
+					sound = getBukkitType(v);
+				} catch (IllegalArgumentException | NoSuchFieldError ex) {
+					CHLog.GetLogger().w(CHLog.Tags.RUNTIME, "Could not find a Bukkit Sound for " + v.name(), Target.UNKNOWN);
 					continue;
 				}
 				BukkitMCSound wrapper = new BukkitMCSound(v, sound);
@@ -475,10 +476,6 @@ private static Sound getBukkitType(MCVanillaSound v) {
 					return Sound.ENTITY_VILLAGER_YES;
 			}
 		}
-		try {
-			return Sound.valueOf(v.name());
-		} catch (IllegalArgumentException iae) {
-			return null;
-		}
+		return Sound.valueOf(v.name());
 	}
 }