Item Recipe conversion, round 1.

src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java

@@ -23,10 +23,10 @@ public class BlockRecipeGenerator extends RecipeProvider {
     @Override
     protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer) {
         //Battery Box
-        Recipe.shapeless(ActuallyBlocks.BATTERY_BOX.get()).ingredients(ActuallyBlocks.ENERGIZER.get(), ActuallyBlocks.ENERVATOR.get(), ActuallyItems.COIL.get()).save(consumer);
+        Recipe.shapeless(ActuallyBlocks.BATTERY_BOX.getItem()).ingredients(ActuallyBlocks.ENERGIZER.get(), ActuallyBlocks.ENERVATOR.get(), ActuallyItems.COIL.get()).save(consumer);
 
         //Farmer
-        Recipe.shaped(ActuallyBlocks.FARMER.get())
+        Recipe.shaped(ActuallyBlocks.FARMER.getItem())
                 .pattern("ISI", "SCS", "ISI")
                 .define('I', ActuallyBlocks.ENORI_CRYSTAL.getItem())
                 .define('C', ActuallyBlocks.IRON_CASING.get())
@@ -34,7 +34,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Empowerer
-        Recipe.shaped(ActuallyBlocks.EMPOWERER.get())
+        Recipe.shaped(ActuallyBlocks.EMPOWERER.getItem())
                 .pattern(" R ", " B ", "CDC")
                 .define('R', ActuallyItems.RESTONIA_CRYSTAL.get())
                 .define('B', ActuallyItems.BATTERY_DOUBLE.get())
@@ -43,14 +43,14 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Tiny Torch
-        Recipe.shaped(ActuallyBlocks.TINY_TORCH.get(), 2)
+        Recipe.shaped(ActuallyBlocks.TINY_TORCH.getItem(), 2)
                 .pattern("C", "S")
                 .define('C', ActuallyTags.Items.TINY_COALS)
                 .define('S', Tags.Items.RODS_WOODEN)
                 .save(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch"));
 
         //Fireworks Box
-        Recipe.shaped(ActuallyBlocks.FIREWORK_BOX.get())
+        Recipe.shaped(ActuallyBlocks.FIREWORK_BOX.getItem())
                 .pattern("GFG", "SAS", "CCC")
                 .define('G', Tags.Items.GUNPOWDER)
                 .define('S', Tags.Items.RODS_WOODEN)
@@ -60,7 +60,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Shock Suppressor
-        Recipe.shaped(ActuallyBlocks.SHOCK_SUPPRESSOR.get())
+        Recipe.shaped(ActuallyBlocks.SHOCK_SUPPRESSOR.getItem())
                 .pattern("OAO", "ACA", "OAO")
                 .define('A', ActuallyItems.VOID_EMPOWERED_CRYSTAL.get())
                 .define('O', Tags.Items.OBSIDIAN)
@@ -68,7 +68,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Display Stand
-        Recipe.shaped(ActuallyBlocks.DISPLAY_STAND.get())
+        Recipe.shaped(ActuallyBlocks.DISPLAY_STAND.getItem())
                 .pattern(" R ", "EEE", "GGG")
                 .define('R', ActuallyItems.COIL_ADVANCED.get())
                 .define('E', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get())
@@ -76,7 +76,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Vertical Digger
-        Recipe.shaped(ActuallyBlocks.VERTICAL_DIGGER.get())
+        Recipe.shaped(ActuallyBlocks.VERTICAL_DIGGER.getItem())
                 .pattern("IRI", "RCR", "IDI")
                 .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE)
                 .define('I', ActuallyBlocks.IRON_CASING.get())
@@ -85,52 +85,52 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         //Black Quartz Wall
-        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.get(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
+        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
 
         //Black Quartz Slab
-        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
+        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
 
         //Black Quartz Stairs
-        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
+        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
 
         //Pillar Black Quartz Wall
-        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
+        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
 
         //Pillar Black Quartz Slab
-        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
+        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
 
         //Pillar Black Quartz Stairs
-        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
+        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get(), consumer);
 
         //Chiseled Black Quartz Wall
-        Recipe.wall(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer);
+        Recipe.wall(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer);
 
         //Chiseled Black Quartz Slab
-        Recipe.slab(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer);
+        Recipe.slab(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer);
 
         //Chiseled Black Quartz Stairs
-        Recipe.stairs(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer);
+        Recipe.stairs(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get(), consumer);
 
         //Ethetic White Wall
-        Recipe.wall(ActuallyBlocks.ETHETIC_WHITE_WALL.get(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer);
+        Recipe.wall(ActuallyBlocks.ETHETIC_WHITE_WALL.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer);
 
         //Ethetic White Slab
-        Recipe.slab(ActuallyBlocks.ETHETIC_WHITE_SLAB.get(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer);
+        Recipe.slab(ActuallyBlocks.ETHETIC_WHITE_SLAB.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer);
 
         //Ethetic White Stairs
-        Recipe.stairs(ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer);
+        Recipe.stairs(ActuallyBlocks.ETHETIC_WHITE_STAIRS.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), consumer);
 
         // Ethetic Green Wall
-        Recipe.wall(ActuallyBlocks.ETHETIC_GREEN_WALL.get(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), consumer);
+        Recipe.wall(ActuallyBlocks.ETHETIC_GREEN_WALL.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), consumer);
 
         // Ethetic Green Slab
-        Recipe.slab(ActuallyBlocks.ETHETIC_GREEN_SLAB.get(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), consumer);
+        Recipe.slab(ActuallyBlocks.ETHETIC_GREEN_SLAB.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), consumer);
 
         // Ethetic Green Stairs
-        Recipe.stairs(ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), consumer);
+        Recipe.stairs(ActuallyBlocks.ETHETIC_GREEN_STAIRS.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), consumer);
 
         // Atomic Reconstructor
-        Recipe.shaped(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.get())
+        Recipe.shaped(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.getItem())
                 .pattern("IRI", "RCR", "IRI")
                 .define('R', Tags.Items.DUSTS_REDSTONE)
                 .define('I', Tags.Items.INGOTS_IRON)
@@ -138,7 +138,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         // Laser Relay
-        Recipe.shaped(ActuallyBlocks.LASER_RELAY.get(), 4)
+        Recipe.shaped(ActuallyBlocks.LASER_RELAY.getItem(), 4)
                 .pattern("OBO", "RCR", "OBO")
                 .define('B', Tags.Items.STORAGE_BLOCKS_REDSTONE)
                 .define('O', Tags.Items.OBSIDIAN)
@@ -147,7 +147,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         // Advanced Laser Relay
-        Recipe.shaped(ActuallyBlocks.LASER_RELAY_ADVANCED.get())
+        Recipe.shaped(ActuallyBlocks.LASER_RELAY_ADVANCED.getItem())
                 .pattern(" I ", "XRX", " I ")
                 .define('I', ActuallyItems.ENORI_CRYSTAL.get())
                 .define('R', ActuallyBlocks.LASER_RELAY.get())
@@ -155,7 +155,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         // Extreme Laser Relay
-        Recipe.shaped(ActuallyBlocks.LASER_RELAY_EXTREME.get())
+        Recipe.shaped(ActuallyBlocks.LASER_RELAY_EXTREME.getItem())
                 .pattern(" I ", "XRX", " I ")
                 .define('I', ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL.get())
                 .define('R', ActuallyBlocks.LASER_RELAY_ADVANCED.get())
@@ -163,12 +163,12 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .save(consumer);
 
         // Whitelist Item Laser Relay
-        Recipe.shapeless(ActuallyBlocks.LASER_RELAY_ITEM_ADVANCED.get())
+        Recipe.shapeless(ActuallyBlocks.LASER_RELAY_ITEM_ADVANCED.getItem())
                 .ingredients(ActuallyBlocks.LASER_RELAY_ITEM.get(), ActuallyItems.COIL_ADVANCED.get(), ActuallyItems.BLACK_QUARTZ.get())
                 .save(consumer);
 
         // Item Interface
-        Recipe.shaped(ActuallyBlocks.ITEM_VIEWER.get())
+        Recipe.shaped(ActuallyBlocks.ITEM_VIEWER.getItem())
                 .pattern("OBO", "RCR", "OBO")
                 .define('B', Tags.Items.DUSTS_REDSTONE)
                 .define('O', ActuallyItems.COIL.get())

src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java

@@ -1,12 +1,16 @@
 package de.ellpeck.actuallyadditions.data;
 
 import com.google.gson.JsonObject;
-import net.minecraft.data.DataGenerator;
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
-import net.minecraft.data.DirectoryCache;
+import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
-import net.minecraft.data.IFinishedRecipe;
+import net.minecraft.data.*;
-import net.minecraft.data.RecipeProvider;
+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 ItemRecipeGenerator extends RecipeProvider {
@@ -16,11 +20,168 @@ public class ItemRecipeGenerator extends RecipeProvider {
 
     @Override
     protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer) {
-        super.buildShapelessRecipes(consumer);
+
+        //Goggles
+        Recipe.shaped(ActuallyItems.ENGINEER_GOGGLES.get())
+            .pattern(" R ")
+            .pattern("IGI")
+            .define('R', ActuallyItems.RESTONIA_CRYSTAL.get())
+            .define('I', Items.IRON_BARS)
+            .define('G', Tags.Items.GLASS).save(consumer);
+
+        //Advanced Goggles
+        Recipe.shaped(ActuallyItems.ENGINEER_GOGGLES_ADVANCED.get())
+            .pattern(" R ")
+            .pattern("IGI")
+            .define('R', ActuallyItems.RESTONIA_EMPOWERED_CRYSTAL.get())
+            .define('I', Items.IRON_BARS)
+            .define('G', ActuallyItems.ENGINEER_GOGGLES.get()).save(consumer);
+
+        //Laser Upgrades
+        //Invisibility
+        Recipe.shaped(ActuallyItems.LASER_UPGRADE_INVISIBILITY.get(), 4)
+            .pattern("GGG")
+            .pattern("RCR")
+            .pattern("GGG")
+            .define('G', Tags.Items.GLASS_BLACK)
+            .define('R', ActuallyItems.VOID_CRYSTAL.get())
+            .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer);
+
+        //Range
+        Recipe.shaped(ActuallyItems.LASER_UPGRADE_RANGE.get(), 2)
+            .pattern("GGC")
+            .pattern("RCR")
+            .pattern("CGG")
+            .define('R', Items.COMPASS)
+            .define('G', ActuallyItems.RESTONIA_CRYSTAL.get())
+            .define('C', ActuallyItems.COIL_ADVANCED.get()).save(consumer);
+
+        //Filling Wand
+        Recipe.shaped(ActuallyItems.FILLING_WAND.get())
+            .pattern("IPI")
+            .pattern("DCD")
+            .pattern(" B ")
+            .define('I', ActuallyItems.ENORI_EMPOWERED_CRYSTAL.get())
+            .define('P', ActuallyItems.PALIS_CRYSTAL.get())
+            .define('C', ActuallyItems.COIL_ADVANCED.get())
+            .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
+            .define('B', ActuallyItems.BATTERY_TRIPLE.get()).save(consumer);
+
+        //Bag
+        Recipe.shaped(ActuallyItems.BAG.get())
+            .pattern("SLS")
+            .pattern("SCS")
+            .pattern("LVL")
+            .define('S', Tags.Items.STRING)
+            .define('L', Tags.Items.LEATHER)
+            .define('C', Tags.Items.CHESTS_WOODEN)
+            .define('B', ActuallyBlocks.VOID_CRYSTAL.getItem()).save(consumer);
+
+        //Void Bag
+        Recipe.shapeless(ActuallyItems.VOID_BAG.get())
+            .requires(ActuallyItems.BAG.get())
+            .requires(Tags.Items.ENDER_PEARLS)
+            .requires(Tags.Items.OBSIDIAN)
+            .requires(ActuallyBlocks.VOID_CRYSTAL.getItem())
+            .save(consumer);
+
+
+
+
+
     }
 
     @Override
     protected void saveAdvancement(DirectoryCache cache, JsonObject cache2, Path advancementJson) {
         //Nope...
     }
+
+    public static class Recipe {
+        public static ItemRecipeGenerator.Recipe.Shapeless shapeless(IItemProvider result) {
+            return new ItemRecipeGenerator.Recipe.Shapeless(result);
+        }
+
+        public static ItemRecipeGenerator.Recipe.Shapeless shapeless(IItemProvider result, int count) {
+            return new ItemRecipeGenerator.Recipe.Shapeless(result, count);
+        }
+
+        public static ItemRecipeGenerator.Recipe.Shaped shaped(IItemProvider result) {
+            return new ItemRecipeGenerator.Recipe.Shaped(result);
+        }
+
+        public static ItemRecipeGenerator.Recipe.Shaped shaped(IItemProvider result, int count) {
+            return new ItemRecipeGenerator.Recipe.Shaped(result, count);
+        }
+
+        private static class Shapeless extends ShapelessRecipeBuilder {
+            public Shapeless(IItemProvider result) {
+                this(result, 1);
+            }
+
+            public Shapeless(IItemProvider result, int countIn) {
+                super(result, countIn);
+            }
+
+            public ItemRecipeGenerator.Recipe.Shapeless ingredients(IItemProvider... ingredients) {
+                Arrays.asList(ingredients).forEach(this::requires);
+                return this;
+            }
+
+            @Override
+            public void save(Consumer<IFinishedRecipe> consumer) {
+                this.unlockedBy("has_book", has(ActuallyItems.ITEM_BOOKLET.get()));
+                super.save(consumer);
+            }
+
+            @Override
+            public void save(Consumer<IFinishedRecipe> consumer, ResourceLocation location) {
+                this.unlockedBy("has_book", has(ActuallyItems.ITEM_BOOKLET.get()));
+                super.save(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 ItemRecipeGenerator.Recipe.Shaped pattern(String line1, String line2, String line3) {
+                this.pattern(line1);
+                this.pattern(line2);
+                this.pattern(line3);
+                return this;
+            }
+
+            public ItemRecipeGenerator.Recipe.Shaped pattern(String line1, String line2) {
+                this.pattern(line1);
+                this.pattern(line2);
+                return this;
+            }
+
+            public ItemRecipeGenerator.Recipe.Shaped patternSingleKey(char key, IItemProvider resource, String... lines) {
+                this.define(key, resource);
+                for (String line : lines) {
+                    this.pattern(line);
+                }
+
+                return this;
+            }
+
+            @Override
+            public void save(Consumer<IFinishedRecipe> consumerIn) {
+                this.unlockedBy("has_book", has(ActuallyItems.ITEM_BOOKLET.get()));
+                super.save(consumerIn);
+            }
+
+            @Override
+            public void save(Consumer<IFinishedRecipe> consumerIn, ResourceLocation id) {
+                this.unlockedBy("has_book", has(ActuallyItems.ITEM_BOOKLET.get()));
+                super.save(consumerIn, id);
+            }
+        }
+    }
 }