From 8d25d6c657e219f0b62ca1fe17f1ec57de8f6190 Mon Sep 17 00:00:00 2001 From: covers1624 Date: Thu, 25 Aug 2022 19:11:25 +0930 Subject: [PATCH] Add pickaxe minable tags. --- .../282910bf22b00ad347f56cc1dfb6815b78e846d9 | 2 +- .../3cae2902f4522543fae07a36318d5ed427f71d39 | 2 +- .../75bcd4dba6ca7d365462b0ec45e291d1056349c4 | 2 ++ .../tags/blocks/mineable/pickaxe.json | 6 ++++ .../enderstorage/init/DataGenerators.java | 29 +++++++++++++++---- 5 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 create mode 100644 src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/main/generated/.cache/282910bf22b00ad347f56cc1dfb6815b78e846d9 b/src/main/generated/.cache/282910bf22b00ad347f56cc1dfb6815b78e846d9 index f90e8a6..cd82047 100644 --- a/src/main/generated/.cache/282910bf22b00ad347f56cc1dfb6815b78e846d9 +++ b/src/main/generated/.cache/282910bf22b00ad347f56cc1dfb6815b78e846d9 @@ -1,4 +1,4 @@ -// 1.19 2022-06-22T22:47:06.915539118 EnderStorage Item models +// 1.19 2022-07-18T14:06:30.26837892 EnderStorage Item models a163c9ce1e63e428f3fa804b66e491b455f18540 assets/enderstorage/models/item/ender_chest.json a163c9ce1e63e428f3fa804b66e491b455f18540 assets/enderstorage/models/item/ender_pouch.json a163c9ce1e63e428f3fa804b66e491b455f18540 assets/enderstorage/models/item/ender_tank.json diff --git a/src/main/generated/.cache/3cae2902f4522543fae07a36318d5ed427f71d39 b/src/main/generated/.cache/3cae2902f4522543fae07a36318d5ed427f71d39 index c9a248f..e28d507 100644 --- a/src/main/generated/.cache/3cae2902f4522543fae07a36318d5ed427f71d39 +++ b/src/main/generated/.cache/3cae2902f4522543fae07a36318d5ed427f71d39 @@ -1,4 +1,4 @@ -// 1.19 2022-06-22T22:47:06.91448628 EnderStorage BlockStates +// 1.19 2022-07-18T14:06:30.266321842 EnderStorage BlockStates 31ae921e4029b7a18bfc63f7cee5e5bf4ce92828 assets/enderstorage/blockstates/ender_chest.json 31ae921e4029b7a18bfc63f7cee5e5bf4ce92828 assets/enderstorage/blockstates/ender_tank.json f105c225def5c2a406cab5c02f6b08774a37e9de assets/enderstorage/models/block/dummy.json diff --git a/src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 new file mode 100644 index 0000000..f47ed9c --- /dev/null +++ b/src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -0,0 +1,2 @@ +// 1.19 2022-07-18T14:06:30.268126447 Tags for minecraft:block +5b2130f55986594660c630dadb50eede58d67c12 data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..0fc8658 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,6 @@ +{ + "values": [ + "enderstorage:ender_chest", + "enderstorage:ender_tank" + ] +} \ No newline at end of file diff --git a/src/main/java/codechicken/enderstorage/init/DataGenerators.java b/src/main/java/codechicken/enderstorage/init/DataGenerators.java index 28ffa01..7ca81f4 100644 --- a/src/main/java/codechicken/enderstorage/init/DataGenerators.java +++ b/src/main/java/codechicken/enderstorage/init/DataGenerators.java @@ -2,16 +2,20 @@ import codechicken.lib.datagen.ItemModelProvider; import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.tags.BlockTags; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import org.jetbrains.annotations.Nullable; import javax.annotation.Nonnull; import static codechicken.enderstorage.EnderStorage.MOD_ID; +import static codechicken.enderstorage.init.EnderStorageModContent.*; /** * Created by covers1624 on 4/25/20. @@ -25,6 +29,7 @@ public static void gatherDataGenerators(GatherDataEvent event) { ExistingFileHelper files = event.getExistingFileHelper(); gen.addProvider(event.includeClient(), new BlockStates(gen, files)); gen.addProvider(event.includeClient(), new ItemModels(gen, files)); + gen.addProvider(event.includeServer(), new BlockTagGen(gen, files)); } private static class ItemModels extends ItemModelProvider { @@ -35,9 +40,9 @@ public ItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper @Override protected void registerModels() { - generated(EnderStorageModContent.ENDER_CHEST_ITEM).noTexture(); - generated(EnderStorageModContent.ENDER_TANK_ITEM).noTexture(); - generated(EnderStorageModContent.ENDER_POUCH).noTexture(); + generated(ENDER_CHEST_ITEM).noTexture(); + generated(ENDER_TANK_ITEM).noTexture(); + generated(ENDER_POUCH).noTexture(); } @Override @@ -63,8 +68,22 @@ protected void registerStatesAndModels() { ModelFile model = models() .withExistingParent("dummy", "block") .texture("particle", "minecraft:block/obsidian"); - simpleBlock(EnderStorageModContent.ENDER_CHEST_BLOCK.get(), model); - simpleBlock(EnderStorageModContent.ENDER_TANK_BLOCK.get(), model); + simpleBlock(ENDER_CHEST_BLOCK.get(), model); + simpleBlock(ENDER_TANK_BLOCK.get(), model); + } + } + + private static class BlockTagGen extends BlockTagsProvider { + + public BlockTagGen(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { + super(gen, MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + tag(BlockTags.MINEABLE_WITH_PICKAXE) + .add(ENDER_CHEST_BLOCK.get()) + .add(ENDER_TANK_BLOCK.get()); } } }