From 9495352b61378d85324200fd6ee6b00f07a0ee37 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 1 Jun 2022 16:00:55 +0200 Subject: [PATCH] added tags for altar materials Closes #250 --- .../resources/data/curios/tags/items/belt.json | 10 +++++----- .../resources/data/curios/tags/items/charm.json | 10 +++++----- .../resources/data/curios/tags/items/necklace.json | 8 ++++---- .../resources/data/curios/tags/items/ring.json | 8 ++++---- .../resources/data/forge/tags/blocks/dirt.json | 6 ------ .../resources/data/minecraft/tags/blocks/dirt.json | 6 ++++++ .../data/naturesaura/tags/blocks/altar_stone.json | 6 ++++++ .../data/naturesaura/tags/blocks/altar_wood.json | 6 ++++++ .../naturesaura/tags/blocks/nether_altar_stone.json | 6 ++++++ .../ellpeck/naturesaura/blocks/multi/Multiblocks.java | 6 +++--- .../de/ellpeck/naturesaura/data/BlockTagProvider.java | 7 +++++++ 11 files changed, 52 insertions(+), 27 deletions(-) delete mode 100644 src/generated/resources/data/forge/tags/blocks/dirt.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/dirt.json create mode 100644 src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json create mode 100644 src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json create mode 100644 src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json diff --git a/src/generated/resources/data/curios/tags/items/belt.json b/src/generated/resources/data/curios/tags/items/belt.json index 96f6cd3a..9eb1a8aa 100644 --- a/src/generated/resources/data/curios/tags/items/belt.json +++ b/src/generated/resources/data/curios/tags/items/belt.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:aura_cache", - "naturesaura:aura_trove" - ] + "replace": false, + "values": [ + "naturesaura:aura_cache", + "naturesaura:aura_trove" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/charm.json b/src/generated/resources/data/curios/tags/items/charm.json index 5f7a0e00..72503671 100644 --- a/src/generated/resources/data/curios/tags/items/charm.json +++ b/src/generated/resources/data/curios/tags/items/charm.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:eye", - "naturesaura:eye_improved" - ] + "replace": false, + "values": [ + "naturesaura:eye", + "naturesaura:eye_improved" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/necklace.json b/src/generated/resources/data/curios/tags/items/necklace.json index a67635d7..200e0031 100644 --- a/src/generated/resources/data/curios/tags/items/necklace.json +++ b/src/generated/resources/data/curios/tags/items/necklace.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "naturesaura:shockwave_creator" - ] + "replace": false, + "values": [ + "naturesaura:shockwave_creator" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/ring.json b/src/generated/resources/data/curios/tags/items/ring.json index 1680c0dd..353316b7 100644 --- a/src/generated/resources/data/curios/tags/items/ring.json +++ b/src/generated/resources/data/curios/tags/items/ring.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "naturesaura:death_ring" - ] + "replace": false, + "values": [ + "naturesaura:death_ring" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/dirt.json b/src/generated/resources/data/forge/tags/blocks/dirt.json deleted file mode 100644 index 40e4b1ca..00000000 --- a/src/generated/resources/data/forge/tags/blocks/dirt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "naturesaura:nether_grass" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/dirt.json b/src/generated/resources/data/minecraft/tags/blocks/dirt.json new file mode 100644 index 00000000..dafa974f --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/dirt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "naturesaura:nether_grass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json b/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json new file mode 100644 index 00000000..3fa56033 --- /dev/null +++ b/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:stone_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json b/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json new file mode 100644 index 00000000..9aa12a78 --- /dev/null +++ b/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:planks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json b/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json new file mode 100644 index 00000000..bb4977e5 --- /dev/null +++ b/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_bricks" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java index 0a3eb159..2ddc5902 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java @@ -26,8 +26,8 @@ public final class Multiblocks { new ResourceLocation(NaturesAura.MOD_ID, "altar"), ALTAR_PATTERN, 'C', Blocks.CHISELED_STONE_BRICKS, - 'B', Blocks.STONE_BRICKS, - 'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTags.PLANKS), + 'B', Matcher.tag(Blocks.STONE_BRICKS, BlockTagProvider.ALTAR_STONE), + 'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTagProvider.ALTAR_WOOD), 'M', ModBlocks.GOLD_BRICK, '0', ModBlocks.NATURE_ALTAR, ' ', Matcher.wildcard()); @@ -35,7 +35,7 @@ public final class Multiblocks { new ResourceLocation(NaturesAura.MOD_ID, "nether_altar"), ALTAR_PATTERN, 'C', Blocks.RED_NETHER_BRICKS, - 'B', Blocks.NETHER_BRICKS, + 'B', Matcher.tag(Blocks.NETHER_BRICKS, BlockTagProvider.NETHER_ALTAR_STONE), 'W', Matcher.tag(Blocks.CRIMSON_PLANKS, BlockTagProvider.NETHER_ALTAR_WOOD), 'M', ModBlocks.GOLD_NETHER_BRICK, '0', ModBlocks.NATURE_ALTAR.defaultBlockState().setValue(BlockNatureAltar.NETHER, true), diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java b/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java index 19f1b15e..9eb5ecfa 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java +++ b/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java @@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable; public class BlockTagProvider extends BlockTagsProvider { + public static final TagKey ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_wood")); + public static final TagKey ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_stone")); public static final TagKey NETHER_ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_wood")); + public static final TagKey NETHER_ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_stone")); public BlockTagProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { super(gen, NaturesAura.MOD_ID, existingFileHelper); @@ -31,6 +34,10 @@ public class BlockTagProvider extends BlockTagsProvider { this.tag(BlockTags.SLABS).add(ModBlocks.ANCIENT_SLAB, ModBlocks.INFUSED_SLAB, ModBlocks.INFUSED_BRICK_SLAB); this.tag(BlockTags.DIRT).add(ModBlocks.NETHER_GRASS); this.tag(BlockTags.SMALL_FLOWERS).add(ModBlocks.END_FLOWER, ModBlocks.AURA_BLOOM); + this.tag(ALTAR_WOOD).addTag(BlockTags.PLANKS); + this.tag(ALTAR_STONE).addTag(BlockTags.STONE_BRICKS); this.tag(NETHER_ALTAR_WOOD).add(Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS); + this.tag(NETHER_ALTAR_STONE).add(Blocks.NETHER_BRICKS); + } }