diff --git a/src/generated/resources/assets/botania/blockstates/incense_plate.json b/src/generated/resources/assets/botania/blockstates/incense_plate.json index a15d620a8..45cdd536d 100644 --- a/src/generated/resources/assets/botania/blockstates/incense_plate.json +++ b/src/generated/resources/assets/botania/blockstates/incense_plate.json @@ -1,17 +1,32 @@ { "variants": { - "facing=north": { + "facing=north,waterlogged=false": { "model": "botania:block/incense_plate", "y": 180 }, - "facing=south": { + "facing=south,waterlogged=false": { "model": "botania:block/incense_plate" }, - "facing=west": { + "facing=west,waterlogged=false": { "model": "botania:block/incense_plate", "y": 90 }, - "facing=east": { + "facing=east,waterlogged=false": { + "model": "botania:block/incense_plate", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "botania:block/incense_plate", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "botania:block/incense_plate" + }, + "facing=west,waterlogged=true": { + "model": "botania:block/incense_plate", + "y": 90 + }, + "facing=east,waterlogged=true": { "model": "botania:block/incense_plate", "y": 270 } diff --git a/src/generated/resources/assets/botania/blockstates/pump.json b/src/generated/resources/assets/botania/blockstates/pump.json index 5cd04443c..88a73b893 100644 --- a/src/generated/resources/assets/botania/blockstates/pump.json +++ b/src/generated/resources/assets/botania/blockstates/pump.json @@ -1,17 +1,32 @@ { "variants": { - "facing=north": { + "facing=north,waterlogged=false": { "model": "botania:block/pump" }, - "facing=south": { + "facing=south,waterlogged=false": { "model": "botania:block/pump", "y": 180 }, - "facing=west": { + "facing=west,waterlogged=false": { "model": "botania:block/pump", "y": 270 }, - "facing=east": { + "facing=east,waterlogged=false": { + "model": "botania:block/pump", + "y": 90 + }, + "facing=north,waterlogged=true": { + "model": "botania:block/pump" + }, + "facing=south,waterlogged=true": { + "model": "botania:block/pump", + "y": 180 + }, + "facing=west,waterlogged=true": { + "model": "botania:block/pump", + "y": 270 + }, + "facing=east,waterlogged=true": { "model": "botania:block/pump", "y": 90 } diff --git a/src/generated/resources/assets/botania/blockstates/tiny_potato.json b/src/generated/resources/assets/botania/blockstates/tiny_potato.json index 45b45b4d5..fc3cb5e2d 100644 --- a/src/generated/resources/assets/botania/blockstates/tiny_potato.json +++ b/src/generated/resources/assets/botania/blockstates/tiny_potato.json @@ -1,17 +1,32 @@ { "variants": { - "facing=north": { + "facing=north,waterlogged=false": { "model": "botania:block/tiny_potato" }, - "facing=south": { + "facing=south,waterlogged=false": { "model": "botania:block/tiny_potato", "y": 180 }, - "facing=west": { + "facing=west,waterlogged=false": { "model": "botania:block/tiny_potato", "y": 270 }, - "facing=east": { + "facing=east,waterlogged=false": { + "model": "botania:block/tiny_potato", + "y": 90 + }, + "facing=north,waterlogged=true": { + "model": "botania:block/tiny_potato" + }, + "facing=south,waterlogged=true": { + "model": "botania:block/tiny_potato", + "y": 180 + }, + "facing=west,waterlogged=true": { + "model": "botania:block/tiny_potato", + "y": 270 + }, + "facing=east,waterlogged=true": { "model": "botania:block/tiny_potato", "y": 90 } diff --git a/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json b/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 000000000..ef3458ebf --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#botania:double_mystical_flowers" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/tall_flowers.json b/src/generated/resources/data/minecraft/tags/items/tall_flowers.json new file mode 100644 index 000000000..ef3458ebf --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#botania:double_mystical_flowers" + ] +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index dbe8e3512..14468a58f 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -89,6 +89,8 @@ public class BlockTagProvider extends BlockTagsProvider { .toArray(Block[]::new) ); + getBuilder(BlockTags.TALL_FLOWERS).add(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS); + getBuilder(BlockTags.IMPERMEABLE).add(ModBlocks.elfGlass, ModBlocks.manaGlass, ModBlocks.bifrost, ModBlocks.bifrostPerm); } diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 9ab1c521e..34f8e5333 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -44,6 +44,7 @@ public class ItemTagProvider extends ItemTagsProvider { this.copy(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS, ModTags.Items.SPECIAL_FLOATING_FLOWERS); this.copy(ModTags.Blocks.FLOATING_FLOWERS, ModTags.Items.FLOATING_FLOWERS); this.copy(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS, ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); + this.getBuilder(ItemTags.TALL_FLOWERS).add(ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); this.copy(ModTags.Blocks.MYSTICAL_FLOWERS, ModTags.Items.MYSTICAL_FLOWERS); Tag.Builder builder = getBuilder(ModTags.Items.DYES); diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/main/resources/data/minecraft/tags/blocks/small_flowers.json deleted file mode 100644 index 03c58ccbd..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#botania:mystical_flowers", - "#botania:special_flowers" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/small_flowers.json b/src/main/resources/data/minecraft/tags/items/small_flowers.json deleted file mode 100644 index 03c58ccbd..000000000 --- a/src/main/resources/data/minecraft/tags/items/small_flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#botania:mystical_flowers", - "#botania:special_flowers" - ] -} \ No newline at end of file