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

Refactor select/edit world screens and related mappings #490

Merged
merged 17 commits into from
Sep 12, 2023
Merged

Refactor select/edit world screens and related mappings #490

merged 17 commits into from
Sep 12, 2023

Conversation

Antikyth
Copy link
Contributor

@Antikyth Antikyth commented Sep 7, 2023

Will add a detailed summary later.

This has refactored the mappings for:

  • WorldListWidget -> WorldEntryListWidget (and many mappings within it)
  • SelectWorldScreen, EditWorldScreen
  • minor related mappings changes:
    • WorldSaveSummary.ConversionWarning texts
    • add mapping for CommonTexts.DISCONNECT (just saw it while mapping, only thing unmapped in CommonTexts)
    • map textSupplier lambda arg in ButtonWidget

And mapped the previously unmapped SymlinkWarningScreen and everything in it.

@Antikyth
update SymlinkWarningScreen package
22b0eaa 
Is there some other process for updating packages I need to do?
@Antikyth
Copy link
Contributor Author

Antikyth commented Sep 7, 2023

Is there some other process I need to do for updating a class' package? E.g. knowing which package it's in, or editing some other file? I just assume that SymlinkWarningScreen would go in net.minecraft.client.gui.screen so edited its path in Enigma to have that instead of unmapped. Let me know if there's more I have to do for that.

@ix0rai
Copy link
Member

ix0rai commented Sep 7, 2023

renaming a class through enigma deals with everything you need regarding package :)
if you right-click in the class tree you can rename entire packages! (I made that feature I need appreciation)

@ix0rai ix0rai added t: refactor proposes a refactor t: new adds new mappings v: snapshot targets a snapshot version of minecraft reviews needed please review this PR labels Sep 7, 2023
ix0rai
ix0rai approved these changes Sep 7, 2023
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.

fantastic, just one suggestion!

mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping Outdated Show resolved Hide resolved
Antikyth
Antikyth commented Sep 7, 2023
View reviewed changes
Copy link
Contributor Author

@Antikyth Antikyth left a comment

Choose a reason for hiding this comment

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

Smh why can't I request changes on my own PR

mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping Outdated Show resolved Hide resolved
mappings/net/minecraft/client/gui/screen/world/WorldEntryListWidget.mapping Show resolved Hide resolved
@Antikyth
Copy link
Contributor Author

Antikyth commented Sep 7, 2023

These errors really need to be improved... I have no idea what the issue is there. I assume it's to do with my change. I don't know. Maybe it's not. I guess I will check over the mappings in Enigma later when I have time.

@Antikyth
Copy link
Contributor Author

Antikyth commented Sep 7, 2023

These errors really need to be improved... I have no idea what the issue is there. I assume it's to do with my change. I don't know. Maybe it's not. I guess I will check over the mappings in Enigma later when I have time.

Hmm, I see that GitHub added a space.

@IotaBread IotaBread added the update-base used to notify github actions that the base branch should be updated label Sep 7, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

🚨 Target branch is already set to 23w35a

@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Sep 7, 2023
@IotaBread IotaBread added the update-base used to notify github actions that the base branch should be updated label Sep 7, 2023
@github-actions github-actions bot changed the base branch from 23w35a to 1.20.2-pre2 September 7, 2023 22:56
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

🚀 Target branch has been updated to 1.20.2-pre2

@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Sep 7, 2023
ix0rai
ix0rai requested changes Sep 7, 2023
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.

just one more comment!

mappings/net/minecraft/client/gui/widget/factory/LayoutWidgetWithTitledRowFactories.mapping Outdated Show resolved Hide resolved
@Antikyth Antikyth requested a review from ix0rai September 8, 2023 08:09
@ix0rai ix0rai added final-comment-period is approved and will soon be merged if no issues are raised s: medium PRs with less than 700 lines and more than 200 and removed reviews needed please review this PR labels Sep 9, 2023
@ix0rai ix0rai merged commit 7d50b62 into QuiltMC:1.20.2-pre2 Sep 12, 2023
6 checks passed
@Antikyth Antikyth deleted the world-screens branch September 12, 2023 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ix0rai ix0rai ix0rai approved these changes

@OroArmor OroArmor OroArmor approved these changes

@supersaiyansubtlety supersaiyansubtlety supersaiyansubtlety approved these changes

Assignees
No one assigned
Labels
final-comment-period is approved and will soon be merged if no issues are raised s: medium PRs with less than 700 lines and more than 200 t: new adds new mappings 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.
5 participants
@Antikyth @ix0rai @supersaiyansubtlety @OroArmor @IotaBread