From aee55e8dff9b6827ee2190510694f6cdd9739cc5 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Tue, 28 Jul 2020 02:34:36 -0500 Subject: [PATCH] Add EnumObject::getOrThrow Saves calls to Object::requireNonNull. If nullable is allowed, use get as before --- .../mantle/registration/object/EnumObject.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/slimeknights/mantle/registration/object/EnumObject.java b/src/main/java/slimeknights/mantle/registration/object/EnumObject.java index 0ca3497..e6e96e8 100644 --- a/src/main/java/slimeknights/mantle/registration/object/EnumObject.java +++ b/src/main/java/slimeknights/mantle/registration/object/EnumObject.java @@ -10,6 +10,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; import java.util.function.BiConsumer; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -53,6 +54,20 @@ public class EnumObject, I extends IForgeRegistryEntry supplier = map.get(value); + if (supplier == null) { + throw new NoSuchElementException("Missing key " + value); + } + return supplier.get(); + } + /** * Checks if this enum object contains the given value * @param value Value to check for