From 3950c5f0598538865ef9368b835024314ec3263f Mon Sep 17 00:00:00 2001 From: Voidsong Dragonfly Date: Tue, 25 Jun 2024 12:22:49 -0400 Subject: [PATCH] Update buzzsaw specialty blade lists (#5974) - Remove raw ore storage blocks from grinding disc - Add glass panes to rockcutter blade --- .../immersiveengineering/data/tags/IEBlockTags.java | 7 ++++++- .../.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 | 6 +++--- .../tags/blocks/mineable/grinding_disk.json | 13 ++++++++++++- .../tags/blocks/mineable/rockcutter.json | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java index 9c3100e79f..1e4f1717d5 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java @@ -340,6 +340,7 @@ private void registerRockcutterMineable() tag.add(Blocks.BONE_BLOCK); // glass, ice, amethyst, glowing blocks, gilded blackstone tag.addTag(Tags.Blocks.GLASS); + tag.addTag(Tags.Blocks.GLASS_PANES); tag.addTag(BlockTags.ICE); tag.add(Blocks.AMETHYST_BLOCK, Blocks.BUDDING_AMETHYST, Blocks.AMETHYST_CLUSTER, Blocks.LARGE_AMETHYST_BUD, Blocks.MEDIUM_AMETHYST_BUD, Blocks.SMALL_AMETHYST_BUD); tag.add(Blocks.GLOWSTONE); @@ -359,13 +360,17 @@ private void registerGrindingDiskMineable() IntrinsicTagAppender tag = tag(IETags.grindingDiskHarvestable); // storage and remove rocklike storage, sheetmetal tag.addTag(Tags.Blocks.STORAGE_BLOCKS); - tag.remove(Blocks.AMETHYST_BLOCK, Blocks.QUARTZ_BLOCK, Blocks.LAPIS_BLOCK, Blocks.REDSTONE_BLOCK, Blocks.DIAMOND_BLOCK, Blocks.EMERALD_BLOCK, Blocks.COAL_BLOCK); tag.addTag(IETags.sheetmetals); // storage and sheetmetal slabs for(EnumMetals metal : EnumMetals.values()) if(!metal.isVanillaMetal()) tag.add(IEBlocks.TO_SLAB.get(Metals.STORAGE.get(metal).getId()).get()); tag.addTag(IETags.sheetmetalSlabs); + // remove blocks the grinding disc shouldn't cut + tag.remove(Blocks.AMETHYST_BLOCK, Blocks.QUARTZ_BLOCK, Blocks.LAPIS_BLOCK, Blocks.REDSTONE_BLOCK, Blocks.DIAMOND_BLOCK, Blocks.EMERALD_BLOCK, Blocks.COAL_BLOCK); + tag.remove(Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER, Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD); + for (BlockEntry raw_storage : Metals.RAW_ORES.values()) + tag.remove(raw_storage.get()); // copper tag.addTag(IETags.copperBlocks); tag.addTag(IETags.cutCopperBlocks); diff --git a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 index 7fd437ce8d..efba25f8eb 100644 --- a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 +++ b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 @@ -1,4 +1,4 @@ -// 1.20.4 2024-06-22T15:55:19.466854633 Tags for minecraft:block mod id immersiveengineering +// 1.20.4 2024-06-23T08:55:51.281497012 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 @@ -53,9 +53,9 @@ a512013e18e15e72a03d9d066e8c87ca591ed9cd data/immersiveengineering/tags/blocks/c 3e4fc91069da2d49ed9c3bd132c947b9879bdd0c data/immersiveengineering/tags/blocks/cut_slabs/copper.json 240d783ca901747689edbff6ec068e1ebafd3dc6 data/immersiveengineering/tags/blocks/cut_stairs/copper.json f7dc293929a2176bc6e428c765f6bf49fbeccdb5 data/immersiveengineering/tags/blocks/mineable/drill.json -df59740a45d81e46667fe6be8276f38bfad83c07 data/immersiveengineering/tags/blocks/mineable/grinding_disk.json +7a685be58cce3d794d8761a57e7fbe3b5a699e7e data/immersiveengineering/tags/blocks/mineable/grinding_disk.json 4c5243b0031eaa087fae83b917f458e007e938ef data/immersiveengineering/tags/blocks/mineable/hammer.json -257302a3aa4c7c0535a097da79937172a08f7e84 data/immersiveengineering/tags/blocks/mineable/rockcutter.json +99fd897f32a6c42b9d25f3f24e2decdce16618f7 data/immersiveengineering/tags/blocks/mineable/rockcutter.json 22c291dd8a303b2f6629a7430880a0678e679ac4 data/immersiveengineering/tags/blocks/mineable/wirecutter.json c3d387e89fbb8dfb53e5e91ad3b45e07f5202650 data/immersiveengineering/tags/blocks/scaffolding_slabs/aluminum.json 56c051f4ddf6a8bfb51631d88f7553d13e908a69 data/immersiveengineering/tags/blocks/scaffolding_slabs/steel.json diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/grinding_disk.json b/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/grinding_disk.json index 485e629a09..dcc30bb4ef 100644 --- a/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/grinding_disk.json +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/grinding_disk.json @@ -6,7 +6,18 @@ "minecraft:redstone_block", "minecraft:diamond_block", "minecraft:emerald_block", - "minecraft:coal_block" + "minecraft:coal_block", + "#forge:storage_blocks/raw_copper", + "#forge:storage_blocks/raw_iron", + "#forge:storage_blocks/raw_gold", + "minecraft:raw_copper_block", + "immersiveengineering:raw_block_aluminum", + "immersiveengineering:raw_block_lead", + "immersiveengineering:raw_block_silver", + "immersiveengineering:raw_block_nickel", + "immersiveengineering:raw_block_uranium", + "minecraft:raw_iron_block", + "minecraft:raw_gold_block" ], "values": [ "#forge:storage_blocks", diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/rockcutter.json b/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/rockcutter.json index 1b66d15615..7f72efda8e 100644 --- a/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/rockcutter.json +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/rockcutter.json @@ -16,6 +16,7 @@ "minecraft:crying_obsidian", "minecraft:bone_block", "#forge:glass", + "#forge:glass_panes", "#minecraft:ice", "minecraft:amethyst_block", "minecraft:budding_amethyst",