FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-08 21:14:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

Fix convention bucket tag ID format ()

Browse source 
* Fix convention bucket tag ID format

* Create plural fields, deprecate singular fields
This commit is contained in:
Juuxel 2022-04-19 19:43:10 +03:00 • committed by modmuss50
parent dd5a0bb164
commit 93eb6f9119
6 changed files with 22 additions and 8 deletions
fabric-convention-tags-v1/src
datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators
ItemTagGenerator.java
generated/resources/data/c/tags/items
empty_buckets.jsonlava_buckets.jsonmilk_buckets.jsonwater_buckets.json
main/java/net/fabricmc/fabric/api/tag/convention/v1
ConventionalItemTags.java

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

@ -198,11 +198,11 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
}
private void generateBucketTags() {
getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKET)
getOrCreateTagBuilder(ConventionalItemTags.EMPTY_BUCKETS)
.add(Items.BUCKET);
getOrCreateTagBuilder(ConventionalItemTags.LAVA_BUCKET)
getOrCreateTagBuilder(ConventionalItemTags.LAVA_BUCKETS)
.add(Items.LAVA_BUCKET);
getOrCreateTagBuilder(ConventionalItemTags.WATER_BUCKET)
getOrCreateTagBuilder(ConventionalItemTags.WATER_BUCKETS)
.add(Items.AXOLOTL_BUCKET)
.add(Items.COD_BUCKET)
.add(Items.PUFFERFISH_BUCKET)
@ -210,7 +210,7 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.add(Items.SALMON_BUCKET)
.add(Items.TADPOLE_BUCKET)
.add(Items.WATER_BUCKET);
getOrCreateTagBuilder(ConventionalItemTags.MILK_BUCKET)
getOrCreateTagBuilder(ConventionalItemTags.MILK_BUCKETS)
.add(Items.MILK_BUCKET);
}

0
fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bucket/empty.json → fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/empty_buckets.json
View file

0
fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bucket/lava.json → fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/lava_buckets.json
View file

0
fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bucket/milk.json → fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/milk_buckets.json
View file

0
fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/bucket/water.json → fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/water_buckets.json
View file

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

@ -61,10 +61,10 @@ public class ConventionalItemTags {
public static final TagKey<Item> FOODS = register("foods");
public static final TagKey<Item> POTIONS = register("potions");
// Buckets
public static final TagKey<Item> WATER_BUCKET = register("bucket/water");
public static final TagKey<Item> LAVA_BUCKET = register("bucket/lava");
public static final TagKey<Item> MILK_BUCKET = register("bucket/milk");
public static final TagKey<Item> EMPTY_BUCKET = register("bucket/empty");
public static final TagKey<Item> WATER_BUCKETS = register("water_buckets");
public static final TagKey<Item> LAVA_BUCKETS = register("lava_buckets");
public static final TagKey<Item> MILK_BUCKETS = register("milk_buckets");
public static final TagKey<Item> EMPTY_BUCKETS = register("empty_buckets");
public static final TagKey<Item> GLASS_BLOCKS = register("glass_blocks");
public static final TagKey<Item> GLASS_PANES = register("glass_panes");
@ -90,6 +90,20 @@ public class ConventionalItemTags {
public static final TagKey<Item> WHITE_DYES = register("white_dyes");
public static final TagKey<Item> YELLOW_DYES = register("yellow_dyes");
// Deprecated
/** @deprecated Replaced with {@link #WATER_BUCKETS}. */
@Deprecated(forRemoval = true)
public static final TagKey<Item> WATER_BUCKET = WATER_BUCKETS;
/** @deprecated Replaced with {@link #LAVA_BUCKETS}. */
@Deprecated(forRemoval = true)
public static final TagKey<Item> LAVA_BUCKET = LAVA_BUCKETS;
/** @deprecated Replaced with {@link #MILK_BUCKETS}. */
@Deprecated(forRemoval = true)
public static final TagKey<Item> MILK_BUCKET = MILK_BUCKETS;
/** @deprecated Replaced with {@link #EMPTY_BUCKETS}. */
@Deprecated(forRemoval = true)
public static final TagKey<Item> EMPTY_BUCKET = EMPTY_BUCKETS;
private static TagKey<Item> register(String tagID) {
return TagRegistration.ITEM_TAG_REGISTRATION.registerCommon(tagID);
}