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 #585] [MERGED] Def cleanup #9796

New Issue
Closed
opened 2026-06-02 12:22:49 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-06-02 12:22:49 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/585
Author: @advnau
Created: 2/5/2023
Status: ✅ Merged
Merged: 2/5/2023
Merged by: @Dark98

Base: master ← Head: def-cleanup

📝 Commits (10+)

📊 Changes

98 files changed (+21769 additions, -285670 deletions)

View changed files

➕ 2006Scape Server/data/cfg/ItemDefinitions.json (+21025 -0)
➖ 2006Scape Server/data/cfg/items.json (+0 -263398)
➖ 2006Scape Server/data/data/itemdef.json (+0 -20694)
➖ 2006Scape Server/data/data/notes.dat (+0 -0)
➖ 2006Scape Server/data/data/stackable.dat (+0 -0)
📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+14 -4)
📝 2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java (+3 -3)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java (+7 -7)
📝 2006Scape Server/src/main/java/com/rs2/game/content/consumables/Potions.java (+7 -6)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java (+19 -16)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWars.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Enchanting.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/MageTrainingArena.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/content/music/sound/CombatSounds.java (+3 -7)
📝 2006Scape Server/src/main/java/com/rs2/game/content/random/PartyRoom.java (+6 -4)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillHandler.java (+2 -2)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java (+6 -6)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java (+2 -2)

...and 78 more files

📄 Description

This cleans up the definitions for Items and Objects to cleanup the cache loaders and to also allow the loading of most Item Definition data from the cache. In the processing of this PR, some bugs were fixed with the Thieving skill where rewards for pickpocketing and stall thieving were given based off of item name but there was a typo so the reward wouldnt be given.

To the reviewer, should we move the minutes.log file from data/data to data/logs?

🔄 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/585 **Author:** [@advnau](https://github.com/advnau) **Created:** 2/5/2023 **Status:** ✅ Merged **Merged:** 2/5/2023 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `def-cleanup` --- ### 📝 Commits (10+) - [`4167bb8`](https://github.com/2006-Scape/2006Scape/commit/4167bb8eb697d97ad46074e761d21d8c957acd17) Object definition cleanup - [`18121de`](https://github.com/2006-Scape/2006Scape/commit/18121de6b7830ee2f447987c0c7dffe002b92498) Update ShopAssistant.java - [`b8b7385`](https://github.com/2006-Scape/2006Scape/commit/b8b738551647f4ae5d51e2dbb8d183ea4bb5bee9) stackables - [`29dc975`](https://github.com/2006-Scape/2006Scape/commit/29dc975d84eca6c83a3a61b9b69292ba3475290c) notables - [`1ec078a`](https://github.com/2006-Scape/2006Scape/commit/1ec078a6e5cf7a44ae8b49ddff39c7d135973fc3) unused files - [`6754bdd`](https://github.com/2006-Scape/2006Scape/commit/6754bdddbb270f3c31d7a0f8678bbb0e951b2fad) more junk - [`ff1c8a5`](https://github.com/2006-Scape/2006Scape/commit/ff1c8a5a7dd98e6e4864ec6c867e1d5e6d956f0c) almost done - [`73adc8c`](https://github.com/2006-Scape/2006Scape/commit/73adc8cb376c1e5063c17c2b72df4b3f87f43dbe) working - [`9af5d30`](https://github.com/2006-Scape/2006Scape/commit/9af5d3071d9926f4934ef3eb3e7f4057e9f92045) moving old methods to deprecated - [`c69d4ca`](https://github.com/2006-Scape/2006Scape/commit/c69d4ca52b44587c332249323dfb9e064bc80f60) update ### 📊 Changes **98 files changed** (+21769 additions, -285670 deletions) <details> <summary>View changed files</summary> ➕ `2006Scape Server/data/cfg/ItemDefinitions.json` (+21025 -0) ➖ `2006Scape Server/data/cfg/items.json` (+0 -263398) ➖ `2006Scape Server/data/data/itemdef.json` (+0 -20694) ➖ `2006Scape Server/data/data/notes.dat` (+0 -0) ➖ `2006Scape Server/data/data/stackable.dat` (+0 -0) 📝 `2006Scape Server/src/main/java/com/rs2/GameEngine.java` (+14 -4) 📝 `2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java` (+3 -3) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java` (+7 -7) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/consumables/Potions.java` (+7 -6) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java` (+19 -16) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWars.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/Enchanting.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/minigames/magetrainingarena/MageTrainingArena.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/music/sound/CombatSounds.java` (+3 -7) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/random/PartyRoom.java` (+6 -4) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillHandler.java` (+2 -2) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java` (+6 -6) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java` (+2 -2) _...and 78 more files_ </details> ### 📄 Description This cleans up the definitions for Items and Objects to cleanup the cache loaders and to also allow the loading of most Item Definition data from the cache. In the processing of this PR, some bugs were fixed with the Thieving skill where rewards for pickpocketing and stall thieving were given based off of item name but there was a typo so the reward wouldnt be given. To the reviewer, should we move the minutes.log file from data/data to data/logs? --- <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-06-02 12:22:49 +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#9796
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?