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.

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

Organise game content packages and scripts #602

Merged
merged 94 commits into from
Jan 26, 2025
Merged

Conversation

GregHib
Copy link
Owner

@GregHib GregHib commented Jan 25, 2025

Alternative change to #584 as the benefits didn't outweigh the costs.

  • Arranged package layouts to follow a quest > area > skill > entity structure
  • Moved all scripts into "content" package
  • Removed worlds.gregs.voidps package prefix to follow kotlins directory structure guidelines
  • Replace ClassGraph with a gradle task to find kotlin scripts for faster load times (-600ms)

Copy link

codecov bot commented Jan 25, 2025

Codecov Report

Attention: Patch coverage is 44.44444% with 30 lines in your changes missing coverage. Please review.

Project coverage is 34.89%. Comparing base (5910410) to head (f8ac857).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
game/src/main/kotlin/ContentLoader.kt 45.16% 14 Missing and 3 partials ⚠️
...n/content/area/misthalin/draynor_village/Leela.kts 25.00% 3 Missing ⚠️
...ntent/area/misthalin/varrock/palace/SurokMagis.kts 25.00% 3 Missing ⚠️
...kotlin/content/entity/npc/combat/magic/Wizards.kts 0.00% 1 Missing and 2 partials ⚠️
game/src/main/kotlin/Main.kt 0.00% 1 Missing ⚠️
...otlin/content/entity/npc/combat/ranged/Archers.kts 66.66% 0 Missing and 1 partial ⚠️
...main/kotlin/content/entity/npc/spawn/NPCSpawns.kts 75.00% 0 Missing and 1 partial ⚠️
...n/kotlin/content/entity/obj/spawn/ObjectSpawns.kts 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
Files with missing lines Coverage Δ
...n/world/gregs/voidps/engine/data/AccountManager.kt 72.83% <ø> (ø)
game/src/main/kotlin/GameModules.kt 64.28% <ø> (ø)
game/src/main/kotlin/GameTick.kt 59.52% <ø> (ø)
...rc/main/kotlin/content/achievement/AntiqueLamp.kts 16.66% <ø> (ø)
.../main/kotlin/content/achievement/ExplorersRing.kts 15.38% <ø> (ø)
...lin/content/achievement/LumbridgeBeginnerTasks.kts 59.40% <ø> (ø)
...e/src/main/kotlin/content/achievement/TaskList.kts 15.78% <ø> (ø)
...src/main/kotlin/content/achievement/TaskSystem.kts 42.75% <ø> (ø)
game/src/main/kotlin/content/achievement/Tasks.kt 25.35% <ø> (ø)
...in/content/activity/shooting_star/ShootingStar.kts 6.32% <ø> (ø)
... and 281 more

... and 638 files with indirect coverage changes

@@             Coverage Diff              @@
##               main     #602      +/-   ##
============================================
- Coverage     34.90%   34.89%   -0.01%     
- Complexity     4887     4889       +2     
============================================
  Files          1338     1339       +1     
  Lines         47101    47120      +19     
  Branches       9500     9502       +2     
============================================
+ Hits          16441    16443       +2     
- Misses        27278    27293      +15     
- Partials       3382     3384       +2     
Components Coverage Δ
Content 28.60% <44.44%> (-0.02%) ⬇️
Engine 43.49% <ø> (ø)
Network 71.85% <ø> (ø)

@GregHib GregHib changed the title Content organisation Organise game content packages and scripts Jan 26, 2025
@GregHib GregHib marked this pull request as ready for review January 26, 2025 22:27
@GregHib GregHib merged commit 9257c97 into main Jan 26, 2025
3 of 4 checks passed
@GregHib GregHib deleted the content-organisation branch January 26, 2025 22:29
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.

1 participant