search

CivMC / Civ

Monorepo for development of and running a Civ Server.
MIT License
4 stars 10 forks source link

1.20.6 #550

Open MrJeremyFisher opened 2 weeks ago

MrJeremyFisher commented 2 weeks ago

Sorry for the big pr, I regret it but I don't know of a good way to split it up afterwards (also standardized editorconfig plz :pray: ). Everything (minus CivSpy which I removed from the gradle project for now as I was told it isn't used anymore) compiles and runs. The FactoryMod config change was just to demonstrate (and test) that part of CivModCore's ConfigHelper and isn't a complete overhaul to the new data format.

MrJeremyFisher commented 2 weeks ago

As a semi-related side note, I have 1.21 working here and will create a PR for it once Paper marks 1.21 as stable.

Protonull commented 2 weeks ago

Question, why Gradle 8.5 instead of 8.8?

MrJeremyFisher commented 2 weeks ago

I think because it was complaining that 8.5 was the minimum viable version so that's what I went with.

Protonull commented 1 week ago

Might be worth going through and undoing the formatting though as this is an extremely contentful PR and it's hard to review the PR.

MrJeremyFisher commented 1 week ago

Managed to get rid of a lot of it, will keep at it. IntelliJ is remarkably frustrating to deal with regarding this, I can't seem to find a way to completely disable every autoformatter that it's using.

Protonull commented 1 week ago

Managed to get rid of a lot of it, will keep at it. IntelliJ is remarkably frustrating to deal with regarding this, I can't seem to find a way to completely disable every autoformatter that it's using.

Hmmm, try going to Settings -> Tools -> Actions on Save and basically unticking everything. You don't really want these things to happen unless it's your own project anyway, or the project's style is strictly enforced, otherwise you'll just get diff-hell :P

MrJeremyFisher commented 1 week ago

Never had any of them checked. I think it's that all the plugins have different styles and IntelliJ isn't sure what to stick to. Mostly it's that they use spaces vs. tabs for indentation or have different rules about line wrapping and whatnot. Even forcing it to not format .java files still has it make some changes for some reason (eg removing indents on empty lines is apparently not formatting).