feat: allow baking ovens to use bronze, and fix egg pasta dough recipe

bruberu · Sep 21, 2024 · 9ca769b · 9ca769b
1 parent a2f49ee
commit 9ca769b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/gregtechfoodoption/machines/multiblock/MetaTileEntityBakingOven.java b/src/main/java/gregtechfoodoption/machines/multiblock/MetaTileEntityBakingOven.java
@@ -15,6 +15,7 @@
 import gregtech.api.metatileentity.multiblock.RecipeMapPrimitiveMultiblockController;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
+import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.client.renderer.ICubeRenderer;
 import gregtech.common.blocks.MetaBlocks;
 import gregtechfoodoption.block.GTFOBlockCasing;
@@ -27,6 +28,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.items.ItemStackHandler;
 
+import static gregtech.api.unification.material.Materials.Bronze;
 import static gregtech.api.unification.material.Materials.Iron;
 
 public class MetaTileEntityBakingOven extends RecipeMapPrimitiveMultiblockController {
@@ -44,8 +46,9 @@ protected IBlockState getCasingState() {
         return GTFOMetaBlocks.GTFO_CASING.getState(GTFOBlockCasing.CasingType.ADOBE_BRICKS);
     }
 
-    protected IBlockState getFrameState() {
-        return MetaBlocks.FRAMES.get(Iron).getBlock(Iron);
+    protected TraceabilityPredicate getFrameState() {
+        return states(MetaBlocks.FRAMES.get(Iron).getBlock(Iron),
+                MetaBlocks.FRAMES.get(Bronze).getBlock(Bronze));
     }
 
     @Override
@@ -79,7 +82,7 @@ protected BlockPattern createStructurePattern() {
                 .aisle("XFX", "X#X")
                 .aisle("XYX", "XXX")
                 .where('X', states(getCasingState()))
-                .where('F', states(getFrameState()))
+                .where('F', getFrameState())
                 .where('#', air())
                 .where(' ', any())
                 .where('Y', selfPredicate())

diff --git a/src/main/java/gregtechfoodoption/recipe/chain/PastaChain.java b/src/main/java/gregtechfoodoption/recipe/chain/PastaChain.java
@@ -37,7 +37,7 @@ public static void init() {
 
         if (!GTFOConfig.gtfoChainsConfig.makeChainsHarder) {
             MIXER_RECIPES.recipeBuilder().EUt(30).duration(1200)
-                    .inputs(EGG_PASTA_DOUGH.getStackForm())
+                    .input(dust, Wheat, 2)
                     .fluidInputs(GTFOMaterialHandler.Egg.getFluid(400))
                     .fluidInputs(Air.getFluid(600))
                     .circuitMeta(2)