Use correct item tag for wrenches (#8048)

AppliedEnergistics · Jul 20, 2024 · 5162d58 · 5162d58
1 parent 66a44dc
commit 5162d58
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ minecraft_release=1.21
 minecraft_version=1.21
 minecraft_version_range=1.21
 # https://projects.neoforged.net/neoforged/neoforge
-neoforge_version=21.0.103-beta
+neoforge_version=21.0.109-beta
 neoforge_version_range=[21.0.0-beta,)
 
 #########################################################

diff --git a/...rces/data/c/tags/item/tools/wrenches.json → ...ources/data/c/tags/item/tools/wrench.json b/...rces/data/c/tags/item/tools/wrenches.json → ...ources/data/c/tags/item/tools/wrench.json
diff --git a/src/main/java/appeng/datagen/providers/tags/ConventionTags.java b/src/main/java/appeng/datagen/providers/tags/ConventionTags.java
@@ -77,7 +77,6 @@ private ConventionTags() {
     // Includes synthetic/purified
     public static final TagKey<Item> ALL_NETHER_QUARTZ = tag("ae2:all_nether_quartz");
     public static final TagKey<Item> NETHER_QUARTZ = Tags.Items.GEMS_QUARTZ;
-    public static final TagKey<Item> NETHER_QUARTZ_ORE = Tags.Items.ORES_QUARTZ;
 
     // Includes synthetic/purified
     public static final TagKey<Item> ALL_FLUIX = tag("ae2:all_fluix");
@@ -88,11 +87,9 @@ private ConventionTags() {
 
     public static final TagKey<Item> GOLD_NUGGET = Tags.Items.NUGGETS_GOLD;
     public static final TagKey<Item> GOLD_INGOT = Tags.Items.INGOTS_GOLD;
-    public static final TagKey<Item> GOLD_ORE = Tags.Items.ORES_GOLD;
 
     public static final TagKey<Item> IRON_NUGGET = Tags.Items.NUGGETS_IRON;
     public static final TagKey<Item> IRON_INGOT = Tags.Items.INGOTS_IRON;
-    public static final TagKey<Item> IRON_ORE = Tags.Items.ORES_IRON;
 
     public static final TagKey<Item> DIAMOND = Tags.Items.GEMS_DIAMOND;
     public static final TagKey<Item> REDSTONE = Tags.Items.DUSTS_REDSTONE;
@@ -105,7 +102,6 @@ private ConventionTags() {
     public static final TagKey<Item> CHEST = Tags.Items.CHESTS_WOODEN;
 
     public static final TagKey<Item> STONE = Tags.Items.STONES;
-    public static final TagKey<Item> COBBLESTONE = Tags.Items.COBBLESTONES;
     public static final TagKey<Item> GLASS = Tags.Items.GLASS_BLOCKS;
     public static final TagKey<Block> GLASS_BLOCK = Tags.Blocks.GLASS_BLOCKS;
 
@@ -156,19 +152,13 @@ private ConventionTags() {
     /**
      * Used to identify items that act as wrenches.
      */
-    public static final TagKey<Item> WRENCH = tag("c:tools/wrenches");
+    public static final TagKey<Item> WRENCH = tag("c:tools/wrench");
 
     public static final Map<DyeColor, TagKey<Item>> DYES = Arrays.stream(DyeColor.values())
             .collect(Collectors.toMap(
                     Function.identity(),
                     dye -> tag("c:dyes/" + dye.getSerializedName())));
 
-    public static final TagKey<Block> STAINED_GLASS_BLOCK = Tags.Blocks.GLASS_BLOCKS_TINTED;
-
-    public static final TagKey<Block> TERRACOTTA_BLOCK = blockTag("c:terracotta");
-
-    public static final TagKey<Item> STORAGE_BLOCKS = Tags.Items.STORAGE_BLOCKS;
-
     public static final TagKey<Item> CURIOS = tag("curios:curio");
 
     public static TagKey<Item> dye(DyeColor color) {