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.

Sign up for GitHub

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

Jump to bottom

Fix a couple loot-y things #637

Open
wants to merge 7 commits into
base: 24w38a
Choose a base branch
from
Open

Fix a couple loot-y things #637

wants to merge 7 commits into from

Conversation

supersaiyansubtlety
Copy link
Contributor

  • rename EntityType's get/LootTableId -> get/LootTable: it' not an id anymore and this matches LivingEntity
  • map MinecraftServer's getReloadableRegistries

OroArmor and others added 4 commits August 29, 2024 14:59
@OroArmor @supersaiyansubtlety
100% n.m.block (QuiltMC#635)
8942d89 
* 100% n.m.block

* Apply suggestions from code review

Co-authored-by: Will <supersaiyansubtlety@gmail.com>

* Small fixes

---------

Co-authored-by: Will <supersaiyansubtlety@gmail.com>
@supersaiyansubtlety
Fix a couple armor-y things (QuiltMC#636)
bb53855 
* rename ArmorDyeRecipe -> DyeableRecipe, add javadoc

* fix ArmorFeatureRenderer model names
@supersaiyansubtlety
drop 'id' from get/LootTableId in EntityType
4f088b5
@supersaiyansubtlety
map MinecraftServer::getReloadableRegistries
7e66bb0
@supersaiyansubtlety supersaiyansubtlety added t: refactor proposes a refactor v: snapshot targets a snapshot version of minecraft reviews needed please review this PR s: tiny PRs with less than 50 lines labels Sep 1, 2024
@supersaiyansubtlety supersaiyansubtlety self-assigned this Sep 1, 2024
@ix0rai ix0rai added the update-base used to notify github actions that the base branch should be updated label Sep 12, 2024
@github-actions github-actions bot changed the base branch from 24w34a to 24w37a September 12, 2024 00:27
@github-actions GitHub Actions
Copy link
Contributor

🚀 Target branch has been updated to 24w37a

@github-actions GitHub Actions
Copy link
Contributor

🚨 Please fix merge conflicts before this can be merged

@github-actions github-actions bot added outdated this pull request hasn't been updated to the latest version or has merge conflicts and removed update-base used to notify github actions that the base branch should be updated labels Sep 12, 2024
ix0rai
ix0rai approved these changes Sep 12, 2024
View reviewed changes
Copy link
Member

@ix0rai ix0rai left a comment

Choose a reason for hiding this comment

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

no idea what happened with the merge, it's probably easier to cherry-pick this once it's through FCP

@supersaiyansubtlety
Merge branch '24w37a' of https://github.com/QuiltMC/quilt-mappings in…
a4b6248 
…to fix-a-couple-loot-y-things

restore QuiltMC#636 which appparently got lost in a match
restore VaultBlockEntity::getEjectionItems
@supersaiyansubtlety
Copy link
Contributor Author

no idea what happened with the merge, it's probably easier to cherry-pick this once it's through FCP

The return type of getLootTable methods changed to Optional in 24w37a.
I've fixed that and restored a couple things that got lost/dropped.

@supersaiyansubtlety
Copy link
Contributor Author

supersaiyansubtlety commented Sep 13, 2024 •
edited
Loading

It looks like #635 and #636 both got lost in a match or something, and this is merging them back in now.

Any idea how that happened?

@supersaiyansubtlety supersaiyansubtlety removed the outdated this pull request hasn't been updated to the latest version or has merge conflicts label Sep 17, 2024
@ix0rai
Copy link
Member

ix0rai commented Sep 18, 2024

no, i'll see if i can fix that up tomorrow

@ix0rai ix0rai added the update-base used to notify github actions that the base branch should be updated label Sep 18, 2024
@github-actions github-actions bot changed the base branch from 24w37a to 24w38a September 18, 2024 23:10
@github-actions GitHub Actions
Copy link
Contributor

🚀 Target branch has been updated to 24w38a

@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Sep 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OroArmor OroArmor OroArmor approved these changes

@ix0rai ix0rai ix0rai approved these changes

Assignees

@supersaiyansubtlety supersaiyansubtlety

Labels
reviews needed please review this PR s: tiny PRs with less than 50 lines t: refactor proposes a refactor v: snapshot targets a snapshot version of minecraft
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@supersaiyansubtlety @ix0rai @OroArmor