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 recipe advancement adder to Recipes.java #574

Merged
merged 6 commits into from
Apr 2, 2024

Conversation

BenCheung0422
Copy link
Member

@BenCheung0422 BenCheung0422 commented Oct 10, 2023

This provides an ability to generate recipes.json automatically with minor manual conflict fixing.
This is directly copied from #445 because this occupies a high portion of changes within that pull request. This is regenerated again once either this or that pull request has been merged.

Recipe advancements removed (by keys):

  • minicraft.advancements.recipes.rock_sword (Rename)
  • minicraft.advancements.recipes.rock_axe (Rename)
  • minicraft.advancements.recipes.rock_hoe (Rename)
  • minicraft.advancements.recipes.rock_pickaxe (Rename)
  • minicraft.advancements.recipes.rock_shovel (Rename)
  • minicraft.advancements.recipes.rock_bow (Rename)

Recipe advancements added (by keys):

  • minicraft.advancements.recipes.stone_sword (Rename)
  • minicraft.advancements.recipes.stone_bow (Rename)
  • minicraft.advancements.recipes.stone_pickaxe (Rename)
  • minicraft.advancements.recipes.watering_can
  • minicraft.advancements.recipes.stone_axe (Rename)
  • minicraft.advancements.recipes.arcane_fertilizer
  • minicraft.advancements.recipes.stone_shovel (Rename)
  • minicraft.advancements.recipes.stone_hoe (Rename)
  • minicraft.advancements.recipes.obsidian_poppet

BenCheung0422 added a commit to BenCheung0422/minicraft-plus-revived that referenced this pull request Oct 10, 2023
This will be redone later.
# Conflicts:
#	src/client/java/minicraft/item/Recipes.java
#	src/client/resources/resources/recipes.json
@Litorom
Copy link
Member

Litorom commented Mar 19, 2024

We are not renaming any items.

@BenCheung0422
Copy link
Member Author

BenCheung0422 commented Mar 19, 2024

This just renames the advancement keys. Stone is called stone, so I renamed the stone/rock level tools to "stone" instead of "rock", but only the code side.

@Litorom
Copy link
Member

Litorom commented Mar 28, 2024

I won’t merge this until you change stone back to rock. It’s inconsistent and you shouldn’t change pre-existing names

@Litorom Litorom merged commit c0501d4 into MinicraftPlus:main Apr 2, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants