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

Map a whole bunch of stuff #530

Merged
merged 7 commits into from
Jan 17, 2024
Merged

Map a whole bunch of stuff #530

merged 7 commits into from
Jan 17, 2024

Conversation

pyrox0
Copy link
Contributor

@pyrox0 pyrox0 commented Jan 12, 2024

As the title says, n/m/command is now fully mapped to the best of my ability, as well as n/m/block to 99%!(8433/8517)

Most of n/m/block was adding CODEC entries for all the blocks, which took a while but shouldn't need to be done again in the future.

n/m/command wasn't too bad, just a bunch of thorny logic to reason through, but I got there in the end.

n/m/scoreboard is essentially fully mapped as well, with only one mysterious field in the Scoreboard class missing. Required pulling a bunch of unmapped stuff out, but got that untangled as well, so that should be done too!

n/m/client/realms also has a bunch of thorny logic, as is to be expected, but pulled that out and it's good now

n/m/resource was trivial.

Feedback is of course welcome. I know there are a few conflicts(or at least similar/identical changes) in #523 , but I'm glad to remove my changes that conflict with the ones in that PR if needed!

@IotaBread IotaBread added t: new adds new mappings v: snapshot targets a snapshot version of minecraft reviews needed please review this PR s: medium PRs with less than 700 lines and more than 200 labels Jan 12, 2024
@pyrox0 pyrox0 changed the title Fully map n/m/command and map n/m/block to 99% completion Map n/m/command, n/m/block, and n/m/scoreboard Jan 12, 2024
@pyrox0 pyrox0 changed the title Map n/m/command, n/m/block, and n/m/scoreboard Map a whole bunch of stuff Jan 12, 2024
@IotaBread IotaBread added s: large PRs with more than 700 lines and removed s: medium PRs with less than 700 lines and more than 200 labels Jan 12, 2024
Copy link
Member

@supersaiyansubtlety supersaiyansubtlety left a comment

Choose a reason for hiding this comment

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

I tried to compare and comment on any conflicts between this PR and #523's block changes.

I also requested some changes to some wall block class names (and a few other misc blocks) that I only noticed because this PR maps their codec fields. I didn't use github's suggestion feature for class names since they need to be changed in enigma.

mappings/net/minecraft/block/Blocks.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/block/Blocks.mapping Show resolved Hide resolved
mappings/net/minecraft/block/Blocks.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/block/Blocks.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/block/Blocks.mapping Show resolved Hide resolved
mappings/net/minecraft/block/WallPlayerSkullBlock.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/block/WallWitherSkullBlock.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/block/sign/SignType.mapping Outdated Show resolved Hide resolved
@pyrox0
Copy link
Contributor Author

pyrox0 commented Jan 13, 2024

Updated the blocks commit based on the suggested changes!

Edit: I'm aware of the lint errors, working on fixing them, will hopefully have a better set of mappings uploaded by tomorrow.

Edit 2: Fixed the lint errors!

Now at 99.0%! Up about 4.5% from when I started :)
99.8%(471/472), only one that's missing is a mysterious constant in Scoreboard that Yarn doesn't have a name for either, so I didn't map it.
kaBAM, another mapping bites the dust
*DJ Khaled voice* Another one
@ix0rai ix0rai added final-comment-period is approved and will soon be merged if no issues are raised and removed reviews needed please review this PR labels Jan 16, 2024
@IotaBread IotaBread merged commit 55a4634 into QuiltMC:23w51b Jan 17, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
final-comment-period is approved and will soon be merged if no issues are raised s: large PRs with more than 700 lines t: new adds new mappings v: snapshot targets a snapshot version of minecraft
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants