mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #417] [MERGED] [FEATURE] Data will now use json #7437
Reference in New Issue
Block a user
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?
📋 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.