Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.21.1] Sync remaining c tags from Fabric side #1593

Merged
merged 24 commits into from
Feb 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c82a610
Sync with fabric tags
TelepathicGrunt Oct 13, 2024
fd5e0e5
Add torchflower seeds tag
TelepathicGrunt Oct 13, 2024
923b4ad
Improved the javadoc for ore rates
TelepathicGrunt Oct 13, 2024
8ec15e6
add mushrooms javadoc
TelepathicGrunt Oct 13, 2024
5a4b50d
added seeds javadoc
TelepathicGrunt Oct 13, 2024
a9b6d5f
addsparse and dense vegetation javadoc
TelepathicGrunt Oct 13, 2024
961d784
Added lush javadoc
TelepathicGrunt Oct 13, 2024
dff2525
Added magical javadoc
TelepathicGrunt Oct 13, 2024
2780a61
Added rare javadoc
TelepathicGrunt Oct 13, 2024
d53dea1
plateau javadoc
TelepathicGrunt Oct 13, 2024
99b4fc4
Deprecate is modified tag for removal in future
TelepathicGrunt Oct 13, 2024
1b6d340
Added spooky javadoc
TelepathicGrunt Oct 13, 2024
91578f6
more javadoc and fixed biomes in temperature tag
TelepathicGrunt Oct 14, 2024
6c35625
fixed typo in biome temperature tag javadoc
TelepathicGrunt Oct 14, 2024
8220af1
attempt 2 at potion tag javadoc
TelepathicGrunt Oct 14, 2024
c8a6391
Add bottled potion subtag
TelepathicGrunt Oct 14, 2024
c7bd387
Datagen biome temperature fix
TelepathicGrunt Oct 14, 2024
014e046
Improved potion javadoc more
TelepathicGrunt Oct 14, 2024
2a2e44f
Changed potion verb to noun
TelepathicGrunt Oct 14, 2024
6525396
Improve potion javadoc to mention data component
TelepathicGrunt Oct 14, 2024
f0c8e3d
Merge branch '1.21.x' into SyncToFabricTags
TelepathicGrunt Oct 15, 2024
5a6a281
backport adjustments and egg PR
TelepathicGrunt Feb 16, 2025
2ee7711
Merge branch '1.21.1' into SyncToFabricTags
TelepathicGrunt Feb 16, 2025
d241cfe
Merge branch '1.21.1' into SyncToFabricTags
TelepathicGrunt Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve potion javadoc to mention data component
TelepathicGrunt committed Oct 14, 2024
commit 652539603bd60f299ddbea6cae8ed6627b4a062a
5 changes: 3 additions & 2 deletions src/main/java/net/neoforged/neoforge/common/Tags.java
Original file line number Diff line number Diff line change
@@ -560,13 +560,14 @@ public static class Items {
public static final TagKey<Item> PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables");
public static final TagKey<Item> PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces");
/**
* Items that can hold various potion effects similar to how potion bottles do.
* Items that can hold various potion effects by making use of {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}.
* Contents of this tag may not always be a kind of bottle. Buckets of potions could go here.
* The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples.
*/
public static final TagKey<Item> POTIONS = tag("potions");
/**
* Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla.
* Variations of the potion bottle that can hold various effects by using {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}.
* Examples are splash and lingering potions from vanilla.
* If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag.
*/
public static final TagKey<Item> POTION_BOTTLE = tag("potions/bottle");