From c3bba89b19ddbdf76230b2d0a22ca3f3dd4e4098 Mon Sep 17 00:00:00 2001
From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:23:56 -0400
Subject: [PATCH] Undo melee tag change
---
.../datagen/generators/ItemTagGenerator.java | 18 ------------------
.../data/c/tags/item/tools/melee_weapon.json | 18 ------------------
.../convention/v2/ConventionalItemTags.java | 3 ++-
3 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
index 8c128e27f..648afd90a 100644
--- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
+++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
@@ -562,24 +562,6 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.add(Items.IRON_AXE)
.add(Items.DIAMOND_AXE)
.add(Items.NETHERITE_AXE)
- .add(Items.WOODEN_PICKAXE)
- .add(Items.STONE_PICKAXE)
- .add(Items.GOLDEN_PICKAXE)
- .add(Items.IRON_PICKAXE)
- .add(Items.DIAMOND_PICKAXE)
- .add(Items.NETHERITE_PICKAXE)
- .add(Items.WOODEN_SHOVEL)
- .add(Items.STONE_SHOVEL)
- .add(Items.GOLDEN_SHOVEL)
- .add(Items.IRON_SHOVEL)
- .add(Items.DIAMOND_SHOVEL)
- .add(Items.NETHERITE_SHOVEL)
- .add(Items.WOODEN_HOE)
- .add(Items.STONE_HOE)
- .add(Items.GOLDEN_HOE)
- .add(Items.IRON_HOE)
- .add(Items.DIAMOND_HOE)
- .add(Items.NETHERITE_HOE)
.addOptionalTag(ConventionalItemTags.MELEE_WEAPONS_TOOLS);
getOrCreateTagBuilder(ConventionalItemTags.RANGED_WEAPON_TOOLS)
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
index 140276003..04adfc134 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
@@ -14,24 +14,6 @@
"minecraft:iron_axe",
"minecraft:diamond_axe",
"minecraft:netherite_axe",
- "minecraft:wooden_pickaxe",
- "minecraft:stone_pickaxe",
- "minecraft:golden_pickaxe",
- "minecraft:iron_pickaxe",
- "minecraft:diamond_pickaxe",
- "minecraft:netherite_pickaxe",
- "minecraft:wooden_shovel",
- "minecraft:stone_shovel",
- "minecraft:golden_shovel",
- "minecraft:iron_shovel",
- "minecraft:diamond_shovel",
- "minecraft:netherite_shovel",
- "minecraft:wooden_hoe",
- "minecraft:stone_hoe",
- "minecraft:golden_hoe",
- "minecraft:iron_hoe",
- "minecraft:diamond_hoe",
- "minecraft:netherite_hoe",
{
"id": "#c:tools/melee_weapons",
"required": false
diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
index df80718ce..1cfbb201e 100644
--- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
@@ -59,7 +59,8 @@ public final class ConventionalItemTags {
// Action-based tool tags
/**
* A tag containing melee-based weapons for recipes and loot tables.
- * Tools are considered melee if they contain a {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_ATTACK_DAMAGE} attribute.
+ * Tools are considered melee if they are intentionally intended to be used for melee attack as a primary purpose.
+ * (In other words, Pickaxes are not melee weapons as they are not intended to be a weapon as a primary purpose)
*/
public static final TagKey<Item> MELEE_WEAPON_TOOLS = register("tools/melee_weapon");
/**