Skip to content

Belated sync#264

Merged
GingerAvalanche merged 217 commits intoNiceneNerd:masterfrom
GingerAvalanche:master
Apr 9, 2026
Merged

Belated sync#264
GingerAvalanche merged 217 commits intoNiceneNerd:masterfrom
GingerAvalanche:master

Conversation

@NiceneNerd
Copy link
Copy Markdown
Owner

Let's bring all this back home

@GingerAvalanche
Copy link
Copy Markdown
Collaborator

Not sure why some unit tests are failing on mergers I don’t remember editing. Maybe I touched something inadvertently. I’ll look into it.

also, whoops! I didn’t realize I was bombarding you with failed workflow errors too. My bad.

@GingerAvalanche
Copy link
Copy Markdown
Collaborator

GingerAvalanche commented Oct 11, 2025

The remainder of the failing unit tests are from when the tests refer to files not included in the repo. I'll redirect those tests and add the files to the repo in the next couple days or so

EDIT: Oh, I guess these actions only do the uk-content tests, and the tests I was talking about were for the ukmm crate. So I won't need to handle those, I guess

@God-damnit-all
Copy link
Copy Markdown

Hey, are you still working on this?

@GingerAvalanche
Copy link
Copy Markdown
Collaborator

Yes. There are still issues to be fixed before bringing it all back to the main repo again. For now, check the releases of the repo this PR comes from for 0.16.0

@GingerAvalanche
Copy link
Copy Markdown
Collaborator

LINTER APPEASED.

I am so, so sorry about all the literally hundreds of emails you suffered as a result of me taking so long to figure out how to use clippy in my IDE

@GingerAvalanche
Copy link
Copy Markdown
Collaborator

GingerAvalanche commented Feb 13, 2026

There are a couple glaring issues I still have to deal with:

  • The mod list doesn't support drags anymore. With egui 0.28, none of the rows would register drags while you were dragging, but as soon as you let it go, it would register for a single frame, which would allow the table renderer to update the hovered row and then move the dragged row(s) there. In egui 0.33, that behavior is gone, so I need to find another way to get it to register the hovered row that's underneath the dragged row
  • The "Copied!" tooltip when pressing the copy button in an error message is broken, and my solution made two copy buttons appear. Considering that tooltip didn't work even in egui 0.28 (at least on Linux) I think I'll just remove it completely, but haven't gotten around to it yet

Whoops, those were for the other branch.

But in the news on this branch, I dunno why it's not compiling. The Copilot comment in the other thread implied it was a winit issue, but this is the first time I've had this issue. It didn't happen 4 days ago on ae372a1 and there were no changes to anything Cargo-related since then, so I'm confused about the windows crate is suddenly whining.

@God-damnit-all
Copy link
Copy Markdown

Maybe it's related to a sub-dependency of one of the crates? Have you tried doing another build since then?

When converting submods, just diff against an empty file, seeing as we have no good interface for converting to ukmm's dependency system
Fix a rare issue where a mod might not be logged for inclusion if it doesn't edit the same language as the mods in the edit manifest
Deletes the output folder if it can be deleted and if the output folder or method has changed
Then resets pending, to log that another deployment is needed
Wish I could just tell mod authors to stop breaking mods, but since DeleteRev is always -1 anyway...
Accounts for when a MainStatic made from the DLC file is applied to a base game MainField/Static.smubin
Make errors with multiple contexts display more than just the top-most error, so that people stop claiming they get the same error.

This is similar to the change that generifies the top-most error message, but I like this one more because it actually gives some info
Need to solve references to objects
Currently refers to all objects as their own
Needs to use a list of elements and a map of children
There's like 5 commits worth of changes in here. Screw it. Uh...
Appeased the linter
Implemented diff and merge behavior for subtypes in case I ever figure out how to implement it for the overall AnimSeq type
Implemented diff and merge behavior for AnimSeq type as just passing the bas file through to the end
Implemented and hooked the traverser into the initial AnimSeq conversion
Turned Element extensions into a map of extension type: Extension so that we don't try to diff different extension types
Probably some other stuff, I don't know
Use MissingAampKey for missing aamp keys (novel idea!)
Specify Self type in invalid-parameter-type errors
Probably way overkill, but better than failure I guess
@GingerAvalanche GingerAvalanche merged commit f6bdc80 into NiceneNerd:master Apr 9, 2026
5 of 10 checks passed
@God-damnit-all
Copy link
Copy Markdown

God-damnit-all commented Apr 10, 2026

At long last...

Thank you for all the work you put into this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants