diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 4a7490a31..4151c9f99 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import de.ellpeck.actuallyadditions.mod.item.AAItems; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -17,29 +20,26 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; @Mod(ActuallyAdditions.MODID) public class ActuallyAdditions { public static final String MODID = "actuallyadditions"; public static final Logger LOGGER = LogManager.getLogger(MODID); - - public static ItemGroup itemGroup = new ItemGroup("actuallyadditions") { - public ItemStack createIcon() { - return new ItemStack(AAItems.black_quartz); - } - }; + public static final ItemGroup GROUP = new ItemGroup("actuallyadditions") { + @Override + public ItemStack createIcon() { + return new ItemStack(AAItems.BLACK_QUARTZ); + } + }; public ActuallyAdditions() { FMLJavaModLoadingContext ctx = FMLJavaModLoadingContext.get(); ctx.getModEventBus().register(this); - } @SubscribeEvent public void setup(FMLCommonSetupEvent e) { - + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java index b854446cd..42e964507 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java @@ -3,8 +3,12 @@ package de.ellpeck.actuallyadditions.mod.block; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import net.minecraft.block.Block; import net.minecraft.block.Block.Properties; +import net.minecraft.block.RotatedPillarBlock; +import net.minecraft.block.SlabBlock; import net.minecraft.block.material.Material; -import net.minecraft.item.*; +import net.minecraft.block.material.MaterialColor; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @@ -14,17 +18,36 @@ import net.minecraftforge.registries.ObjectHolder; @EventBusSubscriber(modid = ActuallyAdditions.MODID, bus = Bus.MOD) @ObjectHolder(ActuallyAdditions.MODID) public class AABlocks { - - @ObjectHolder(ActuallyAdditions.MODID + ":block_black_quartz") - public static Block BLACK_QUARTZ; + + public static final Block BLACK_QUARTZ_ORE = null; + public static final Block BLACK_QUARTZ_BLOCK = null; + public static final Block CHISELED_BLACK_QUARTZ_BLOCK = null; + public static final Block BLACK_QUARTZ_PILLAR = null; + public static final Block BLACK_QUARTZ_SLAB = null; @SubscribeEvent public static void register(Register e) { - e.getRegistry().register(new Block(Properties.create(Material.ROCK).hardnessAndResistance(0.8F)).setRegistryName("block_black_quartz")); //Values from the QUARTZ_BLOCK + //Formatter::off + e.getRegistry().registerAll( + new Block(Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(3.0F)).setRegistryName("black_quartz_ore"), + new Block(Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_block"), + new Block(Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("chiseled_black_quartz_block"), + new RotatedPillarBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_pillar"), + new SlabBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_slab") + ); + //Formatter::on } @SubscribeEvent public static void registerItemBlocks(Register e) { - e.getRegistry().register(new BlockItem(BLACK_QUARTZ, new Item.Properties().group(ActuallyAdditions.itemGroup)).setRegistryName(BLACK_QUARTZ.getRegistryName())); + //Formatter::off + e.getRegistry().registerAll( + new BlockItem(BLACK_QUARTZ_ORE, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_ORE.getRegistryName()), + new BlockItem(BLACK_QUARTZ_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_BLOCK.getRegistryName()), + new BlockItem(CHISELED_BLACK_QUARTZ_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(CHISELED_BLACK_QUARTZ_BLOCK.getRegistryName()), + new BlockItem(BLACK_QUARTZ_PILLAR, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_PILLAR.getRegistryName()), + new BlockItem(BLACK_QUARTZ_SLAB, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_SLAB.getRegistryName()) + ); + //Formatter::on } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java index 9887b8151..6d95a1206 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java @@ -13,12 +13,15 @@ import net.minecraftforge.registries.ObjectHolder; @ObjectHolder(ActuallyAdditions.MODID) public class AAItems { - @ObjectHolder(ActuallyAdditions.MODID + ":black_quartz") - public static Item black_quartz = new Item(new Properties().group(ActuallyAdditions.itemGroup)).setRegistryName("black_quartz"); - + public static final Item BLACK_QUARTZ = null; + @SubscribeEvent public static void register(Register e) { - e.getRegistry().register(black_quartz); + //Formatter::off + e.getRegistry().registerAll( + new Item(new Properties().group(ActuallyAdditions.GROUP)).setRegistryName("black_quartz") + ); + //Formatter::on } } diff --git a/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_block.json b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_block.json new file mode 100644 index 000000000..1bfa3afc4 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "actuallyadditions:block/black_quartz_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json new file mode 100644 index 000000000..1bb24d951 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "actuallyadditions:block/black_quartz_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json new file mode 100644 index 000000000..e060fc4d5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "actuallyadditions:block/black_quartz_pillar" }, + "axis=z": { "model": "actuallyadditions:block/black_quartz_pillar", "x": 90 }, + "axis=x": { "model": "actuallyadditions:block/black_quartz_pillar", "x": 90, "y": 90 } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json new file mode 100644 index 000000000..94553afec --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/black_quartz_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=bottom": { "model": "actuallyadditions:block/black_quartz_slab" }, + "type=top": { "model": "actuallyadditions:block/black_quartz_slab_top" }, + "type=double": { "model": "actuallyadditions:block/black_quartz_block" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json b/src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json deleted file mode 100644 index 653809d0e..000000000 --- a/src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "actuallyadditions:block/block_black_quartz" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json b/src/main/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json new file mode 100644 index 000000000..34b75dfa9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "actuallyadditions:block/chiseled_black_quartz_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 10c99ed00..b4b43c5ed 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -1,11 +1,9 @@ { - "testkey": "testvalue", - + "itemGroup.actuallyadditions": "Actually Additions", "item.actuallyadditions.black_quartz": "Black Quartz", - - - "block.actuallyadditions.block_black_quartz": "Black Quarts Block", - - - "itemGroup.actuallyadditions": "Actually Additions" + "block.actuallyadditions.black_quartz_block": "Black Quartz Block", + "block.actuallyadditions.chiseled_black_quartz_block": "Chiseled Black Quartz Block", + "block.actuallyadditions.black_quartz_pillar": "Black Quartz Pillar", + "block.actuallyadditions.black_quartz_slab": "Black Quartz Slab", + "block.actuallyadditions.black_quartz_ore": "Black Quartz Ore" } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json new file mode 100644 index 000000000..8692eba09 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/black_quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_ore.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_ore.json new file mode 100644 index 000000000..8b6d87c26 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/black_quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json new file mode 100644 index 000000000..c1d3ca0d6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "actuallyadditions:block/black_quartz_pillar", + "side": "actuallyadditions:block/black_quartz_pillar" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_slab.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_slab.json new file mode 100644 index 000000000..4bbbb91c1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz", + "side": "actuallyadditions:block/black_quartz" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json new file mode 100644 index 000000000..283438cb5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "actuallyadditions:block/black_quartz", + "top": "actuallyadditions:block/black_quartz", + "side": "actuallyadditions:block/black_quartz" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json b/src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json deleted file mode 100644 index 37c7f20bc..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "actuallyadditions:block/block_black_quartz" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_block.json new file mode 100644 index 000000000..1cdcb73cb --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/chiseled_black_quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_block.json new file mode 100644 index 000000000..4e38abb0a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_block" +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/black_quartz_ore.json b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_ore.json new file mode 100644 index 000000000..fc43ca52d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_ore" +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json new file mode 100644 index 000000000..9705341da --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar" +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/black_quartz_slab.json b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_slab.json new file mode 100644 index 000000000..752824886 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/black_quartz_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_slab" +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json b/src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json deleted file mode 100644 index 790c90993..000000000 --- a/src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/block_black_quartz" -} diff --git a/src/main/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json new file mode 100644 index 000000000..0fdf44929 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz_block" +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_ore.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_ore.png new file mode 100644 index 000000000..c17cd4b7c Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_ore.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_pillar.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_pillar.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_chiseled.png b/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_chiseled.png rename to src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz.png diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_block.json similarity index 82% rename from src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json rename to src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_block.json index 8c47df04a..c349d995b 100644 --- a/src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "actuallyadditions:block_black_quartz" + "name": "actuallyadditions:black_quartz_block" } ], "conditions": [ diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_ore.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_ore.json new file mode 100644 index 000000000..cde4868eb --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:black_quartz_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar.json new file mode 100644 index 000000000..ba3d727a3 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:black_quartz_pillar" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_slab.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_slab.json new file mode 100644 index 000000000..90dce6dc3 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_slab.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "actuallyadditions:black_quartz_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "actuallyadditions:black_quartz_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json new file mode 100644 index 000000000..5d709f85d --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:chiseled_black_quartz_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/black_quartz.json b/src/main/resources/data/actuallyadditions/recipes/black_quartz.json new file mode 100644 index 000000000..994fb4026 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/black_quartz.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "actuallyadditions:black_quartz_ore" + }, + "result": "actuallyadditions:black_quartz", + "experience": 0.7, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/black_quartz_blasting.json b/src/main/resources/data/actuallyadditions/recipes/black_quartz_blasting.json new file mode 100644 index 000000000..71a02679d --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/black_quartz_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "actuallyadditions:black_quartz_ore" + }, + "result": "actuallyadditions:black_quartz", + "experience": 0.7, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json b/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json index 5369d40ea..06346b5be 100644 --- a/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json +++ b/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "actuallyadditions:block_black_quartz" + "item": "actuallyadditions:black_quartz_block" } } \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/black_quartz_pillar.json b/src/main/resources/data/actuallyadditions/recipes/black_quartz_pillar.json new file mode 100644 index 000000000..946a92d7e --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/black_quartz_pillar.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#" + ], + "key": { + "#": { + "item": "actuallyadditions:black_quartz_block" + } + }, + "result": { + "item": "actuallyadditions:black_quartz_pillar", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/black_quartz_slab.json b/src/main/resources/data/actuallyadditions/recipes/black_quartz_slab.json new file mode 100644 index 000000000..f74704163 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/black_quartz_slab.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "actuallyadditions:black_quartz_block" + } + }, + "result": { + "item": "actuallyadditions:black_quartz_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/chiseled_black_quartz_block.json b/src/main/resources/data/actuallyadditions/recipes/chiseled_black_quartz_block.json new file mode 100644 index 000000000..7c2c76654 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/chiseled_black_quartz_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#" + ], + "key": { + "#": { + "item": "actuallyadditions:black_quartz_slab" + } + }, + "result": { + "item": "actuallyadditions:chiseled_black_quartz_block" + } +} \ No newline at end of file