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

Add c:slime_balls tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags #3957

Merged
merged 15 commits into from
Aug 4, 2024

Conversation

TelepathicGrunt
Copy link
Contributor

@TelepathicGrunt TelepathicGrunt commented Jul 19, 2024

  • Adds Sparse Jungle to c:is_sparse_vegetation/overworld biome tag as it was missing from before. The biome belongs there. It got sparse in the name!

  • Clarified the melee weapon tag's javadoc to make it clear pickaxes are excluded because being a weapon is not a pickaxe's primary purpose.

  • Added c:slime_balls tag to match NeoForge and because someone requested it on Fabric. Showing there is use case for this tag likely due to mods that do Slimes that drop ore-based slimeballs or something.

  • Added c:fertilizers tag so farming machines can know what items can be consumed/damaged in order to grow nearby crops/plants. This is needed as some mods do add their own bonemeal variant items such as Minecolonies Compost item. The growing logic is on the crop/plant so no hooks needed in item. Just need to know what item is a bonemeal-like item.

  • Added Old Growth Spruce Taiga, Windswept Hills, Windswept Gravelly Hills, Windswept Forest, and Stony Shores to the c:is_cold/overworld tag.

  • Moved Melon Slice from c:foods/vegetable to c:foods/fruit as melons are usually considered fruits.

  • Removed Glistering Melon Slice from c:foods/golden because it is not actually edible and thus, not food.

Neo PR: neoforged/NeoForge#1348

closes #3946
closes #3949
closes #3956

@TelepathicGrunt TelepathicGrunt changed the title Add c:slimeballs tag, add more melee weapons to melee tag, and Sparse Jungle to Sparse tag Add c:slimeballs tag, add more melee weapons to melee tag, add c:fertilizers tag, and Sparse Jungle to Sparse tag Jul 19, 2024
Copy link
Contributor

@Chocohead Chocohead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to link Minecraft references so any changes in the future won't get missed in the Javadocs

TelepathicGrunt and others added 2 commits July 23, 2024 19:04
…i/tag/convention/v2/ConventionalItemTags.java

Co-authored-by: Chocohead <Chocohead@users.noreply.github.com>
…i/tag/convention/v2/ConventionalItemTags.java

Co-authored-by: Chocohead <Chocohead@users.noreply.github.com>
@Crendgrim
Copy link

Hm, as a mod dev I'm not a big fan of the change to c:tools/melee_weapons. It was nice to have a common tag that basically meant "this is a melee weapon". I don't see a good way to filter things out again because there's no common tags for shovels/hoes/paxels/whatever mods add that do damage but aren't actually melee weapons. Also, it is confusing that c:tools now includes c:spear_tools, but c:tools/melee_weapons hardcodes the trident. If a mod adds a trident, it automatically appears in one collective tag but not the other.

@TelepathicGrunt
Copy link
Contributor Author

@Crendgrim You can use the diff ingredients to filter out shovels, hoes, and pickaxes. Maybe even axes too if that's not something you want. So adding more entries is fine since we can filter them later in datapacks using modloader's diff ingredients if desired. It’s the same logic we encourage with the dyed tags. See the javadoc here for more info:

* See {@link net.fabricmc.fabric.api.recipe.v1.ingredient.DefaultCustomIngredients}

the reason I did not nest tags into the melee tag is because someone can make a sword that does not have the attack damage attribute and instead, shoots fireball projectiles. That sword would be in sword tag because it is a sword. But it is not a melee weapon. Same goes for axes, spears, etc. it is better to individually define each item in the melee tag so modders can add their weapons only if it is truly a melee weapon and not some case where it doing unique behavior than the rest of the similar tools do

@TelepathicGrunt
Copy link
Contributor Author

@Crendgrim to clarify a bit more on first point, there are shovel and hoe tags. They are under the Mc namespace https://github.com/misode/mcmeta/blob/data-json/data/minecraft/tags/item/shovels.json

But again, if they define an attack damage attribute, they are defined to deal more damage than hand or other normal items. That makes them well, a weapon. More efficient at killing than empty hand. Now you may have specific use case for specific kinds of weapons and that’s where ingredient difference/intersection comes into play as that is its entire purpose to allow you to pick exactly what you need from a tag

@modmuss50 modmuss50 added the enhancement New feature or request label Jul 25, 2024
@TelepathicGrunt TelepathicGrunt changed the title Add c:slimeballs tag, add more melee weapons to melee tag, add c:fertilizers tag, and Sparse Jungle to Sparse tag Add c:slime_balls tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags Jul 25, 2024
@TelepathicGrunt TelepathicGrunt changed the title Add c:slime_balls tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags Add c:slimeballs tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags Jul 31, 2024
@TelepathicGrunt TelepathicGrunt changed the title Add c:slimeballs tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags Add c:slime_balls tag, add more melee weapons to melee tag, add c:fertilizers tag, fix entries for some biome and food tags Jul 31, 2024
@modmuss50 modmuss50 added last call If you care, make yourself heard right away! merge me please Pull requests that are ready to merge labels Jul 31, 2024
@modmuss50 modmuss50 merged commit c5e2b5c into FabricMC:1.21 Aug 4, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request last call If you care, make yourself heard right away! merge me please Pull requests that are ready to merge
Projects
None yet
4 participants