update tags

architectury · Apr 22, 2024 · 1957325 · 1957325
1 parent 1a29af4
commit 1957325
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 31 deletions.
diff --git a/common/src/main/java/dev/architectury/tags/EnchantmentTags.java b/common/src/main/java/dev/architectury/tags/EnchantmentTags.java
@@ -38,9 +38,6 @@ public class EnchantmentTags {
     public static TagKey<Enchantment> WEAPON_DAMAGE_ENHANCEMENTS = impl_WEAPON_DAMAGE_ENHANCEMENTS();
     public static TagKey<Enchantment> ENTITY_SPEED_ENHANCEMENTS = impl_ENTITY_SPEED_ENHANCEMENTS();
     public static TagKey<Enchantment> ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS = impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS();
-    // Fabric only
-    public static TagKey<Enchantment> ENTITY_DEFENSE_ENHANCEMENT = impl_ENTITY_DEFENSE_ENHANCEMENT();
-    // NeoForge only
     public static TagKey<Enchantment> ENTITY_DEFENSE_ENHANCEMENTS = impl_ENTITY_DEFENSE_ENHANCEMENTS();
     @PlatformOnly({"fabric","neoforge"})
     @ExpectPlatform
@@ -67,13 +64,6 @@ private static TagKey<Enchantment> impl_ENTITY_SPEED_ENHANCEMENTS() {
     private static TagKey<Enchantment> impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS() {
         throw new AssertionError();
     }
-    // Returns null on NeoForge
-    @PlatformOnly({"fabric","neoforge"})
-    @ExpectPlatform
-    private static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENT() {
-        throw new AssertionError();
-    }
-    // Returns null on Fabric
     @PlatformOnly({"fabric","neoforge"})
     @ExpectPlatform
     private static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENTS() {

diff --git a/common/src/main/java/dev/architectury/tags/ItemTags.java b/common/src/main/java/dev/architectury/tags/ItemTags.java
@@ -100,15 +100,19 @@ public class ItemTags {
     public static TagKey<Item> FOODS_EDIBLE_WHEN_PLACED = impl_FOODS_EDIBLE_WHEN_PLACED();
     public static TagKey<Item> FOODS_FOOD_POISONING = impl_FOODS_FOOD_POISONING();
     // Fabric only
-    public static TagKey<Item> BUCKETS_WATER = impl_BUCKETS_WATER();
+    public static TagKey<Item> BUCKETS = impl_BUCKETS();
     // Fabric only
-    public static TagKey<Item> BUCKETS_ENTITY_WATER = impl_BUCKETS_ENTITY_WATER();
+    public static TagKey<Item> BUCKETS_EMPTY = impl_BUCKETS_EMPTY();
+    // Fabric only
+    public static TagKey<Item> BUCKETS_WATER = impl_BUCKETS_WATER();
     // Fabric only
     public static TagKey<Item> BUCKETS_LAVA = impl_BUCKETS_LAVA();
     // Fabric only
     public static TagKey<Item> BUCKETS_MILK = impl_BUCKETS_MILK();
     // Fabric only
-    public static TagKey<Item> BUCKETS_EMPTY = impl_BUCKETS_EMPTY();
+    public static TagKey<Item> BUCKETS_POWDER_SNOW = impl_BUCKETS_POWDER_SNOW();
+    // Fabric only
+    public static TagKey<Item> BUCKETS_ENTITY_WATER = impl_BUCKETS_ENTITY_WATER();
     public static TagKey<Item> BARRELS = impl_BARRELS();
     public static TagKey<Item> BARRELS_WOODEN = impl_BARRELS_WOODEN();
     public static TagKey<Item> BOOKSHELVES = impl_BOOKSHELVES();
@@ -627,13 +631,19 @@ private static TagKey<Item> impl_FOODS_FOOD_POISONING() {
     // Returns null on NeoForge
     @PlatformOnly({"fabric","neoforge"})
     @ExpectPlatform
-    private static TagKey<Item> impl_BUCKETS_WATER() {
+    private static TagKey<Item> impl_BUCKETS() {
         throw new AssertionError();
     }
     // Returns null on NeoForge
     @PlatformOnly({"fabric","neoforge"})
     @ExpectPlatform
-    private static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
+    private static TagKey<Item> impl_BUCKETS_EMPTY() {
+        throw new AssertionError();
+    }
+    // Returns null on NeoForge
+    @PlatformOnly({"fabric","neoforge"})
+    @ExpectPlatform
+    private static TagKey<Item> impl_BUCKETS_WATER() {
         throw new AssertionError();
     }
     // Returns null on NeoForge
@@ -651,7 +661,13 @@ private static TagKey<Item> impl_BUCKETS_MILK() {
     // Returns null on NeoForge
     @PlatformOnly({"fabric","neoforge"})
     @ExpectPlatform
-    private static TagKey<Item> impl_BUCKETS_EMPTY() {
+    private static TagKey<Item> impl_BUCKETS_POWDER_SNOW() {
+        throw new AssertionError();
+    }
+    // Returns null on NeoForge
+    @PlatformOnly({"fabric","neoforge"})
+    @ExpectPlatform
+    private static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
         throw new AssertionError();
     }
     @PlatformOnly({"fabric","neoforge"})

diff --git a/fabric/src/main/java/dev/architectury/tags/fabric/EnchantmentTagsImpl.java b/fabric/src/main/java/dev/architectury/tags/fabric/EnchantmentTagsImpl.java
@@ -40,10 +40,7 @@ public static TagKey<Enchantment> impl_ENTITY_SPEED_ENHANCEMENTS() {
     public static TagKey<Enchantment> impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS() {
         return net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS;
     }
-    public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENT() {
-        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT;
-    }
     public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENTS() {
-        return null;
+        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENTS;
     }
 }
diff --git a/fabric/src/main/java/dev/architectury/tags/fabric/ItemTagsImpl.java b/fabric/src/main/java/dev/architectury/tags/fabric/ItemTagsImpl.java
@@ -208,20 +208,26 @@ public static TagKey<Item> impl_FOODS_EDIBLE_WHEN_PLACED() {
     public static TagKey<Item> impl_FOODS_FOOD_POISONING() {
         return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOOD_POISONING_FOODS;
     }
+    public static TagKey<Item> impl_BUCKETS() {
+        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BUCKETS;
+    }
+    public static TagKey<Item> impl_BUCKETS_EMPTY() {
+        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.EMPTY_BUCKETS;
+    }
     public static TagKey<Item> impl_BUCKETS_WATER() {
         return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WATER_BUCKETS;
     }
-    public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
-        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.ENTITY_WATER_BUCKETS;
-    }
     public static TagKey<Item> impl_BUCKETS_LAVA() {
         return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LAVA_BUCKETS;
     }
     public static TagKey<Item> impl_BUCKETS_MILK() {
         return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MILK_BUCKETS;
     }
-    public static TagKey<Item> impl_BUCKETS_EMPTY() {
-        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.EMPTY_BUCKETS;
+    public static TagKey<Item> impl_BUCKETS_POWDER_SNOW() {
+        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.POWDER_SNOW_BUCKETS;
+    }
+    public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
+        return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.ENTITY_WATER_BUCKETS;
     }
     public static TagKey<Item> impl_BARRELS() {
         return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BARRELS;

diff --git a/neoforge/src/main/java/dev/architectury/tags/forge/EnchantmentTagsImpl.java b/neoforge/src/main/java/dev/architectury/tags/forge/EnchantmentTagsImpl.java
@@ -40,9 +40,6 @@ public static TagKey<Enchantment> impl_ENTITY_SPEED_ENHANCEMENTS() {
     public static TagKey<Enchantment> impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS() {
         return net.neoforged.neoforge.common.Tags.Enchantments.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS;
     }
-    public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENT() {
-        return null;
-    }
     public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENTS() {
         return net.neoforged.neoforge.common.Tags.Enchantments.ENTITY_DEFENSE_ENHANCEMENTS;
     }

diff --git a/neoforge/src/main/java/dev/architectury/tags/forge/ItemTagsImpl.java b/neoforge/src/main/java/dev/architectury/tags/forge/ItemTagsImpl.java
@@ -208,10 +208,13 @@ public static TagKey<Item> impl_FOODS_EDIBLE_WHEN_PLACED() {
     public static TagKey<Item> impl_FOODS_FOOD_POISONING() {
         return net.neoforged.neoforge.common.Tags.Items.FOODS_FOOD_POISONING;
     }
-    public static TagKey<Item> impl_BUCKETS_WATER() {
+    public static TagKey<Item> impl_BUCKETS() {
         return null;
     }
-    public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
+    public static TagKey<Item> impl_BUCKETS_EMPTY() {
+        return null;
+    }
+    public static TagKey<Item> impl_BUCKETS_WATER() {
         return null;
     }
     public static TagKey<Item> impl_BUCKETS_LAVA() {
@@ -220,7 +223,10 @@ public static TagKey<Item> impl_BUCKETS_LAVA() {
     public static TagKey<Item> impl_BUCKETS_MILK() {
         return null;
     }
-    public static TagKey<Item> impl_BUCKETS_EMPTY() {
+    public static TagKey<Item> impl_BUCKETS_POWDER_SNOW() {
+        return null;
+    }
+    public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
         return null;
     }
     public static TagKey<Item> impl_BARRELS() {