2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

[PR #540] [MERGED] Replace clipping files with loading straight from the cache. #4075

New Issue
Closed
opened 2026-05-25 12:21:43 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-25 12:21:43 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/540
Author: @advnau
Created: 1/24/2023
Status: ✅ Merged
Merged: 1/25/2023
Merged by: @Dark98

Base: master ← Head: master

📝 Commits (10+)

  • 06fa7d1 Archive decompression from apollo
  • cfdb00b Removed unused object definition fields
  • 689d28e Add more options to IndexedFileSystem
  • 806d6a4 Fix opcode 19 of object defs
  • b33c567 Initial commit of loading maps from cache
  • 6d4b7d1 Removed deprecated methods
  • de325b7 Some code cleanup to fix packaging.
  • 2918fe3 map_index loading from cache
  • 96bc5d4 Update pom.xml
  • c3f61bc Renaming some object definition values.

📊 Changes

1353 files changed (+551 additions, -475 deletions)

View changed files

➖ 2006Scape Server/data/world/map/0.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1.gz (+0 -0)
➖ 2006Scape Server/data/world/map/10.gz (+0 -0)
➖ 2006Scape Server/data/world/map/100.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1000.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1001.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1002.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1003.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1004.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1005.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1006.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1007.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1008.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1009.gz (+0 -0)
➖ 2006Scape Server/data/world/map/101.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1010.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1011.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1012.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1013.gz (+0 -0)
➖ 2006Scape Server/data/world/map/1014.gz (+0 -0)

...and 80 more files

📄 Description

This replaces the existing clipping files with loading the data from the cache. The cache loader code is mostly unmodified, however there is a method added in the IndexedFileSystem to load the data as a byte[] rather than a bytebuffer.

Archive loading code for the map_index/loc files is from Apollo.

The accessor methods within ObjectDefinition have not been renamed to minimize the amount of changed files to allow easier merging of any existing PRs. The private values that they reference were renamed to make that easier later.

There is a readString method from a ByteBuffer currently in ObjectDefinition just because there was no obvious place forit outside of making a Utility class.

This may potentially help fix some random clipping issues because the definitions loaded by the server did not completely match the cache. This PR does not affect any clipping on doors or affect force movement (such as firemaking).

🔄 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/2006-Scape/2006Scape/pull/540 **Author:** [@advnau](https://github.com/advnau) **Created:** 1/24/2023 **Status:** ✅ Merged **Merged:** 1/25/2023 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `master` --- ### 📝 Commits (10+) - [`06fa7d1`](https://github.com/2006-Scape/2006Scape/commit/06fa7d161db22ec8bb0381b47511572aec6e7426) Archive decompression from apollo - [`cfdb00b`](https://github.com/2006-Scape/2006Scape/commit/cfdb00bb44d3b643289473c8a0f1c17ac01bddc2) Removed unused object definition fields - [`689d28e`](https://github.com/2006-Scape/2006Scape/commit/689d28e0a7ce4b3ef2bfa43d0841efbc02f7121a) Add more options to IndexedFileSystem - [`806d6a4`](https://github.com/2006-Scape/2006Scape/commit/806d6a4148e4ec07918c1764fe1982b9c9d3a449) Fix opcode 19 of object defs - [`b33c567`](https://github.com/2006-Scape/2006Scape/commit/b33c5674c8682bf358807982dd74e10d04a170b1) Initial commit of loading maps from cache - [`6d4b7d1`](https://github.com/2006-Scape/2006Scape/commit/6d4b7d1d9a3b055c056ae238051e15f829c00c43) Removed deprecated methods - [`de325b7`](https://github.com/2006-Scape/2006Scape/commit/de325b7ab213f73d90ce7375dd1fa909a6033dae) Some code cleanup to fix packaging. - [`2918fe3`](https://github.com/2006-Scape/2006Scape/commit/2918fe324cf11bace810972484111024504a9ba5) map_index loading from cache - [`96bc5d4`](https://github.com/2006-Scape/2006Scape/commit/96bc5d4f4e9ba1ff3e9f397ede692672c516bce5) Update pom.xml - [`c3f61bc`](https://github.com/2006-Scape/2006Scape/commit/c3f61bcd33e152536a4d4d5c7f4adedb91ffd907) Renaming some object definition values. ### 📊 Changes **1353 files changed** (+551 additions, -475 deletions) <details> <summary>View changed files</summary> ➖ `2006Scape Server/data/world/map/0.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/10.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/100.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1000.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1001.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1002.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1003.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1004.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1005.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1006.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1007.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1008.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1009.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/101.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1010.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1011.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1012.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1013.gz` (+0 -0) ➖ `2006Scape Server/data/world/map/1014.gz` (+0 -0) _...and 80 more files_ </details> ### 📄 Description This replaces the existing clipping files with loading the data from the cache. The cache loader code is mostly unmodified, however there is a method added in the IndexedFileSystem to load the data as a byte[] rather than a bytebuffer. Archive loading code for the map_index/loc files is from Apollo. The accessor methods within ObjectDefinition have not been renamed to minimize the amount of changed files to allow easier merging of any existing PRs. The private values that they reference were renamed to make that easier later. There is a readString method from a ByteBuffer currently in ObjectDefinition just because there was no obvious place forit outside of making a Utility class. This may potentially help fix some random clipping issues because the definitions loaded by the server did not completely match the cache. This PR does not affect any clipping on doors or affect force movement (such as firemaking). --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Dark98 added the pull-request label 2026-05-25 12:21:43 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Cannot Reproduce
Difficulty: Easy
Difficulty: Easy
Difficulty: Hard
Difficulty: Medium
Documentation
enhancement
Highest Priority of Type
New Content
New Content
pull-request
Mirrored from GitHub Pull Request
 QoL
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#4075
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?