[PR #519] [MERGED] Merge The File&Game Servers Into One Module #586

New Issue

2026-05-15T02:57:55Z

Dark98 commented

2026-05-15 02:57:55 +00:00

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/519
Author: @Dark98
Created: 11/12/2021
Status: ✅ Merged
Merged: 11/23/2021
Merged by: @Dark98

Base: master ← Head: fs_merge

📝 Commits (10+)

45874d3 Merge The File&Game Servers Into One Module
862bc66 Make SettingsLoader A GameConstants ConfigLoader
2a3adc2 Update ConfigLoader
89b2b84 Bundle FileServer with Server (docker)
497d601 Remove /udp and http port
504f2ca Update .gitignore
37ce5ee Move FileServer from org.apollo.jagcached → org/apollo/jagcached
cd31654 Tidy GameConstants & Add More Vars To ConfigLoader
c2fb4c0 Fix A Derp Caused By Laziness
e425e0f Add -c/-config arg to README.md

📊 Changes

59 files changed (+213 additions, -236 deletions)

View changed files

📝 .gitignore (+3 -0)
➕ 2006Scape Server/ServerConfig.Sample.json (+20 -0)
📝 2006Scape Server/data/cache/.scape-settings.dat (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.dat (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.idx0 (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.idx1 (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.idx2 (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.idx3 (+0 -0)
📝 2006Scape Server/data/cache/main_file_cache.idx4 (+0 -0)
📝 2006Scape Server/pom.xml (+6 -0)
➕ 2006Scape Server/src/main/java/com/rs2/ConfigLoader.java (+97 -0)
📝 2006Scape Server/src/main/java/com/rs2/GameConstants.java (+39 -30)
📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+33 -3)
📝 2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java (+1 -1)
➖ 2006Scape Server/src/main/java/com/rs2/integrations/SettingsLoader.java (+0 -45)
📝 2006Scape Server/src/main/java/org/apollo/jagcached/Constants.java (+1 -1)
📝 2006Scape Server/src/main/java/org/apollo/jagcached/FileServer.java (+5 -4)
📝 2006Scape Server/src/main/java/org/apollo/jagcached/dispatch/ChannelRequest.java (+0 -0)
📝 2006Scape Server/src/main/java/org/apollo/jagcached/dispatch/HttpRequestWorker.java (+0 -0)

...and 39 more files

📄 Description

No description provided

_{🔄 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/519 **Author:** [@Dark98](https://github.com/Dark98) **Created:** 11/12/2021 **Status:** ✅ Merged **Merged:** 11/23/2021 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `fs_merge` --- ### 📝 Commits (10+) - [`45874d3`](https://github.com/2006-Scape/2006Scape/commit/45874d304ab161e46d2028f71948b85e10e6a61a) Merge The File&Game Servers Into One Module - [`862bc66`](https://github.com/2006-Scape/2006Scape/commit/862bc66153d056371b6a30e1a8c1e12797606b34) Make SettingsLoader A GameConstants ConfigLoader - [`2a3adc2`](https://github.com/2006-Scape/2006Scape/commit/2a3adc24a74faca3c6a1fef73452f075de88292a) Update ConfigLoader - [`89b2b84`](https://github.com/2006-Scape/2006Scape/commit/89b2b84e40ebced63552035582b0363e51ab399b) Bundle FileServer with Server (docker) - [`497d601`](https://github.com/2006-Scape/2006Scape/commit/497d60120b4966e0b58fb8c0187d85fc0554b2ee) Remove /udp and http port - [`504f2ca`](https://github.com/2006-Scape/2006Scape/commit/504f2cae0463671b8be2909c846edefc4ac8b429) Update .gitignore - [`37ce5ee`](https://github.com/2006-Scape/2006Scape/commit/37ce5ee17005ea56239aaba55a26fe9380e6f276) Move FileServer from `org.apollo.jagcached` → `org/apollo/jagcached` - [`cd31654`](https://github.com/2006-Scape/2006Scape/commit/cd31654ba8961bf2e1105b65855ad7d24c4d32e7) Tidy GameConstants & Add More Vars To ConfigLoader - [`c2fb4c0`](https://github.com/2006-Scape/2006Scape/commit/c2fb4c092e2ef1df39b2276a01bd57a657bfa155) Fix A Derp Caused By Laziness - [`e425e0f`](https://github.com/2006-Scape/2006Scape/commit/e425e0f5142b7df3bf44f3b4204bb79f38700795) Add -c/-config arg to README.md ### 📊 Changes **59 files changed** (+213 additions, -236 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+3 -0) ➕ `2006Scape Server/ServerConfig.Sample.json` (+20 -0) 📝 `2006Scape Server/data/cache/.scape-settings.dat` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.dat` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.idx0` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.idx1` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.idx2` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.idx3` (+0 -0) 📝 `2006Scape Server/data/cache/main_file_cache.idx4` (+0 -0) 📝 `2006Scape Server/pom.xml` (+6 -0) ➕ `2006Scape Server/src/main/java/com/rs2/ConfigLoader.java` (+97 -0) 📝 `2006Scape Server/src/main/java/com/rs2/GameConstants.java` (+39 -30) 📝 `2006Scape Server/src/main/java/com/rs2/GameEngine.java` (+33 -3) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java` (+1 -1) ➖ `2006Scape Server/src/main/java/com/rs2/integrations/SettingsLoader.java` (+0 -45) 📝 `2006Scape Server/src/main/java/org/apollo/jagcached/Constants.java` (+1 -1) 📝 `2006Scape Server/src/main/java/org/apollo/jagcached/FileServer.java` (+5 -4) 📝 `2006Scape Server/src/main/java/org/apollo/jagcached/dispatch/ChannelRequest.java` (+0 -0) 📝 `2006Scape Server/src/main/java/org/apollo/jagcached/dispatch/HttpRequestWorker.java` (+0 -0) _...and 39 more files_ </details> ### 📄 Description _No description provided_ --- <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-15 02:57:55 +00:00

Dark98 closed this issue