Skip to content

Commit 1957325

Browse files
Jab125Jab125
committed
update tags
1 parent 1a29af4 commit 1957325

File tree

6 files changed

+43
-31
lines changed

6 files changed

+43
-31
lines changed

‎common/src/main/java/dev/architectury/tags/EnchantmentTags.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ public class EnchantmentTags {
3838
public static TagKey<Enchantment> WEAPON_DAMAGE_ENHANCEMENTS = impl_WEAPON_DAMAGE_ENHANCEMENTS();
3939
public static TagKey<Enchantment> ENTITY_SPEED_ENHANCEMENTS = impl_ENTITY_SPEED_ENHANCEMENTS();
4040
public static TagKey<Enchantment> ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS = impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS();
41-
// Fabric only
42-
public static TagKey<Enchantment> ENTITY_DEFENSE_ENHANCEMENT = impl_ENTITY_DEFENSE_ENHANCEMENT();
43-
// NeoForge only
4441
public static TagKey<Enchantment> ENTITY_DEFENSE_ENHANCEMENTS = impl_ENTITY_DEFENSE_ENHANCEMENTS();
4542
@PlatformOnly({"fabric","neoforge"})
4643
@ExpectPlatform
@@ -67,13 +64,6 @@ private static TagKey<Enchantment> impl_ENTITY_SPEED_ENHANCEMENTS() {
6764
private static TagKey<Enchantment> impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS() {
6865
throw new AssertionError();
6966
}
70-
// Returns null on NeoForge
71-
@PlatformOnly({"fabric","neoforge"})
72-
@ExpectPlatform
73-
private static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENT() {
74-
throw new AssertionError();
75-
}
76-
// Returns null on Fabric
7767
@PlatformOnly({"fabric","neoforge"})
7868
@ExpectPlatform
7969
private static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENTS() {

‎common/src/main/java/dev/architectury/tags/ItemTags.java

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,19 @@ public class ItemTags {
100100
public static TagKey<Item> FOODS_EDIBLE_WHEN_PLACED = impl_FOODS_EDIBLE_WHEN_PLACED();
101101
public static TagKey<Item> FOODS_FOOD_POISONING = impl_FOODS_FOOD_POISONING();
102102
// Fabric only
103-
public static TagKey<Item> BUCKETS_WATER = impl_BUCKETS_WATER();
103+
public static TagKey<Item> BUCKETS = impl_BUCKETS();
104104
// Fabric only
105-
public static TagKey<Item> BUCKETS_ENTITY_WATER = impl_BUCKETS_ENTITY_WATER();
105+
public static TagKey<Item> BUCKETS_EMPTY = impl_BUCKETS_EMPTY();
106+
// Fabric only
107+
public static TagKey<Item> BUCKETS_WATER = impl_BUCKETS_WATER();
106108
// Fabric only
107109
public static TagKey<Item> BUCKETS_LAVA = impl_BUCKETS_LAVA();
108110
// Fabric only
109111
public static TagKey<Item> BUCKETS_MILK = impl_BUCKETS_MILK();
110112
// Fabric only
111-
public static TagKey<Item> BUCKETS_EMPTY = impl_BUCKETS_EMPTY();
113+
public static TagKey<Item> BUCKETS_POWDER_SNOW = impl_BUCKETS_POWDER_SNOW();
114+
// Fabric only
115+
public static TagKey<Item> BUCKETS_ENTITY_WATER = impl_BUCKETS_ENTITY_WATER();
112116
public static TagKey<Item> BARRELS = impl_BARRELS();
113117
public static TagKey<Item> BARRELS_WOODEN = impl_BARRELS_WOODEN();
114118
public static TagKey<Item> BOOKSHELVES = impl_BOOKSHELVES();
@@ -627,13 +631,19 @@ private static TagKey<Item> impl_FOODS_FOOD_POISONING() {
627631
// Returns null on NeoForge
628632
@PlatformOnly({"fabric","neoforge"})
629633
@ExpectPlatform
630-
private static TagKey<Item> impl_BUCKETS_WATER() {
634+
private static TagKey<Item> impl_BUCKETS() {
631635
throw new AssertionError();
632636
}
633637
// Returns null on NeoForge
634638
@PlatformOnly({"fabric","neoforge"})
635639
@ExpectPlatform
636-
private static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
640+
private static TagKey<Item> impl_BUCKETS_EMPTY() {
641+
throw new AssertionError();
642+
}
643+
// Returns null on NeoForge
644+
@PlatformOnly({"fabric","neoforge"})
645+
@ExpectPlatform
646+
private static TagKey<Item> impl_BUCKETS_WATER() {
637647
throw new AssertionError();
638648
}
639649
// Returns null on NeoForge
@@ -651,7 +661,13 @@ private static TagKey<Item> impl_BUCKETS_MILK() {
651661
// Returns null on NeoForge
652662
@PlatformOnly({"fabric","neoforge"})
653663
@ExpectPlatform
654-
private static TagKey<Item> impl_BUCKETS_EMPTY() {
664+
private static TagKey<Item> impl_BUCKETS_POWDER_SNOW() {
665+
throw new AssertionError();
666+
}
667+
// Returns null on NeoForge
668+
@PlatformOnly({"fabric","neoforge"})
669+
@ExpectPlatform
670+
private static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
655671
throw new AssertionError();
656672
}
657673
@PlatformOnly({"fabric","neoforge"})

‎fabric/src/main/java/dev/architectury/tags/fabric/EnchantmentTagsImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ public static TagKey<Enchantment> impl_ENTITY_SPEED_ENHANCEMENTS() {
4040
public static TagKey<Enchantment> impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS() {
4141
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS;
4242
}
43-
public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENT() {
44-
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT;
45-
}
4643
public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENTS() {
47-
return null;
44+
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENTS;
4845
}
4946
}

‎fabric/src/main/java/dev/architectury/tags/fabric/ItemTagsImpl.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,26 @@ public static TagKey<Item> impl_FOODS_EDIBLE_WHEN_PLACED() {
208208
public static TagKey<Item> impl_FOODS_FOOD_POISONING() {
209209
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOOD_POISONING_FOODS;
210210
}
211+
public static TagKey<Item> impl_BUCKETS() {
212+
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BUCKETS;
213+
}
214+
public static TagKey<Item> impl_BUCKETS_EMPTY() {
215+
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.EMPTY_BUCKETS;
216+
}
211217
public static TagKey<Item> impl_BUCKETS_WATER() {
212218
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WATER_BUCKETS;
213219
}
214-
public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
215-
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.ENTITY_WATER_BUCKETS;
216-
}
217220
public static TagKey<Item> impl_BUCKETS_LAVA() {
218221
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LAVA_BUCKETS;
219222
}
220223
public static TagKey<Item> impl_BUCKETS_MILK() {
221224
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MILK_BUCKETS;
222225
}
223-
public static TagKey<Item> impl_BUCKETS_EMPTY() {
224-
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.EMPTY_BUCKETS;
226+
public static TagKey<Item> impl_BUCKETS_POWDER_SNOW() {
227+
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.POWDER_SNOW_BUCKETS;
228+
}
229+
public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
230+
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.ENTITY_WATER_BUCKETS;
225231
}
226232
public static TagKey<Item> impl_BARRELS() {
227233
return net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BARRELS;

‎neoforge/src/main/java/dev/architectury/tags/forge/EnchantmentTagsImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ public static TagKey<Enchantment> impl_ENTITY_SPEED_ENHANCEMENTS() {
4040
public static TagKey<Enchantment> impl_ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS() {
4141
return net.neoforged.neoforge.common.Tags.Enchantments.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS;
4242
}
43-
public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENT() {
44-
return null;
45-
}
4643
public static TagKey<Enchantment> impl_ENTITY_DEFENSE_ENHANCEMENTS() {
4744
return net.neoforged.neoforge.common.Tags.Enchantments.ENTITY_DEFENSE_ENHANCEMENTS;
4845
}

‎neoforge/src/main/java/dev/architectury/tags/forge/ItemTagsImpl.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,13 @@ public static TagKey<Item> impl_FOODS_EDIBLE_WHEN_PLACED() {
208208
public static TagKey<Item> impl_FOODS_FOOD_POISONING() {
209209
return net.neoforged.neoforge.common.Tags.Items.FOODS_FOOD_POISONING;
210210
}
211-
public static TagKey<Item> impl_BUCKETS_WATER() {
211+
public static TagKey<Item> impl_BUCKETS() {
212212
return null;
213213
}
214-
public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
214+
public static TagKey<Item> impl_BUCKETS_EMPTY() {
215+
return null;
216+
}
217+
public static TagKey<Item> impl_BUCKETS_WATER() {
215218
return null;
216219
}
217220
public static TagKey<Item> impl_BUCKETS_LAVA() {
@@ -220,7 +223,10 @@ public static TagKey<Item> impl_BUCKETS_LAVA() {
220223
public static TagKey<Item> impl_BUCKETS_MILK() {
221224
return null;
222225
}
223-
public static TagKey<Item> impl_BUCKETS_EMPTY() {
226+
public static TagKey<Item> impl_BUCKETS_POWDER_SNOW() {
227+
return null;
228+
}
229+
public static TagKey<Item> impl_BUCKETS_ENTITY_WATER() {
224230
return null;
225231
}
226232
public static TagKey<Item> impl_BARRELS() {

0 commit comments

Comments
 (0)