Update to Create 6.0.7

Author: MaxNeedsSnacks

gradle.properties

@@ -13,13 +13,13 @@ minecraft_version=1.21.1
 supported_versions=1.21.1, 1.21
 mod_version=2101.3.1
 
-neoforge_version=21.1.199
+neoforge_version=21.1.200
 neoForge.parchment.minecraftVersion=1.21.1
 neoForge.parchment.mappingsVersion=2024.11.17
 kubejs_version=2101.7.2-build.285
 
 jei_version=19.25.0.322
 flywheel_version=1.0.2
-create_version=6.0.6-99
-ponder_version=1.0.56
+create_version=6.0.7-159
+ponder_version=1.0.63
 registrate_version=MC1.21-1.3.0+62

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

@@ -2,17 +2,14 @@
 
 import com.simibubi.create.Create;
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import dev.latvian.mods.kubejs.create.events.BoilerHeaterHandlerEvent;
 import dev.latvian.mods.kubejs.create.events.CreateEvents;
 import dev.latvian.mods.kubejs.create.events.SpecialFluidHandlerEvent;
 import dev.latvian.mods.kubejs.create.events.SpecialSpoutHandlerEvent;
 import dev.latvian.mods.kubejs.create.item.SandpaperItemBuilder;
 import dev.latvian.mods.kubejs.create.item.SequencedAssemblyItemBuilder;
-import dev.latvian.mods.kubejs.create.recipe.CreateFluidIngredientRecipeComponent;
 import dev.latvian.mods.kubejs.create.recipe.CreateRecipeComponents;
 import dev.latvian.mods.kubejs.create.recipe.ProcessingOutputRecipeComponent;
-import dev.latvian.mods.kubejs.create.wrapper.FluidIngredientWrapper;
 import dev.latvian.mods.kubejs.create.wrapper.KubeCreateOutput;
 import dev.latvian.mods.kubejs.event.EventGroupRegistry;
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
@@ -54,7 +51,6 @@ public void registerBindings(BindingRegistry bindings) {
 
 	@Override
 	public void registerTypeWrappers(TypeWrapperRegistry registry) {
-		registry.register(FluidIngredient.class, FluidIngredientWrapper::wrap);
 		registry.register(ProcessingOutput.class, KubeCreateOutput::wrapProcessingOutput);
 	}
 
@@ -78,7 +74,7 @@ public void registerRecipeSchemas(RecipeSchemaRegistry registry) {
 	@Override
 	public void registerRecipeComponents(RecipeComponentTypeRegistry registry) {
 		registry.register(ProcessingOutputRecipeComponent.TYPE);
-		registry.register(CreateFluidIngredientRecipeComponent.TYPE);
+		registry.register(CreateRecipeComponents.SIZED_FLUID_INGREDIENT);
 		registry.register(CreateRecipeComponents.HEAT_CONDITION);
 	}
 }

src/main/java/dev/latvian/mods/kubejs/create/core/KubeFluidTagIngredient.java

@@ -0,0 +1,14 @@
+package dev.latvian.mods.kubejs.create.core.mixin;
+
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.crafting.FluidIngredient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import java.util.stream.Stream;
+
+@Mixin(FluidIngredient.class)
+public interface FluidIngredientStacksInvoker {
+	@Invoker
+	Stream<FluidStack> callGenerateStacks();
+}

src/main/java/dev/latvian/mods/kubejs/create/core/mixin/FluidIngredientStacksInvoker.java

@@ -1,19 +1,73 @@
 package dev.latvian.mods.kubejs.create.events;
 
 import com.simibubi.create.api.effect.OpenPipeEffectHandler;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
-import dev.latvian.mods.kubejs.create.wrapper.FluidIngredientWrapper;
+import com.simibubi.create.api.registry.SimpleRegistry;
+import dev.latvian.mods.kubejs.create.core.mixin.FluidIngredientStacksInvoker;
 import dev.latvian.mods.kubejs.event.KubeEvent;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.phys.AABB;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.TagsUpdatedEvent;
 import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.crafting.FluidIngredient;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class SpecialFluidHandlerEvent implements KubeEvent {
 	public interface PipeHandler {
 		void apply(Level level, AABB aabb, FluidStack fluid);
 	}
 
 	public void add(FluidIngredient fluidIngredient, PipeHandler handler) {
-		OpenPipeEffectHandler.REGISTRY.registerProvider(FluidIngredientWrapper.createEffectHandler(fluidIngredient, handler));
+		OpenPipeEffectHandler.REGISTRY.registerProvider(createEffectHandler(fluidIngredient, handler));
+	}
+
+	static SimpleRegistry.Provider<Fluid, OpenPipeEffectHandler> createEffectHandler(FluidIngredient fluidIngredient, SpecialFluidHandlerEvent.PipeHandler handler) {
+		return new SimpleRegistry.Provider<>() {
+			// hack to make it so people don't need to use Supplier<FluidIngredient> as a param, this sucks
+			Set<Fluid> validFluids = null;
+
+			final OpenPipeEffectHandler internalHandler = (level, aabb, fluid) -> {
+				if (fluidIngredient.test(fluid)) {
+					handler.apply(level, aabb, fluid);
+				}
+			};
+
+			@Override
+			@Nullable
+			public OpenPipeEffectHandler get(Fluid fluidIn) {
+				if (getValidFluids().contains(fluidIn)) {
+					return internalHandler;
+				} else {
+					return null;
+				}
+			}
+
+			private Set<Fluid> getValidFluids() {
+				if (validFluids == null) {
+					// this relies on the stacks returned by the ingredient also being
+					// exactly all the fluids that are accepted, but that should be true
+					// for the vast majority
+					var stacks = ((FluidIngredientStacksInvoker) fluidIngredient).callGenerateStacks();
+
+					validFluids = stacks.map(FluidStack::getFluid).collect(Collectors.toSet());
+				}
+
+				return validFluids;
+			}
+
+			@Override
+			public void onRegister(Runnable invalidate) {
+				NeoForge.EVENT_BUS.addListener((TagsUpdatedEvent event) -> {
+					if (event.shouldUpdateStaticData()) {
+						invalidate.run();
+						validFluids = null;
+					}
+				});
+			}
+		};
 	}
 }

src/main/java/dev/latvian/mods/kubejs/create/core/mixin/FluidTagIngredientMixin.java

@@ -1,11 +1,12 @@
 package dev.latvian.mods.kubejs.create.events;
 
 import com.simibubi.create.api.behaviour.spouting.BlockSpoutingBehaviour;
+import com.simibubi.create.api.registry.SimpleRegistry;
 import dev.latvian.mods.kubejs.block.state.BlockStatePredicate;
-import dev.latvian.mods.kubejs.create.wrapper.FluidIngredientWrapper;
 import dev.latvian.mods.kubejs.event.KubeEvent;
 import dev.latvian.mods.kubejs.level.LevelBlock;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
 import net.neoforged.neoforge.fluids.FluidStack;
 
 public class SpecialSpoutHandlerEvent implements KubeEvent {
@@ -15,6 +16,18 @@ public interface SpoutHandler {
 	}
 
 	public void add(ResourceLocation path, BlockStatePredicate block, SpoutHandler handler) {
-		BlockSpoutingBehaviour.BY_BLOCK.registerProvider(FluidIngredientWrapper.createSpoutingHandler(block, handler));
+		BlockSpoutingBehaviour.BY_BLOCK.registerProvider(createSpoutingHandler(block, handler));
+	}
+
+	static SimpleRegistry.Provider<Block, BlockSpoutingBehaviour> createSpoutingHandler(BlockStatePredicate block, SpecialSpoutHandlerEvent.SpoutHandler handler) {
+		final BlockSpoutingBehaviour internalHandler = (world, pos, spout, availableFluid, simulate) -> {
+			if (!block.test(world.getBlockState(pos))) {
+				return 0;
+			}
+
+			return (int) handler.fillBlock(world.kjs$getBlock(pos), availableFluid, simulate);
+		};
+
+		return blockIn -> block.testBlock(blockIn) ? internalHandler : null;
 	}
 }

src/main/java/dev/latvian/mods/kubejs/create/events/SpecialFluidHandlerEvent.java

@@ -2,9 +2,17 @@
 
 import com.simibubi.create.Create;
 import com.simibubi.create.content.processing.recipe.HeatCondition;
+import com.simibubi.create.foundation.codec.CreateCodecs;
 import dev.latvian.mods.kubejs.recipe.component.EnumComponent;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponentType;
+import dev.latvian.mods.kubejs.recipe.component.SizedFluidIngredientComponent;
+import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
 
 public interface CreateRecipeComponents {
 	RecipeComponentType<HeatCondition> HEAT_CONDITION = EnumComponent.of(Create.asResource("heat_condition"), HeatCondition.class, HeatCondition.CODEC);
+
+	// uses create's custom codec for sized ingredients that always serialises the type for... reasons?
+	RecipeComponentType<SizedFluidIngredient> SIZED_FLUID_INGREDIENT = RecipeComponentType.unit(
+		Create.asResource("sized_fluid_ingredient"), (type) ->
+			new SizedFluidIngredientComponent(type, CreateCodecs.FLAT_SIZED_FLUID_INGREDIENT_WITH_TYPE, false));
 }