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

A small amount of 1.20.2 mappings #479

Merged
merged 6 commits into from
Sep 6, 2023
Merged

A small amount of 1.20.2 mappings #479

merged 6 commits into from
Sep 6, 2023

Conversation

EnnuiL
Copy link
Contributor

@EnnuiL EnnuiL commented Aug 12, 2023

No description provided.

@EnnuiL EnnuiL added t: new adds new mappings v: snapshot targets a snapshot version of minecraft s: small PRs with less than 200 lines labels Aug 12, 2023
Co-authored-by: Will <supersaiyansubtlety@gmail.com>
@ix0rai
Copy link
Member

ix0rai commented Aug 15, 2023

EnnuiL:john_madden

Co-authored-by: ix0rai <ix0rai64@gmail.com>
@ix0rai
Copy link
Member

ix0rai commented Aug 27, 2023

@EnnuiL do you intend to fix this up, or should I take it over?

@EnnuiL
Copy link
Contributor Author

EnnuiL commented Aug 28, 2023

oh god i completely forgot about this pr; i have been quite busy recently, but i'll see if i can tackle it later

@EnnuiL
Copy link
Contributor Author

EnnuiL commented Aug 28, 2023

actually, please take it over

@OroArmor OroArmor added the update-base used to notify github actions that the base branch should be updated label Aug 31, 2023
@github-actions github-actions bot changed the base branch from 23w32a to 23w35a August 31, 2023 06:00
@github-actions
Copy link
Contributor

🚀 Target branch has been updated to 23w35a

@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Aug 31, 2023
Co-authored-by: Will <supersaiyansubtlety@gmail.com>
@ix0rai ix0rai added the final-comment-period is approved and will soon be merged if no issues are raised label Sep 1, 2023
@@ -36,6 +36,8 @@ CLASS net/minecraft/unmapped/C_wwadquuj net/minecraft/block/entity/BeaconBlockEn
ARG 1 x
ARG 2 y
ARG 3 z
METHOD m_jlfysuud getEffect (Lnet/minecraft/unmapped/C_jaqasomh;)Lnet/minecraft/unmapped/C_jaqasomh;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

i still have a bad feeling about getting rid of the orNull; it just feels reasonable here, it's like, a standard too;
please reconsider it before merge

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you give an example of a similar method with the OrNull suffix?
I've been comparing it to Map#get, but there could be a better comparison.

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually maybe part of the issue is get might be the wrong verb here.
It checks if the beacon has the effect, returns it if so, or null otherwise.
It's like a weird contains method that returns arg/null instead of true/false.

Copy link
Contributor

Choose a reason for hiding this comment

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

This method seems to be replacing what mojmap called getValidEffectById, I think valid is important.
I also think effect in the name is redundant given the parameter.
How about just validate?

Copy link
Member

Choose a reason for hiding this comment

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

after looking through the source, I agree with @supersaiyansubtlety on validate being the best name
I'm going to add javadoc too

Copy link
Member

Choose a reason for hiding this comment

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

@EnnuiL please take a look at the new name!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks good to me; I'll double-check on Enigma soon, since uh, getContainerOrNull still lost the OrNull and i remember that it was there for good reasons

Copy link
Member

Choose a reason for hiding this comment

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

it's annotated as @Nullable which imo makes the suffix redundant always

Copy link
Member

Choose a reason for hiding this comment

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

it's annotated as @Nullable which imo makes the suffix redundant always

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fair enough

@ix0rai ix0rai merged commit ff6b15f into QuiltMC:23w35a Sep 6, 2023
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: small PRs with less than 200 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