mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 23:28:35 +01:00
Finished the quartz recipes... i think...
Atomic Reconstructor...
This commit is contained in:
parent
7ef9492778
commit
785c4b7460
4 changed files with 97 additions and 18 deletions
|
@ -9,6 +9,7 @@ public final class ActuallyTags {
|
||||||
public static class Items {
|
public static class Items {
|
||||||
public static final ITag.INamedTag<Item> DRILLS = tag("drills");
|
public static final ITag.INamedTag<Item> DRILLS = tag("drills");
|
||||||
public static final ITag.INamedTag<Item> COFFEE_BEANS = tag("coffee_beans");
|
public static final ITag.INamedTag<Item> COFFEE_BEANS = tag("coffee_beans");
|
||||||
|
public static final ITag.INamedTag<Item> TINY_COALS = tag("tiny_coals");
|
||||||
|
|
||||||
private static ITag.INamedTag<Item> tag(String name) {
|
private static ITag.INamedTag<Item> tag(String name) {
|
||||||
return ItemTags.makeWrapperTag(String.format("%s:%s", ActuallyAdditions.MODID, name));
|
return ItemTags.makeWrapperTag(String.format("%s:%s", ActuallyAdditions.MODID, name));
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package de.ellpeck.actuallyadditions.data;
|
package de.ellpeck.actuallyadditions.data;
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
|
import de.ellpeck.actuallyadditions.api.ActuallyTags;
|
||||||
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
|
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
|
||||||
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
|
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
|
||||||
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
|
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
|
||||||
|
@ -50,23 +51,14 @@ public class BlockRecipeGenerator extends RecipeProvider {
|
||||||
.addCriterion("", hasItem(Items.AIR))
|
.addCriterion("", hasItem(Items.AIR))
|
||||||
.build(consumer);
|
.build(consumer);
|
||||||
|
|
||||||
//Tiny Torch coal
|
//Tiny Torch
|
||||||
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.TINY_TORCH.get(), 2)
|
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.TINY_TORCH.get(), 2)
|
||||||
.patternLine("C")
|
.patternLine("C")
|
||||||
.patternLine("S")
|
.patternLine("S")
|
||||||
.key('C', ActuallyItems.TINY_COAL.get())
|
.key('C', ActuallyTags.Items.TINY_COALS)
|
||||||
.key('S', Tags.Items.RODS_WOODEN)
|
.key('S', Tags.Items.RODS_WOODEN)
|
||||||
.addCriterion("", hasItem(Items.AIR))
|
.addCriterion("", hasItem(Items.AIR))
|
||||||
.build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch_coal"));
|
.build(consumer, new ResourceLocation(ActuallyAdditions.MODID, "tiny_torch"));
|
||||||
|
|
||||||
//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
|
//Fireworks Box
|
||||||
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.FIREWORK_BOX.get())
|
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.FIREWORK_BOX.get())
|
||||||
|
@ -119,14 +111,14 @@ public class BlockRecipeGenerator extends RecipeProvider {
|
||||||
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_WALL.get())
|
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_WALL.get())
|
||||||
.patternLine("QQQ")
|
.patternLine("QQQ")
|
||||||
.patternLine("QQQ")
|
.patternLine("QQQ")
|
||||||
.key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get())
|
.key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get())
|
||||||
.addCriterion("", hasItem(Items.AIR))
|
.addCriterion("", hasItem(Items.AIR))
|
||||||
.build(consumer);
|
.build(consumer);
|
||||||
|
|
||||||
//Black Quartz Slab
|
//Black Quartz Slab
|
||||||
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_SLAB.get())
|
ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.BLACK_QUARTZ_SLAB.get())
|
||||||
.patternLine("QQQ")
|
.patternLine("QQQ")
|
||||||
.key('Q', ActuallyBlocks.BLACK_QUARTZ_BLOCK.get())
|
.key('Q', ActuallyBlocks.BLACK_QUARTZ_PILLAR_BLOCK.get())
|
||||||
.addCriterion("", hasItem(Items.AIR))
|
.addCriterion("", hasItem(Items.AIR))
|
||||||
.build(consumer);
|
.build(consumer);
|
||||||
|
|
||||||
|
@ -135,7 +127,53 @@ public class BlockRecipeGenerator extends RecipeProvider {
|
||||||
.patternLine("Q ")
|
.patternLine("Q ")
|
||||||
.patternLine("QQ ")
|
.patternLine("QQ ")
|
||||||
.patternLine("QQQ")
|
.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);
|
.build(consumer);
|
||||||
|
|
||||||
//Ethetic White Wall
|
//Ethetic White Wall
|
||||||
|
@ -160,6 +198,41 @@ public class BlockRecipeGenerator extends RecipeProvider {
|
||||||
.patternLine("QQQ")
|
.patternLine("QQQ")
|
||||||
.key('Q', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get())
|
.key('Q', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get())
|
||||||
.build(consumer);
|
.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
|
@Override
|
||||||
|
|
|
@ -19,6 +19,9 @@ public class ItemTagsGenerator extends ItemTagsProvider {
|
||||||
protected void registerTags() {
|
protected void registerTags() {
|
||||||
this.getOrCreateBuilder(ActuallyTags.Items.COFFEE_BEANS)
|
this.getOrCreateBuilder(ActuallyTags.Items.COFFEE_BEANS)
|
||||||
.add(ActuallyItems.COFFEE_BEANS.get());
|
.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(
|
// getOrCreateBuilder(ActuallyTags.Items.DRILLS).add(
|
||||||
// ActuallyItems.DRILL_MAIN.get(),
|
// ActuallyItems.DRILL_MAIN.get(),
|
||||||
// ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLUE.get(), ActuallyItems.DRILL_BROWN.get(),
|
// ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLUE.get(), ActuallyItems.DRILL_BROWN.get(),
|
||||||
|
|
|
@ -141,15 +141,17 @@ public final class ActuallyBlocks {
|
||||||
public static final RegistryObject<Block> COFFEE_MACHINE = BLOCKS.register("coffee_machine", BlockCoffeeMachine::new);
|
public static final RegistryObject<Block> COFFEE_MACHINE = BLOCKS.register("coffee_machine", BlockCoffeeMachine::new);
|
||||||
public static final RegistryObject<Block> PHANTOM_BOOSTER = BLOCKS.register("phantom_booster", BlockPhantomBooster::new);
|
public static final RegistryObject<Block> PHANTOM_BOOSTER = BLOCKS.register("phantom_booster", BlockPhantomBooster::new);
|
||||||
public static final RegistryObject<Block> BLACK_QUARTZ_BLOCK = BLOCKS.register("black_quartz_block", BlockGeneric::new);
|
public static final RegistryObject<Block> BLACK_QUARTZ_BLOCK = BLOCKS.register("black_quartz_block", BlockGeneric::new);
|
||||||
|
public static final RegistryObject<Block> BLACK_QUARTZ_PILLAR_BLOCK = BLOCKS.register("black_quartz_pillar_block", BlockGeneric::new);
|
||||||
|
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_BLOCK = BLOCKS.register("chiseled_black_quartz_block", BlockGeneric::new);
|
||||||
public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_WALL = BLOCKS.register("chiseled_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_WALL = BLOCKS.register("chiseled_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> PILLAR_BLACK_QUARTZ_WALL = BLOCKS.register("pillar_black_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> BLACK_QUARTZ_PILLAR_WALL = BLOCKS.register("black_quartz_pillar_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_STAIR = BLOCKS.register("chiseled_black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_STAIR = BLOCKS.register("chiseled_black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> PILLAR_BLACK_QUARTZ_STAIR = BLOCKS.register("pillar_black_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> BLACK_QUARTZ_PILLAR_STAIR = BLOCKS.register("black_quartz_pillar_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_SLAB = BLOCKS.register("chiseled_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> CHISELED_BLACK_QUARTZ_SLAB = BLOCKS.register("chiseled_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
||||||
public static final RegistryObject<Block> PILLAR_BLACK_QUARTZ_SLAB = BLOCKS.register("pillar_black_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get())));
|
public static final RegistryObject<Block> 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) {
|
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);
|
return AbstractBlock.Properties.create(Material.ROCK).harvestLevel(harvestLevel).harvestTool(ToolType.PICKAXE).hardnessAndResistance(hardness, resistance).sound(SoundType.STONE);
|
||||||
|
|
Loading…
Reference in a new issue