Merge pull request #79 from liujustin604/forge/1.20.1

Make all blocks mineable with pickaxe

Author: ko-lja

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -0,0 +1,29 @@
+{
+  "values": [
+    "expandedae:exp_pattern_provider",
+    "expandedae:exp_io_port",
+    "expandedae:exp_energy_cell",
+    "expandedae:giga_pattern_provider",
+    "expandedae:exp_crafting_unit",
+    "expandedae:exp_crafting_accelerator_2",
+    "expandedae:exp_crafting_accelerator_4",
+    "expandedae:exp_crafting_accelerator_8",
+    "expandedae:exp_crafting_accelerator_16",
+    "expandedae:exp_crafting_accelerator_32",
+    "expandedae:exp_crafting_accelerator_64",
+    "expandedae:exp_crafting_accelerator_128",
+    "expandedae:exp_crafting_accelerator_256",
+    "expandedae:exp_crafting_accelerator_512",
+    "expandedae:exp_crafting_accelerator_1k",
+    "expandedae:exp_crafting_accelerator_2k",
+    "expandedae:exp_crafting_accelerator_4k",
+    "expandedae:exp_crafting_accelerator_8k",
+    "expandedae:exp_crafting_accelerator_16k",
+    "expandedae:exp_crafting_accelerator_32k",
+    "expandedae:exp_crafting_accelerator_64k",
+    "expandedae:exp_crafting_accelerator_128k",
+    "expandedae:exp_crafting_accelerator_256k",
+    "expandedae:exp_crafting_accelerator_512k",
+    "expandedae:exp_crafting_accelerator_1m"
+  ]
+}

src/main/java/lu/kolja/expandedae/datagen/ExpBlockTagsProvider.java

@@ -0,0 +1,25 @@
+package lu.kolja.expandedae.datagen;
+
+import lu.kolja.expandedae.Expandedae;
+import lu.kolja.expandedae.definition.ExpBlocks;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.tags.BlockTags;
+import net.minecraftforge.common.data.BlockTagsProvider;
+import net.minecraftforge.common.data.ExistingFileHelper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ExpBlockTagsProvider extends BlockTagsProvider {
+
+    public ExpBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
+        super(output, lookupProvider, Expandedae.MODID, existingFileHelper);
+    }
+
+    @Override
+    protected void addTags(HolderLookup.Provider provider) {
+        var pickaxe = tag(BlockTags.MINEABLE_WITH_PICKAXE);
+        ExpBlocks.getBlocks().forEach(blockDef -> pickaxe.add(blockDef.block()));
+    }
+}

src/main/java/lu/kolja/expandedae/datagen/ExpDataGen.java

@@ -14,10 +14,12 @@ public static void onGatherData(GatherDataEvent event) {
         var gen = event.getGenerator();
         var out = gen.getPackOutput();
         var existing = event.getExistingFileHelper();
+        var lookup = event.getLookupProvider();
 
         gen.addProvider(event.includeClient(), new ExpLangProvider(out));
         gen.addProvider(event.includeClient(), new ExpModelProvider(out, existing));
         gen.addProvider(event.includeClient(), new ExpItemModelProvider(out, existing));
+        gen.addProvider(event.includeServer(), new ExpBlockTagsProvider(out, lookup, existing));
         gen.addProvider(event.includeServer(), new ExpRecipeProvider(out));
         gen.addProvider(event.includeServer(), new ExpLootProvider(out));
     }