From 9da2b45f74acba73f00b893b0c98eb23509f09e9 Mon Sep 17 00:00:00 2001 From: BluSunrize Date: Fri, 29 Mar 2024 22:51:22 +0100 Subject: [PATCH] Greatly expand the blocks dug by rockcutter and grinding disk --- .../immersiveengineering/api/IETags.java | 8 ++- .../data/tags/IEBlockTags.java | 66 ++++++++++++++++--- .../data/tags/IEItemTags.java | 6 -- .../8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 | 18 +++-- .../8e3dac66008279787e3c8e46982fcdaea78599ee | 11 ++-- .../tags/blocks/blocks/copper.json | 12 ++++ .../tags/blocks/cut_blocks/copper.json | 12 ++++ .../tags/blocks/cut_slabs/copper.json | 12 ++++ .../tags/blocks/cut_stairs/copper.json | 12 ++++ .../tags/blocks/mineable/grinding_disk.json | 42 +++++++++++- .../tags/blocks/mineable/rockcutter.json | 9 ++- .../tags/items/blocks/copper.json | 12 ++++ 12 files changed, 188 insertions(+), 32 deletions(-) create mode 100644 src/generated/resources/data/immersiveengineering/tags/blocks/blocks/copper.json create mode 100644 src/generated/resources/data/immersiveengineering/tags/blocks/cut_blocks/copper.json create mode 100644 src/generated/resources/data/immersiveengineering/tags/blocks/cut_slabs/copper.json create mode 100644 src/generated/resources/data/immersiveengineering/tags/blocks/cut_stairs/copper.json create mode 100644 src/generated/resources/data/immersiveengineering/tags/items/blocks/copper.json diff --git a/src/api/java/blusunrize/immersiveengineering/api/IETags.java b/src/api/java/blusunrize/immersiveengineering/api/IETags.java index 1b79b1a9cb..fcaf252098 100644 --- a/src/api/java/blusunrize/immersiveengineering/api/IETags.java +++ b/src/api/java/blusunrize/immersiveengineering/api/IETags.java @@ -57,9 +57,11 @@ public class IETags public static final TagKey glowstoneBlock = createBlockTag(getStorageBlock("glowstone")); public static final TagKey colorlessSandstoneBlocks = createBlockTag(forgeLoc("sandstone/colorless")); public static final TagKey redSandstoneBlocks = createBlockTag(forgeLoc("sandstone/red")); - public static final TagKey cutCopperBlocks = createItemWrapper(rl("cut_blocks/copper")); - public static final TagKey cutCopperStairs = createItemWrapper(rl("cut_stairs/copper")); - public static final TagKey cutCopperSlabs = createItemWrapper(rl("cut_slabs/copper")); + public static final TagKey copperBlocks = createBlockTag(rl("blocks/copper")); + public static final TagKey cutCopperBlocks = createBlockTag(rl("cut_blocks/copper")); + + public static final TagKey cutCopperStairs = createBlockTag(rl("cut_stairs/copper")); + public static final TagKey cutCopperSlabs = createBlockTag(rl("cut_slabs/copper")); //IE Blocks public static final TagKey treatedWood = createBlockTag(forgeLoc("treated_wood")); public static final TagKey treatedWoodSlab = createBlockTag(forgeLoc("treated_wood_slab")); diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java index d409e512dc..c733a695a6 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java @@ -36,19 +36,26 @@ import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Items; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SlabBlock; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.IntFunction; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.ibm.icu.lang.UCharacter.GraphemeClusterBreak.T; + public class IEBlockTags extends BlockTagsProvider { @@ -87,6 +94,19 @@ protected void addTags(Provider p_256380_) .add(Blocks.CUT_RED_SANDSTONE) .add(Blocks.CHISELED_RED_SANDSTONE) .add(Blocks.SMOOTH_RED_SANDSTONE); + tag(IETags.copperBlocks) + .add(Blocks.COPPER_BLOCK, Blocks.EXPOSED_COPPER, Blocks.WEATHERED_COPPER, Blocks.OXIDIZED_COPPER) + .add(Blocks.WAXED_COPPER_BLOCK, Blocks.WAXED_EXPOSED_COPPER, Blocks.WAXED_WEATHERED_COPPER, Blocks.WAXED_OXIDIZED_COPPER); + tag(IETags.cutCopperBlocks) + .add(Blocks.CUT_COPPER, Blocks.EXPOSED_CUT_COPPER, Blocks.WEATHERED_CUT_COPPER, Blocks.OXIDIZED_CUT_COPPER) + .add(Blocks.WAXED_CUT_COPPER, Blocks.WAXED_EXPOSED_CUT_COPPER, Blocks.WAXED_WEATHERED_CUT_COPPER, Blocks.WAXED_OXIDIZED_CUT_COPPER); + tag(IETags.cutCopperStairs) + .add(Blocks.CUT_COPPER_STAIRS, Blocks.EXPOSED_CUT_COPPER_STAIRS, Blocks.WEATHERED_CUT_COPPER_STAIRS, Blocks.OXIDIZED_CUT_COPPER_STAIRS) + .add(Blocks.WAXED_CUT_COPPER_STAIRS, Blocks.WAXED_EXPOSED_CUT_COPPER_STAIRS, Blocks.WAXED_WEATHERED_CUT_COPPER_STAIRS, Blocks.WAXED_OXIDIZED_CUT_COPPER_STAIRS); + tag(IETags.cutCopperSlabs) + .add(Blocks.CUT_COPPER_SLAB, Blocks.EXPOSED_CUT_COPPER_SLAB, Blocks.WEATHERED_CUT_COPPER_SLAB, Blocks.OXIDIZED_CUT_COPPER_SLAB) + .add(Blocks.WAXED_CUT_COPPER_SLAB, Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB); + for(BlockEntry b : MetalDecoration.METAL_LADDER.values()) tag(BlockTags.CLIMBABLE).add(b.get()); for(EnumMetals metal : EnumMetals.values()) @@ -233,25 +253,53 @@ private void registerHammerMineable() } } - // TODO rockcutter and grinding disk tags are nowhere near complete at this point, they were determined based on - // block material in <=1.19.4 private void registerRockcutterMineable() { IntrinsicTagAppender tag = tag(IETags.rockcutterHarvestable); + // stones & ores tag.addTag(Tags.Blocks.COBBLESTONE); tag.addTag(Tags.Blocks.STONE); + tag.addTag(Tags.Blocks.ORES); + // glass, ice, glowing blocks tag.addTag(Tags.Blocks.GLASS); tag.addTag(BlockTags.ICE); - tag.addTag(Tags.Blocks.ORES); + tag.add(Blocks.GLOWSTONE); + tag.add(Blocks.SEA_LANTERN); + // enderchest + tag.addTag(Tags.Blocks.CHESTS_ENDER); + // skulk, but intentionally only some of them + tag.add(Blocks.SCULK, Blocks.SCULK_CATALYST, Blocks.SCULK_SENSOR, Blocks.CALIBRATED_SCULK_SENSOR); } private void registerGrindingDiskMineable() { IntrinsicTagAppender tag = tag(IETags.grindingDiskHarvestable); + // storage and sheetmetal tag.addTag(Tags.Blocks.STORAGE_BLOCKS); 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); + // copper + tag.addTag(IETags.copperBlocks); + tag.addTag(IETags.cutCopperBlocks); + tag.addTag(IETags.cutCopperSlabs); + tag.addTag(IETags.cutCopperStairs); + // scaffolding tag.addTag(IETags.scaffoldingSteel); tag.addTag(IETags.scaffoldingAlu); + tag.add(MetalDecoration.ALU_FENCE.get(), MetalDecoration.ALU_POST.get(), MetalDecoration.ALU_WALLMOUNT.get(), MetalDecoration.ALU_SLOPE.get()); + tag.add(MetalDecoration.STEEL_FENCE.get(), MetalDecoration.STEEL_POST.get(), MetalDecoration.STEEL_WALLMOUNT.get(), MetalDecoration.STEEL_SLOPE.get()); + MetalDecoration.METAL_LADDER.values().forEach(entry -> tag.add(entry.get())); + // chutes + MetalDevices.CHUTES.values().forEach(entry -> tag.add(entry.get())); + // fluid machines + tag.add(MetalDevices.BARREL.get(), MetalDevices.FLUID_PUMP.get(), MetalDevices.FLUID_PIPE.get(), MetalDevices.FLUID_PLACER.get()); + // multiblock components + tag.add(MetalDecoration.LV_COIL.get(), MetalDecoration.MV_COIL.get(), MetalDecoration.MV_COIL.get()); + tag.add(MetalDecoration.ENGINEERING_RS.get(), MetalDecoration.ENGINEERING_LIGHT.get(), MetalDecoration.ENGINEERING_HEAVY.get(), MetalDecoration.RADIATOR.get(), MetalDecoration.GENERATOR.get()); } private void registerAxeMineable() @@ -470,12 +518,12 @@ private void setStorageMiningLevel(EnumMetals metal, Tiers level) private void setMiningLevel(Supplier block, Tiers level) { TagKey tag = switch(level) - { - case STONE -> BlockTags.NEEDS_STONE_TOOL; - case IRON -> BlockTags.NEEDS_IRON_TOOL; - case DIAMOND -> BlockTags.NEEDS_DIAMOND_TOOL; - default -> throw new IllegalArgumentException("No tag available for "+level.name()); - }; + { + case STONE -> BlockTags.NEEDS_STONE_TOOL; + case IRON -> BlockTags.NEEDS_IRON_TOOL; + case DIAMOND -> BlockTags.NEEDS_DIAMOND_TOOL; + default -> throw new IllegalArgumentException("No tag available for "+level.name()); + }; tag(tag).add(block.get()); } diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java index 8cfbbbc523..95f630e484 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java @@ -130,12 +130,6 @@ protected void addTags(Provider p_256380_) .addTag(ItemTags.TERRACOTTA) .add(IEBlocks.StoneDecoration.DUROPLAST.asItem()); tag(ItemTags.CLUSTER_MAX_HARVESTABLES).add(Tools.STEEL_PICK.get()); - tag(IETags.cutCopperBlocks).add(Items.CUT_COPPER, Items.EXPOSED_CUT_COPPER, Items.WEATHERED_CUT_COPPER, Items.OXIDIZED_CUT_COPPER, - Items.WAXED_CUT_COPPER, Items.WAXED_EXPOSED_CUT_COPPER, Items.WAXED_WEATHERED_CUT_COPPER, Items.WAXED_OXIDIZED_CUT_COPPER); - tag(IETags.cutCopperStairs).add(Items.CUT_COPPER_STAIRS, Items.EXPOSED_CUT_COPPER_STAIRS, Items.WEATHERED_CUT_COPPER_STAIRS, Items.OXIDIZED_CUT_COPPER_STAIRS, - Items.WAXED_CUT_COPPER_STAIRS, Items.WAXED_EXPOSED_CUT_COPPER_STAIRS, Items.WAXED_WEATHERED_CUT_COPPER_STAIRS, Items.WAXED_OXIDIZED_CUT_COPPER_STAIRS); - tag(IETags.cutCopperSlabs).add(Items.CUT_COPPER_SLAB, Items.EXPOSED_CUT_COPPER_SLAB, Items.WEATHERED_CUT_COPPER_SLAB, Items.OXIDIZED_CUT_COPPER_SLAB, - Items.WAXED_CUT_COPPER_SLAB, Items.WAXED_EXPOSED_CUT_COPPER_SLAB, Items.WAXED_WEATHERED_CUT_COPPER_SLAB, Items.WAXED_OXIDIZED_CUT_COPPER_SLAB); generateTagsForToolbox(); tag(IETags.tools) diff --git a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 index a861bbe3ff..c4a2106b22 100644 --- a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 +++ b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 @@ -1,9 +1,8 @@ -// 1.20.4 2024-01-28T16:30:59.905908881 Tags for minecraft:block mod id immersiveengineering +// 1.20.4 2024-03-29T22:46:59.4764562 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 @@ -12,9 +11,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 @@ -27,6 +26,7 @@ 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 @@ -46,19 +46,23 @@ b55e74dc34f8adea30d4dc91d50f91f426aa114b data/forge/tags/blocks/storage_blocks/r e563b87b316084581f07d20d80466bc0014fce68 data/forge/tags/blocks/storage_blocks/uranium.json 1ecedf0824d3b4f49aec34b67416c1243d1d23a0 data/forge/tags/blocks/treated_wood.json 485ca26048e0c430a7ab442ed9e5b1a1ea596bb5 data/forge/tags/blocks/treated_wood_slab.json +085238f24aca214ce9eb3f57ab02370467990f33 data/immersiveengineering/tags/blocks/blocks/copper.json fb960fb69ed7f923b8ddb20685e869b6cfeb1a55 data/immersiveengineering/tags/blocks/buzzsaw/tree_blacklist.json 2038420c75a18e0a8e4f6f665eb836e172ef918c data/immersiveengineering/tags/blocks/concrete_for_concrete_feet.json +9f68aab51771ffcf2d804182251d3e06913ef5bc data/immersiveengineering/tags/blocks/cut_blocks/copper.json +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 -cd10cf41a3388eed9cdbbb2ff72ed2e51e140fd9 data/immersiveengineering/tags/blocks/mineable/grinding_disk.json +cbf85412255d24b479f6ffd05374a23bb4e18d6f data/immersiveengineering/tags/blocks/mineable/grinding_disk.json 7204f37efe73e4ab8e5d05aef0e7c1fc973a8771 data/immersiveengineering/tags/blocks/mineable/hammer.json -e6e558779be5ecfbd52c319a6eae6d0b3187bb3f data/immersiveengineering/tags/blocks/mineable/rockcutter.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 -586d8c57de0cdcef9e768494366ce79e22d75223 data/immersiveengineering/tags/blocks/scaffoldings/aluminum.json -8f3e0a730467c3941f6d1bc9e6c02d4dac7200f0 data/immersiveengineering/tags/blocks/scaffoldings/steel.json 1afa9b6c66a9f4f37018addf8e85d9e59e1e6fc1 data/immersiveengineering/tags/blocks/survey_tool_targets.json 3cd6a3f387dbdf003ef362dd1a6c26b1d8322e17 data/minecraft/tags/blocks/climbable.json 570f4747fd57b1bd476af0e54e7c4b0542ec975d data/minecraft/tags/blocks/crops.json diff --git a/src/generated/resources/.cache/8e3dac66008279787e3c8e46982fcdaea78599ee b/src/generated/resources/.cache/8e3dac66008279787e3c8e46982fcdaea78599ee index 55210684f6..692ad8622b 100644 --- a/src/generated/resources/.cache/8e3dac66008279787e3c8e46982fcdaea78599ee +++ b/src/generated/resources/.cache/8e3dac66008279787e3c8e46982fcdaea78599ee @@ -1,4 +1,4 @@ -// 1.20.4 2024-01-06T21:27:57.326179494 Tags for minecraft:item mod id immersiveengineering +// 1.20.4 2024-03-29T22:46:59.4694578 Tags for minecraft:item mod id immersiveengineering 0ec28c858b1b91c5bff32d09a6c333dd450fa2da data/curios/tags/items/back.json 929bbfcc2e578a06d498a3ac24c23dfc1e69677c data/curios/tags/items/head.json d0562e49ea1662a8e02805b805f76658ebd3ea7c data/forge/tags/items/armors.json @@ -52,7 +52,6 @@ f2e3544ce176352f85129bd1a956e3c32f7213d6 data/forge/tags/items/nuggets/copper.js 6caa44724480042a9f115326034f7ac497d41f1b data/forge/tags/items/nuggets/silver.json ff70749ed7436c3421de143e996e3c5161af1d82 data/forge/tags/items/nuggets/steel.json 688bfc4df0c1d2bfa47d34a2eac474ea7b4cfbda data/forge/tags/items/nuggets/uranium.json -03803ad3e358573f495ef5a2b28fff69483d9903 data/forge/tags/items/ore_rates/singular.json 096b05ce0e1511fdf1f849355b7214fd71c6727d data/forge/tags/items/ores.json 996364607181408578d2a18b0cd5941fe3251ffd data/forge/tags/items/ores/aluminum.json 2d5302798c26775d656807ac1d209b4b7430ff17 data/forge/tags/items/ores/lead.json @@ -61,6 +60,7 @@ ff70749ed7436c3421de143e996e3c5161af1d82 data/forge/tags/items/nuggets/steel.jso e10e19eb1ecd0d4fbd2270995a9c4b14c981af49 data/forge/tags/items/ores/uranium.json ad7cc89e6b8ad6b0c7c3544c0abd3446c612060c data/forge/tags/items/ores_in_ground/deepslate.json 81467f7c9399b301ac496bf424b8c8b807db752a data/forge/tags/items/ores_in_ground/stone.json +03803ad3e358573f495ef5a2b28fff69483d9903 data/forge/tags/items/ore_rates/singular.json 25979f85ffe3a60f6a6ff1a9393146fa407f233c data/forge/tags/items/plates.json acf6b113ec54a56762cde07b98764c3b8ae28754 data/forge/tags/items/plates/aluminum.json 4070924cacbdf8cd04656525b43f3dbe1b43e009 data/forge/tags/items/plates/constantan.json @@ -91,7 +91,6 @@ c0ba8fbc5bb958978c15dbbbf9109c2f235e20ec data/forge/tags/items/sandstone/colorle 6a91d4acdb80541d81cbf2ccc3347b0749b64363 data/forge/tags/items/sandstone/red.json de1d550cd16eb974c4908a0707d28c459d7100cc data/forge/tags/items/sawblades.json e1fcb72ddbe4430266625044432e9752bb0890e6 data/forge/tags/items/seeds.json -f8407d8b86459d08f321ad472e23df8b11f04807 data/forge/tags/items/sheetmetal_slabs.json edecb36d2c51c53656e146c80bbf300e4d52de39 data/forge/tags/items/sheetmetals.json 685fe54ad50bcb90d1857662c38ad1e2e89bb8a6 data/forge/tags/items/sheetmetals/aluminum.json 208b8916c3964147d79703c1eb7096e8775aa78f data/forge/tags/items/sheetmetals/constantan.json @@ -104,6 +103,7 @@ ff543a6161432e4e8dd2bd8775ab99af16c0315c data/forge/tags/items/sheetmetals/nicke bc8cb8d4f41333ae547eb75f529beb92a7a62dd9 data/forge/tags/items/sheetmetals/silver.json 44df194bae79ecbc6ba642f28825d7d55f640865 data/forge/tags/items/sheetmetals/steel.json 517af5879eee0eaacb6ec77424a19790f680f6bd data/forge/tags/items/sheetmetals/uranium.json +f8407d8b86459d08f321ad472e23df8b11f04807 data/forge/tags/items/sheetmetal_slabs.json 0e4aefbc2ed6059d8a6577044f12f658c39b57d1 data/forge/tags/items/slag.json c0afad8eab5f9b2dac5ccf01d9dbec3d9c080202 data/forge/tags/items/storage_blocks.json a252494dc3a9a5b9aab17e82ae7ff504ca84a099 data/forge/tags/items/storage_blocks/aluminum.json @@ -136,6 +136,7 @@ f5470081131755f2ca6efe914c57a261c517eec5 data/forge/tags/items/wires/copper.json ef8563aa2ee1f32b7bea78d511d14c4de2fa7f9f data/forge/tags/items/wires/electrum.json 9b11ddba67b507e14e22e33521204309ef1e6dfe data/forge/tags/items/wires/lead.json 090c3aab10acd9836ba1976243fc7ce381120a1a data/forge/tags/items/wires/steel.json +085238f24aca214ce9eb3f57ab02370467990f33 data/immersiveengineering/tags/items/blocks/copper.json d6dd4d8bc65e07b1262b11dc0177d1fe5fbf9680 data/immersiveengineering/tags/items/circuits/logic.json 1fe9d2f525aae99bcd22b42ce0a5601f493e62b6 data/immersiveengineering/tags/items/circuits/pcb.json c1d78e3fa5f5148f12a3f9c5eefe3940a3779908 data/immersiveengineering/tags/items/circuits/solder.json @@ -144,12 +145,12 @@ c1d78e3fa5f5148f12a3f9c5eefe3940a3779908 data/immersiveengineering/tags/items/ci 3e4fc91069da2d49ed9c3bd132c947b9879bdd0c data/immersiveengineering/tags/items/cut_slabs/copper.json 240d783ca901747689edbff6ec068e1ebafd3dc6 data/immersiveengineering/tags/items/cut_stairs/copper.json 760547229cd962c162d51cb04c941ef73537db0b data/immersiveengineering/tags/items/recycling/ignored_components.json +586d8c57de0cdcef9e768494366ce79e22d75223 data/immersiveengineering/tags/items/scaffoldings/aluminum.json +8f3e0a730467c3941f6d1bc9e6c02d4dac7200f0 data/immersiveengineering/tags/items/scaffoldings/steel.json c3d387e89fbb8dfb53e5e91ad3b45e07f5202650 data/immersiveengineering/tags/items/scaffolding_slabs/aluminum.json 56c051f4ddf6a8bfb51631d88f7553d13e908a69 data/immersiveengineering/tags/items/scaffolding_slabs/steel.json b7ae6076dcdde66b8bd7c303e7f5ea5e58ba24f1 data/immersiveengineering/tags/items/scaffolding_stairs/aluminum.json 58bcbaec9e8e1403838cbc28eb4bae9fdfa0dc3d data/immersiveengineering/tags/items/scaffolding_stairs/steel.json -586d8c57de0cdcef9e768494366ce79e22d75223 data/immersiveengineering/tags/items/scaffoldings/aluminum.json -8f3e0a730467c3941f6d1bc9e6c02d4dac7200f0 data/immersiveengineering/tags/items/scaffoldings/steel.json ffd1e0a7fd1c1915b8c905faadd6b3aab3f99f99 data/immersiveengineering/tags/items/toolbox/tools.json e5c3944c2ae80d9e04025f18f44f3f7f45e17818 data/immersiveengineering/tags/items/toolbox/wiring.json 6e2720545b691b7dd962c68ecb9715cab8583fb9 data/immersiveengineering/tags/items/tools/hammers.json diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/blocks/copper.json b/src/generated/resources/data/immersiveengineering/tags/blocks/blocks/copper.json new file mode 100644 index 0000000000..538486501f --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/blocks/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:copper_block", + "minecraft:exposed_copper", + "minecraft:weathered_copper", + "minecraft:oxidized_copper", + "minecraft:waxed_copper_block", + "minecraft:waxed_exposed_copper", + "minecraft:waxed_weathered_copper", + "minecraft:waxed_oxidized_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/cut_blocks/copper.json b/src/generated/resources/data/immersiveengineering/tags/blocks/cut_blocks/copper.json new file mode 100644 index 0000000000..cde015b6b9 --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/cut_blocks/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:cut_copper", + "minecraft:exposed_cut_copper", + "minecraft:weathered_cut_copper", + "minecraft:oxidized_cut_copper", + "minecraft:waxed_cut_copper", + "minecraft:waxed_exposed_cut_copper", + "minecraft:waxed_weathered_cut_copper", + "minecraft:waxed_oxidized_cut_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/cut_slabs/copper.json b/src/generated/resources/data/immersiveengineering/tags/blocks/cut_slabs/copper.json new file mode 100644 index 0000000000..29346ebebf --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/cut_slabs/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:cut_copper_slab", + "minecraft:exposed_cut_copper_slab", + "minecraft:weathered_cut_copper_slab", + "minecraft:oxidized_cut_copper_slab", + "minecraft:waxed_cut_copper_slab", + "minecraft:waxed_exposed_cut_copper_slab", + "minecraft:waxed_weathered_cut_copper_slab", + "minecraft:waxed_oxidized_cut_copper_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/tags/blocks/cut_stairs/copper.json b/src/generated/resources/data/immersiveengineering/tags/blocks/cut_stairs/copper.json new file mode 100644 index 0000000000..822189bda3 --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/cut_stairs/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:cut_copper_stairs", + "minecraft:exposed_cut_copper_stairs", + "minecraft:weathered_cut_copper_stairs", + "minecraft:oxidized_cut_copper_stairs", + "minecraft:waxed_cut_copper_stairs", + "minecraft:waxed_exposed_cut_copper_stairs", + "minecraft:waxed_weathered_cut_copper_stairs", + "minecraft:waxed_oxidized_cut_copper_stairs" + ] +} \ No newline at end of file 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 296b90f76f..540b17b2a0 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 @@ -2,7 +2,47 @@ "values": [ "#forge:storage_blocks", "#forge:sheetmetals", + "immersiveengineering:slab_storage_aluminum", + "immersiveengineering:slab_storage_lead", + "immersiveengineering:slab_storage_silver", + "immersiveengineering:slab_storage_nickel", + "immersiveengineering:slab_storage_uranium", + "immersiveengineering:slab_storage_constantan", + "immersiveengineering:slab_storage_electrum", + "immersiveengineering:slab_storage_steel", + "#forge:sheetmetal_slabs", + "#immersiveengineering:blocks/copper", + "#immersiveengineering:cut_blocks/copper", + "#immersiveengineering:cut_slabs/copper", + "#immersiveengineering:cut_stairs/copper", "#immersiveengineering:scaffoldings/steel", - "#immersiveengineering:scaffoldings/aluminum" + "#immersiveengineering:scaffoldings/aluminum", + "immersiveengineering:alu_fence", + "immersiveengineering:alu_post", + "immersiveengineering:alu_wallmount", + "immersiveengineering:alu_slope", + "immersiveengineering:steel_fence", + "immersiveengineering:steel_post", + "immersiveengineering:steel_wallmount", + "immersiveengineering:steel_slope", + "immersiveengineering:metal_ladder_none", + "immersiveengineering:metal_ladder_alu", + "immersiveengineering:metal_ladder_steel", + "immersiveengineering:chute_copper", + "immersiveengineering:chute_aluminum", + "immersiveengineering:chute_steel", + "immersiveengineering:chute_iron", + "immersiveengineering:metal_barrel", + "immersiveengineering:fluid_pump", + "immersiveengineering:fluid_pipe", + "immersiveengineering:fluid_placer", + "immersiveengineering:coil_lv", + "immersiveengineering:coil_mv", + "immersiveengineering:coil_mv", + "immersiveengineering:rs_engineering", + "immersiveengineering:light_engineering", + "immersiveengineering:heavy_engineering", + "immersiveengineering:radiator", + "immersiveengineering:generator" ] } \ No newline at end of file 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 52666e82f7..247e33726a 100644 --- a/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/rockcutter.json +++ b/src/generated/resources/data/immersiveengineering/tags/blocks/mineable/rockcutter.json @@ -2,8 +2,15 @@ "values": [ "#forge:cobblestone", "#forge:stone", + "#forge:ores", "#forge:glass", "#minecraft:ice", - "#forge:ores" + "minecraft:glowstone", + "minecraft:sea_lantern", + "#forge:chests/ender", + "minecraft:sculk", + "minecraft:sculk_catalyst", + "minecraft:sculk_sensor", + "minecraft:calibrated_sculk_sensor" ] } \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/tags/items/blocks/copper.json b/src/generated/resources/data/immersiveengineering/tags/items/blocks/copper.json new file mode 100644 index 0000000000..538486501f --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/tags/items/blocks/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:copper_block", + "minecraft:exposed_copper", + "minecraft:weathered_copper", + "minecraft:oxidized_copper", + "minecraft:waxed_copper_block", + "minecraft:waxed_exposed_copper", + "minecraft:waxed_weathered_copper", + "minecraft:waxed_oxidized_copper" + ] +} \ No newline at end of file