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 #213] [MERGED] Cleanup part 1 #5940

New Issue
Closed
opened 2026-05-28 12:21:14 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-28 12:21:14 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/213
Author: @mrextremez
Created: 11/25/2019
Status: ✅ Merged
Merged: 11/25/2019
Merged by: @dginovker

Base: master ← Head: cleanup

📝 Commits (7)

📊 Changes

379 files changed (+80684 additions, -83170 deletions)

View changed files

📝 2006Redone Server/src/com/rebotted/Connection.java (+315 -318)
📝 2006Redone Server/src/com/rebotted/GameConstants.java (+190 -191)
📝 2006Redone Server/src/com/rebotted/GameEngine.java (+203 -213)
📝 2006Redone Server/src/com/rebotted/event/CycleEvent.java (+22 -22)
📝 2006Redone Server/src/com/rebotted/event/CycleEventContainer.java (+137 -137)
📝 2006Redone Server/src/com/rebotted/event/CycleEventHandler.java (+142 -142)
📝 2006Redone Server/src/com/rebotted/game/bots/Bot.java (+8 -8)
📝 2006Redone Server/src/com/rebotted/game/bots/BotConstants.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/bots/BotHandler.java (+22 -22)
📝 2006Redone Server/src/com/rebotted/game/content/BankPin.java (+348 -351)
📝 2006Redone Server/src/com/rebotted/game/content/EmoteHandler.java (+70 -71)
📝 2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java (+2375 -2385)
📝 2006Redone Server/src/com/rebotted/game/content/combat/Specials.java (+401 -400)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/CastOnOther.java (+84 -83)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/CastRequirements.java (+61 -61)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/Enchanting.java (+248 -249)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicData.java (+388 -388)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicMaxHit.java (+38 -38)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java (+175 -175)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicSpells.java (+139 -138)

...and 80 more files

📄 Description

  • Adjusted some of the server packaging to be more appropriate
    ex: redone ----> com.rebotted
  • Removed lots of dead code
  • Removed unncessary files not in use
  • Cleaned up small bits of code
  • Removed a few warnings
  • Server.java ---> GameEngine.java
  • Constants.java ---> GameConstants.java
  • Rewrote cape dyeing (CapeDye.java)
    (Also includes goblin mail dyeing)
  • ActionSender.java ---> PacketSender.java
  • Moved many more packets to PacketSender
  • Merged the majority of Client.java with Player.java (both were doing same thing so redundant to have both)
  • Tidied up some code that I saw appropriate
  • Made quests static and cleaned them up a bit
  • Corrected naming of some of the shop variables

🔄 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/213 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 11/25/2019 **Status:** ✅ Merged **Merged:** 11/25/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `cleanup` --- ### 📝 Commits (7) - [`c5b5c57`](https://github.com/2006-Scape/2006Scape/commit/c5b5c57d2f2860b55cd29d81c6450b87c3f9126b) Clean up part 1 - [`c32d796`](https://github.com/2006-Scape/2006Scape/commit/c32d796eb4f75bce851d5c1936e30e2a4f3caeee) Cape Dye - [`9e48f3b`](https://github.com/2006-Scape/2006Scape/commit/9e48f3b13b14162753906072fa0632916cd627af) Packaging - [`9a325bb`](https://github.com/2006-Scape/2006Scape/commit/9a325bbf7614949a18d1199ba37f31b0d4f0c613) PacketSender/clean up - [`89fe5b8`](https://github.com/2006-Scape/2006Scape/commit/89fe5b8234a5c3f171cec09f5c06342f02b525ee) Merge Client/Player - [`2d7a816`](https://github.com/2006-Scape/2006Scape/commit/2d7a8162985c102c4e00d13dbee26f5d01df69c1) Quests/more clean up - [`46162f2`](https://github.com/2006-Scape/2006Scape/commit/46162f20dbba29e962c9e5cb17c96014ce244003) More cleanup ### 📊 Changes **379 files changed** (+80684 additions, -83170 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/com/rebotted/Connection.java` (+315 -318) 📝 `2006Redone Server/src/com/rebotted/GameConstants.java` (+190 -191) 📝 `2006Redone Server/src/com/rebotted/GameEngine.java` (+203 -213) 📝 `2006Redone Server/src/com/rebotted/event/CycleEvent.java` (+22 -22) 📝 `2006Redone Server/src/com/rebotted/event/CycleEventContainer.java` (+137 -137) 📝 `2006Redone Server/src/com/rebotted/event/CycleEventHandler.java` (+142 -142) 📝 `2006Redone Server/src/com/rebotted/game/bots/Bot.java` (+8 -8) 📝 `2006Redone Server/src/com/rebotted/game/bots/BotConstants.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/bots/BotHandler.java` (+22 -22) 📝 `2006Redone Server/src/com/rebotted/game/content/BankPin.java` (+348 -351) 📝 `2006Redone Server/src/com/rebotted/game/content/EmoteHandler.java` (+70 -71) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java` (+2375 -2385) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/Specials.java` (+401 -400) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/CastOnOther.java` (+84 -83) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/CastRequirements.java` (+61 -61) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/Enchanting.java` (+248 -249) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicData.java` (+388 -388) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicMaxHit.java` (+38 -38) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java` (+175 -175) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicSpells.java` (+139 -138) _...and 80 more files_ </details> ### 📄 Description - Adjusted some of the server packaging to be more appropriate ex: redone ----> com.rebotted - Removed lots of dead code - Removed unncessary files not in use - Cleaned up small bits of code - Removed a few warnings - Server.java ---> GameEngine.java - Constants.java ---> GameConstants.java - Rewrote cape dyeing (CapeDye.java) (Also includes goblin mail dyeing) - ActionSender.java ---> PacketSender.java - Moved many more packets to PacketSender - Merged the majority of Client.java with Player.java (both were doing same thing so redundant to have both) - Tidied up some code that I saw appropriate - Made quests static and cleaned them up a bit - Corrected naming of some of the shop variables --- <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-28 12:21:14 +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#5940
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?