From 785c4b7460424ce0a9f43e7ae19a268782a75fe8 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 5 May 2021 11:34:43 -0500 Subject: [PATCH] Finished the quartz recipes... i think... Atomic Reconstructor... --- .../actuallyadditions/api/ActuallyTags.java | 1 + .../data/BlockRecipeGenerator.java | 103 +++++++++++++++--- .../data/ItemTagsGenerator.java | 3 + .../mod/blocks/ActuallyBlocks.java | 8 +- 4 files changed, 97 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java index 49b7fb4fa..f37abcb9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java @@ -9,6 +9,7 @@ public final class ActuallyTags { public static class Items { public static final ITag.INamedTag DRILLS = tag("drills"); public static final ITag.INamedTag COFFEE_BEANS = tag("coffee_beans"); + public static final ITag.INamedTag TINY_COALS = tag("tiny_coals"); private static ITag.INamedTag tag(String name) { return ItemTags.makeWrapperTag(String.format("%s:%s", ActuallyAdditions.MODID, name)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index 20a0a1614..c96effa1b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -1,6 +1,7 @@ package de.ellpeck.actuallyadditions.data; import com.google.gson.JsonObject; +import de.ellpeck.actuallyadditions.api.ActuallyTags; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; @@ -50,23 +51,14 @@ public class BlockRecipeGenerator extends RecipeProvider { .addCriterion("", hasItem(Items.AIR)) .build(consumer); - //Tiny Torch coal + //Tiny Torch ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.TINY_TORCH.get(), 2) .patternLine("C") .patternLine("S") - .key('C', ActuallyItems.TINY_COAL.get()) + .key('C', ActuallyTags.Items.TINY_COALS) .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")); + .build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch")); //Fireworks Box ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.FIREWORK_BOX.get()) @@ -119,14 +111,14 @@ public class BlockRecipeGenerator extends RecipeProvider { ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_WALL.get()) .patternLine("QQQ") .patternLine("QQQ") - .key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get()) + .key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_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()) + .key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get()) .addCriterion("", hasItem(Items.AIR)) .build(consumer); @@ -135,7 +127,53 @@ public class BlockRecipeGenerator extends RecipeProvider { .patternLine("Q ") .patternLine("QQ ") .patternLine("QQQ") - .key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get()) + .key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get()) + .build(consumer); + + //Pillar Black Quartz Wall + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get()) + .patternLine("QQQ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Pillar Black Quartz Slab + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get()) + .patternLine("QQQ") + .key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Pillar Black Quartz Stairs + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get()) + .patternLine("Q ") + .patternLine("QQ ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get()) + .build(consumer); + + //Chiseled Black Quartz Wall + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get()) + .patternLine("QQQ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Chiseled Black Quartz Slab + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get()) + .patternLine("QQQ") + .key('Q', ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Chiseled Black Quartz Stairs + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get()) + .patternLine("Q ") + .patternLine("QQ ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.CHISELED_BLACK_QUARTZ_BLOCK.get()) .build(consumer); //Ethetic White Wall @@ -160,6 +198,41 @@ public class BlockRecipeGenerator extends RecipeProvider { .patternLine("QQQ") .key('Q', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) .build(consumer); + + //Ethetic Green Wall + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ETHETIC_GREEN_WALL.get()) + .patternLine("QQQ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Ethetic Green Slab + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ETHETIC_GREEN_SLAB.get()) + .patternLine("QQQ") + .key('Q', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Ethetic Green Stairs + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ETHETIC_GREEN_STAIRS.get()) + .patternLine("Q ") + .patternLine("QQ ") + .patternLine("QQQ") + .key('Q', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); + + //Atomic Reconstructor + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.get()) + .patternLine("IRI") + .patternLine("RCR") + .patternLine("IRI") + .key('R', Tags.Items.DUSTS_REDSTONE) + .key('I', Tags.Items.INGOTS_IRON) + .key('C', ActuallyBlocks.IRON_CASING.get()) + .addCriterion("", hasItem(Items.AIR)) + .build(consumer); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index c54547fe2..c2cb8fd7f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -19,6 +19,9 @@ public class ItemTagsGenerator extends ItemTagsProvider { protected void registerTags() { this.getOrCreateBuilder(ActuallyTags.Items.COFFEE_BEANS) .add(ActuallyItems.COFFEE_BEANS.get()); + this.getOrCreateBuilder(ActuallyTags.Items.TINY_COALS) + .add(ActuallyItems.TINY_COAL.get()) + .add(ActuallyItems.TINY_CHARCOAL.get()); // getOrCreateBuilder(ActuallyTags.Items.DRILLS).add( // ActuallyItems.DRILL_MAIN.get(), // ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLUE.get(), ActuallyItems.DRILL_BROWN.get(), 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 104276a5c..12f4e0fca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -141,15 +141,17 @@ public final class ActuallyBlocks { 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 BLACK_QUARTZ_BLOCK = BLOCKS.register("black_quartz_block", BlockGeneric::new); + public static final RegistryObject BLACK_QUARTZ_PILLAR_BLOCK = BLOCKS.register("black_quartz_pillar_block", BlockGeneric::new); + public static final RegistryObject CHISELED_BLACK_QUARTZ_BLOCK = BLOCKS.register("chiseled_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_PILLAR_WALL = BLOCKS.register("black_quartz_pillar_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_PILLAR_STAIR = BLOCKS.register("black_quartz_pillar_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 final RegistryObject BLACK_QUARTZ_PILLAR_SLAB = BLOCKS.register("black_quartz_pillar_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);