remove empty.

common/src/main/java/net/infumia/frame/typedkey/TypedKeyStorageFactory.java

@@ -17,7 +17,4 @@ static TypedKeyStorageFactory create() {
 
     @NotNull
     TypedKeyStorageImmutableBuilder createImmutableBuilder(@NotNull Map<TypedKey<?>, Object> base);
-
-    @NotNull
-    TypedKeyStorageImmutable createImmutableEmpty();
 }

common/src/main/java/net/infumia/frame/typedkey/TypedKeyStorageFactoryImpl.java

@@ -27,10 +27,4 @@ public TypedKeyStorageImmutableBuilder createImmutableBuilder(
     ) {
         return new TypedKeyStorageImmutableBuilderImpl(base);
     }
-
-    @NotNull
-    @Override
-    public TypedKeyStorageImmutable createImmutableEmpty() {
-        return TypedKeyStorageImmutableEmpty.INSTANCE;
-    }
 }

common/src/main/java/net/infumia/frame/typedkey/TypedKeyStorageImmutable.java

@@ -16,6 +16,15 @@ public interface TypedKeyStorageImmutable {
     @Nullable
     <T> T getUnchecked(@NotNull String key);
 
+    @NotNull
+    <T> T getOrThrow(@NotNull TypedKey<T> key);
+
+    @NotNull
+    Object getOrThrow(@NotNull String key);
+
+    @NotNull
+    <T> T getUncheckedOrThrow(@NotNull String key);
+
     boolean contains(@NotNull TypedKey<?> key);
 
     @NotNull

common/src/main/java/net/infumia/frame/typedkey/TypedKeyStorageImmutableImpl.java

@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import net.infumia.frame.util.Preconditions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -45,6 +46,24 @@ public <T> T getUnchecked(@NotNull final String key) {
             .orElse(null);
     }
 
+    @NotNull
+    @Override
+    public <T> T getOrThrow(@NotNull final TypedKey<T> key) {
+        return Preconditions.argumentNotNull(this.get(key), "Key '%s' not found!", key);
+    }
+
+    @NotNull
+    @Override
+    public Object getOrThrow(@NotNull final String key) {
+        return Preconditions.argumentNotNull(this.get(key), "Key '%s' not found!", key);
+    }
+
+    @NotNull
+    @Override
+    public <T> T getUncheckedOrThrow(@NotNull final String key) {
+        return Preconditions.argumentNotNull(this.getUnchecked(key), "Key '%s' not found!", key);
+    }
+
     @Override
     public boolean contains(@NotNull final TypedKey<?> key) {
         return this.map.containsKey(key);