fixed engine recipe

RealAntEngineer · RealAntEngineer · commit d738d072ca7f · 2025-10-20T23:38:44.000+02:00
diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSChemicalSynthesisRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSChemicalSynthesisRecipeGen.java
@@ -4,9 +4,9 @@
 import com.rae.creatingspace.content.recipes.chemical_synthesis.ChemicalSynthesisRecipe;
 import com.rae.creatingspace.init.ingameobject.FluidInit;
 import com.rae.creatingspace.init.RecipeInit;
-import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
+import com.simibubi.create.api.data.recipe.StandardProcessingRecipeGen;
 import com.simibubi.create.content.processing.recipe.HeatCondition;
-import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe;
 import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
@@ -16,11 +16,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @SuppressWarnings("unused")
-public class CSChemicalSynthesisRecipeGen extends ProcessingRecipeGen<
-        ProcessingRecipeParams,
-        ChemicalSynthesisRecipe,
-        ChemicalSynthesisRecipe.Builder<ChemicalSynthesisRecipe>
-        > {
+public class CSChemicalSynthesisRecipeGen extends StandardProcessingRecipeGen<ChemicalSynthesisRecipe> {
 
     public CSChemicalSynthesisRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> lookup) {
         super(output, lookup, CreatingSpace.MODID);
@@ -32,8 +28,8 @@ protected IRecipeTypeInfo getRecipeType() {
     }
 
     @Override
-    protected ChemicalSynthesisRecipe.Builder<ChemicalSynthesisRecipe> getBuilder(ResourceLocation id) {
-        return new ChemicalSynthesisRecipe.Builder<>(ChemicalSynthesisRecipe::new, id);
+    protected StandardProcessingRecipe.Builder<ChemicalSynthesisRecipe> getBuilder(ResourceLocation id) {
+        return new ChemicalSynthesisRecipe.Builder(id);
     }
 
     {
diff --git a/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/CatalystCarrierBlock.java b/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/CatalystCarrierBlock.java
@@ -5,20 +5,31 @@
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
+import net.createmod.catnip.platform.CatnipServices;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.EntityCollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.lwjgl.system.NonnullDefault;
 
+import java.util.Objects;
+import java.util.function.Function;
+@NonnullDefault
 public class CatalystCarrierBlock extends HorizontalKineticBlock implements IBE<CatalystCarrierBlockEntity> {
 
     public CatalystCarrierBlock(Properties properties) {
@@ -44,7 +55,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {
         Direction prefferedSide = getPreferredHorizontalFacing(context);
         if (prefferedSide != null)
             return defaultBlockState().setValue(HORIZONTAL_FACING, prefferedSide);
-        return super.getStateForPlacement(context);
+        return Objects.requireNonNull(super.getStateForPlacement(context));
     }
 
     @Override
@@ -74,4 +85,31 @@ protected boolean isPathfindable(BlockState state, PathComputationType pathCompu
         return false;
     }
 
+    @Override
+    protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
+        if (!level.isClientSide) {
+            if (stack.getItem() instanceof CatalystItem) {
+                withBlockEntityDo(level, pos, be -> be.setCatalyst(stack));
+                return ItemInteractionResult.CONSUME;
+
+            }
+        }
+        return super.useItemOn(stack, state, level, pos, player, hand, hitResult);
+    }
+
+    @Override
+    protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
+
+        if (!level.isClientSide) {
+            withBlockEntityDo(level, pos, be -> be.setCatalyst(ItemStack.EMPTY));
+            return InteractionResult.SUCCESS;
+        }
+        return super.useWithoutItem(state, level, pos, player, hitResult);
+    }
+
+    @Override
+    public InteractionResult onBlockEntityUse(BlockGetter world, BlockPos pos, Function<CatalystCarrierBlockEntity, InteractionResult> action) {
+        return IBE.super.onBlockEntityUse(world, pos, action);
+    }
+
 }
diff --git a/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/CatalystCarrierBlockEntity.java b/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/CatalystCarrierBlockEntity.java
@@ -20,17 +20,21 @@
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.Mth;
 import net.minecraft.world.Container;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.RecipeInput;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class CatalystCarrierBlockEntity extends BasinOperatingBlockEntity {
 
@@ -39,6 +43,7 @@ public class CatalystCarrierBlockEntity extends BasinOperatingBlockEntity {
     public int runningTicks;
     public int processingTicks;
     public boolean running;
+    private ItemStack catalyst = ItemStack.EMPTY;//todo replace null values by air item
 
     public CatalystCarrierBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
         super(type, pos, state);
@@ -82,6 +87,16 @@ protected void read(CompoundTag compound,  HolderLookup.Provider registries,bool
         runningTicks = compound.getInt("Ticks");
         super.read(compound,registries, clientPacket);
 
+        CompoundTag catalyst = (CompoundTag) compound.get("catalyst");
+        if (catalyst != null) {
+            if (catalyst.isEmpty()) {
+                this.catalyst = ItemStack.EMPTY;
+            } else {
+                this.catalyst  = ItemStack.parseOptional(registries,catalyst);
+            }
+        } else {
+            this.catalyst = ItemStack.EMPTY;
+        }
         if (clientPacket && hasLevel())
             getBasin().ifPresent(bte -> bte.setAreFluidsMoving(running && runningTicks <= 20));
     }
@@ -90,6 +105,11 @@ protected void read(CompoundTag compound,  HolderLookup.Provider registries,bool
     public void write(CompoundTag compound, HolderLookup.Provider registries, boolean clientPacket) {
         compound.putBoolean("Running", running);
         compound.putInt("Ticks", runningTicks);
+        assert level != null;
+        if (!level.isClientSide) {
+            if (!catalyst.isEmpty())
+                compound.put("catalyst", catalyst.save(registries));
+        }
         super.write(compound,registries, clientPacket);
     }
 
@@ -110,7 +130,7 @@ public void tick() {
                 renderParticles();
 
             if ((!level.isClientSide || isVirtual()) && runningTicks == 20) {
-                if (processingTicks < 0) {
+                 if (processingTicks < 0) {
                     float recipeSpeed = 1;
                     if (currentRecipe instanceof ProcessingRecipe) {
                         int t = ((ProcessingRecipe<?,?>) currentRecipe).getProcessingDuration();
@@ -148,6 +168,14 @@ public void tick() {
         }
     }
 
+    @Override
+    protected void applyBasinRecipe() {
+        super.applyBasinRecipe();
+        if (!catalyst.isEmpty()){
+            catalyst.setDamageValue(catalyst.getDamageValue() + 1);
+        }
+    }
+
     public void renderParticles() {
     }
 
@@ -162,6 +190,13 @@ protected void spillParticle(ParticleOptions data) {
         level.addParticle(data, center.x, center.y - 1.75f, center.z, target.x, target.y, target.z);
     }
 
+    @Override
+    protected <I extends RecipeInput> boolean matchBasinRecipe(Recipe<I> recipe) {
+        return super.matchBasinRecipe(recipe) &&
+                recipe instanceof ChemicalSynthesisRecipe chemicalSynthesisRecipe &&
+                chemicalSynthesisRecipe.catalyst.test(catalyst);
+    }
+
     @Override
     protected boolean matchStaticFilters(RecipeHolder<? extends Recipe<?>> r) {
         return r.value().getType() == RecipeInit.CHEMICAL_SYNTHESIS.getType();
@@ -219,4 +254,17 @@ public void tickAudio() {
          */
     }
 
-}
+    public ItemStack getCatalyst() {
+        return catalyst;
+    }
+
+    public void setCatalyst(@Nullable ItemStack held) {
+        if (held == null) {
+            catalyst = null;
+            notifyUpdate();
+            return;
+        }
+        catalyst = held.copy();
+        notifyUpdate();
+    }
+}
diff --git a/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/CatalystCarrierRenderer.java b/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/CatalystCarrierRenderer.java
@@ -43,6 +43,17 @@ protected void renderSafe(CatalystCarrierBlockEntity be, float partialTicks, Pos
 
         float renderedHeadOffset =
                 be.getRenderedHeadOffset(partialTicks);
+        ItemStack catalyst = be.getCatalyst();
+        if (catalyst != null) {
+            if (!catalyst.isEmpty()) {
+                ms.pushPose();
+                ms.translate(0, -renderedHeadOffset, 0);
+                renderCatalystFromTexture(ms,
+                        CreatingSpace.resource("textures/block/catalyst_carrier/catalyst/" +
+                                catalyst.getItemHolder().unwrapKey().orElseThrow().location().getPath() + ".png"), buffer);
+                ms.popPose();
+            }
+        }
 
         if (VisualizationManager.supportsVisualization(be.getLevel())) return;
 
@@ -61,6 +72,11 @@ protected BlockState getRenderedBlockState(CatalystCarrierBlockEntity be) {
         return shaft(getRotationAxisOf(be));
     }
 
+    private void renderCatalystFromTexture(PoseStack stack, ResourceLocation texLocation, MultiBufferSource buffer) {
+        ModelPart catalyst = createCatalyst();
+        catalyst.render(stack, buffer.getBuffer(RenderType.entitySolid(texLocation)), LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY);
+    }
+
     public static ModelPart createCatalyst() {
         MeshDefinition meshdefinition = new MeshDefinition();
         PartDefinition partdefinition = meshdefinition.getRoot();
diff --git a/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/ChemicalSynthesisParams.java b/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/ChemicalSynthesisParams.java
@@ -0,0 +1,39 @@
+package com.rae.creatingspace.content.recipes.chemical_synthesis;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.world.item.crafting.Ingredient;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Function;
+
+public class ChemicalSynthesisParams extends ProcessingRecipeParams {
+    public static MapCodec<ChemicalSynthesisParams> CODEC = RecordCodecBuilder.mapCodec(
+            instance -> instance.group(
+            codec(ChemicalSynthesisParams::new).forGetter(Function.identity()),
+                            Ingredient.CODEC.optionalFieldOf("catalyst", Ingredient.EMPTY)
+                    .forGetter( r -> r.catalyst)
+    ).apply(instance, (params, catalyst) -> {
+        params.catalyst = catalyst;
+        return params;
+    }));
+    public static StreamCodec<RegistryFriendlyByteBuf, ChemicalSynthesisParams> STREAM_CODEC = streamCodec(ChemicalSynthesisParams::new);
+
+    Ingredient catalyst;
+
+    @Override
+    public void decode(@NotNull RegistryFriendlyByteBuf buffer) {
+        super.decode(buffer);
+        catalyst = Ingredient.CONTENTS_STREAM_CODEC.decode(buffer);
+
+    }
+
+    @Override
+    public void encode(@NotNull RegistryFriendlyByteBuf buffer) {
+        super.encode(buffer);
+        Ingredient.CONTENTS_STREAM_CODEC.encode(buffer,catalyst);
+    }
+}
diff --git a/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/ChemicalSynthesisRecipe.java b/src/main/java/com/rae/creatingspace/content/recipes/chemical_synthesis/ChemicalSynthesisRecipe.java
@@ -2,13 +2,49 @@
 
 import com.rae.creatingspace.init.RecipeInit;
 import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.crafting.Ingredient;
+import org.jetbrains.annotations.NotNull;
 
 
 public class ChemicalSynthesisRecipe extends BasinRecipe {
-
+    final Ingredient catalyst;
     public ChemicalSynthesisRecipe(ProcessingRecipeParams params) {
         super(RecipeInit.CHEMICAL_SYNTHESIS, params);
+        if (params instanceof ChemicalSynthesisParams chemicalSynthesisParams) {
+            catalyst = chemicalSynthesisParams.catalyst;
+        } else {
+            catalyst = Ingredient.EMPTY;
+        }
     }
 
+    /*@FunctionalInterface
+    public interface Factory<R extends BasinRecipe> extends StandardProcessingRecipe.Factory<R> {
+        //@NotNull R create(@NotNull ChemicalSynthesisParams params);
+    }*/
+
+    public static class Builder extends StandardProcessingRecipe.Builder<ChemicalSynthesisRecipe> {
+        public Builder(ResourceLocation recipeId) {
+            super((params) -> new ChemicalSynthesisRecipe((ChemicalSynthesisParams) params), recipeId);
+        }
+
+        @Override
+        protected @NotNull ChemicalSynthesisParams createParams() {
+            return new ChemicalSynthesisParams();
+        }
+
+        @Override
+        public @NotNull Builder self() {
+            return this;
+        }
+
+        public ChemicalSynthesisRecipe.Builder toolNotConsumed() {
+            //params.catalyst = true;
+            return this;
+        }
+    }
 }
diff --git a/src/main/java/com/rae/creatingspace/init/CreativeModeTabsInit.java b/src/main/java/com/rae/creatingspace/init/CreativeModeTabsInit.java
@@ -29,13 +29,10 @@
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.*;
-import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Fluid;
 import net.neoforged.api.distmarker.Dist;
diff --git a/src/main/java/com/rae/creatingspace/init/RecipeInit.java b/src/main/java/com/rae/creatingspace/init/RecipeInit.java
@@ -3,6 +3,7 @@
 import com.rae.creatingspace.CreatingSpace;
 import com.rae.creatingspace.content.recipes.air_liquefying.AirLiquefyingRecipe;
 import com.rae.creatingspace.content.recipes.air_liquefying.AirLiquefyingRecipeParam;
+import com.rae.creatingspace.content.recipes.chemical_synthesis.ChemicalSynthesisParams;
 import com.rae.creatingspace.content.recipes.chemical_synthesis.ChemicalSynthesisRecipe;
 import com.rae.creatingspace.content.recipes.electrolysis.MechanicalElectrolysisRecipe;
 import com.simibubi.create.AllTags;
@@ -63,11 +64,11 @@ public enum RecipeInit implements IRecipeTypeInfo , StringRepresentable {
 
     RecipeInit(StandardProcessingRecipe.Factory<?> processingFactory) {
         this(() -> new StandardProcessingRecipe.Serializer<>(processingFactory));
-
     }
     RecipeInit(ProcessingRecipe.Factory<AirLiquefyingRecipeParam, ? extends AirLiquefyingRecipe> liquefyingRecipeParamFactory) {
         this(() -> new AirLiquefyingRecipe.Serializer<>(liquefyingRecipeParamFactory));
     }
+
     @ApiStatus.Internal
     public static void register(IEventBus modEventBus) {
         ShapedRecipePattern.setCraftingSize(9, 9);
diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java
diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java
diff --git a/src/main/resources/data/creatingspace/recipe/duplicate_blueprint.json b/src/main/resources/data/creatingspace/recipe/duplicate_blueprint.json
diff --git a/src/main/resources/data/creatingspace/recipe/engine.json b/src/main/resources/data/creatingspace/recipe/engine.json
