FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-05 19:47:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

Undo melee tag change

Browse source
This commit is contained in:
TelepathicGrunt 2024-07-30 20:23:56 -04:00
parent 84cb33b868
commit c3bba89b19
3 changed files with 2 additions and 37 deletions
fabric-convention-tags-v2/src
datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators
ItemTagGenerator.java
generated/resources/data/c/tags/item/tools
melee_weapon.json
main/java/net/fabricmc/fabric/api/tag/convention/v2
ConventionalItemTags.java

18
fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
View file

@ -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)

18
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
View file

@ -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

3
fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
View file

@ -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");
/**