update tool tags

TheMCBrothers · Jun 17, 2024 · 2b336c1 · 2b336c1
1 parent 989f422
commit 2b336c1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...ources/data/c/tags/item/tools/shears.json → ...sources/data/c/tags/item/tools/shear.json b/...ources/data/c/tags/item/tools/shears.json → ...sources/data/c/tags/item/tools/shear.json
diff --git a/...urces/data/c/tags/item/tools/shields.json → ...ources/data/c/tags/item/tools/shield.json b/...urces/data/c/tags/item/tools/shields.json → ...ources/data/c/tags/item/tools/shield.json
diff --git a/src/generated/resources/data/uselessmod/loot_table/blocks/useless_oak_leaves.json b/src/generated/resources/data/uselessmod/loot_table/blocks/useless_oak_leaves.json
@@ -18,7 +18,7 @@
  {
  "condition": "minecraft:match_tool",
  "predicate": {
- "items": "#c:tools/shears"
+ "items": "#c:tools/shear"
  }
  },
  {
@@ -77,7 +77,7 @@
  {
  "condition": "minecraft:match_tool",
  "predicate": {
- "items": "#c:tools/shears"
+ "items": "#c:tools/shear"
  }
  },
  {
@@ -145,7 +145,7 @@
  {
  "condition": "minecraft:match_tool",
  "predicate": {
- "items": "#c:tools/shears"
+ "items": "#c:tools/shear"
  }
  },
  {

diff --git a/src/main/java/net/themcbrothers/uselessmod/datagen/UselessTagsProvider.java b/src/main/java/net/themcbrothers/uselessmod/datagen/UselessTagsProvider.java
@@ -149,8 +149,8 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
  this.tag(Tags.Items.RAW_MATERIALS).addTag(UselessTags.Items.RAW_MATERIALS_USELESS).addTag(UselessTags.Items.RAW_MATERIALS_SUPER_USELESS);
 
  // other common tags
- this.tag(Tags.Items.TOOLS_SHEARS).add(UselessItems.USELESS_SHEARS.get());
- this.tag(Tags.Items.TOOLS_SHIELDS).add(UselessItems.USELESS_SHIELD.get(), UselessItems.SUPER_USELESS_SHIELD.get());
+ this.tag(Tags.Items.TOOLS_SHEAR).add(UselessItems.USELESS_SHEARS.get());
+ this.tag(Tags.Items.TOOLS_SHIELD).add(UselessItems.USELESS_SHIELD.get(), UselessItems.SUPER_USELESS_SHIELD.get());
 
  this.tag(UselessTags.Items.CROPS_USELESS_WHEAT).add(UselessItems.USELESS_WHEAT.get());
  this.tag(UselessTags.Items.CROPS_COFFEEBEAN).add(UselessItems.COFFEE_BEANS.get());

diff --git a/src/main/java/net/themcbrothers/uselessmod/datagen/loot/UselessBlockLoot.java b/src/main/java/net/themcbrothers/uselessmod/datagen/loot/UselessBlockLoot.java
@@ -41,7 +41,7 @@
 import static net.themcbrothers.uselessmod.core.UselessBlocks.*;
 
 public class UselessBlockLoot extends BlockLootSubProvider {
- private static final LootItemCondition.Builder HAS_SHEARS = MatchTool.toolMatches(ItemPredicate.Builder.item().of(Tags.Items.TOOLS_SHEARS));
+ private static final LootItemCondition.Builder HAS_SHEARS = MatchTool.toolMatches(ItemPredicate.Builder.item().of(Tags.Items.TOOLS_SHEAR));
  private static final float[] NORMAL_LEAVES_SAPLING_CHANCES = new float[]{0.05F, 0.0625F, 0.083333336F, 0.1F};
 
  private static final Set<Item> EXPLOSION_RESISTANT = Stream.of(