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

[PR #559] [MERGED] Replace a bunch of magic numbers & Fix Mackerel Spelling #6855

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/559
Author: @Dark98
Created: 1/28/2023
Status: ✅ Merged
Merged: 1/30/2023
Merged by: @Dark98

Base: master ← Head: magic-numbers

📝 Commits (10+)

  • 2855775 Convert Some NPCActions Magic Numbers
  • d7116f3 IntelliJ Reformat NpcActions.java
  • fec8921 Convert Magic Numbers In Dye.java
  • eb18c54 Convert More Magic Numbers In NpcActions.java
  • 58d4479 Convert More NpcActions.java Magic Numbers
  • 3b85692 Plugins: Replace Magic Numbers
  • 120fdc2 Skills: Cooking: Replaced all Item/Object Magic Numbers & Fixed Mackerel spelling
  • 666929d Food: Fixed Mackerel spelling
  • faf78c9 Skills: Fishing: Replace Magic Numbers
  • 54c95d8 Skills: Mining: Replace Magic Numbers

📊 Changes

18 files changed (+2769 additions, -2845 deletions)

View changed files

📝 2006Scape Server/plugins/plugin/click/item/ItemFirstClick.kt (+2 -1)
📝 2006Scape Server/plugins/plugin/click/item/ItemOnItem.kt (+4 -3)
📝 2006Scape Server/plugins/plugin/click/item/ItemSecondClick.kt (+2 -1)
📝 2006Scape Server/plugins/plugin/click/item/ItemThirdClick.kt (+2 -1)
📝 2006Scape Server/plugins/plugin/click/npc/NpcFirstClick.kt (+2 -3)
📝 2006Scape Server/plugins/plugin/click/obj/ObjectFirstClick.kt (+5 -0)
📝 2006Scape Server/plugins/plugin/click/obj/ObjectSecondClick.kt (+5 -0)
📝 2006Scape Server/plugins/plugin/click/obj/ObjectThirdClick.kt (+7 -1)
📝 2006Scape Server/plugins/plugin/npc/fadli/SecondClick.kt (+2 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java (+239 -236)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java (+157 -155)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/DairyChurn.java (+103 -101)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Potatoes.java (+107 -104)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Fishing.java (+537 -530)
📝 2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Mining.java (+408 -400)
📝 2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java (+67 -64)
📝 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java (+1119 -1243)

📄 Description

  • Replaced a bunch of magic numbers with constants
  • Fixed Spelling For Mackerel in Cooking & Food Classes
  • Removed Some Dead IDs from the code(blurite in mining had Ids linked not in the cache for example)

🔄 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/559 **Author:** [@Dark98](https://github.com/Dark98) **Created:** 1/28/2023 **Status:** ✅ Merged **Merged:** 1/30/2023 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `magic-numbers` --- ### 📝 Commits (10+) - [`2855775`](https://github.com/2006-Scape/2006Scape/commit/2855775e09c96de718a0dafc855d07c2a263381f) Convert Some NPCActions Magic Numbers - [`d7116f3`](https://github.com/2006-Scape/2006Scape/commit/d7116f33decf34d89ac1a40df505186c9915a84d) IntelliJ Reformat NpcActions.java - [`fec8921`](https://github.com/2006-Scape/2006Scape/commit/fec8921744b35ce781c94d1b23262c23d72a0a72) Convert Magic Numbers In Dye.java - [`eb18c54`](https://github.com/2006-Scape/2006Scape/commit/eb18c54e708c5f9c7237704471db113a077e8200) Convert More Magic Numbers In NpcActions.java - [`58d4479`](https://github.com/2006-Scape/2006Scape/commit/58d4479ec4c138cad59dd5db8a6673351ded6c51) Convert More NpcActions.java Magic Numbers - [`3b85692`](https://github.com/2006-Scape/2006Scape/commit/3b856922e2d01f9c1a4d1b3165e7245374ebe521) Plugins: Replace Magic Numbers - [`120fdc2`](https://github.com/2006-Scape/2006Scape/commit/120fdc2890d2759f983b5f621af4456755d395fe) Skills: Cooking: Replaced all Item/Object Magic Numbers & Fixed Mackerel spelling - [`666929d`](https://github.com/2006-Scape/2006Scape/commit/666929d8c51949575e00a93dfcdb160149cdd7ed) Food: Fixed Mackerel spelling - [`faf78c9`](https://github.com/2006-Scape/2006Scape/commit/faf78c9598569a3549813d120fd09211ee756b25) Skills: Fishing: Replace Magic Numbers - [`54c95d8`](https://github.com/2006-Scape/2006Scape/commit/54c95d8bac620efec714f58fffe3d7a918ebe506) Skills: Mining: Replace Magic Numbers ### 📊 Changes **18 files changed** (+2769 additions, -2845 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Server/plugins/plugin/click/item/ItemFirstClick.kt` (+2 -1) 📝 `2006Scape Server/plugins/plugin/click/item/ItemOnItem.kt` (+4 -3) 📝 `2006Scape Server/plugins/plugin/click/item/ItemSecondClick.kt` (+2 -1) 📝 `2006Scape Server/plugins/plugin/click/item/ItemThirdClick.kt` (+2 -1) 📝 `2006Scape Server/plugins/plugin/click/npc/NpcFirstClick.kt` (+2 -3) 📝 `2006Scape Server/plugins/plugin/click/obj/ObjectFirstClick.kt` (+5 -0) 📝 `2006Scape Server/plugins/plugin/click/obj/ObjectSecondClick.kt` (+5 -0) 📝 `2006Scape Server/plugins/plugin/click/obj/ObjectThirdClick.kt` (+7 -1) 📝 `2006Scape Server/plugins/plugin/npc/fadli/SecondClick.kt` (+2 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java` (+239 -236) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java` (+157 -155) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/DairyChurn.java` (+103 -101) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Potatoes.java` (+107 -104) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Fishing.java` (+537 -530) 📝 `2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Mining.java` (+408 -400) 📝 `2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java` (+67 -64) 📝 `2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java` (+1119 -1243) </details> ### 📄 Description * Replaced a bunch of magic numbers with constants * Fixed Spelling For Mackerel in Cooking & Food Classes * Removed Some Dead IDs from the code(blurite in mining had Ids linked not in the cache for example) --- <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-29 12:22:02 +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
Highest Priority of Type
New Content
New Content
QoL
enhancement
pull-request
Mirrored from GitHub Pull Request
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#6855