From 8d56947d33e6cdf21d6c1541fb8924dc9eb386fd Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Thu, 31 Oct 2024 19:58:57 +0100 Subject: [PATCH] Add Stairs, Slabs and Walls to the appropriate tags Fixing #1428 --- .../70af3238de42da66beb5f354425347f373dca837 | 6 ++- .../tags/block/mineable/pickaxe.json | 23 +++++++++- .../data/minecraft/tags/block/slabs.json | 11 +++++ .../data/minecraft/tags/block/stairs.json | 11 +++++ .../data/BlockTagsGenerator.java | 43 ++++++++++++++++++- 5 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/block/slabs.json create mode 100644 src/generated/resources/data/minecraft/tags/block/stairs.json diff --git a/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 b/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 index ba2daba6d..c9962a330 100644 --- a/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 +++ b/src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-19T16:19:48.5749712 Block Tags +// 1.21.1 2024-10-31T19:57:10.5378083 Block Tags 8665de82dd3d3a1351ce58f78108214f359104b0 data/actuallyadditions/tags/block/mineable/aio.json f7dc293929a2176bc6e428c765f6bf49fbeccdb5 data/actuallyadditions/tags/block/mineable/drill.json 3ce233e27b4d7db10e2d4832602ef5b2a57f9a65 data/c/tags/block/ores.json @@ -18,6 +18,8 @@ fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/block/storage_blocks/empowe b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/block/storage_blocks/restonia_crystal.json fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/block/storage_blocks/void_crystal.json 8dbaf9b7bd6774bc7c01a47a72b8a7fdaee51f87 data/minecraft/tags/block/mineable/axe.json -58c611cbaae2a0a5dd6f82f183b7d0f5dc2d09e6 data/minecraft/tags/block/mineable/pickaxe.json +0f159793ba45fc4aee456d9b70fab9c0003899e8 data/minecraft/tags/block/mineable/pickaxe.json fab721a4fe7ece1d0e019ce36c4d2862f70ee53b data/minecraft/tags/block/needs_stone_tool.json +51d50547b5f031f4fa6e62189af06059a407c009 data/minecraft/tags/block/slabs.json +a60870f29ca48ea0d55ac32620ff5b4bb2f2f62e data/minecraft/tags/block/stairs.json f74407e86c92d0d9435d62ff0f95999f3a84c674 data/minecraft/tags/block/walls.json diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 51562c1b7..5d8aecfbf 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -86,6 +86,27 @@ "actuallyadditions:laser_relay_fluids", "actuallyadditions:laser_relay_item", "actuallyadditions:laser_relay_item_advanced", - "actuallyadditions:greenhouse_glass" + "actuallyadditions:greenhouse_glass", + "actuallyadditions:ethetic_white_wall", + "actuallyadditions:ethetic_green_wall", + "actuallyadditions:black_quartz_wall", + "actuallyadditions:smooth_black_quartz_wall", + "actuallyadditions:black_quartz_pillar_wall", + "actuallyadditions:chiseled_black_quartz_wall", + "actuallyadditions:black_quartz_brick_wall", + "actuallyadditions:ethetic_white_stairs", + "actuallyadditions:ethetic_green_stairs", + "actuallyadditions:black_quartz_stair", + "actuallyadditions:smooth_black_quartz_stair", + "actuallyadditions:black_quartz_pillar_stair", + "actuallyadditions:chiseled_black_quartz_stair", + "actuallyadditions:black_quartz_brick_stair", + "actuallyadditions:ethetic_white_slab", + "actuallyadditions:ethetic_green_slab", + "actuallyadditions:black_quartz_slab", + "actuallyadditions:smooth_black_quartz_slab", + "actuallyadditions:black_quartz_pillar_slab", + "actuallyadditions:chiseled_black_quartz_slab", + "actuallyadditions:black_quartz_brick_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/slabs.json b/src/generated/resources/data/minecraft/tags/block/slabs.json new file mode 100644 index 000000000..1fa9893fc --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/block/slabs.json @@ -0,0 +1,11 @@ +{ + "values": [ + "actuallyadditions:ethetic_white_slab", + "actuallyadditions:ethetic_green_slab", + "actuallyadditions:black_quartz_slab", + "actuallyadditions:smooth_black_quartz_slab", + "actuallyadditions:black_quartz_pillar_slab", + "actuallyadditions:chiseled_black_quartz_slab", + "actuallyadditions:black_quartz_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/stairs.json b/src/generated/resources/data/minecraft/tags/block/stairs.json new file mode 100644 index 000000000..406bb2a67 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/block/stairs.json @@ -0,0 +1,11 @@ +{ + "values": [ + "actuallyadditions:ethetic_white_stairs", + "actuallyadditions:ethetic_green_stairs", + "actuallyadditions:black_quartz_stair", + "actuallyadditions:smooth_black_quartz_stair", + "actuallyadditions:black_quartz_pillar_stair", + "actuallyadditions:chiseled_black_quartz_stair", + "actuallyadditions:black_quartz_brick_stair" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java index e03801f27..25d0831e9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java @@ -31,6 +31,26 @@ public class BlockTagsGenerator extends BlockTagsProvider { ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get() ); + tag(BlockTags.STAIRS).add( + ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(), + ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(), + ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), + ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(), + ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(), + ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(), + ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get() + ); + + tag(BlockTags.SLABS).add( + ActuallyBlocks.ETHETIC_WHITE_SLAB.get(), + ActuallyBlocks.ETHETIC_GREEN_SLAB.get(), + ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), + ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(), + ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(), + ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(), + ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get() + ); + tag(BlockTags.MINEABLE_WITH_AXE).add( ActuallyBlocks.FERMENTING_BARREL.get() ); @@ -121,7 +141,28 @@ public class BlockTagsGenerator extends BlockTagsProvider { ActuallyBlocks.LASER_RELAY_FLUIDS.get(), ActuallyBlocks.LASER_RELAY_ITEM.get(), ActuallyBlocks.LASER_RELAY_ITEM_ADVANCED.get(), - ActuallyBlocks.GREENHOUSE_GLASS.get() + ActuallyBlocks.GREENHOUSE_GLASS.get(), + ActuallyBlocks.ETHETIC_WHITE_WALL.get(), + ActuallyBlocks.ETHETIC_GREEN_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(), + ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get(), + ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(), + ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(), + ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), + ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(), + ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(), + ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(), + ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get(), + ActuallyBlocks.ETHETIC_WHITE_SLAB.get(), + ActuallyBlocks.ETHETIC_GREEN_SLAB.get(), + ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), + ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(), + ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(), + ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(), + ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get() ); tag(BlockTags.NEEDS_STONE_TOOL).add(