[PR #9] [MERGED] Deduplicating a lot of stuff #10

New Issue

OMGeeky · 2025-10-27T18:43:45+01:00

OMGeeky commented

2025-10-27 18:43:45 +01:00

📋 Pull Request Information

Original PR: https://github.com/AndorsTrailRelease/ATCS/pull/9
Author: @OMGeeky
Created: 6/24/2025
Status: ✅ Merged
Merged: 8/4/2025
Merged by: @NutAndor

Base: master ← Head: dedup-1

📝 Commits (10+)

4239beb de-dupe code
e232c33 more de-duplication
3f1f988 fix missed null check
04b704d more de-duplication
286d95d improve imports
70055be improve usings
185f168 misc
8561415 dedup link check
8c42b49 rename needsToBeLinked to linkCheck and continue dedupe
9ed9393 extract wordWrap to TextUtils helper-class

📊 Changes

132 files changed (+31007 additions, -34226 deletions)

View changed files

➕ .idea/codeStyles/Project.xml (+14 -0)
➕ .idea/codeStyles/codeStyleConfig.xml (+5 -0)
📝 hacked-libtiled/tiled/core/MapObject.java (+1 -1)
📝 hacked-libtiled/tiled/core/Sprite.java (+1 -1)
📝 hacked-libtiled/tiled/io/TMXMapWriter.java (+1 -1)
📝 src/com/gpl/rpg/atcontentstudio/ATContentStudio.java (+212 -219)
📝 src/com/gpl/rpg/atcontentstudio/ConfigCache.java (+93 -92)
📝 src/com/gpl/rpg/atcontentstudio/Notification.java (+83 -83)
📝 src/com/gpl/rpg/atcontentstudio/NotificationListener.java (+4 -3)
📝 src/com/gpl/rpg/atcontentstudio/io/JsonPrettyWriter.java (+45 -45)
📝 src/com/gpl/rpg/atcontentstudio/io/SettingsSave.java (+63 -69)
📝 src/com/gpl/rpg/atcontentstudio/model/ClosedProject.java (+125 -114)
📝 src/com/gpl/rpg/atcontentstudio/model/GameDataElement.java (+227 -183)
📝 src/com/gpl/rpg/atcontentstudio/model/GameSource.java (+289 -278)
📝 src/com/gpl/rpg/atcontentstudio/model/Preferences.java (+9 -9)
📝 src/com/gpl/rpg/atcontentstudio/model/Project.java (+1337 -1370)
📝 src/com/gpl/rpg/atcontentstudio/model/ProjectElementListener.java (+6 -6)
📝 src/com/gpl/rpg/atcontentstudio/model/ProjectTreeNode.java (+56 -51)
📝 src/com/gpl/rpg/atcontentstudio/model/SaveEvent.java (+30 -30)
📝 src/com/gpl/rpg/atcontentstudio/model/SavedSlotCollection.java (+55 -55)

...and 80 more files

📄 Description

this is foundation for actual changes like the effectOnMiss stuff (not included in this PR)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AndorsTrailRelease/ATCS/pull/9 **Author:** [@OMGeeky](https://github.com/OMGeeky) **Created:** 6/24/2025 **Status:** ✅ Merged **Merged:** 8/4/2025 **Merged by:** [@NutAndor](https://github.com/NutAndor) **Base:** `master` ← **Head:** `dedup-1` --- ### 📝 Commits (10+) - [`4239beb`](https://github.com/AndorsTrailRelease/ATCS/commit/4239beb82573a7c13ef05d7cdbf4407a16ab7553) de-dupe code - [`e232c33`](https://github.com/AndorsTrailRelease/ATCS/commit/e232c333392380e8f5f19a47f6c909a1ee372b6d) more de-duplication - [`3f1f988`](https://github.com/AndorsTrailRelease/ATCS/commit/3f1f988808d638f3a8dd85d70a48f8d43c1143d2) fix missed null check - [`04b704d`](https://github.com/AndorsTrailRelease/ATCS/commit/04b704daf061a75e121dce37c14ddb80eb0c7ee2) more de-duplication - [`286d95d`](https://github.com/AndorsTrailRelease/ATCS/commit/286d95d83d744def6235dc400d60f0c1ff071889) improve imports - [`70055be`](https://github.com/AndorsTrailRelease/ATCS/commit/70055be6d28bff679e2cb1fe31b51645ec045caf) improve usings - [`185f168`](https://github.com/AndorsTrailRelease/ATCS/commit/185f168b198727dca233064ecd641928d07aa42d) misc - [`8561415`](https://github.com/AndorsTrailRelease/ATCS/commit/8561415574a516a11b673b58845a47d7356708fe) dedup link check - [`8c42b49`](https://github.com/AndorsTrailRelease/ATCS/commit/8c42b498b04021056589afbcdc149b1369fb84e2) rename needsToBeLinked to linkCheck and continue dedupe - [`9ed9393`](https://github.com/AndorsTrailRelease/ATCS/commit/9ed9393b16c6911af2a836d0b76ef87b427af737) extract wordWrap to TextUtils helper-class ### 📊 Changes **132 files changed** (+31007 additions, -34226 deletions) <details> <summary>View changed files</summary> ➕ `.idea/codeStyles/Project.xml` (+14 -0) ➕ `.idea/codeStyles/codeStyleConfig.xml` (+5 -0) 📝 `hacked-libtiled/tiled/core/MapObject.java` (+1 -1) 📝 `hacked-libtiled/tiled/core/Sprite.java` (+1 -1) 📝 `hacked-libtiled/tiled/io/TMXMapWriter.java` (+1 -1) 📝 `src/com/gpl/rpg/atcontentstudio/ATContentStudio.java` (+212 -219) 📝 `src/com/gpl/rpg/atcontentstudio/ConfigCache.java` (+93 -92) 📝 `src/com/gpl/rpg/atcontentstudio/Notification.java` (+83 -83) 📝 `src/com/gpl/rpg/atcontentstudio/NotificationListener.java` (+4 -3) 📝 `src/com/gpl/rpg/atcontentstudio/io/JsonPrettyWriter.java` (+45 -45) 📝 `src/com/gpl/rpg/atcontentstudio/io/SettingsSave.java` (+63 -69) 📝 `src/com/gpl/rpg/atcontentstudio/model/ClosedProject.java` (+125 -114) 📝 `src/com/gpl/rpg/atcontentstudio/model/GameDataElement.java` (+227 -183) 📝 `src/com/gpl/rpg/atcontentstudio/model/GameSource.java` (+289 -278) 📝 `src/com/gpl/rpg/atcontentstudio/model/Preferences.java` (+9 -9) 📝 `src/com/gpl/rpg/atcontentstudio/model/Project.java` (+1337 -1370) 📝 `src/com/gpl/rpg/atcontentstudio/model/ProjectElementListener.java` (+6 -6) 📝 `src/com/gpl/rpg/atcontentstudio/model/ProjectTreeNode.java` (+56 -51) 📝 `src/com/gpl/rpg/atcontentstudio/model/SaveEvent.java` (+30 -30) 📝 `src/com/gpl/rpg/atcontentstudio/model/SavedSlotCollection.java` (+55 -55) _...and 80 more files_ </details> ### 📄 Description this is foundation for actual changes like the effectOnMiss stuff (not included in this PR) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

OMGeeky added the

pull-request

label 2025-10-27 18:43:45 +01:00

OMGeeky closed this issue

2025-10-27 18:43:45 +01:00

OMGeeky referenced this issue

2025-10-27 18:43:45 +01:00

[PR #10] [MERGED] Json project files #11

Sign in to join this conversation.