From 7ef9492778524e51c603a43dc008878b343350fe Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 5 May 2021 11:15:25 -0500 Subject: [PATCH] Moar recipes.... --- .../data/BlockRecipeGenerator.java | 70 +++++++++++++++++-- .../mod/blocks/ActuallyBlocks.java | 25 +++---- ...ockMiner.java => BlockVerticalDigger.java} | 4 +- 3 files changed, 79 insertions(+), 20 deletions(-) rename src/main/java/de/ellpeck/actuallyadditions/mod/blocks/{BlockMiner.java => BlockVerticalDigger.java} (96%) diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index 790285b7b..20a0a1614 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -25,7 +25,7 @@ public class BlockRecipeGenerator extends RecipeProvider { .addIngredient(ActuallyBlocks.ENERVATOR.get()) .addIngredient(ActuallyItems.COIL.get()) .addCriterion("", hasItem(Items.AIR)) - .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "battery_box")); + .build(consumer); //Farmer ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.FARMER.get()) @@ -36,7 +36,7 @@ public class BlockRecipeGenerator extends RecipeProvider { .key('C', ActuallyBlocks.IRON_CASING.get()) .key('S', Tags.Items.SEEDS) .addCriterion("", hasItem(Items.AIR)) - .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "farmer")); + .build(consumer); //Empowerer ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.EMPOWERER.get()) @@ -48,7 +48,7 @@ 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); //Tiny Torch coal ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.TINY_TORCH.get(), 2) @@ -79,7 +79,7 @@ public class BlockRecipeGenerator extends RecipeProvider { .key('F', Items.FIREWORK_ROCKET) .key('C', ActuallyItems.ENORI_CRYSTAL.get()) .addCriterion("", hasItem(Items.AIR)) - .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "firework_box")); + .build(consumer); //Shock Suppressor ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.SHOCK_SUPPRESSOR.get()) @@ -90,7 +90,7 @@ public class BlockRecipeGenerator extends RecipeProvider { .key('O', Tags.Items.OBSIDIAN) .key('C', ActuallyItems.COIL_ADVANCED.get()) .addCriterion("", hasItem(Items.AIR)) - .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "shock_suppressor")); + .build(consumer); //Display Stand ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.DISPLAY_STAND.get()) @@ -101,7 +101,65 @@ public class BlockRecipeGenerator extends RecipeProvider { .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")); + .build(consumer); + + //Vertical Digger + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.MINER.get()) + .patternLine("IRI") + .patternLine("RCR") + .patternLine("IDI") + .key('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) + .key('I', ActuallyBlocks.IRON_CASING.get()) + .key('C', ActuallyItems.VOID_EMPOWERED_CRYSTAL.get()) + .key('D', ActuallyItems.DRILL.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Black Quartz Wall + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_WALL.get()) + .patternLine("QQQ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Black Quartz Slab + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_SLAB.get()) + .patternLine("QQQ") + .key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Black Quartz Stairs + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_STAIR.get()) + .patternLine("Q ") + .patternLine("QQ ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get()) + .build(consumer); + + //Ethetic White Wall + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ETHETIC_WHITE_WALL.get()) + .patternLine("QQQ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Ethetic White Slab + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ETHETIC_WHITE_SLAB.get()) + .patternLine("QQQ") + .key('Q', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Ethetic White Stairs + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ETHETIC_WHITE_STAIRS.get()) + .patternLine("Q ") + .patternLine("QQ ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) + .build(consumer); } @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 2d4a8719d..104276a5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -54,7 +54,7 @@ public final class ActuallyBlocks { public static final RegistryObject PLAYER_INTERFACE = BLOCKS.register("player_interface", BlockPlayerInterface::new); public static final RegistryObject ITEM_VIEWER = BLOCKS.register("item_viewer", BlockItemViewer::new); public static final RegistryObject FIREWORK_BOX = BLOCKS.register("firework_box", BlockFireworkBox::new); - public static final RegistryObject MINER = BLOCKS.register("miner", BlockMiner::new); + public static final RegistryObject MINER = BLOCKS.register("miner", BlockVerticalDigger::new); public static final RegistryObject ATOMIC_RECONSTRUCTOR = BLOCKS.register("atomic_reconstructor", BlockAtomicReconstructor::new); public static final RegistryObject LASER_RELAY = BLOCKS.register("laser_relay", () -> new BlockLaserRelay(BlockLaserRelay.Type.ENERGY_BASIC)); public static final RegistryObject LASER_RELAY_ADVANCED = BLOCKS.register("laser_relay_advanced", () -> new BlockLaserRelay(BlockLaserRelay.Type.ENERGY_ADVANCED)); @@ -72,8 +72,8 @@ public final class ActuallyBlocks { 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 ETHETIC_GREEN_WALL = BLOCKS.register("ethetic_green_wall", () -> new WallBlock(AbstractBlock.Properties.from(ETHETIC_GREEN_BLOCK.get()))); + public static final RegistryObject ETHETIC_WHITE_WALL = BLOCKS.register("ethetic_white_wall", () -> 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)); @@ -140,15 +140,16 @@ public final class ActuallyBlocks { public static final RegistryObject FLUID_COLLECTOR = BLOCKS.register("fluid_collector", () -> new BlockFluidCollector(false)); public static final RegistryObject COFFEE_MACHINE = BLOCKS.register("coffee_machine", BlockCoffeeMachine::new); public static final RegistryObject PHANTOM_BOOSTER = BLOCKS.register("phantom_booster", BlockPhantomBooster::new); - public static final RegistryObject QUARTZ_WALL = BLOCKS.register("quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject CHISELED_QUARTZ_WALL = BLOCKS.register("chiseled_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject PILLAR_QUARTZ_WALL = BLOCKS.register("pillar_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject QUARTZ_STAIR = BLOCKS.register("quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject CHISELED_QUARTZ_STAIR = BLOCKS.register("chiseled_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject PILLAR_QUARTZ_STAIR = BLOCKS.register("pillar_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject QUARTZ_SLAB = BLOCKS.register("quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject CHISELED_QUARTZ_SLAB = BLOCKS.register("chiseled_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); - public static final RegistryObject PILLAR_QUARTZ_SLAB = BLOCKS.register("pillar_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject BLACK_QUARTZ_BLOCK = BLOCKS.register("black_quartz_block", BlockGeneric::new); + public static final RegistryObject BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject CHISELED_BLACK_QUARTZ_WALL = BLOCKS.register("chiseled_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject PILLAR_BLACK_QUARTZ_WALL = BLOCKS.register("pillar_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject CHISELED_BLACK_QUARTZ_STAIR = BLOCKS.register("chiseled_black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject PILLAR_BLACK_QUARTZ_STAIR = BLOCKS.register("pillar_black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject CHISELED_BLACK_QUARTZ_SLAB = BLOCKS.register("chiseled_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject PILLAR_BLACK_QUARTZ_SLAB = BLOCKS.register("pillar_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); public static AbstractBlock.Properties defaultPickProps(int harvestLevel, float hardness, float resistance) { return AbstractBlock.Properties.create(Material.ROCK).harvestLevel(harvestLevel).harvestTool(ToolType.PICKAXE).hardnessAndResistance(hardness, resistance).sound(SoundType.STONE); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java similarity index 96% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java index fa7154fa0..0f834752f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java @@ -33,9 +33,9 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class BlockMiner extends DirectionalBlock.Container implements IHudDisplay { +public class BlockVerticalDigger extends DirectionalBlock.Container implements IHudDisplay { - public BlockMiner() { + public BlockVerticalDigger() { super(ActuallyBlocks.defaultPickProps(0, 8F, 30F)); }