Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-06-01 11:13:38 +02:00
Code Issues Projects Releases Wiki Activity

added tags for altar materials

Browse source 
Closes #250
This commit is contained in:
Ell 2022-06-01 16:00:55 +02:00
parent 31c0a9221e
commit 9495352b61
11 changed files with 52 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/generated/resources/data/curios/tags/items/belt.json
View file

@ -1,7 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"naturesaura:aura_cache", "naturesaura:aura_cache",
"naturesaura:aura_trove" "naturesaura:aura_trove"
] ]
} }

10
src/generated/resources/data/curios/tags/items/charm.json
View file

@ -1,7 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"naturesaura:eye", "naturesaura:eye",
"naturesaura:eye_improved" "naturesaura:eye_improved"
] ]
} }

8
src/generated/resources/data/curios/tags/items/necklace.json
View file

@ -1,6 +1,6 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"naturesaura:shockwave_creator" "naturesaura:shockwave_creator"
] ]
} }

8
src/generated/resources/data/curios/tags/items/ring.json
View file

@ -1,6 +1,6 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"naturesaura:death_ring" "naturesaura:death_ring"
] ]
} }

6
src/generated/resources/data/forge/tags/blocks/dirt.json
View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"naturesaura:nether_grass"
]
}

6
src/generated/resources/data/minecraft/tags/blocks/dirt.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"naturesaura:nether_grass"
]
}

6
src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"#minecraft:stone_bricks"
]
}

6
src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"#minecraft:planks"
]
}

6
src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:nether_bricks"
]
}

6
src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java
View file

@ -26,8 +26,8 @@ public final class Multiblocks {
new ResourceLocation(NaturesAura.MOD_ID, "altar"), new ResourceLocation(NaturesAura.MOD_ID, "altar"),
ALTAR_PATTERN, ALTAR_PATTERN,
'C', Blocks.CHISELED_STONE_BRICKS, 'C', Blocks.CHISELED_STONE_BRICKS,
'B', Blocks.STONE_BRICKS, 'B', Matcher.tag(Blocks.STONE_BRICKS, BlockTagProvider.ALTAR_STONE),
'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTags.PLANKS), 'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTagProvider.ALTAR_WOOD),
'M', ModBlocks.GOLD_BRICK, 'M', ModBlocks.GOLD_BRICK,
'0', ModBlocks.NATURE_ALTAR, '0', ModBlocks.NATURE_ALTAR,
' ', Matcher.wildcard()); ' ', Matcher.wildcard());
@ -35,7 +35,7 @@ public final class Multiblocks {
new ResourceLocation(NaturesAura.MOD_ID, "nether_altar"), new ResourceLocation(NaturesAura.MOD_ID, "nether_altar"),
ALTAR_PATTERN, ALTAR_PATTERN,
'C', Blocks.RED_NETHER_BRICKS, '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), 'W', Matcher.tag(Blocks.CRIMSON_PLANKS, BlockTagProvider.NETHER_ALTAR_WOOD),
'M', ModBlocks.GOLD_NETHER_BRICK, 'M', ModBlocks.GOLD_NETHER_BRICK,
'0', ModBlocks.NATURE_ALTAR.defaultBlockState().setValue(BlockNatureAltar.NETHER, true), '0', ModBlocks.NATURE_ALTAR.defaultBlockState().setValue(BlockNatureAltar.NETHER, true),

7
src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java
View file

@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable;
public class BlockTagProvider extends BlockTagsProvider { public class BlockTagProvider extends BlockTagsProvider {
public static final TagKey<Block> ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_wood"));
public static final TagKey<Block> ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_stone"));
public static final TagKey<Block> NETHER_ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_wood")); public static final TagKey<Block> NETHER_ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_wood"));
public static final TagKey<Block> NETHER_ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_stone"));
public BlockTagProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { public BlockTagProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) {
super(gen, NaturesAura.MOD_ID, 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.SLABS).add(ModBlocks.ANCIENT_SLAB, ModBlocks.INFUSED_SLAB, ModBlocks.INFUSED_BRICK_SLAB);
this.tag(BlockTags.DIRT).add(ModBlocks.NETHER_GRASS); this.tag(BlockTags.DIRT).add(ModBlocks.NETHER_GRASS);
this.tag(BlockTags.SMALL_FLOWERS).add(ModBlocks.END_FLOWER, ModBlocks.AURA_BLOOM); 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_WOOD).add(Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS);
this.tag(NETHER_ALTAR_STONE).add(Blocks.NETHER_BRICKS);
} }
} }