[update] Update for Create 6.0.6

[fix] Fix printingEnchantedBookCostMultiplier doesn't affect printing cost
[fix] Fix Blaze Enchanter/Forger crash when be destroyed by lightning strike when being pumped in.
2.1.6

Author: MarbleGateKeeper

CHANGELOG.md

@@ -1,7 +1,10 @@
-### Create: Enchantment Industry 2.1.5
+### Create: Enchantment Industry 2.1.6
+
+Update for Create 6.0.6
 
 #### Update
-- Experience Lanterns now pull in experience orbs (by @Catman06)
+- Update Mexican Spanish Translation by @Oscar Pacheco
 
 #### Fix
-- Fix right-click Mechanical Grindstone with empty hand causes crash
+- Fix printingEnchantedBookCostMultiplier doesn't affect printing cost
+- Fix Blaze Enchanter/Forger crash when be destroyed by lightning strike when being pumped in.

gradle.properties

@@ -9,30 +9,30 @@ parchment_minecraft_version = 1.21.1
 parchment_mappings_version = 2024.11.13
 minecraft_version = 1.21.1
 minecraft_version_range = [1.21.1, 1.22)
-neo_version = 21.1.129
+neo_version = 21.1.152
 neo_version_range = [21.1.0,)
 loader_version_range = [4,)
 # Mod
 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.1.5
+mod_version = 2.1.6
 mod_group_id = plus.dragons.createenchantmentindustry
 mod_authors = DragonsPlus
 mod_description = Automatic Enchanting with Create.
 mod_github = https://github.com/DragonsPlusMinecraft/CreateEnchantmentIndustry
 # Mod Dependencies
 flywheel_minecraft_version = 1.21.1
 flywheel_version = 1.0.0-9
-vanillin_version = 1.0.0-beta-9
+vanillin_version = 1.0.0-beta-11
 registrate_version = MC1.21-1.3.0+62
-ponder_version = 1.0.45
-create_version = 6.0.4-50
-create_version_production = 6.0.4
-create_version_range = [6.0.4,)
-create_dragons_plus_version = 1.5.0
-create_dragons_plus_version_range = [1.5.0,)
+ponder_version = 1.0.56
+create_version = 6.0.6-98
+create_version_production = 6.0.6
+create_version_range = [6.0.6,)
+create_dragons_plus_version = 1.6.0
+create_dragons_plus_version_range = [1.6.0,)
 jei_minecraft_version = 1.21.1
 jei_version = 19.21.0.247
 curios_minecraft_version = 1.21.1

src/generated/resources/data/create_enchantment_industry/recipe/emptying/experience_bottle.json

@@ -7,11 +7,11 @@
   ],
   "results": [
     {
-      "amount": 10,
-      "id": "create_enchantment_industry:experience"
+      "id": "minecraft:glass_bottle"
     },
     {
-      "id": "minecraft:glass_bottle"
+      "amount": 10,
+      "id": "create_enchantment_industry:experience"
     }
   ]
 }

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrinterRenderer.java

@@ -25,6 +25,7 @@
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
 import dev.engine_room.flywheel.lib.model.baked.PartialModel;
+import net.createmod.catnip.platform.NeoForgeCatnipServices;
 import net.createmod.catnip.render.CachedBuffers;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
@@ -58,11 +59,11 @@ protected void renderSafe(PrinterBlockEntity printer, float partialTicks, PoseSt
             float max = min + (11 / 16f);
             float minY = top ? (max - fluidLevel) : min;
             float maxY = top ? max : (min + fluidLevel);
-            FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(),
+            NeoForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack,
                     min, minY, min,
                     max, maxY, max,
                     buffer, poseStack, light,
-                    false, true, fluidStack.getComponentsPatch());
+                    false, true);
         }
 
         float progress = getProgress(printer.processingTicks - partialTicks);

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrintingRecipe.java

@@ -18,34 +18,38 @@
 
 package plus.dragons.createenchantmentindustry.common.fluids.printer;
 
+import com.mojang.serialization.MapCodec;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
+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.List;
 import java.util.Set;
 import java.util.function.Supplier;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.valueproviders.ConstantFloat;
 import net.minecraft.util.valueproviders.UniformFloat;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.enchantment.effects.PlaySoundEffect;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
-import plus.dragons.createdragonsplus.common.recipe.CustomProcessingRecipe;
-import plus.dragons.createdragonsplus.common.recipe.CustomProcessingRecipeBuilder;
 import plus.dragons.createenchantmentindustry.common.registry.CEIBlocks;
 import plus.dragons.createenchantmentindustry.common.registry.CEIRecipes;
 import plus.dragons.createenchantmentindustry.integration.jei.category.assembly.AssemblyPrintingCategory;
 import plus.dragons.createenchantmentindustry.util.CEILang;
 
-public class PrintingRecipe extends CustomProcessingRecipe<PrintingInput, PrintingRecipeParams> implements IAssemblyRecipe {
+public class PrintingRecipe extends ProcessingRecipe<PrintingInput, PrintingRecipeParams> implements IAssemblyRecipe {
     public PrintingRecipe(PrintingRecipeParams params) {
         super(CEIRecipes.PRINTING, params);
     }
@@ -125,16 +129,41 @@ public Supplier<Supplier<SequencedAssemblySubCategory>> getJEISubCategory() {
         return () -> AssemblyPrintingCategory::new;
     }
 
-    public static class Builder extends CustomProcessingRecipeBuilder<PrintingRecipeParams, PrintingRecipe> {
+    public static class Builder extends ProcessingRecipeBuilder<PrintingRecipeParams, PrintingRecipe, Builder> {
         protected Builder(ResourceLocation id, PlaySoundEffect sound) {
             super(PrintingRecipe::new, id);
             PrintingRecipeParams params = (PrintingRecipeParams) this.params;
             params.sound = sound;
         }
 
         @Override
-        protected PrintingRecipeParams createParams(ResourceLocation id) {
-            return new PrintingRecipeParams(id);
+        protected PrintingRecipeParams createParams() {
+            return new PrintingRecipeParams();
+        }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
+    }
+
+    public static class Serializer<R extends PrintingRecipe> implements RecipeSerializer<R> {
+        private final MapCodec<R> codec;
+        private final StreamCodec<RegistryFriendlyByteBuf, R> streamCodec;
+
+        public Serializer(ProcessingRecipe.Factory<PrintingRecipeParams, R> factory) {
+            this.codec = ProcessingRecipe.codec(factory, PrintingRecipeParams.CODEC);
+            this.streamCodec = ProcessingRecipe.streamCodec(factory, PrintingRecipeParams.STREAM_CODEC);
+        }
+
+        @Override
+        public MapCodec<R> codec() {
+            return codec;
+        }
+
+        @Override
+        public StreamCodec<RegistryFriendlyByteBuf, R> streamCodec() {
+            return streamCodec;
         }
     }
 }

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrintingRecipeParams.java

@@ -24,6 +24,7 @@
 import com.mojang.serialization.MapCodec;
 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;
@@ -32,15 +33,13 @@
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.valueproviders.ConstantFloat;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.enchantment.effects.PlaySoundEffect;
-import plus.dragons.createdragonsplus.common.recipe.CustomProcessingRecipeParams;
 import plus.dragons.createdragonsplus.util.FieldsNullabilityUnknownByDefault;
 
 @FieldsNullabilityUnknownByDefault
-public class PrintingRecipeParams extends CustomProcessingRecipeParams {
+public class PrintingRecipeParams extends ProcessingRecipeParams {
     protected static final Codec<PlaySoundEffect> SOUND_CODEC = Codec.either(
             BuiltInRegistries.SOUND_EVENT.holderByNameCodec(),
             PlaySoundEffect.CODEC.codec()).xmap(
@@ -57,12 +56,12 @@ public class PrintingRecipeParams extends CustomProcessingRecipeParams {
     public static final StreamCodec<RegistryFriendlyByteBuf, PrintingRecipeParams> STREAM_CODEC = streamCodec(PrintingRecipeParams::new);
     protected PlaySoundEffect sound;
 
-    protected PrintingRecipeParams(ResourceLocation id) {
-        super(id);
+    protected PrintingRecipeParams() {
+        super();
     }
 
-    public PrintingRecipeParams(ResourceLocation id, PlaySoundEffect sound) {
-        super(id);
+    public PrintingRecipeParams(PlaySoundEffect sound) {
+        super();
         this.sound = sound;
     }
 

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/behaviour/EnchantedBookPrintingBehaviour.java

@@ -73,7 +73,8 @@ private EnchantedBookPrintingBehaviour(Level level, SmartFluidTankBehaviour tank
             if (customCost != null) {
                 optional = customCost.stream().filter(pair -> pair.level() == entry.getIntValue()).findFirst();
             }
-            result.addAndGet(optional.map(CEIIntIntPair::value).orElseGet(() -> CEIEnchantmentHelper.getEnchantmentCost(entry.getKey(), entry.getIntValue())));
+            result.addAndGet(optional.map(CEIIntIntPair::value).orElseGet(() ->
+                    (int) (CEIEnchantmentHelper.getEnchantmentCost(entry.getKey(), entry.getIntValue()) * CEIConfig.fluids().printingEnchantedBookCostMultiplier.get())));
         });
         this.cost = result.get();
     }

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindingRecipe.java

@@ -22,6 +22,8 @@
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
 import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe;
+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.List;
 import java.util.Optional;
@@ -35,23 +37,20 @@
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
-import plus.dragons.createdragonsplus.common.recipe.CustomProcessingRecipe;
-import plus.dragons.createdragonsplus.common.recipe.CustomProcessingRecipeBuilder;
-import plus.dragons.createdragonsplus.common.recipe.CustomProcessingRecipeParams;
 import plus.dragons.createenchantmentindustry.common.registry.CEIBlocks;
 import plus.dragons.createenchantmentindustry.common.registry.CEIRecipes;
 import plus.dragons.createenchantmentindustry.integration.jei.category.assembly.AssemblyGrindingCategory;
 import plus.dragons.createenchantmentindustry.util.CEILang;
 
-public class GrindingRecipe extends CustomProcessingRecipe<SingleRecipeInput, CustomProcessingRecipeParams> implements IAssemblyRecipe {
-    public GrindingRecipe(CustomProcessingRecipeParams params) {
+public class GrindingRecipe extends StandardProcessingRecipe<SingleRecipeInput> implements IAssemblyRecipe {
+    public GrindingRecipe(ProcessingRecipeParams params) {
         super(CEIRecipes.GRINDING, params);
         if (fluidIngredients.size() + fluidResults.size() > 1)
             throw new IllegalArgumentException("Grinding recipe can only have either 1 fluid input or 1 fluid result");
     }
 
-    public static Builder builder(ResourceLocation id) {
-        return new Builder(id);
+    public static StandardProcessingRecipe.Builder<GrindingRecipe> builder(ResourceLocation id) {
+        return new StandardProcessingRecipe.Builder<>(GrindingRecipe::new, id);
     }
 
     public static Optional<RecipeHolder<GrindingRecipe>> fromPolishing(RecipeHolder<SandPaperPolishingRecipe> recipe) {
@@ -119,15 +118,4 @@ public void addAssemblyIngredients(List<Ingredient> list) {}
     public Supplier<Supplier<SequencedAssemblySubCategory>> getJEISubCategory() {
         return () -> AssemblyGrindingCategory::new;
     }
-
-    public static class Builder extends CustomProcessingRecipeBuilder<CustomProcessingRecipeParams, GrindingRecipe> {
-        protected Builder(ResourceLocation id) {
-            super(GrindingRecipe::new, id);
-        }
-
-        @Override
-        protected CustomProcessingRecipeParams createParams(ResourceLocation id) {
-            return new CustomProcessingRecipeParams(id);
-        }
-    }
 }

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainRenderer.java

@@ -27,6 +27,7 @@
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
 import dev.engine_room.flywheel.lib.transform.TransformStack;
+import net.createmod.catnip.platform.NeoForgeCatnipServices;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context;
@@ -128,13 +129,12 @@ private void renderFluid(GrindstoneDrainBlockEntity drain, float partialTicks, P
             float max = min + (12 / 16f);
             float minY = 5f / 16f;
             level *= (7 / 16f);
-            FluidRenderer.renderFluidBox(
-                    fluidStack.getFluid(), fluidStack.getAmount(),
+            NeoForgeCatnipServices.FLUID_RENDERER.renderFluidBox(
+                    fluidStack,
                     min, minY, min,
                     max, minY + level, max,
                     buffer, poseStack, light,
-                    false, false,
-                    fluidStack.getComponentsPatch());
+                    false, false);
         }
     }
 }

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/MechanicalGrindStoneItem.java

@@ -22,6 +22,7 @@
 import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -37,7 +38,7 @@ public MechanicalGrindStoneItem(Block block, Properties properties) {
     }
 
     public static ManualApplicationRecipe createRecipe() {
-        return new ProcessingRecipeBuilder<>(ManualApplicationRecipe::new, CEIBlocks.GRINDSTONE_DRAIN.getId())
+        return new ManualApplicationRecipe.Builder<>(ManualApplicationRecipe::new, CEIBlocks.GRINDSTONE_DRAIN.getId())
                 .require(AllBlocks.ITEM_DRAIN)
                 .require(CEIBlocks.MECHANICAL_GRINDSTONE)
                 .output(CEIBlocks.GRINDSTONE_DRAIN)