2.2.4

MarbleGateKeeper · MarbleGateKeeper · commit f475c1c58986 · 2025-10-28T12:17:29.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,3 @@
-## Create: Enchantment Industry 2.2.3
+## Create: Enchantment Industry 2.2.4
 
-**REQUIRE Create: Dragon Plus 1.8.1!**
-
-### Update
-* Add compacting recipe for infested stone and crushing recipe for infested cobblestone
-
-### Bugfix
-* Fix spout using too much exp when mending
+Update for Create ***6.0.7***.
diff --git a/gradle.properties b/gradle.properties
@@ -17,17 +17,17 @@ mod_id = create_enchantment_industry
 mod_artifact_id = create-enchantment-industry
 mod_name = Create: Enchantment Industry
 mod_license = LGPL-3.0-or-later
-mod_version = 2.2.3
+mod_version = 2.2.4
 mod_group_id = plus.dragons.createenchantmentindustry
 mod_authors = DragonsPlus
 mod_description = Automatic Enchanting with Create.
 mod_github = https://github.com/DragonsPlusMinecraft/CreateEnchantmentIndustry
 # Mod Dependencies
 vanillin_version = 1.0.0-beta-11
-create_version_production = 6.0.6
-create_version_range = [6.0.6,)
-create_dragons_plus_version = 1.8.1
-create_dragons_plus_version_range = [1.8.1,)
+create_version_production = 6.0.7
+create_version_range = [6.0.7,)
+create_dragons_plus_version = 1.8.3
+create_dragons_plus_version_range = [1.8.3,)
 jei_minecraft_version = 1.21.1
 jei_version = 19.21.2.313
 curios_minecraft_version = 1.21.1
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrintingRecipe.java b/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrintingRecipe.java
@@ -23,7 +23,8 @@
 import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -44,6 +45,7 @@
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
 import plus.dragons.createenchantmentindustry.common.registry.CEIBlocks;
 import plus.dragons.createenchantmentindustry.common.registry.CEIRecipes;
 import plus.dragons.createenchantmentindustry.integration.jei.category.assembly.AssemblyPrintingCategory;
@@ -94,13 +96,13 @@ protected int getMaxOutputCount() {
     public boolean matches(PrintingInput input, Level level) {
         return ingredients.get(0).test(input.base()) &&
                 ingredients.get(1).test(input.template()) &&
-                (input.fluid().isEmpty() || fluidIngredients.get(0).test(input.fluid()));
+                (input.fluid().isEmpty() || fluidIngredients.getFirst().test(input.fluid()));
     }
 
     @Override
     public Component getDescriptionForAssembly() {
         ItemStack[] matchingStacks = ingredients.get(1).getItems();
-        List<FluidStack> matchingFluidStacks = fluidIngredients.getFirst().getMatchingFluidStacks();
+        List<FluidStack> matchingFluidStacks = Arrays.asList(fluidIngredients.getFirst().getFluids());
         if (matchingStacks.length == 0 || matchingFluidStacks.isEmpty()) {
             return Component.literal("Invalid");
         }
@@ -120,7 +122,7 @@ public void addAssemblyIngredients(List<Ingredient> list) {
     }
 
     @Override
-    public void addAssemblyFluidIngredients(List<FluidIngredient> list) {
+    public void addAssemblyFluidIngredients(List<SizedFluidIngredient> list) {
         list.add(getFluidIngredients().getFirst());
     }
 
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrintingRecipeParams.java b/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrintingRecipeParams.java
@@ -25,7 +25,6 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import io.netty.buffer.ByteBuf;
 import java.util.function.Function;
 import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders;
@@ -36,6 +35,8 @@
 import net.minecraft.util.valueproviders.ConstantFloat;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.enchantment.effects.PlaySoundEffect;
+import net.neoforged.neoforge.fluids.crafting.FluidIngredient;
+import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
 import plus.dragons.createdragonsplus.util.FieldsNullabilityUnknownByDefault;
 
 @FieldsNullabilityUnknownByDefault
@@ -86,15 +87,15 @@ protected DataResult<PrintingRecipeParams> validate() {
     protected void encode(RegistryFriendlyByteBuf buffer) {
         CatnipStreamCodecBuilders.nonNullList(Ingredient.CONTENTS_STREAM_CODEC).encode(buffer, ingredients);
         CatnipStreamCodecBuilders.nonNullList(ProcessingOutput.STREAM_CODEC).encode(buffer, results);
-        CatnipStreamCodecBuilders.nonNullList(FluidIngredient.STREAM_CODEC).encode(buffer, fluidIngredients);
+        CatnipStreamCodecBuilders.nonNullList(SizedFluidIngredient.STREAM_CODEC).encode(buffer, fluidIngredients);
         SOUND_STREAM_CODEC.encode(buffer, sound);
     }
 
     @Override
     protected void decode(RegistryFriendlyByteBuf buffer) {
         ingredients = CatnipStreamCodecBuilders.nonNullList(Ingredient.CONTENTS_STREAM_CODEC).decode(buffer);
         results = CatnipStreamCodecBuilders.nonNullList(ProcessingOutput.STREAM_CODEC).decode(buffer);
-        fluidIngredients = CatnipStreamCodecBuilders.nonNullList(FluidIngredient.STREAM_CODEC).decode(buffer);
+        fluidIngredients = CatnipStreamCodecBuilders.nonNullList(SizedFluidIngredient.STREAM_CODEC).decode(buffer);
         sound = SOUND_STREAM_CODEC.decode(buffer);
     }
 }
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/behaviour/RecipePrintingBehaviour.java b/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/behaviour/RecipePrintingBehaviour.java
@@ -76,7 +76,7 @@ public int getRequiredItemCount(Level level, ItemStack stack) {
     @Override
     public int getRequiredFluidAmount(Level level, ItemStack stack, FluidStack fluidStack) {
         return findRecipe(level, stack, fluidStack)
-                .map(recipe -> recipe.getFluidIngredients().getFirst().getRequiredAmount())
+                .map(recipe -> recipe.getFluidIngredients().getFirst().amount())
                 .orElse(0);
     }
 
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindingRecipe.java b/src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindingRecipe.java
@@ -25,6 +25,8 @@
 import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
 import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe;
 import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -96,7 +98,7 @@ public Component getDescriptionForAssembly() {
         if (fluidIngredients.isEmpty()) {
             return CEILang.translate("recipe.assembly.grinding").component();
         } else {
-            List<FluidStack> matchingFluidStacks = fluidIngredients.getFirst().getMatchingFluidStacks();
+            List<FluidStack> matchingFluidStacks = Arrays.asList(fluidIngredients.getFirst().getFluids());
             if (matchingFluidStacks.isEmpty()) {
                 return Component.literal("Invalid");
             }
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainBlockEntity.java b/src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainBlockEntity.java
@@ -27,7 +27,6 @@
 import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import java.util.List;
 import java.util.Optional;
 import net.createmod.catnip.math.VecHelper;
@@ -56,6 +55,7 @@
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler.FluidAction;
+import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
 import net.neoforged.neoforge.items.IItemHandler;
 import org.jetbrains.annotations.Nullable;
 import plus.dragons.createdragonsplus.common.advancements.AdvancementBehaviour;
@@ -175,9 +175,9 @@ private boolean fill(FluidStack fluid) {
         return false;
     }
 
-    private boolean drain(FluidIngredient fluidIngredient) {
+    private boolean drain(SizedFluidIngredient fluidIngredient) {
         FluidStack fluid = tank.getPrimaryHandler().getFluid();
-        int required = fluidIngredient.getRequiredAmount();
+        int required = fluidIngredient.amount();
         if (fluidIngredient.test(fluid) && fluid.getAmount() >= required) {
             fluid.shrink(required);
             tank.getPrimaryHandler().setFluid(fluid);
@@ -219,7 +219,7 @@ else if (!fluidResults.isEmpty())
                 if (fluidResults.getFirst().is(CEIFluids.EXPERIENCE))
                     advancement.awardStat(CEIStats.GRINDSTONE_EXPERIENCE.get(), fluidResults.getFirst().getAmount());
                 inventory.clear();
-                var grinded = recipe.rollResults();
+                var grinded = recipe.rollResults(level.random);
                 for (int i = 0; i < grinded.size(); i++)
                     inventory.setStackInSlot(i + 1, grinded.get(i));
                 return;
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/data/CEIRecipeProvider.java b/src/main/java/plus/dragons/createenchantmentindustry/data/CEIRecipeProvider.java
@@ -20,7 +20,6 @@
 
 import static com.simibubi.create.AllBlocks.*;
 import static com.simibubi.create.AllItems.*;
-import static com.simibubi.create.AllTags.commonItemTag;
 import static net.minecraft.world.item.Items.*;
 import static net.neoforged.neoforge.common.Tags.Items.EGGS;
 import static net.neoforged.neoforge.common.Tags.Items.STORAGE_BLOCKS_IRON;
@@ -36,6 +35,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.simibubi.create.AllItems;
+import com.simibubi.create.foundation.data.recipe.CommonMetal;
 import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.RecipeCategory;
@@ -79,7 +79,7 @@ private void buildMachineRecipes(RecipeOutput output) {
                 .require(EXPERIENCE_BLOCK)
                 .output(EXPERIENCE_HATCH)
                 .build(output);
-        shaped().define('-', commonItemTag("plates/brass"))
+        shaped().define('-', CommonMetal.BRASS.plates)
                 .define('o', SPOUT)
                 .define('=', STORAGE_BLOCKS_IRON)
                 .pattern("-")
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/assembly/AssemblyGrindingCategory.java b/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/assembly/AssemblyGrindingCategory.java
@@ -22,11 +22,11 @@
 import com.simibubi.create.compat.jei.category.CreateRecipeCategory;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
 import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import java.util.List;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.recipe.IFocusGroup;
 import net.minecraft.client.gui.GuiGraphics;
+import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
 import plus.dragons.createenchantmentindustry.integration.jei.category.grinding.AnimatedGrindstone;
 
 public class AssemblyGrindingCategory extends SequencedAssemblySubCategory {
@@ -38,7 +38,7 @@ public AssemblyGrindingCategory() {
 
     @Override
     public void setRecipe(IRecipeLayoutBuilder builder, SequencedRecipe<?> recipe, IFocusGroup focuses, int x) {
-        List<FluidIngredient> fluidIngredients = recipe.getRecipe().getFluidIngredients();
+        List<SizedFluidIngredient> fluidIngredients = recipe.getRecipe().getFluidIngredients();
         if (!fluidIngredients.isEmpty())
             CreateRecipeCategory.addFluidSlot(builder, x + 4, 15, fluidIngredients.getFirst());
     }
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/assembly/AssemblyPrintingCategory.java b/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/assembly/AssemblyPrintingCategory.java
@@ -22,11 +22,11 @@
 import com.simibubi.create.compat.jei.category.CreateRecipeCategory;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
 import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
-import com.simibubi.create.foundation.fluid.FluidIngredient;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.recipe.IFocusGroup;
 import mezz.jei.api.recipe.RecipeIngredientRole;
 import net.minecraft.client.gui.GuiGraphics;
+import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
 import plus.dragons.createenchantmentindustry.integration.jei.category.printing.AnimatedPrinter;
 
 public class AssemblyPrintingCategory extends SequencedAssemblySubCategory {
@@ -41,15 +41,15 @@ public void setRecipe(IRecipeLayoutBuilder builder, SequencedRecipe<?> recipe, I
         builder.addSlot(RecipeIngredientRole.INPUT, x, 15)
                 .setBackground(CreateRecipeCategory.getRenderedSlot(), -1, -1)
                 .addIngredients(recipe.getRecipe().getIngredients().get(1));
-        FluidIngredient fluidIngredient = recipe.getRecipe()
+        SizedFluidIngredient fluidIngredient = recipe.getRecipe()
                 .getFluidIngredients()
                 .getFirst();
         CreateRecipeCategory.addFluidSlot(builder, x + 18, 15, fluidIngredient);
     }
 
     @Override
     public void draw(SequencedRecipe<?> recipe, GuiGraphics graphics, double mouseX, double mouseY, int index) {
-        var fluid = recipe.getRecipe().getFluidIngredients().getFirst().getMatchingFluidStacks().getFirst();
+        var fluid = recipe.getRecipe().getFluidIngredients().getFirst().getFluids()[0];
         PoseStack poseStack = graphics.pose();
         printer.offset = index;
         poseStack.pushPose();
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/printing/CopyPrintingRecipeJEI.java b/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/printing/CopyPrintingRecipeJEI.java
@@ -19,7 +19,9 @@
 package plus.dragons.createenchantmentindustry.integration.jei.category.printing;
 
 import com.mojang.serialization.MapCodec;
+import com.simibubi.create.AllDataComponents;
 import com.simibubi.create.content.equipment.clipboard.ClipboardBlockItem;
+import com.simibubi.create.content.equipment.clipboard.ClipboardContent;
 import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides;
 import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType;
 import com.simibubi.create.foundation.recipe.ItemCopyingRecipe.SupportsItemCopying;
@@ -58,7 +60,8 @@ public void setTemplate(IRecipeSlotBuilder slot) {
         for (Item item : BuiltInRegistries.ITEM) {
             if (item instanceof ClipboardBlockItem) {
                 ItemStack stack = new ItemStack(item);
-                ClipboardOverrides.switchTo(ClipboardType.WRITTEN, stack);
+                ClipboardContent content = ClipboardContent.EMPTY.setType(ClipboardType.WRITTEN);
+                stack.set(AllDataComponents.CLIPBOARD_CONTENT, content);
                 slot.addItemStack(stack);
             } else if (item instanceof SupportsItemCopying) {
                 slot.addItemLike(item);
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/printing/StandardPrintingRecipeJEI.java b/src/main/java/plus/dragons/createenchantmentindustry/integration/jei/category/printing/StandardPrintingRecipeJEI.java
@@ -28,6 +28,8 @@
 import plus.dragons.createenchantmentindustry.common.CEICommon;
 import plus.dragons.createenchantmentindustry.common.fluids.printer.PrintingRecipe;
 
+import java.util.Arrays;
+
 public class StandardPrintingRecipeJEI implements PrintingRecipeJEI {
     public static final PrintingRecipeJEI.Type TYPE = PrintingRecipeJEI
             .register(CEICommon.asResource("standard"), StandardPrintingRecipeJEI::createCodec);
@@ -56,7 +58,7 @@ public void setTemplate(IRecipeSlotBuilder slot) {
     @Override
     public void setFluid(IRecipeSlotBuilder slot) {
         var fluid = recipe.value().getFluidIngredients().getFirst();
-        slot.addIngredients(NeoForgeTypes.FLUID_STACK, fluid.getMatchingFluidStacks());
+        slot.addIngredients(NeoForgeTypes.FLUID_STACK, Arrays.asList(fluid.getFluids()));
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public int getRequiredItemCount(Level level, ItemStack stack) {`
`76`	`76`	`@Override`
`77`	`77`	`public int getRequiredFluidAmount(Level level, ItemStack stack, FluidStack fluidStack) {`
`78`	`78`	`return findRecipe(level, stack, fluidStack)`
`79`		`- .map(recipe -> recipe.getFluidIngredients().getFirst().getRequiredAmount())`
	`79`	`+ .map(recipe -> recipe.getFluidIngredients().getFirst().amount())`
`80`	`80`	`.orElse(0);`
`81`	`81`	`}`
`82`	`82`