Cleanup RecipeSchemaStorage, add RecipeNamespace#withExistingParent

Author: MaxNeedsSnacks

src/main/java/dev/latvian/mods/kubejs/recipe/schema/RecipeNamespace.java

@@ -4,6 +4,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.LinkedHashMap;
+import java.util.NoSuchElementException;
 
 public class RecipeNamespace extends LinkedHashMap<String, RecipeSchemaType> {
 	public final RecipeSchemaStorage storage;
@@ -28,15 +29,28 @@ public RecipeNamespace registerBasic(String id, RecipeKey<?>... keys) {
 	}
 
 	public RecipeNamespace shaped(String id) {
-		return register(id, storage.shapedSchema);
+		return withExistingParent(id, ResourceLocation.withDefaultNamespace("shaped"));
 	}
 
 	public RecipeNamespace shapeless(String id) {
-		return register(id, storage.shapelessSchema);
+		return withExistingParent(id, ResourceLocation.withDefaultNamespace("shapeless"));
 	}
 
 	public RecipeNamespace special(String id) {
-		return register(id, storage.specialSchema);
+		return withExistingParent(id, ResourceLocation.withDefaultNamespace("special"));
+	}
+
+	public RecipeNamespace withExistingParent(String id, ResourceLocation parent) {
+		return register(id, storage.namespace(parent.getNamespace()).getRegisteredOrThrow(parent.getPath()).schema);
+	}
+
+	public RecipeSchemaType getRegisteredOrThrow(String id) {
+		var value = get(id);
+		if (value != null) {
+			return value;
+		} else {
+			throw new NoSuchElementException("Required schema %s not found!".formatted(id));
+		}
 	}
 
 	@Override

src/main/java/dev/latvian/mods/kubejs/recipe/schema/RecipeSchemaStorage.java

@@ -29,7 +29,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 public class RecipeSchemaStorage {
 
@@ -59,9 +58,7 @@ public void init(RecipeTypeRegistryContext ctx) {
 	public final Map<String, RecipeNamespace> namespaces;
 	public final Map<String, ResourceLocation> mappings;
 	public final Map<String, RecipeSchemaType> schemaTypes;
-	public RecipeSchema shapedSchema;
-	public RecipeSchema shapelessSchema;
-	public RecipeSchema specialSchema;
+
 	public Codec<RecipeComponent<?>> recipeComponentCodec;
 	public Codec<RecipePostProcessor> recipePostProcessorCodec;
 
@@ -86,9 +83,6 @@ public void fireEvents(RegistryAccessContainer registries, ResourceManager resou
 		namespaces.clear();
 		mappings.clear();
 		schemaTypes.clear();
-		shapedSchema = null;
-		shapelessSchema = null;
-		specialSchema = null;
 
 		var jsonOps = registries.json();
 
@@ -197,10 +191,6 @@ public void fireEvents(RegistryAccessContainer registries, ResourceManager resou
 		var schemaRegistry = new RecipeSchemaRegistry(this);
 		JsonRecipeSchemaLoader.load(rcCtx, jsonOps, schemaRegistry, resourceManager);
 
-		shapedSchema = Objects.requireNonNull(namespace("minecraft").get("shaped").schema);
-		shapelessSchema = Objects.requireNonNull(namespace("minecraft").get("shapeless").schema);
-		specialSchema = Objects.requireNonNull(namespace("minecraft").get("special").schema);
-
 		KubeJSPlugins.forEachPlugin(schemaRegistry, KubeJSPlugin::registerRecipeSchemas);
 		ServerEvents.RECIPE_SCHEMA_REGISTRY.post(ScriptType.SERVER, schemaRegistry);
 	}