Original PR: https://github.com/2006-Scape/2006Scape/pull/417 Author: @SandroCoutinho Created: 8/5/2020 Status: ✅ Merged Merged: 8/13/2020 Merged by: @dginovker
Base: master ← Head: feature/json-data
master
feature/json-data
b4571a2
c818b16
e1af20f
ac76dac
c2b0c3d
ab2bd5b
391335c
33 files changed (+513658 additions, -22442 deletions)
➕ 2006Redone Server/data/cfg/globaldrops.json (+1927 -0) ➖ 2006Redone Server/data/cfg/globaldrops.txt (+0 -321) ➖ 2006Redone Server/data/cfg/item.cfg (+0 -9409) ➕ 2006Redone Server/data/cfg/items.json (+263398 -0) ➖ 2006Redone Server/data/cfg/npc.cfg (+0 -2911) ➕ 2006Redone Server/data/cfg/npc.json (+16646 -0) ➕ 2006Redone Server/data/cfg/npcdrops.json (+173871 -0) ➖ 2006Redone Server/data/cfg/shops.cfg (+0 -350) ➕ 2006Redone Server/data/cfg/shops.json (+15211 -0) ➖ 2006Redone Server/data/cfg/spawn-config.cfg (+0 -2461) ➕ 2006Redone Server/data/cfg/spawns.json (+23582 -0) ➕ 2006Redone Server/data/data/minutes.log (+1 -0) ➕ 2006Redone Server/data/doors.json (+12302 -0) ➖ 2006Redone Server/data/doors.txt (+0 -1025) ➕ 2006Redone Server/data/doubledoors.json (+2840 -0) ➖ 2006Redone Server/data/doubledoors.txt (+0 -258) 📝 2006Redone Server/pom.xml (+6 -2) 📝 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/Doors.java (+298 -260) 📝 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleDoors.java (+417 -381) 📝 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java (+1597 -1521)
2006Redone Server/data/cfg/globaldrops.json
2006Redone Server/data/cfg/globaldrops.txt
2006Redone Server/data/cfg/item.cfg
2006Redone Server/data/cfg/items.json
2006Redone Server/data/cfg/npc.cfg
2006Redone Server/data/cfg/npc.json
2006Redone Server/data/cfg/npcdrops.json
2006Redone Server/data/cfg/shops.cfg
2006Redone Server/data/cfg/shops.json
2006Redone Server/data/cfg/spawn-config.cfg
2006Redone Server/data/cfg/spawns.json
2006Redone Server/data/data/minutes.log
2006Redone Server/data/doors.json
2006Redone Server/data/doors.txt
2006Redone Server/data/doubledoors.json
2006Redone Server/data/doubledoors.txt
2006Redone Server/pom.xml
2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/Doors.java
2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleDoors.java
2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java
...and 13 more files
Data will now be loaded from .json instead of .txt or .cfg simply for readability sake.
.json
.txt
.cfg
DO NOT PUSH UNTIL I NOTIFY
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/2006-Scape/2006Scape/pull/417
Author: @SandroCoutinho
Created: 8/5/2020
Status: ✅ Merged
Merged: 8/13/2020
Merged by: @dginovker
Base:
master← Head:feature/json-data📝 Commits (7)
b4571a2[FEATURE] Item data is now loaded from jsonc818b16[TASK] Renamed the old method into it's new usee1af20f[TASK] Removed unused codeac76dac[FEATURE] Added some more json'sc2b0c3d[CLEANUP] Code cleanupab2bd5b[FEATURE] NPC drops are now in json391335c[CLEANUP] Removed testing class📊 Changes
33 files changed (+513658 additions, -22442 deletions)
View changed files
➕
2006Redone Server/data/cfg/globaldrops.json(+1927 -0)➖
2006Redone Server/data/cfg/globaldrops.txt(+0 -321)➖
2006Redone Server/data/cfg/item.cfg(+0 -9409)➕
2006Redone Server/data/cfg/items.json(+263398 -0)➖
2006Redone Server/data/cfg/npc.cfg(+0 -2911)➕
2006Redone Server/data/cfg/npc.json(+16646 -0)➕
2006Redone Server/data/cfg/npcdrops.json(+173871 -0)➖
2006Redone Server/data/cfg/shops.cfg(+0 -350)➕
2006Redone Server/data/cfg/shops.json(+15211 -0)➖
2006Redone Server/data/cfg/spawn-config.cfg(+0 -2461)➕
2006Redone Server/data/cfg/spawns.json(+23582 -0)➕
2006Redone Server/data/data/minutes.log(+1 -0)➕
2006Redone Server/data/doors.json(+12302 -0)➖
2006Redone Server/data/doors.txt(+0 -1025)➕
2006Redone Server/data/doubledoors.json(+2840 -0)➖
2006Redone Server/data/doubledoors.txt(+0 -258)📝
2006Redone Server/pom.xml(+6 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/Doors.java(+298 -260)📝
2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleDoors.java(+417 -381)📝
2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java(+1597 -1521)...and 13 more files
📄 Description
Data will now be loaded from
.jsoninstead of.txtor.cfgsimply for readability sake.DO NOT PUSH UNTIL I NOTIFY
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.