From 354a118a1f48408e3d467d29b8034772b0897e0e Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 5 May 2021 10:21:00 -0500 Subject: [PATCH] More Recipes. renamed Ethetic Quartz Blocks. --- .../data/BlockRecipeGenerator.java | 53 ++++++++++++++++++- .../mod/blocks/ActuallyBlocks.java | 16 +++--- .../mod/booklet/InitBooklet.java | 2 +- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index 97434e1ef..790285b7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -48,9 +48,60 @@ public class BlockRecipeGenerator extends RecipeProvider { .key('C', ActuallyBlocks.IRON_CASING.get()) .key('D', ActuallyBlocks.DISPLAY_STAND.get()) .addCriterion("", hasItem(Items.AIR)) - .build(consumer,new ResourceLocation(ActuallyAdditions.MODID, "empowerer")); + .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "empowerer")); + //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")); + //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")); + + //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")); + + //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")); + + //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")); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index 52bd65c7e..2d4a8719d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -66,14 +66,14 @@ public final class ActuallyBlocks { public static final RegistryObject DIRECTIONAL_BREAKER = BLOCKS.register("directional_breaker", BlockDirectionalBreaker::new); public static final RegistryObject LEAF_GENERATOR = BLOCKS.register("leaf_generator", BlockLeafGenerator::new); public static final RegistryObject XP_SOLIDIFIER = BLOCKS.register("xp_solidifier", BlockXPSolidifier::new); - public static final RegistryObject TESTIFI_BUCKS_GREEN_WALL = BLOCKS.register("testifi_bucks_green_wall", BlockGeneric::new); - public static final RegistryObject TESTIFI_BUCKS_WHITE_WALL = BLOCKS.register("testifi_bucks_white_wall", BlockGeneric::new); - public static final RegistryObject TESTIFI_BUCKS_GREEN_STAIRS = BLOCKS.register("testifi_bucks_green_stairs", () -> new StairsBlock(() -> TESTIFI_BUCKS_GREEN_WALL.get().getDefaultState(), AbstractBlock.Properties.from(TESTIFI_BUCKS_GREEN_WALL.get()))); - public static final RegistryObject TESTIFI_BUCKS_WHITE_STAIRS = BLOCKS.register("testifi_bucks_white_stairs", () -> new StairsBlock(() -> TESTIFI_BUCKS_WHITE_WALL.get().getDefaultState(), AbstractBlock.Properties.from(TESTIFI_BUCKS_WHITE_WALL.get()))); - public static final RegistryObject TESTIFI_BUCKS_GREEN_SLAB = BLOCKS.register("testifi_bucks_green_slab", () -> new SlabBlock(AbstractBlock.Properties.from(TESTIFI_BUCKS_GREEN_WALL.get()))); - public static final RegistryObject TESTIFI_BUCKS_WHITE_SLAB = BLOCKS.register("testifi_bucks_white_slab", () -> new SlabBlock(AbstractBlock.Properties.from(TESTIFI_BUCKS_WHITE_WALL.get()))); - public static final RegistryObject TESTIFI_BUCKS_GREEN_FENCE = BLOCKS.register("testifi_bucks_green_fence", () -> new WallBlock(AbstractBlock.Properties.from(TESTIFI_BUCKS_GREEN_WALL.get()))); - public static final RegistryObject TESTIFI_BUCKS_WHITE_FENCE = BLOCKS.register("testifi_bucks_white_fence", () -> new WallBlock(AbstractBlock.Properties.from(TESTIFI_BUCKS_WHITE_WALL.get()))); + public static final RegistryObject ETHETIC_GREEN_BLOCK = BLOCKS.register("ethetic_green_block", BlockGeneric::new); + public static final RegistryObject ETHETIC_WHITE_BLOCK = BLOCKS.register("ethetic_white_block", BlockGeneric::new); + public static final RegistryObject ETHETIC_GREEN_STAIRS = BLOCKS.register("ethetic_green_stairs", () -> new StairsBlock(() -> ETHETIC_GREEN_BLOCK.get().getDefaultState(), AbstractBlock.Properties.from(ETHETIC_GREEN_BLOCK.get()))); + public static final RegistryObject ETHETIC_WHITE_STAIRS = BLOCKS.register("ethetic_white_stairs", () -> new StairsBlock(() -> ETHETIC_WHITE_BLOCK.get().getDefaultState(), AbstractBlock.Properties.from(ETHETIC_WHITE_BLOCK.get()))); + public static final RegistryObject ETHETIC_GREEN_SLAB = BLOCKS.register("ethetic_green_slab", () -> new SlabBlock(AbstractBlock.Properties.from(ETHETIC_GREEN_BLOCK.get()))); + public static final RegistryObject ETHETIC_WHITE_SLAB = BLOCKS.register("ethetic_white_slab", () -> new SlabBlock(AbstractBlock.Properties.from(ETHETIC_WHITE_BLOCK.get()))); + public static final RegistryObject ETHETIC_GREEN_FENCE = BLOCKS.register("ethetic_green_fence", () -> new WallBlock(AbstractBlock.Properties.from(ETHETIC_GREEN_BLOCK.get()))); + public static final RegistryObject ETHETIC_WHITE_FENCE = BLOCKS.register("ethetic_white_fence", () -> new WallBlock(AbstractBlock.Properties.from(ETHETIC_WHITE_BLOCK.get()))); public static final RegistryObject CRYSTAL_ENORI = BLOCKS.register("crystal_enori_block", () -> new BlockCrystal(false)); public static final RegistryObject CRYSTAL_RESTONIA = BLOCKS.register("crystal_restonia_block", () -> new BlockCrystal(false)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index da7ff1ae3..558d156a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -154,7 +154,7 @@ public final class InitBooklet { new BookletChapter("lushCaves", ActuallyAdditionsAPI.entryMisc, new ItemStack(Blocks.STONE), new PageTextOnly(1), new PagePicture(2, "page_lush_caves", 0).setNoText()); new BookletChapter("crystalClusters", ActuallyAdditionsAPI.entryMisc, new ItemStack(ActuallyBlocks.CRYSTAL_CLUSTER_EMERALD.get()), new PageTextOnly(1).addItemsToPage(WorldGenLushCaves.CRYSTAL_CLUSTERS), new PageCrafting(2, MiscCrafting.RECIPES_CRYSTAL_SHARDS).setNoText(), new PageCrafting(3, MiscCrafting.RECIPES_CRYSTAL_SHARDS_BACK).setNoText()).setSpecial(); new BookletChapter("banners", ActuallyAdditionsAPI.entryMisc, new ItemStack(Items.BLUE_BANNER, 1), new PageTextOnly(1)); - new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(ActuallyBlocks.TESTIFI_BUCKS_GREEN_WALL), new PageTextOnly(1), new PageReconstructor(2, LensRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensRecipeHandler.recipeGreenWall).setNoText()); + new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()), new PageTextOnly(1), new PageReconstructor(2, LensRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensRecipeHandler.recipeGreenWall).setNoText()); chaptersIntroduction[3] = new BookletChapter("quartz", ActuallyAdditionsAPI.entryMisc, new ItemStack(ActuallyItems.itemBlackQuartz.get()), new PageTextOnly(1).addItemsToPage(new ItemStack(ActuallyBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("", AAWorldGen.QUARTZ_MIN).addTextReplacement("", AAWorldGen.QUARTZ_MAX), new PageTextOnly(2).addItemsToPage(new ItemStack(ActuallyItems.itemBlackQuartz.get())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText()); // new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(ActuallyBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setWildcard()).setSpecial(); new BookletChapter("coalStuff", ActuallyAdditionsAPI.entryMisc, new ItemStack(ActuallyItems.TINY_COAL.get()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText());