diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
index 790285b7b..6f7d8d0e3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
@@ -6,10 +6,12 @@ import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import net.minecraft.data.*;
 import net.minecraft.item.Items;
+import net.minecraft.util.IItemProvider;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.Tags;
 
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 public class BlockRecipeGenerator extends RecipeProvider {
@@ -20,92 +22,156 @@ public class BlockRecipeGenerator extends RecipeProvider {
     @Override
     protected void registerRecipes(Consumer<IFinishedRecipe> consumer) {
         //Battery Box
-       ShapelessRecipeBuilder.shapelessRecipe(ActuallyBlocks.BATTERY_BOX.get())
-                .addIngredient(ActuallyBlocks.ENERGIZER.get())
-                .addIngredient(ActuallyBlocks.ENERVATOR.get())
-                .addIngredient(ActuallyItems.COIL.get())
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "battery_box"));
+        Recipe.shapeless(ActuallyBlocks.BATTERY_BOX.get()).ingredients(ActuallyBlocks.ENERGIZER.get(), ActuallyBlocks.ENERVATOR.get(), ActuallyItems.COIL.get()).build(consumer);
 
         //Farmer
-       ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.FARMER.get())
-                .patternLine("ISI")
-                .patternLine("SCS")
-                .patternLine("ISI")
-                .key('I', ActuallyBlocks.CRYSTAL_ENORI.get())
-                .key('C', ActuallyBlocks.IRON_CASING.get())
-                .key('S', Tags.Items.SEEDS)
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "farmer"));
+        Recipe.shaped(ActuallyBlocks.FARMER.get())
+            .pattern("ISI", "SCS", "ISI")
+            .key('I', ActuallyBlocks.CRYSTAL_ENORI.get())
+            .key('C', ActuallyBlocks.IRON_CASING.get())
+            .key('S', Tags.Items.SEEDS)
+            .build(consumer);
 
-       //Empowerer
-       ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.EMPOWERER.get())
-               .patternLine(" R ")
-               .patternLine(" B ")
-               .patternLine("CDC")
-               .key('R', ActuallyItems.RESTONIA_CRYSTAL.get())
-               .key('B', ActuallyItems.BATTERY_DOUBLE.get())
-               .key('C', ActuallyBlocks.IRON_CASING.get())
-               .key('D', ActuallyBlocks.DISPLAY_STAND.get())
-               .addCriterion("", hasItem(Items.AIR))
-               .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "empowerer"));
+        //Empowerer
+        ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.EMPOWERER.get())
+            .patternLine(" R ")
+            .patternLine(" B ")
+            .patternLine("CDC")
+            .key('R', ActuallyItems.RESTONIA_CRYSTAL.get())
+            .key('B', ActuallyItems.BATTERY_DOUBLE.get())
+            .key('C', ActuallyBlocks.IRON_CASING.get())
+            .key('D', ActuallyBlocks.DISPLAY_STAND.get())
+            .addCriterion("", hasItem(Items.AIR))
+            .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "empowerer"));
 
-       //Tiny Torch coal
+        //Tiny Torch coal
         ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.TINY_TORCH.get(), 2)
-                .patternLine("C")
-                .patternLine("S")
-                .key('C', ActuallyItems.TINY_COAL.get())
-                .key('S', Tags.Items.RODS_WOODEN)
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch_coal"));
+            .patternLine("C")
+            .patternLine("S")
+            .key('C', ActuallyItems.TINY_COAL.get())
+            .key('S', Tags.Items.RODS_WOODEN)
+            .addCriterion("", hasItem(Items.AIR))
+            .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch_coal"));
 
         //Tiny Torch charcoal
         ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.TINY_TORCH.get(), 2)
-                .patternLine("C")
-                .patternLine("S")
-                .key('C', ActuallyItems.TINY_CHARCOAL.get())
-                .key('S', Tags.Items.RODS_WOODEN)
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch_charcoal"));
+            .patternLine("C")
+            .patternLine("S")
+            .key('C', ActuallyItems.TINY_CHARCOAL.get())
+            .key('S', Tags.Items.RODS_WOODEN)
+            .addCriterion("", hasItem(Items.AIR))
+            .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch_charcoal"));
 
         //Fireworks Box
         ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.FIREWORK_BOX.get())
-                .patternLine("GFG")
-                .patternLine("SAS")
-                .patternLine("CCC")
-                .key('G', Tags.Items.GUNPOWDER)
-                .key('S', Tags.Items.RODS_WOODEN)
-                .key('A', ActuallyBlocks.IRON_CASING.get())
-                .key('F', Items.FIREWORK_ROCKET)
-                .key('C', ActuallyItems.ENORI_CRYSTAL.get())
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "firework_box"));
+            .patternLine("GFG")
+            .patternLine("SAS")
+            .patternLine("CCC")
+            .key('G', Tags.Items.GUNPOWDER)
+            .key('S', Tags.Items.RODS_WOODEN)
+            .key('A', ActuallyBlocks.IRON_CASING.get())
+            .key('F', Items.FIREWORK_ROCKET)
+            .key('C', ActuallyItems.ENORI_CRYSTAL.get())
+            .addCriterion("", hasItem(Items.AIR))
+            .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "firework_box"));
 
         //Shock Suppressor
         ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.SHOCK_SUPPRESSOR.get())
-                .patternLine("OAO")
-                .patternLine("ACA")
-                .patternLine("OAO")
-                .key('A', ActuallyItems.VOID_EMPOWERED_CRYSTAL.get())
-                .key('O', Tags.Items.OBSIDIAN)
-                .key('C', ActuallyItems.COIL_ADVANCED.get())
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "shock_suppressor"));
+            .patternLine("OAO")
+            .patternLine("ACA")
+            .patternLine("OAO")
+            .key('A', ActuallyItems.VOID_EMPOWERED_CRYSTAL.get())
+            .key('O', Tags.Items.OBSIDIAN)
+            .key('C', ActuallyItems.COIL_ADVANCED.get())
+            .addCriterion("", hasItem(Items.AIR))
+            .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "shock_suppressor"));
 
         //Display Stand
         ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.DISPLAY_STAND.get())
-                .patternLine(" R ")
-                .patternLine("EEE")
-                .patternLine("GGG")
-                .key('R', ActuallyItems.COIL_ADVANCED.get())
-                .key('E', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get())
-                .key('G', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get())
-                .addCriterion("", hasItem(Items.AIR))
-                .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "display_stand"));
+            .patternLine(" R ")
+            .patternLine("EEE")
+            .patternLine("GGG")
+            .key('R', ActuallyItems.COIL_ADVANCED.get())
+            .key('E', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get())
+            .key('G', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get())
+            .addCriterion("", hasItem(Items.AIR))
+            .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "display_stand"));
     }
 
     @Override
     protected void saveRecipeAdvancement(DirectoryCache cache, JsonObject cache2, Path advancementJson) {
         //Nope...
     }
+
+    public static class Recipe {
+        public static Shapeless shapeless(IItemProvider result) {
+            return new Shapeless(result);
+        }
+
+        public static Shaped shaped(IItemProvider result) {
+            return new Shaped(result);
+        }
+
+        private static class Shapeless extends ShapelessRecipeBuilder {
+            public Shapeless(IItemProvider result) {
+                this(result, 1);
+            }
+
+            public Shapeless(IItemProvider result, int countIn) {
+                super(result, countIn);
+            }
+
+            public Shapeless ingredients(IItemProvider... ingredients) {
+                Arrays.asList(ingredients).forEach(this::addIngredient);
+                return this;
+            }
+
+            @Override
+            public void build(Consumer<IFinishedRecipe> consumer) {
+                this.addCriterion("has_book", hasItem(ActuallyItems.ITEM_BOOKLET.get()));
+                super.build(consumer);
+            }
+
+            @Override
+            public void build(Consumer<IFinishedRecipe> consumer, ResourceLocation location) {
+                this.addCriterion("has_book", hasItem(ActuallyItems.ITEM_BOOKLET.get()));
+                super.build(consumer, location);
+            }
+        }
+
+        private static class Shaped extends ShapedRecipeBuilder {
+            public Shaped(IItemProvider resultIn) {
+                this(resultIn, 1);
+            }
+
+            public Shaped(IItemProvider resultIn, int countIn) {
+                super(resultIn, countIn);
+            }
+
+            public Shaped pattern(String line1, String line2, String line3) {
+                this.patternLine(line1);
+                this.patternLine(line2);
+                this.patternLine(line3);
+                return this;
+            }
+
+            public Shaped pattern(String line1, String line2) {
+                this.patternLine(line1);
+                this.patternLine(line2);
+                return this;
+            }
+
+            @Override
+            public void build(Consumer<IFinishedRecipe> consumerIn) {
+                this.addCriterion("has_book", hasItem(ActuallyItems.ITEM_BOOKLET.get()));
+                super.build(consumerIn);
+            }
+
+            @Override
+            public void build(Consumer<IFinishedRecipe> consumerIn, ResourceLocation id) {
+                this.addCriterion("has_book", hasItem(ActuallyItems.ITEM_BOOKLET.get()));
+                super.build(consumerIn, id);
+            }
+        }
+    }
 }