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

Merge The File&Game Servers Into One Module (#519)

Browse Source 
* Merge The File&Game Servers Into One Module

* Make SettingsLoader A GameConstants ConfigLoader
If A Config File Isn't Used, The Server Will Fall Back To The Defaults Set In GameConstants.java

Config Files Can Be Loaded With The "-c/-config configfilelocation.json"
Added A Default Prefilled ServerConfig.json

* Update ConfigLoader

* Bring Back Independant "Secrets" Loader For External Password Stuff
* Added A Bunch More Vars To The ConfigLoader
* Included A Sample "Server Config"
* Also Updated README.md As Parabot Is No Longer Maintained & We No Longer Have A FileServer Module

* Bundle FileServer with Server (docker)

* Remove /udp and http port

* Update .gitignore

* Move FileServer from `org.apollo.jagcached` → `org/apollo/jagcached`

* Tidy GameConstants & Add More Vars To ConfigLoader

* Organised Up GameConstants A Little To Separate ConfigLoader Vars From The Rest
* Added Some More Variables To Be Loaded Through The ConfigLoader

* Fix A Derp Caused By Laziness

* Add -c/-config arg to README.md

* Enable FileServer By Default

Co-authored-by: Danial <admin@redsparr0w.com>
This commit is contained in:
Josh Shippam
2021-11-23 00:29:25 +00:00
committed by GitHub
parent ba7f84fc45
commit 1c5b400f00
59 changed files with 213 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
+3 -15
View File
@@ -10,26 +10,14 @@ services:
working_dir: /usr/src/2006scape
restart: "no"
rsps-2006scape-file-server:
image: openjdk:8-alpine
container_name: rsps-2006scape-file-server
command: ["java", "-jar", "target/file_server-1.0-jar-with-dependencies.jar"]
volumes:
- ./2006Scape file_server:/usr/src/fileserver
working_dir: /usr/src/fileserver
ports:
- 8080:8080 # web panel
- 43595-43596:43595-43596 # File Server
restart: unless-stopped
rsps-2006scape-server:
image: openjdk:8-alpine
container_name: rsps-2006scape-server
command: ["java", "-jar", "target/server-1.0-jar-with-dependencies.jar"]
command: ["java", "-jar", "target/server-1.0-jar-with-dependencies.jar", "-c", "ServerConfig.json"]
volumes:
- ./2006Scape Server:/usr/src/server
working_dir: /usr/src/server
ports:
ports: # You will need to open other ports if your world ID is not 1 (43597 for world 2)
- 43594:43594 # Server
- 43594:43594/udp # Server
- 43595-43596:43595-43596 # File Server
restart: unless-stopped