Works

Author: LatvianModder

gradle.properties

@@ -16,7 +16,7 @@ mod_version=2101.3.1
 neoforge_version=21.1.199
 neoForge.parchment.minecraftVersion=1.21.1
 neoForge.parchment.mappingsVersion=2024.11.17
-kubejs_version=2101.7.2-build.254
+kubejs_version=2101.7.2-build.259
 
 jei_version=19.22.1.316
 flywheel_version=1.0.2

src/main/java/dev/latvian/mods/kubejs/create/KubeJSCreatePlugin.java

@@ -15,13 +15,16 @@
 import dev.latvian.mods.kubejs.create.recipe.ProcessingOutputRecipeComponent;
 import dev.latvian.mods.kubejs.event.EventGroupRegistry;
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
+import dev.latvian.mods.kubejs.plugin.builtin.wrapper.ItemWrapper;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponentTypeRegistry;
 import dev.latvian.mods.kubejs.recipe.schema.RecipeSchemaRegistry;
 import dev.latvian.mods.kubejs.registry.BuilderTypeRegistry;
 import dev.latvian.mods.kubejs.script.BindingRegistry;
 import dev.latvian.mods.kubejs.script.ScriptType;
 import dev.latvian.mods.kubejs.script.TypeWrapperRegistry;
+import dev.latvian.mods.rhino.Context;
 import net.minecraft.core.registries.Registries;
+import org.jetbrains.annotations.Nullable;
 
 public class KubeJSCreatePlugin implements KubeJSPlugin {
 	@Override
@@ -52,6 +55,16 @@ public void registerBindings(BindingRegistry bindings) {
 	@Override
 	public void registerTypeWrappers(TypeWrapperRegistry registry) {
 		registry.register(FluidIngredient.class, FluidIngredientHelper::wrap);
+		registry.register(ProcessingOutput.class, KubeJSCreatePlugin::wrapProcessingOutput);
+	}
+
+	private static ProcessingOutput wrapProcessingOutput(Context cx, @Nullable Object from) {
+		if (from instanceof ProcessingOutput p) {
+			return p;
+		}
+
+		var stack = ItemWrapper.wrap(cx, from);
+		return stack.isEmpty() ? ProcessingOutput.EMPTY : new ProcessingOutput(stack, 1F);
 	}
 
 	@Override

src/main/java/dev/latvian/mods/kubejs/create/recipe/CreateFluidIngredientRecipeComponent.java

@@ -4,14 +4,13 @@
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import dev.latvian.mods.kubejs.create.platform.FluidIngredientHelper;
-import dev.latvian.mods.kubejs.recipe.KubeRecipe;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponent;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponentType;
 import dev.latvian.mods.kubejs.recipe.component.UniqueIdBuilder;
+import dev.latvian.mods.kubejs.recipe.filter.RecipeMatchContext;
 import dev.latvian.mods.kubejs.recipe.match.FluidMatch;
 import dev.latvian.mods.kubejs.recipe.match.ReplacementMatchInfo;
 import dev.latvian.mods.kubejs.util.OpsContainer;
-import dev.latvian.mods.rhino.Context;
 import dev.latvian.mods.rhino.type.TypeInfo;
 import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.fluids.FluidStack;
@@ -37,18 +36,18 @@ public TypeInfo typeInfo() {
 	}
 
 	@Override
-	public boolean hasPriority(Context cx, KubeRecipe recipe, Object from) {
+	public boolean hasPriority(RecipeMatchContext cx, Object from) {
 		return from instanceof SizedFluidIngredient || from instanceof FluidIngredient || from instanceof FluidStack || from instanceof Fluid;
 	}
 
 	@Override
-	public boolean matches(Context cx, KubeRecipe recipe, FluidIngredient value, ReplacementMatchInfo match) {
+	public boolean matches(RecipeMatchContext cx, FluidIngredient value, ReplacementMatchInfo match) {
 		return match.match() instanceof FluidMatch m && m.matches(cx, FluidIngredientHelper.convert(value), match.exact());
 	}
 
 	@Override
 	public boolean isEmpty(FluidIngredient value) {
-		return value == FluidIngredient.EMPTY;
+		return value.getRequiredAmount() <= 0;
 	}
 
 	@Override

src/main/java/dev/latvian/mods/kubejs/create/recipe/ProcessingOutputRecipeComponent.java

@@ -3,15 +3,13 @@
 import com.simibubi.create.Create;
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import dev.latvian.mods.kubejs.plugin.builtin.wrapper.ItemWrapper;
-import dev.latvian.mods.kubejs.recipe.KubeRecipe;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponentType;
 import dev.latvian.mods.kubejs.recipe.component.SimpleRecipeComponent;
 import dev.latvian.mods.kubejs.recipe.component.UniqueIdBuilder;
+import dev.latvian.mods.kubejs.recipe.filter.RecipeMatchContext;
 import dev.latvian.mods.kubejs.recipe.match.ItemMatch;
 import dev.latvian.mods.kubejs.recipe.match.ReplacementMatchInfo;
-import dev.latvian.mods.rhino.Context;
 import dev.latvian.mods.rhino.type.TypeInfo;
-import net.minecraft.world.item.ItemStack;
 
 public class ProcessingOutputRecipeComponent extends SimpleRecipeComponent<ProcessingOutput> {
 	public static final TypeInfo TYPE_INFO = TypeInfo.of(ProcessingOutput.class);
@@ -22,25 +20,15 @@ public ProcessingOutputRecipeComponent(RecipeComponentType<?> type) {
 	}
 
 	@Override
-	public boolean hasPriority(Context cx, KubeRecipe recipe, Object from) {
+	public boolean hasPriority(RecipeMatchContext cx, Object from) {
 		return from instanceof ProcessingOutput || ItemWrapper.isItemStackLike(from);
 	}
 
 	@Override
-	public boolean matches(Context cx, KubeRecipe recipe, ProcessingOutput value, ReplacementMatchInfo match) {
+	public boolean matches(RecipeMatchContext cx, ProcessingOutput value, ReplacementMatchInfo match) {
 		return match.match() instanceof ItemMatch m && m.matches(cx, value.getStack(), match.exact());
 	}
 
-	@Override
-	public ProcessingOutput wrap(Context cx, KubeRecipe recipe, Object from) {
-		if (from instanceof ProcessingOutput p) {
-			return p;
-		}
-
-		var stack = (ItemStack) cx.jsToJava(from, ItemWrapper.TYPE_INFO);
-		return stack == null || stack.isEmpty() ? ProcessingOutput.EMPTY : new ProcessingOutput(stack, 1F);
-	}
-
 	@Override
 	public boolean isEmpty(ProcessingOutput value) {
 		return value == ProcessingOutput.EMPTY || value.getStack().isEmpty();