* Use single method for level for XP
These methods are functionally identical. This was done via test from 0->13034431 and they always returned the same value.
* redundant access
* New xp and level methods
* Removed test command
* Object definition cleanup
* Update ShopAssistant.java
* stackables
* notables
* unused files
* more junk
* almost done
* working
* moving old methods to deprecated
* update
* fixed pickpocket typos
* Update Pickpocket.java
* Remove redundant method. Fix stall stealing
* Documentation for deprecated methods
* WIP commit partial removal. Has test and dump classes
* Final cleanup
* Move definitions from data folder to cfg
* Temporarily moving definition loaders to GameEngine
This is until loading can be done asynchronously.
* Correct indentation.
* Updated and Added various drops
Added global drops to Al-Kharid and Lumbridge
* Added Uglug and Roachey
* Update npc.json
* Update shops.json
* Update Shops.java
* Firemaking: Fix some text (#548)
* Network cleanup (#552)
* Replaced packetType/Size with packet
* Replace Instream with Packet
Read data directly from packet to ease future network upgrade
* Update Packet.java
Removed unused methods to ease netty migration and network rewrite.
* Moved packet sizes.
* Removed unused stream methods
* Added readhex method for buttons
* preparing to replace mina
* Packet->GamePacket for refactoring
* Netty 3.6.6
* formatting
* formatting
* Apollo core
* Update net.xml
Added variables for 2006scape
* Netty 4 migration. Jagcached replaced with Apollo Core
* Porting network into apollo
* WIP Packet Changes
Do not merge. This is broken.
* Packet read methods converted to netty buffer
* Replacing game network and login with apollo
* Netty 4
* Cleanup
* Same port for update and game server.
* Cleanup login for integration with apollo
* Login works. fixing packets
* Running on apollo netcode.
* Server runs
* Update apollo-core.jar
* Disable encoder. write outstream directly to channel.
* Update RS2ProtocolDecoder.java
Added apollo decoder
* Add constant
* Synchronization not needed
* Update apollo-core.jar
* Better performance.
* Commit pre PR
* Update apollo-core.jar
* Fixup Port Binding Based On World
* Apollo files
* Additional Commit
---------
Co-authored-by: Dark98 <darkaidz98@gmail.com>
* Redo StaticNpcList constants (#553)
* Redo StaticNpcList constants
* Added items and objects
* Update NpcAggressive.java
* Bump netty-all from 4.0.34.Final to 4.1.42.Final in /2006Scape Server (#555)
Bumps [netty-all](https://github.com/netty/netty) from 4.0.34.Final to 4.1.42.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.0.34.Final...netty-4.1.42.Final)
---
updated-dependencies:
- dependency-name: io.netty:netty-all
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Converted FarmingTask to CycleEvent
* Removed redundant tick system.
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Josh Shippam <darkaidz98@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Updated all shops to correct quanities
* fixed shop quantities
Fixed Diango, Keldagrim, Lighthouse, Ape Atoll, and Mage Arena
* Updated shop items, quantities, and names
Updated Castle Wars, Lletya, Void Knight Outpost, and Mos Le' Harmless
* Updated shop names, items, and quantities
touchups
* Updated general stores to buy and sell all items
* Updated general shops to buy and sell all items
* Updated general stores to buy and sell all items
* Replaced packetType/Size with packet
* Replace Instream with Packet
Read data directly from packet to ease future network upgrade
* Update Packet.java
Removed unused methods to ease netty migration and network rewrite.
* Moved packet sizes.
* Removed unused stream methods
* Added readhex method for buttons
* preparing to replace mina
* Packet->GamePacket for refactoring
* Netty 3.6.6
* formatting
* formatting
* Apollo core
* Update net.xml
Added variables for 2006scape
* Netty 4 migration. Jagcached replaced with Apollo Core
* Porting network into apollo
* WIP Packet Changes
Do not merge. This is broken.
* Packet read methods converted to netty buffer
* Replacing game network and login with apollo
* Netty 4
* Cleanup
* Same port for update and game server.
* Cleanup login for integration with apollo
* Login works. fixing packets
* Running on apollo netcode.
* Server runs
* Update apollo-core.jar
* Disable encoder. write outstream directly to channel.
* Update RS2ProtocolDecoder.java
Added apollo decoder
* Add constant
* Synchronization not needed
* Update apollo-core.jar
* Better performance.
* Commit pre PR
* Update apollo-core.jar
* Fixup Port Binding Based On World
* Apollo files
* Additional Commit
---------
Co-authored-by: Dark98 <darkaidz98@gmail.com>
* Archive decompression from apollo
* Removed unused object definition fields
* Add more options to IndexedFileSystem
New methods are to read directly to a bytearray rather than allocating a large number of ByteBuffers on server startup for map loading. decompress is from client and will be depre
* Fix opcode 19 of object defs
* Initial commit of loading maps from cache
* Removed deprecated methods
Methods were in IndexedFileSystem for testing to ensure the getFileBytes method worked correctly.
* Some code cleanup to fix packaging.
#TODO review methods in CompressionUtil to use the best Gzip decompression
* map_index loading from cache
* Update pom.xml
Added commons compress dependency from maven for bzip2 decompression
* Renaming some object definition values.
* Update ObjectDefinition.java
Removed rest of unused variables
* Update ObjectDefinition.java
* Object Definitions loading from cache
* Remove dead code
* Remove unneeded files
Maps/Definitions now load from in the cache.
* Firemaking clipping
* Various Fixes
* Sea Turtle can be cooked, fixed xp received when cooking Manta Ray
* Al kharid warrior has correct emote when fighting
* Drop tables only roll once for items that do not have 100% drop rate (Prevents multiple items from rolling and dropping on same npc)
* Nerfed Tree Spirit (Lost City) max hit (From 20 to 10)
* Nerfed Abyssal Demon max hit (From 16 to 8)
* Discord Bot Update
Updated JavaCord To Latest
Changed Some Commands To No Longer Be World Specific
Added An "AdminCommands" Command
* Update Some Server Libs
* Added Purge & Pin/Un-Pin To Commands Discord Bot
* Fixed -dev & -no-crc Client Args
* Add Discord User ID Linking Support(Useless For Now)
* Added Support For User's Kicking Own Accounts Through Discord Bot
* Merge Website Integration Stuff Into One Var
* Start Setting Up Second World
Added World Number To Login Message
Added World Number To Login Interface
Made World 2 Listen On Different Port
Made Client Connect To 43597 For World 2
* Small Cleanup For World 2 Support
Calculate Port For World Based On World Number
Use Existing World int For World In Server
* Woops Wrong Ports
* Set Server Port After Loading Config
* Add xpRate Var & Include With XPRate Calculations
* Add -w/-world arg to client
* Add XP Rate Multiplier For Non-Bot Worlds
* More Multi World Stuff
Update Integrations(Discord Bot/Website Stuff) For Multiple Worlds
Added More XP Rate Dialogue Stuff
* Add Kick Command To Discord Bot & Fix Type In ConfigLoader
* Create/Use commandPrefix Var For Discord Bot
* Small Fixup For World 2
Renamed BOT_WORLD to VARIABLE_XP_RATE
Fixed Dialogue/Message grammar
Added a check for VARIABLE_XP_RATES to ::xprate command
* More Discord Commands(GameKick, MoveHome & Update)
*GameKick kicks A player if their client froze but acc stayed logged in
*MoveHome removes the need for ::stuck which removes potential for abuse
*Update schedules A server update
* Minor fixup
* 43597 → 43598
* Fix XP Rate Multiplier & add ::xprate to cooamnds list if enabled
* Use Either VARIABLE_SKILL_RATE OR XP_RATE Not Both
TODO(Convert Player.xpRate Into An Array For Easier Rate Changes)
* Create/Use PLAYER_XP_RATES For Easier Rate Changes
* Fixed Abusive Client Command Privileges & Added myxprate/checkxprate
* Allow Loading VARIABLE_XP_RATES & PLAYER_XP_RATES From Config
* Properly Update Client Title Logo
If The Cache Has Already Been Downloaded You Will Need To Delete It & Let The Client ReDownload It
* Fix Cache CRC Checks For The Client(Allows Cache To Actually Check For Updates)
* Add -no-crc & -dev Arguments To Client
* Fix Naming For Some Vars
* Make CHECK_CRC Description More Descriptive
* Fix More Var Descriptions
* Cleanup Unused GameConstants Vars & Add More Vars To ConfigLoader
Co-authored-by: Danial <admin@redsparr0w.com>
* Merge The File&Game Servers Into One Module
* Make SettingsLoader A GameConstants ConfigLoader
If A Config File Isn't Used, The Server Will Fall Back To The Defaults Set In GameConstants.java
Config Files Can Be Loaded With The "-c/-config configfilelocation.json"
Added A Default Prefilled ServerConfig.json
* Update ConfigLoader
* Bring Back Independant "Secrets" Loader For External Password Stuff
* Added A Bunch More Vars To The ConfigLoader
* Included A Sample "Server Config"
* Also Updated README.md As Parabot Is No Longer Maintained & We No Longer Have A FileServer Module
* Bundle FileServer with Server (docker)
* Remove /udp and http port
* Update .gitignore
* Move FileServer from `org.apollo.jagcached` → `org/apollo/jagcached`
* Tidy GameConstants & Add More Vars To ConfigLoader
* Organised Up GameConstants A Little To Separate ConfigLoader Vars From The Rest
* Added Some More Variables To Be Loaded Through The ConfigLoader
* Fix A Derp Caused By Laziness
* Add -c/-config arg to README.md
* Enable FileServer By Default
Co-authored-by: Danial <admin@redsparr0w.com>
* Show preference state
* Fixup multiple of the same item on the ground.
* Fixup combat
* Fixup yell, decrease delay
* Tidy up yell
* use jdk8
(cherry picked from commit 1fe76d739e)
Josh Shippam