diff --git a/common/src/main/java/io/github/gaming32/bingo/data/tags/bingo/BingoItemTags.java b/common/src/main/java/io/github/gaming32/bingo/data/tags/bingo/BingoItemTags.java index a1f97b05..22383a19 100644 --- a/common/src/main/java/io/github/gaming32/bingo/data/tags/bingo/BingoItemTags.java +++ b/common/src/main/java/io/github/gaming32/bingo/data/tags/bingo/BingoItemTags.java @@ -29,6 +29,8 @@ private BingoItemTags() { public static final TagKey NOT_MEAT = create("not_meat"); public static final TagKey SLABS = create("slabs"); public static final TagKey STAIRS = create("stairs"); + public static final TagKey TALL_FLOWERS = create("tall_flowers"); + public static final TagKey TRIM_TEMPLATES = create("trim_templates"); private static TagKey create(String name) { return TagKey.create(Registries.ITEM, ResourceLocations.bingo(name)); diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/EasyGoalProvider.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/EasyGoalProvider.java index 15593784..0815b811 100644 --- a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/EasyGoalProvider.java +++ b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/EasyGoalProvider.java @@ -507,7 +507,7 @@ public void addGoals() { )) .antisynergy("bucket_types", "water_bucket", "lava_bucket", "milk_bucket") .reactant("use_buckets")); - addGoal(obtainSomeItemsFromTag(id("different_flowers"), ItemTags.FLOWERS, "bingo.goal.different_flowers", 5, 7) + addGoal(obtainSomeItemsFromTag(id("different_flowers"), BingoItemTags.FLOWERS, "bingo.goal.different_flowers", 5, 7) .antisynergy("flowers") .infrequency(2) .tags(BingoTags.OVERWORLD)); diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/HardGoalProvider.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/HardGoalProvider.java index 4f02b25d..0c2d01c1 100644 --- a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/HardGoalProvider.java +++ b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/HardGoalProvider.java @@ -682,7 +682,7 @@ public void addGoals() { .tags(BingoTags.OCEAN, BingoTags.OVERWORLD)); addGoal(obtainItemGoal(id("sniffer_egg"), items, Items.SNIFFER_EGG) .tags(BingoTags.OCEAN, BingoTags.OVERWORLD)); - addGoal(obtainSomeItemsFromTag(id("armor_trims"), ItemTags.TRIM_TEMPLATES, "bingo.goal.armor_trims", 3, 3) + addGoal(obtainSomeItemsFromTag(id("armor_trims"), BingoItemTags.TRIM_TEMPLATES, "bingo.goal.armor_trims", 3, 3) .antisynergy("armor_trims")); addGoal(obtainSomeItemsFromTag(id("bonemealable_blocks"), BingoItemTags.BONEMEALABLE, "bingo.goal.bonemealable", 15, 25) .antisynergy("bonemealable")); diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/MediumGoalProvider.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/MediumGoalProvider.java index d1b8491b..7bf156f1 100644 --- a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/MediumGoalProvider.java +++ b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/MediumGoalProvider.java @@ -384,7 +384,7 @@ public void addGoals() { .tags(BingoTags.COLOR, BingoTags.OVERWORLD)); addGoal(bedRowGoal(id("bed_row"), 7, 10)); // TODO: power redstone lamp - addGoal(obtainSomeItemsFromTag(id("different_flowers"), ItemTags.FLOWERS, "bingo.goal.different_flowers", 8, 10) + addGoal(obtainSomeItemsFromTag(id("different_flowers"), BingoItemTags.FLOWERS, "bingo.goal.different_flowers", 8, 10) .antisynergy("flowers") .infrequency(2) .tags(BingoTags.OVERWORLD)); @@ -933,8 +933,8 @@ private Table getArmors() { .map(Holder::value) .forEach(item -> { final var equippable = item.components().get(DataComponents.EQUIPPABLE); - if (equippable == null || equippable.model().isEmpty()) return; - armors.put(equippable.slot(), equippable.model().get(), item); + if (equippable == null || equippable.assetId().isEmpty()) return; + armors.put(equippable.slot(), equippable.assetId().get().location(), item); }); return armors.build(); } diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/VeryHardGoalProvider.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/VeryHardGoalProvider.java index 7ec185dc..79c14c40 100644 --- a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/VeryHardGoalProvider.java +++ b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/VeryHardGoalProvider.java @@ -333,7 +333,7 @@ public void addGoals() { .name("beacon_regen") .icon(Blocks.BEACON) .reactant("pacifist")); - addGoal(obtainSomeItemsFromTag(id("armor_trims"), ItemTags.TRIM_TEMPLATES, "bingo.goal.armor_trims", 5, 5) + addGoal(obtainSomeItemsFromTag(id("armor_trims"), BingoItemTags.TRIM_TEMPLATES, "bingo.goal.armor_trims", 5, 5) .antisynergy("armor_trims")); addGoal(obtainAllGoatHorns()); addGoal(obtainAllItemsFromTag(BingoItemTags.CLIMBABLE, "climbables") diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/tag/BingoItemTagProvider.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/tag/BingoItemTagProvider.java index 0d1ffaee..ada1829f 100644 --- a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/tag/BingoItemTagProvider.java +++ b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/tag/BingoItemTagProvider.java @@ -9,6 +9,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.packs.VanillaRecipeProvider; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.BannerPatternItem; @@ -104,7 +105,7 @@ protected void addTags(HolderLookup.Provider registries) { getOrCreateTagBuilder(BingoItemTags.BONEMEALABLE) .forceAddTag(ItemTags.VILLAGER_PLANTABLE_SEEDS) .forceAddTag(ItemTags.SAPLINGS) - .forceAddTag(ItemTags.TALL_FLOWERS) + .forceAddTag(BingoItemTags.TALL_FLOWERS) .add( Items.BAMBOO, Items.BIG_DRIPLEAF, @@ -135,8 +136,9 @@ protected void addTags(HolderLookup.Provider registries) { Items.WEEPING_VINES ); - // The vanilla flower tag contains weird stuff like cherry leaves that bees are attracted to, but they are not flowers - getOrCreateTagBuilder(BingoItemTags.FLOWERS).forceAddTag(ItemTags.SMALL_FLOWERS).forceAddTag(ItemTags.TALL_FLOWERS); + getOrCreateTagBuilder(BingoItemTags.FLOWERS) + .forceAddTag(ItemTags.SMALL_FLOWERS) + .addTag(BingoItemTags.TALL_FLOWERS); getOrCreateTagBuilder(BingoItemTags.DEAD_CORAL_BLOCKS).add( Items.DEAD_BRAIN_CORAL_BLOCK, @@ -146,6 +148,19 @@ protected void addTags(HolderLookup.Provider registries) { Items.DEAD_TUBE_CORAL_BLOCK ); + getOrCreateTagBuilder(BingoItemTags.TALL_FLOWERS).add( + Items.LILAC, + Items.PEONY, + Items.PITCHER_PLANT, + Items.ROSE_BUSH, + Items.SUNFLOWER + ); + + final var trimTemplatesBuilder = getOrCreateTagBuilder(BingoItemTags.TRIM_TEMPLATES); + VanillaRecipeProvider.smithingTrims() + .map(VanillaRecipeProvider.TrimTemplate::template) + .forEach(trimTemplatesBuilder::add); + var glazedTerracottaBuilder = getOrCreateTagBuilder(BingoItemTags.GLAZED_TERRACOTTA); var concreteBuilder = getOrCreateTagBuilder(BingoItemTags.CONCRETE); for (DyeColor dyeColor : DyeColor.values()) { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 240c1c8c..fc04955c 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -39,9 +39,9 @@ "bingo-common.mixins.json" ], "depends": { - "fabricloader": ">=0.16.7", + "fabricloader": ">=0.16.9", "fabric-api": ">=0.110.0", - "minecraft": ">=1.21.4 <1.21.5" + "minecraft": ">=1.21.4- <1.21.5" }, "custom": { "loom:injected_interfaces": { diff --git a/gradle.properties b/gradle.properties index f87de1e9..d8f09da7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ archives_base_name=bingo mod_version=1.1.12 maven_group=io.github.gaming32 -fabric_loader_version=0.16.7 +fabric_loader_version=0.16.9 fabric_api_version=0.110.2+1.21.4 neoforge_version=21.4.0-alpha.1.21.4-rc1.date.time