From a8031b7569e5d03f5686bc1d1e89ce44cb737b1e Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 20 Oct 2020 17:34:39 +0200 Subject: [PATCH] Missed Tags --- src/generated/resources/.cache/cache | 4 ++++ .../resources/data/forge/tags/blocks/ores.json | 7 +++++++ .../data/forge/tags/blocks/storage_blocks.json | 8 ++++++++ .../resources/data/forge/tags/items/ores.json | 7 +++++++ .../data/forge/tags/items/storage_blocks.json | 8 ++++++++ src/main/java/com/simibubi/create/AllBlocks.java | 11 +++++++++++ 6 files changed, 45 insertions(+) create mode 100644 src/generated/resources/data/forge/tags/blocks/ores.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks.json create mode 100644 src/generated/resources/data/forge/tags/items/ores.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 521a7f5e4..336470f9d 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -3153,8 +3153,10 @@ abbe5d7cc9d1705509257888154ed7ca23292586 data/create/tags/items/upright_on_belt. 50936b211d94167a35ec78c89954082a336b6269 data/create/tags/items/valve_handles.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/blocks/glass/colorless.json 81ced867d24ec814942909965dd4576eff1db685 data/forge/tags/blocks/glass_panes.json +4b700ee8aa748c2ec70c29ef1589844879c0deae data/forge/tags/blocks/ores.json 4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data/forge/tags/blocks/ores/copper.json d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores/zinc.json +508730d3822c54d355329bf6a33d58071653afad data/forge/tags/blocks/storage_blocks.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/blocks/storage_blocks/copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json @@ -3170,6 +3172,7 @@ bcf15289cbadd429a48bd9accb4d2d5f75353a61 data/forge/tags/items/nuggets.json cc82188fe8d986f4457301ed4f75ae833d263601 data/forge/tags/items/nuggets/brass.json 7affb30e30a252566a77467994b0c99331f1076c data/forge/tags/items/nuggets/copper.json 0d8cb5092ee6ec01ea09324c80d649ba05549799 data/forge/tags/items/nuggets/zinc.json +4b700ee8aa748c2ec70c29ef1589844879c0deae data/forge/tags/items/ores.json 4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data/forge/tags/items/ores/copper.json d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores/zinc.json 5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data/forge/tags/items/plates.json @@ -3177,6 +3180,7 @@ d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores/zinc.json c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data/forge/tags/items/plates/copper.json fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json 04d947ed7a5066f3cfe75a8dc564fe2dca8a9c93 data/forge/tags/items/plates/iron.json +508730d3822c54d355329bf6a33d58071653afad data/forge/tags/items/storage_blocks.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/blocks/ores.json new file mode 100644 index 000000000..dc8820ef1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "create:copper_ore", + "create:zinc_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json new file mode 100644 index 000000000..fd18acec8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "create:copper_block", + "create:zinc_block", + "create:brass_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json new file mode 100644 index 000000000..dc8820ef1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "create:copper_ore", + "create:zinc_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json new file mode 100644 index 000000000..fd18acec8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "create:copper_block", + "create:zinc_block", + "create:brass_block" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index d19984f73..b3b0c72c1 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -161,6 +161,7 @@ import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.ToolType; public class AllBlocks { @@ -1033,7 +1034,9 @@ public class AllBlocks { REGISTRATE.block("copper_ore", p -> new OxidizingBlock(p, 1)) .initialProperties(() -> Blocks.IRON_ORE) .transform(oxidizedBlockstate()) + .tag(Tags.Blocks.ORES) .transform(tagBlockAndItem("ores/copper")) + .tag(Tags.Items.ORES) .transform(oxidizedItemModel()) .register(); @@ -1042,14 +1045,18 @@ public class AllBlocks { .properties(p -> p.harvestLevel(2) .harvestTool(ToolType.PICKAXE) .sound(SoundType.STONE)) + .tag(Tags.Blocks.ORES) .transform(tagBlockAndItem("ores/zinc")) + .tag(Tags.Items.ORES) .build() .register(); public static final BlockEntry COPPER_BLOCK = REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f, true)) .initialProperties(() -> Blocks.IRON_BLOCK) + .tag(Tags.Blocks.STORAGE_BLOCKS) .transform(tagBlockAndItem("storage_blocks/copper")) + .tag(Tags.Items.STORAGE_BLOCKS) .transform(oxidizedItemModel()) .transform(oxidizedBlockstate()) .register(); @@ -1072,14 +1079,18 @@ public class AllBlocks { public static final BlockEntry ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new MetalBlock(p, true)) .initialProperties(() -> Blocks.IRON_BLOCK) + .tag(Tags.Blocks.STORAGE_BLOCKS) .transform(tagBlockAndItem("storage_blocks/zinc")) + .tag(Tags.Items.STORAGE_BLOCKS) .build() .register(); public static final BlockEntry BRASS_BLOCK = REGISTRATE.block("brass_block", p -> new MetalBlock(p, true)) .initialProperties(() -> Blocks.IRON_BLOCK) + .tag(Tags.Blocks.STORAGE_BLOCKS) .transform(tagBlockAndItem("storage_blocks/brass")) + .tag(Tags.Items.STORAGE_BLOCKS) .build() .register();