Big GUI Mappings PR (sorry!) #495

Antikyth · 2023-09-15T00:30:43Z

Summary: probably not coming unfortunately, I'm very busy at the moment

Big PR, adds a lot of mappings and refactors some existing ones.

mappings/net/minecraft/client/gui/screen/realms/RealmsPopupScreen.mapping

mappings/net/minecraft/client/gui/screen/world/SwitchGrid.mapping

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

mappings/net/minecraft/recipe/RecipeUnlocker.mapping

mappings/net/minecraft/client/gui/screen/realms/RealmsPopupScreen.mapping

Antikyth · 2023-09-15T20:55:15Z

I want to know what these invalid mappings are... (in the errors)

mappings/net/minecraft/client/gui/hud/debug/TickRateDebugChartRenderer.mapping

mappings/net/minecraft/client/gui/hud/debug/AbstractDebugChartRenderer.mapping

mappings/net/minecraft/client/gui/hud/debug/DebugHud.mapping

mappings/net/minecraft/client/gui/hud/debug/FrameRateDebugChartRenderer.mapping

supersaiyansubtlety · 2023-09-15T22:59:58Z

~~Did a bunch of my comments get duped because there were changes while I was reviewing?~~
Guess not, the duped ones were 'pending' and I canceled the duped review.

OroArmor

Looks good with the given changes!

Antikyth · 2023-09-16T20:20:55Z

I'll try make the changes today, just a lil busy. Also to add a proper summary.

ix0rai

refactors are great overall, but I'm not sure I like the ResourcePack to Pack renames, they could pretty easily be mistaken for data pack things like that. thank you for the huge PR!

for my approval:

address supersaiyansubtlety's comments
justify the pack rename

buildSrc/src/main/java/quilt/internal/Constants.java

mappings/net/minecraft/client/gui/ServerFavicon.mapping

mappings/net/minecraft/client/gui/hud/debug/DebugHud.mapping

mappings/net/minecraft/client/gui/screen/option/KeyBindOptionsScreen.mapping

mappings/net/minecraft/client/network/ServerInfo.mapping

mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping

Antikyth · 2023-09-18T02:23:24Z

refactors are great overall, but I'm not sure I like the ResourcePack to Pack renames, they could pretty easily be mistaken for data pack things like that. thank you for the huge PR!

for my approval:

address supersaiyansubtlety's comments

justify the pack rename

The pack renames was for exactly that reason: they are data pack things as well. At least, some of them are, I'm not certain if there's some of them that aren't.

Antikyth · 2023-09-18T02:23:53Z

refactors are great overall, but I'm not sure I like the ResourcePack to Pack renames, they could pretty easily be mistaken for data pack things like that. thank you for the huge PR!

for my approval:

address supersaiyansubtlety's comments

justify the pack rename

The pack renames was for exactly that reason: they are data pack things as well. At least, some of them are, I'm not certain if there's some of them that aren't.

As in, data packs use these classes, they don't have their own.

github-actions · 2023-09-18T02:25:35Z

🚀 Target branch has been updated to 1.20.2-rc1

ix0rai · 2023-09-18T02:26:35Z

oh perfect, address changes and you're golden!

Antikyth · 2023-09-18T05:28:09Z

I don't have the time to address the changes at the moment because I have a very busy week. I feel like it might be good to merge this before 1.20.2 releases, however, as it would lump any breaking changes together. If someone had the time to PR to my branch with the changes then I could merge that; otherwise I'll do it when I have time.

ix0rai · 2023-09-18T22:32:47Z

@Antikyth would you like me to resolve comments myself?

github-actions · 2023-09-20T23:23:33Z

🚀 Target branch has been updated to 1.20.2-rc2

Antikyth · 2023-09-20T23:38:35Z

Still have to manually apply some suggestions in Enigma.

mappings/net/minecraft/client/gui/hud/debug/AbstractDebugChartRenderer.mapping

makes getSampleColor param javadocs lowercase with no full stops

Co-authored-by: ix0rai <[email protected]> Co-authored-by: Will <[email protected]>

Co-authored-by: Will <[email protected]>

Antikyth · 2023-09-23T01:00:28Z

I just rebased it onto the recipe holder changes ^

github-actions · 2023-09-23T01:09:06Z

🚀 Target branch has been updated to 1.20.2

EnnuiL

one word: damn
great job here!

just one nitpick: i feel like something like "the X coordinate" would be better than "the 'x' coordinate" or "the x coordinate"

EnnuiL · 2023-09-23T19:35:02Z

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

+		ARG 2 layoutSettingsConsumer
+	CLASS C_ekgfxrpf Orientation
+		METHOD m_fnqdcoug setRotatedY (Lnet/minecraft/unmapped/C_zuxsitrm$C_isrpishr;II)V
+			COMMENT Sets the "y" coordinate of the given {@code widget} rotated with this orientation.


Suggested change

COMMENT Sets the "y" coordinate of the given {@code widget} rotated with this orientation.

COMMENT Sets the Y coordinate of the given {@code widget} rotated with this orientation.

No no no! Coordinates are almost always lowercase in math notation.

Unless you have a very good reason to make it capital, it should be lowercase.

I'm confused; i thought this was a standard on our javadocs
And yes, math does have the fancy x and such but we don't have TeX on our javadoc and uh, just having a lowercase letter doesn't make sense here; i made this request because it felt like it blended with the rest of the text, which is bad; it didn't feel distinct, and considering that stuff like Blender does use capital letters for coordinates? I feel like my gut feelings are justified here

So, if we want to follow a lowercase standard, we ought to use {@code x} in order to make it distinct and we must make it a formal standard; else? It has to be capital

I'd prefer flat x over {@code x}, since we usually use code for parameters it may get people to do a double take

I think it should be lowercase because that's how it's used in math

I agree with EnnuiL that "it felt like it blended with the rest of the text, which is bad"

I don't think we should make it distinct with {@code}, because it's not code, that's misleading

So, how about it's made distinct with other text formatting, like some combination of bold/italic//etc?
I'm partial to italics, but idk if that's enough to make it stand out in all cases.

I support italics, I don't think it needs to be super flashy

Italics is the closest way of making the coordinate letters look like math notation without making Java implement TeX on their javadoc engine :p

It uses quotes because it's not necessarily the actual y coordinate by the way. I think. On mobile, GitHub won't let me scroll the text to the right to see what it says.

I definitely wouldnt capitalize it, whatever you pick. The issue isn't so much that coords are generally lowercase in math - it's that uppercase letters have several other connotations! I see an X somewhere and my brain goes "matrix!"

EnnuiL · 2023-09-23T19:35:16Z

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

+			COMMENT <p>
+			COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual y
+			COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},
+			COMMENT it will set its x coordinate.


Suggested change

COMMENT it will set its x coordinate.

COMMENT it will set its X coordinate.

EnnuiL · 2023-09-23T19:35:47Z

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

+			COMMENT Returns the "y" coordinate of the given {@code widget} rotated with this orientation.
+			COMMENT <p>
+			COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will be the actual y
+			COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},
+			COMMENT it will be its x coordinate.


Suggested change

COMMENT Returns the "y" coordinate of the given {@code widget} rotated with this orientation.

COMMENT 

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will be the actual y

COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},

COMMENT it will be its x coordinate.

COMMENT Returns the Y coordinate of the given {@code widget} rotated with this orientation.

COMMENT 

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will be the actual Y

COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},

COMMENT it will be its X coordinate.

Again, there is a reason it is in quotes. Perhaps it needs to be made clearer if that wasn't clear, how I don't know.

EnnuiL · 2023-09-23T19:36:15Z

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

+			COMMENT Returns the "x" coordinate of the given {@code widget} rotated with this orientation.
+			COMMENT <p>
+			COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will be the actual x
+			COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},
+			COMMENT it will be its y coordinate.


Suggested change

COMMENT Returns the "x" coordinate of the given {@code widget} rotated with this orientation.

COMMENT 

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will be the actual x

COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},

COMMENT it will be its y coordinate.

COMMENT Returns the X coordinate of the given {@code widget} rotated with this orientation.

COMMENT 

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will be the actual X

COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},

COMMENT it will be its Y coordinate.

EnnuiL · 2023-09-23T19:36:32Z

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

+			COMMENT Sets the "x" coordinate of the given {@code widget} rotated with this orientation.
+			COMMENT <p>
+			COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual x
+			COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},
+			COMMENT it will set its y coordinate.


Suggested change

COMMENT Sets the "x" coordinate of the given {@code widget} rotated with this orientation.

COMMENT 

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual x

COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},

COMMENT it will set its y coordinate.

COMMENT Sets the X coordinate of the given {@code widget} rotated with this orientation.

COMMENT 

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual X

COMMENT coordinate of the {@code widget}. Otherwise, if it is {@link Orientation#VERTICAL VERTICAL},

COMMENT it will set its Y coordinate.

EnnuiL · 2023-09-23T19:39:46Z

mappings/net/minecraft/client/gui/widget/layout/RotatableLayoutWidget.mapping

+		METHOD m_fnqdcoug setRotatedY (Lnet/minecraft/unmapped/C_zuxsitrm$C_isrpishr;II)V
+			COMMENT Sets the "y" coordinate of the given {@code widget} rotated with this orientation.
+			COMMENT <p>
+			COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual y


oh i missed one

Suggested change

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual y

COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual Y

Antikyth · 2023-09-25T10:15:57Z

one word: damn
great job here!

just one nitpick: i feel like something like "the X coordinate" would be better than "the 'x' coordinate" or "the x coordinate"

Personally, I don't think so, it's how I'd always write it myself, but if other people agree with that then it can be changed.

EnnuiL · 2023-09-30T21:42:03Z

ps: do note that as suspected, this was what it was used before

we shouldn't block this merge though, so,

ix0rai added t: refactor proposes a refactor t: new adds new mappings v: snapshot targets a snapshot version of minecraft wip this is a work in progress s: large PRs with more than 700 lines labels Sep 15, 2023

supersaiyansubtlety requested changes Sep 15, 2023

View reviewed changes

Antikyth marked this pull request as ready for review September 15, 2023 21:44

supersaiyansubtlety requested changes Sep 15, 2023

View reviewed changes

OroArmor approved these changes Sep 16, 2023

View reviewed changes

ix0rai self-requested a review September 16, 2023 15:57

ix0rai requested changes Sep 18, 2023

View reviewed changes

ix0rai added the update-base used to notify github actions that the base branch should be updated label Sep 18, 2023

github-actions bot changed the base branch from 1.20.2-pre4 to 1.20.2-rc1 September 18, 2023 02:25

github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Sep 18, 2023

ix0rai added the update-base used to notify github actions that the base branch should be updated label Sep 20, 2023

github-actions bot changed the base branch from 1.20.2-rc1 to 1.20.2-rc2 September 20, 2023 23:23

github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Sep 20, 2023

supersaiyansubtlety requested changes Sep 21, 2023

View reviewed changes

mappings/net/minecraft/client/gui/hud/debug/AbstractDebugChartRenderer.mapping Outdated Show resolved Hide resolved

mappings/net/minecraft/client/gui/hud/debug/AbstractDebugChartRenderer.mapping Outdated Show resolved Hide resolved

Antikyth requested a review from ix0rai September 21, 2023 10:08

Antikyth and others added 15 commits September 23, 2023 12:57

fix ServerEntryListWidget package relocation caused by enigma bug

60a7b57

fix realms.dto.PlayerInfo package relocation due to enigma bug

d23bb7f

rename a couple data and resource pack things from resource pack to pack

da008a4

complete RealmsPopupScreen mappings

61d0393

add unmute to allowed words

6090ef7

fix a number of javadoc compile errors

d04c048

fix pack javadoc reference error in net.minecraft.resource package-info

cb2e4f3

map debug chart renderers

22e7aac

drop invalid mapping

6446fbe

fix javadoc errors

2dbb9d3

fix getSampleColor param javadocs

8bdda8c

makes getSampleColor param javadocs lowercase with no full stops

fix even more javadocs...

79fac18

Apply suggestions from code review

9eb24dc

Co-authored-by: ix0rai <[email protected]> Co-authored-by: Will <[email protected]>

rest of requested changes (those marked resolved, that is)

e42192c

Apply suggestions from code review

3c2f555

Co-authored-by: Will <[email protected]>

Antikyth force-pushed the screen-mappings branch from 7d0ddd1 to 3c2f555 Compare September 23, 2023 00:58

Antikyth added the update-base used to notify github actions that the base branch should be updated label Sep 23, 2023

github-actions bot changed the base branch from 1.20.2-rc2 to 1.20.2 September 23, 2023 01:09

github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Sep 23, 2023

Merge branch '1.20.2' into screen-mappings

1183e12

Antikyth added v: release targets a release version of minecraft and removed v: snapshot targets a snapshot version of minecraft labels Sep 23, 2023

EnnuiL suggested changes Sep 23, 2023

View reviewed changes

EnnuiL reviewed Sep 23, 2023

View reviewed changes

EnnuiL approved these changes Sep 30, 2023

View reviewed changes

EnnuiL merged commit 3e33e4f into QuiltMC:1.20.2 Sep 30, 2023
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Big GUI Mappings PR (sorry!) #495

Big GUI Mappings PR (sorry!) #495

Antikyth commented Sep 15, 2023 •

edited

Loading

Antikyth commented Sep 15, 2023 •

edited

Loading

supersaiyansubtlety commented Sep 15, 2023 •

edited

Loading

OroArmor left a comment

Antikyth commented Sep 16, 2023

ix0rai left a comment

Antikyth commented Sep 18, 2023

Antikyth commented Sep 18, 2023

github-actions bot commented Sep 18, 2023

ix0rai commented Sep 18, 2023

Antikyth commented Sep 18, 2023

ix0rai commented Sep 18, 2023

github-actions bot commented Sep 20, 2023

Antikyth commented Sep 20, 2023

Antikyth commented Sep 23, 2023

github-actions bot commented Sep 23, 2023

EnnuiL left a comment

EnnuiL Sep 23, 2023

TheGlitch76 Sep 23, 2023 •

edited

Loading

TheGlitch76 Sep 23, 2023

EnnuiL Sep 23, 2023

ix0rai Sep 23, 2023

supersaiyansubtlety Sep 23, 2023 •

edited

Loading

ix0rai Sep 23, 2023

EnnuiL Sep 23, 2023

Antikyth Sep 25, 2023 •

edited

Loading

lukebemish Sep 25, 2023

EnnuiL Sep 23, 2023

EnnuiL Sep 23, 2023

Antikyth Sep 25, 2023

EnnuiL Sep 23, 2023

EnnuiL Sep 23, 2023

EnnuiL Sep 23, 2023

Antikyth commented Sep 25, 2023

EnnuiL commented Sep 30, 2023

	COMMENT Sets the "y" coordinate of the given {@code widget} rotated with this orientation.
	COMMENT Sets the Y coordinate of the given {@code widget} rotated with this orientation.

	COMMENT it will set its x coordinate.
	COMMENT it will set its X coordinate.

	COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual y
	COMMENT If the orientation is {@link Orientation#HORIZONTAL HORIZONTAL}, this will set the actual Y

Big GUI Mappings PR (sorry!) #495

Big GUI Mappings PR (sorry!) #495

Conversation

Antikyth commented Sep 15, 2023 • edited Loading

Antikyth commented Sep 15, 2023 • edited Loading

supersaiyansubtlety commented Sep 15, 2023 • edited Loading

OroArmor left a comment

Choose a reason for hiding this comment

Antikyth commented Sep 16, 2023

ix0rai left a comment

Choose a reason for hiding this comment

Antikyth commented Sep 18, 2023

Antikyth commented Sep 18, 2023

github-actions bot commented Sep 18, 2023

ix0rai commented Sep 18, 2023

Antikyth commented Sep 18, 2023

ix0rai commented Sep 18, 2023

github-actions bot commented Sep 20, 2023

Antikyth commented Sep 20, 2023

Antikyth commented Sep 23, 2023

github-actions bot commented Sep 23, 2023

EnnuiL left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheGlitch76 Sep 23, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

supersaiyansubtlety Sep 23, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Antikyth Sep 25, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Antikyth commented Sep 25, 2023

EnnuiL commented Sep 30, 2023

Antikyth commented Sep 15, 2023 •

edited

Loading

Antikyth commented Sep 15, 2023 •

edited

Loading

supersaiyansubtlety commented Sep 15, 2023 •

edited

Loading

TheGlitch76 Sep 23, 2023 •

edited

Loading

supersaiyansubtlety Sep 23, 2023 •

edited

Loading

Antikyth Sep 25, 2023 •

edited

Loading