Back ProcessingRecipe#validate with Codec#validate

Author: RaymondBlaze

src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java

@@ -2,31 +2,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import com.google.common.base.Joiner;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.MapCodec;
 
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import com.simibubi.create.foundation.codec.ResourceLocationAwareOps;
-
-import net.minecraft.util.ExtraCodecs;
-
-import org.slf4j.Logger;
-
-import com.simibubi.create.Create;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.Recipe;
@@ -89,40 +79,37 @@ protected int getMaxFluidOutputCount() {
 		return 0;
 	}
 
-	//TODO: Recipe id is no longer avcailable on construct,
-	// 		validation should be called in a reload listener after RecipeManager if needed,
-	//		currently only validates recipes created from builder for datagen
-	public void validate(ResourceLocation id) {
-		Logger logger = Create.LOGGER;
-		String messageHeader = "Your custom " + typeInfo.getId() + " recipe (" + id + ")";
+	public List<String> validate() {
+		List<String> errors = new ArrayList<>();
 		int ingredientCount = ingredients.size();
 		int outputCount = results.size();
 
 		if (ingredientCount > getMaxInputCount())
-			logger.warn(messageHeader + " has more item inputs (" + ingredientCount + ") than supported ("
+			errors.add("Recipe has more item inputs (" + ingredientCount + ") than supported ("
 				+ getMaxInputCount() + ").");
 
 		if (outputCount > getMaxOutputCount())
-			logger.warn(messageHeader + " has more item outputs (" + outputCount + ") than supported ("
+			errors.add("Recipe has more item outputs (" + outputCount + ") than supported ("
 				+ getMaxOutputCount() + ").");
 
 		ingredientCount = fluidIngredients.size();
 		outputCount = fluidResults.size();
 
 		if (ingredientCount > getMaxFluidInputCount())
-			logger.warn(messageHeader + " has more fluid inputs (" + ingredientCount + ") than supported ("
+			errors.add("Recipe has more fluid inputs (" + ingredientCount + ") than supported ("
 						+ getMaxFluidInputCount() + ").");
 
 		if (outputCount > getMaxFluidOutputCount())
-			logger.warn(messageHeader + " has more fluid outputs (" + outputCount + ") than supported ("
+			errors.add("Recipe has more fluid outputs (" + outputCount + ") than supported ("
 						+ getMaxFluidOutputCount() + ").");
 
 		if (processingDuration > 0 && !canSpecifyDuration())
-			logger.warn(messageHeader + " specified a duration. Durations have no impact on this type of recipe.");
+			errors.add("Recipe specified a duration. Durations have no impact on this type of recipe.");
 
 		if (requiredHeat != HeatCondition.NONE && !canRequireHeat())
-			logger.warn(
-				messageHeader + " specified a heat condition. Heat conditions have no impact on this type of recipe.");
+			errors.add("Recipe specified a heat condition. Heat conditions have no impact on this type of recipe.");
+
+		return errors;
 	}
 
 	public P getParams() {
@@ -226,16 +213,14 @@ public IRecipeTypeInfo getTypeInfo() {
 	public static <P extends ProcessingRecipeParams, R extends ProcessingRecipe<?, P>> MapCodec<R> codec(
 		Factory<P, R> factory, MapCodec<P> paramsCodec
 	) {
-		return RecordCodecBuilder.mapCodec(instance -> instance.group(
-			paramsCodec.xmap(factory::create, recipe -> recipe.getParams()).forGetter(Function.identity()),
-			ExtraCodecs.retrieveContext(ops -> ops instanceof ResourceLocationAwareOps awareOps
-				? DataResult.success(Optional.ofNullable(awareOps.getResourceLocation()))
-				: DataResult.success(Optional.<ResourceLocation>empty())
-			).forGetter(recipe -> Optional.empty())
-		).apply(instance, (recipe, id) -> {
-			id.ifPresent(recipe::validate);
-			return recipe;
-		}));
+		return paramsCodec.xmap(factory::create, recipe -> recipe.getParams())
+			.validate(recipe -> {
+				var errors = recipe.validate();
+				if (errors.isEmpty())
+					return DataResult.success(recipe);
+				errors.add(recipe.getClass().getSimpleName() + " failed validation:");
+				return DataResult.error(() -> Joiner.on('\n').join(errors), recipe);
+			});
 	}
 
 	@FunctionalInterface

src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java

@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.base.Joiner;
+import com.simibubi.create.Create;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipe.Factory;
 import com.simibubi.create.foundation.data.SimpleDatagenIngredient;
 import com.simibubi.create.foundation.data.recipe.Mods;
@@ -106,7 +108,11 @@ public void build(RecipeOutput consumer) {
 		IRecipeTypeInfo recipeType = recipe.getTypeInfo();
 		ResourceLocation typeId = recipeType.getId();
 		ResourceLocation id = recipeId.withPrefix(typeId.getPath() + "/");
-		recipe.validate(id);
+		var errors = recipe.validate();
+		if (!errors.isEmpty()) {
+			errors.add(recipe.getClass().getSimpleName() + "with id " + id + " failed validation:");
+			Create.LOGGER.warn(Joiner.on('\n').join(errors));
+		}
 		consumer.accept(id, recipe, null, recipeConditions.toArray(new ICondition[0]));
 	}
 
@@ -130,11 +136,6 @@ public S require(Mods mod, String id) {
 		return self();
 	}
 
-	public S require(ResourceLocation ingredient) {
-		params.ingredients.add(DataIngredient.ingredient(null, ingredient).toVanilla());
-		return self();
-	}
-
 	public S require(Fluid fluid, int amount) {
 		return require(FluidIngredient.fromFluid(fluid, amount));
 	}

src/main/java/com/simibubi/create/foundation/codec/ResourceLocationAwareOps.java

@@ -18,8 +18,6 @@
     "MobMixin",
     "PlayerMixin",
     "ProjectileUtilMixin",
-    "RecipeManagerMixin",
-    "RegistryOpsMixin",
     "ShulkerBoxBlockMixin",
     "SmithingMenuMixin",
     "SmithingTrimRecipeMixin",