add new tags introduced in forge 42.0.8

MelanX · Aug 5, 2022 · 74d4e57 · 74d4e57
1 parent 35fbe6a
commit 74d4e57
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,10 +7,10 @@ group=de.melanx
 base_version=1.1
 
 # dependencies
-forge_version=1.19.1-42.0.1
+forge_version=1.19.1-42.0.8
 
 # upload properties
-upload_versions=1.19.1
+upload_versions=1.19.1, 1.19.2
 upload_release=release
 modrinth_project=v7uAVl86
 modrinth_requirements=libx

diff --git a/src/generated/resources/data/forge/tags/items/tools.json b/src/generated/resources/data/forge/tags/items/tools.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:tools/hammers",
+    "#forge:tools/excavators"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/tools/excavators.json b/src/generated/resources/data/forge/tags/items/tools/excavators.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "simplytools:wooden_excavator",
+    "simplytools:stone_excavator",
+    "simplytools:iron_excavator",
+    "simplytools:golden_excavator",
+    "simplytools:diamond_excavator",
+    "simplytools:netherite_excavator",
+    "simplytools:bone_excavator",
+    "simplytools:coal_excavator",
+    "simplytools:copper_excavator",
+    "simplytools:emerald_excavator",
+    "simplytools:ender_excavator",
+    "simplytools:fiery_excavator",
+    "simplytools:glowstone_excavator",
+    "simplytools:lapis_excavator",
+    "simplytools:nether_excavator",
+    "simplytools:obsidian_excavator",
+    "simplytools:paper_excavator",
+    "simplytools:prismarine_excavator",
+    "simplytools:quartz_excavator",
+    "simplytools:redstone_excavator",
+    "simplytools:slime_excavator"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/tools/hammers.json b/src/generated/resources/data/forge/tags/items/tools/hammers.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "simplytools:wooden_hammer",
+    "simplytools:stone_hammer",
+    "simplytools:iron_hammer",
+    "simplytools:golden_hammer",
+    "simplytools:diamond_hammer",
+    "simplytools:netherite_hammer",
+    "simplytools:bone_hammer",
+    "simplytools:coal_hammer",
+    "simplytools:copper_hammer",
+    "simplytools:emerald_hammer",
+    "simplytools:ender_hammer",
+    "simplytools:fiery_hammer",
+    "simplytools:glowstone_hammer",
+    "simplytools:lapis_hammer",
+    "simplytools:nether_hammer",
+    "simplytools:obsidian_hammer",
+    "simplytools:paper_hammer",
+    "simplytools:prismarine_hammer",
+    "simplytools:quartz_hammer",
+    "simplytools:redstone_hammer",
+    "simplytools:slime_hammer"
+  ]
+}
diff --git a/src/main/java/de/melanx/simplytools/data/ToolTags.java b/src/main/java/de/melanx/simplytools/data/ToolTags.java
@@ -3,10 +3,13 @@
 import de.melanx.morevanillalib.data.ModTags;
 import de.melanx.simplytools.items.BaseTool;
 import net.minecraft.data.DataGenerator;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.data.ExistingFileHelper;
 import org.moddingx.libx.annotation.data.Datagen;
 import org.moddingx.libx.base.decoration.DecoratedBlock;
@@ -18,13 +21,17 @@
 @Datagen
 public class ToolTags extends CommonTagsProviderBase {
 
+    public static final TagKey<Item> TOOLS_HAMMERS = ItemTags.create(new ResourceLocation("forge", "tools/hammers"));
+    public static final TagKey<Item> TOOLS_EXCAVATORS = ItemTags.create(new ResourceLocation("forge", "tools/excavators"));
+
     public ToolTags(ModX mod, DataGenerator generator, ExistingFileHelper fileHelper) {
         super(mod, generator, fileHelper);
     }
 
     @Override
     public void setup() {
-        // NO-OP
+        //noinspection unchecked
+        this.item(Tags.Items.TOOLS).addTags(TOOLS_HAMMERS, TOOLS_EXCAVATORS);
     }
 
     @Override
@@ -54,6 +61,13 @@ public void defaultItemTags(Item item) {
                 case REDSTONE -> this.item(ModTags.Items.REDSTONE_TOOLS).add(item);
                 case SLIME -> this.item(ModTags.Items.SLIME_TOOLS).add(item);
             }
+            if (tool.blocks == BlockTags.MINEABLE_WITH_PICKAXE) {
+                this.item(TOOLS_HAMMERS).add(item);
+            }
+
+            if (tool.blocks == BlockTags.MINEABLE_WITH_SHOVEL) {
+                this.item(TOOLS_EXCAVATORS).add(item);
+            }
         }
     }
 

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -18,7 +18,7 @@ Install MoreVanillaLib for special effects ingame
 [[dependencies.simplytools]]
     modId="forge"
     mandatory=true
-    versionRange="[42,)"
+    versionRange="[42.0.8,)"
     ordering="NONE"
     side="BOTH"