From 2f6bdeb2282ac7eb0242604b1a9df11162771d4e Mon Sep 17 00:00:00 2001 From: Voidsong Dragonfly Date: Wed, 19 Jun 2024 15:31:23 -0400 Subject: [PATCH] Clean up survey tools to be tag-only & include more --- .../data/tags/IEBlockTags.java | 27 ++++++++++++++++++- .../8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 | 12 ++++----- .../tags/blocks/survey_tool_targets.json | 23 +++++++++++++++- .../common/items/SurveyToolsItem.java | 20 -------------- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java index 18bb5fda04..38a2ff4bda 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java @@ -227,10 +227,35 @@ protected void addTags(Provider p_256380_) .addOptionalTag(new ResourceLocation("dynamictrees", "branches")) .addOptionalTag(new ResourceLocation("dynamictrees", "leaves")); tag(IETags.surveyToolTargets) + //Overworld stones + .addTag(Tags.Blocks.STONE) + .add(Blocks.DRIPSTONE_BLOCK) + .add(Blocks.CALCITE) + //Overworld soils .addTag(BlockTags.DIRT) + .remove(Blocks.MOSS_BLOCK) .addTag(Tags.Blocks.GRAVEL) .addTag(Tags.Blocks.SAND) - .add(Blocks.CLAY); + .add(Blocks.CLAY) + //Overworld terracotta + .add(Blocks.TERRACOTTA) + .add(Blocks.WHITE_TERRACOTTA) + .add(Blocks.LIGHT_GRAY_TERRACOTTA) + .add(Blocks.GRAY_TERRACOTTA) + .add(Blocks.BROWN_TERRACOTTA) + .add(Blocks.RED_TERRACOTTA) + .add(Blocks.ORANGE_TERRACOTTA) + .add(Blocks.YELLOW_TERRACOTTA) + //Nether stones + .addTag(Tags.Blocks.NETHERRACK) + .add(Blocks.BASALT) + .add(Blocks.BLACKSTONE) + //Nether soils + .addTag(BlockTags.NYLIUM) + .add(Blocks.SOUL_SAND) + .add(Blocks.SOUL_SOIL) + //End Stones + .add(Blocks.END_STONE); checkAllRegisteredForBreaking(); for(BlockEntry treatedWood : WoodenDecoration.TREATED_WOOD.values()) diff --git a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 index a00c73b114..ca5306da76 100644 --- a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 +++ b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 @@ -1,8 +1,9 @@ -// 1.20.4 2024-06-17T22:29:36.1359271 Tags for minecraft:block mod id immersiveengineering +// 1.20.4 2024-06-19T15:27:04.770760174 Tags for minecraft:block mod id immersiveengineering 23e0570e60d941c629a243d8c02fbf74523eee75 data/chiselsandbits/tags/blocks/chiselable/forced.json bb2e9cd3d85c96526d774c4c6023d900f99a15bc data/forge/tags/blocks/fences/aluminum.json c9ee95be2edb84e91278b0fef1cbc9dea336b664 data/forge/tags/blocks/fences/steel.json 798333dba3595d9304d05418ce04a44f69a7d6c1 data/forge/tags/blocks/gravel.json +03803ad3e358573f495ef5a2b28fff69483d9903 data/forge/tags/blocks/ore_rates/singular.json 096b05ce0e1511fdf1f849355b7214fd71c6727d data/forge/tags/blocks/ores.json 996364607181408578d2a18b0cd5941fe3251ffd data/forge/tags/blocks/ores/aluminum.json 2d5302798c26775d656807ac1d209b4b7430ff17 data/forge/tags/blocks/ores/lead.json @@ -11,9 +12,9 @@ c9ee95be2edb84e91278b0fef1cbc9dea336b664 data/forge/tags/blocks/fences/steel.jso e10e19eb1ecd0d4fbd2270995a9c4b14c981af49 data/forge/tags/blocks/ores/uranium.json ad7cc89e6b8ad6b0c7c3544c0abd3446c612060c data/forge/tags/blocks/ores_in_ground/deepslate.json 81467f7c9399b301ac496bf424b8c8b807db752a data/forge/tags/blocks/ores_in_ground/stone.json -03803ad3e358573f495ef5a2b28fff69483d9903 data/forge/tags/blocks/ore_rates/singular.json c0ba8fbc5bb958978c15dbbbf9109c2f235e20ec data/forge/tags/blocks/sandstone/colorless.json 6a91d4acdb80541d81cbf2ccc3347b0749b64363 data/forge/tags/blocks/sandstone/red.json +f8407d8b86459d08f321ad472e23df8b11f04807 data/forge/tags/blocks/sheetmetal_slabs.json edecb36d2c51c53656e146c80bbf300e4d52de39 data/forge/tags/blocks/sheetmetals.json 685fe54ad50bcb90d1857662c38ad1e2e89bb8a6 data/forge/tags/blocks/sheetmetals/aluminum.json 208b8916c3964147d79703c1eb7096e8775aa78f data/forge/tags/blocks/sheetmetals/constantan.json @@ -26,7 +27,6 @@ ff543a6161432e4e8dd2bd8775ab99af16c0315c data/forge/tags/blocks/sheetmetals/nick bc8cb8d4f41333ae547eb75f529beb92a7a62dd9 data/forge/tags/blocks/sheetmetals/silver.json 44df194bae79ecbc6ba642f28825d7d55f640865 data/forge/tags/blocks/sheetmetals/steel.json 517af5879eee0eaacb6ec77424a19790f680f6bd data/forge/tags/blocks/sheetmetals/uranium.json -f8407d8b86459d08f321ad472e23df8b11f04807 data/forge/tags/blocks/sheetmetal_slabs.json c0afad8eab5f9b2dac5ccf01d9dbec3d9c080202 data/forge/tags/blocks/storage_blocks.json a252494dc3a9a5b9aab17e82ae7ff504ca84a099 data/forge/tags/blocks/storage_blocks/aluminum.json da1d12f678963493519caaff63a76241b220579f data/forge/tags/blocks/storage_blocks/clay.json @@ -57,13 +57,13 @@ cbf85412255d24b479f6ffd05374a23bb4e18d6f data/immersiveengineering/tags/blocks/m 7204f37efe73e4ab8e5d05aef0e7c1fc973a8771 data/immersiveengineering/tags/blocks/mineable/hammer.json 2c887477b8e0a8ee24392b29c8b0488279730574 data/immersiveengineering/tags/blocks/mineable/rockcutter.json 22c291dd8a303b2f6629a7430880a0678e679ac4 data/immersiveengineering/tags/blocks/mineable/wirecutter.json -586d8c57de0cdcef9e768494366ce79e22d75223 data/immersiveengineering/tags/blocks/scaffoldings/aluminum.json -8f3e0a730467c3941f6d1bc9e6c02d4dac7200f0 data/immersiveengineering/tags/blocks/scaffoldings/steel.json c3d387e89fbb8dfb53e5e91ad3b45e07f5202650 data/immersiveengineering/tags/blocks/scaffolding_slabs/aluminum.json 56c051f4ddf6a8bfb51631d88f7553d13e908a69 data/immersiveengineering/tags/blocks/scaffolding_slabs/steel.json b7ae6076dcdde66b8bd7c303e7f5ea5e58ba24f1 data/immersiveengineering/tags/blocks/scaffolding_stairs/aluminum.json 58bcbaec9e8e1403838cbc28eb4bae9fdfa0dc3d data/immersiveengineering/tags/blocks/scaffolding_stairs/steel.json -6e3f4f3271f5fb23cf7dbf161c0e3f5cff0cc0bf data/immersiveengineering/tags/blocks/survey_tool_targets.json +586d8c57de0cdcef9e768494366ce79e22d75223 data/immersiveengineering/tags/blocks/scaffoldings/aluminum.json +8f3e0a730467c3941f6d1bc9e6c02d4dac7200f0 data/immersiveengineering/tags/blocks/scaffoldings/steel.json +699e25a00d866871500903f6811b01219de593a3 data/immersiveengineering/tags/blocks/survey_tool_targets.json 7719335563ce8d10e5dbd9d148c5be1d25ae89a5 data/immersiveengineering/tags/blocks/teleport_blocking.json 9acd1b4c75ce6ff1914c8b9852a3e6d29bb85403 data/minecraft/tags/blocks/azalea_root_replaceable.json 9acd1b4c75ce6ff1914c8b9852a3e6d29bb85403 data/minecraft/tags/blocks/bamboo_plantable_on.json diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/survey_tool_targets.json b/src/generated/resources/data/immersiveengineering/tags/blocks/survey_tool_targets.json index 6e2dc60d3e..edcf8104de 100644 --- a/src/generated/resources/data/immersiveengineering/tags/blocks/survey_tool_targets.json +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/survey_tool_targets.json @@ -1,8 +1,29 @@ { + "remove": [ + "minecraft:moss_block" + ], "values": [ + "#forge:stone", + "minecraft:dripstone_block", + "minecraft:calcite", "#minecraft:dirt", "#forge:gravel", "#forge:sand", - "minecraft:clay" + "minecraft:clay", + "minecraft:terracotta", + "minecraft:white_terracotta", + "minecraft:light_gray_terracotta", + "minecraft:gray_terracotta", + "minecraft:brown_terracotta", + "minecraft:red_terracotta", + "minecraft:orange_terracotta", + "minecraft:yellow_terracotta", + "#forge:netherrack", + "minecraft:basalt", + "minecraft:blackstone", + "#minecraft:nylium", + "minecraft:soul_sand", + "minecraft:soul_soil", + "minecraft:end_stone" ] } \ No newline at end of file diff --git a/src/main/java/blusunrize/immersiveengineering/common/items/SurveyToolsItem.java b/src/main/java/blusunrize/immersiveengineering/common/items/SurveyToolsItem.java index cbfb81186a..b73a53d863 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/items/SurveyToolsItem.java +++ b/src/main/java/blusunrize/immersiveengineering/common/items/SurveyToolsItem.java @@ -51,27 +51,7 @@ public class SurveyToolsItem extends IEBaseItem public SurveyToolsItem() { super(new Properties().stacksTo(1).defaultDurability(300)); - // earthen materials CAN_USE_ON.add((world, pos) -> world.getBlockState(pos).is(IETags.surveyToolTargets)); - // Stone, Diorite, Andesite, etc. - CAN_USE_ON.add((world, pos) -> world.getBlockState(pos).is(Tags.Blocks.STONE)); - // Nether materials - CAN_USE_ON.add((world, pos) -> { - BlockState state = world.getBlockState(pos); - Block block = state.getBlock(); - return state.is(Tags.Blocks.NETHERRACK) - ||block==Blocks.SOUL_SAND - ||block==Blocks.SOUL_SOIL - ||block==Blocks.BLACKSTONE - ||block==Blocks.BASALT - ||block==Blocks.CRIMSON_NYLIUM - ||block==Blocks.WARPED_NYLIUM; - }); - // soft rocks - CAN_USE_ON.add((world, pos) -> { - BlockState state = world.getBlockState(pos); - return state.is(Tags.Blocks.STONE)&&state.getDestroySpeed(world, pos) < 0.5; - }); } @Override