Commit Graph
88 Commits
Author SHA1 Message Date
Josh Shippam 6fecac4b55 Fix Some NPC's Turning When Clicked That Shouldn't (#624)
* Fix Some NPC's That Shouldn't Turn When Clicked

* Fix Some NPC's That Shouldn't Turn When Clicked

* Make immobileNpcs private

* Npc.java IntelliJ Code Format
2023-02-23 04:18:57 +00:00
Josh Shippam 566d04744c Fix Variable XP Rates(Thanks Advo) (#620) 2023-02-21 06:28:17 +00:00
Josh Shippam 4f6afe496c Fixed Fridgeir and Styrmir "Walking" Around (#623) 2023-02-19 15:00:32 +00:00
Josh Shippam fc0782104b Fix Some Helmets (#622)
* Fix Some More Full Helms

* Fix Leather Cowl
2023-02-19 04:34:21 +00:00
Josh Shippam 9e285b96c5 Single Player changes (#621)
* Enabled GUI By Default For SinglePlayer

* GH Actions: Update Output File Name

* GH Actions: Update Workflow Actions To Latest Versions

* GH Actions: Cache Maven Deps
2023-02-19 01:58:06 +00:00
Josh Shippam 94026b854f Magic num nums (#619)
* Update Libs

* Replaced Some Magic Numbers

* Rename DWARF_REMAINS to NULL_0

* Food.java Rename DWARF_REMAINS to NULL_0

* Kebabs.java static import

* Kebabs.java IntelliJ Code Format

* Fix some fullmask item names

* Potions.java Replace Magic Numbers

* Potions.java IntelliJ Code Format

* BattleStaffs.java Replaced Magic numbers

* BattleStaffs.java IntelliJ Code Format

* CraftingData.java Replaced Some Magic Numbers & Fixed Some Enums?

* CraftingData.java IntelliJ Code Format
2023-02-18 04:39:47 +00:00
Josh Shippam 55ca851d07 Various Changes (#614)
* Clean Old Log Files

* Various Changes

* Moved minutes.log to log folder
* Made SERVER_LOG_DIR constant
* Moved FILE_SYSTEM_DIR to GameConstants & Deleted org.apollo.jagcached.Constants
* Removed unused minutes.log from data/data
* Removed Duplicate RSAKeyGen
* Moved RSAKeyGen from com.rs2.net.rsa to com.rs2.util.rsa

* Removed data/net.xml & Created Moved NetworkConstants.java

* Add HTTP & Jaggrab Port's to ConfigLoader

* IntelliJ Reformat ConfigLoader.java

* Fix Mistake

* Attempt #2

* Woops, wrong port
2023-02-09 01:05:06 +00:00
Dark98 88a9562e03 Revert "Revert "Bump jackson-databind from 2.10.5.1 to 2.12.7.1 in /2006Scape Server (#537)" (#613)"
This reverts commit 5d6827d82b.
2023-02-07 22:20:26 +00:00
Josh Shippam 5d6827d82b Revert "Bump jackson-databind from 2.10.5.1 to 2.12.7.1 in /2006Scape Server (#537)" (#613)
This reverts commit a26d5cf7eb.
2023-02-07 21:41:30 +00:00
Josh Shippam 0721314a6d Remove Unused MySQL Library (#612) 2023-02-07 21:16:20 +00:00
Josh Shippam 572c80b32e Fix Parabot Keyboard Input (#610) 2023-02-07 04:12:36 +00:00
Josh Shippam 67efff663e Fix GroundItem Value Setting (#590) 2023-02-06 02:47:11 +00:00
Josh Shippam 64f9654377 Changes to make Updating the Live Server easier (#589)
* Update Default Server IP to Live

* Add RSAKeyGen.java
2023-02-06 02:11:31 +00:00
Josh Shippam 5db6da334d Kotlin -> Java (#586)
* Convert All Plugins To Java

* Convert Rest Of Kt To Java & Remove Kt From Maven
2023-02-05 22:30:52 +00:00
Josh Shippam b2212d357e Add New Kotlin Dir To Maven POM (#584) 2023-02-05 04:25:25 +00:00
Josh Shippam a5df216be9 Move Kotlin Files To src/main/kotlin (#583) 2023-02-05 04:13:38 +00:00
Josh ShippamandMatthewBishop 1a2a7e2b9b Fix Darks Mistakes (#580)
Co-authored-by: MatthewBishop <55411296+matthewbishop@users.noreply.github.com>
2023-02-04 07:02:44 +00:00
Josh Shippam 42727bde11 Suppress "unused" Warnings in StaticLists (#579)
warnings bug me
2023-02-04 06:54:25 +00:00
Josh Shippam f59e396359 Block anim fixes (#578)
* Fix Shield & Staff Block Anims

* IntelliJ Code Format MeleeData.java
2023-02-04 06:38:20 +00:00
Josh Shippam c42dc29f73 Only Enable Custom Settings Tab If "-qol/-fixes" Arg Is Used (#575) 2023-02-03 00:30:56 +00:00
Josh Shippam 628d8b98da Magic numbers & removed some dead specials (#574)
* Replace Magic Numbers in Specials.java

* Removed Dbow, Hand Cannon & Morrigans Ranged Specs

Released after 2006

* RangeData.java Convert Magic Numbers

* DwarfCannon.java Convert Magic Numbers
2023-02-02 06:56:44 +00:00
Josh Shippam 209dae48a6 Fix X11 Error On Headless Servers With GUI Disabled (#573) 2023-02-02 05:00:54 +00:00
Josh Shippam ec77731ff5 Fix NoSuchElementException In Discord Link Command (#569) 2023-02-01 02:43:45 +00:00
Josh Shippam 0754b24aa7 Implemented & Adapted RobGob69's Server ControlPanel (#568) 2023-01-30 22:27:20 +00:00
Josh Shippam aab9cfe951 Replace a bunch of magic numbers & Fix Mackerel Spelling (#559)
* Convert Some NPCActions Magic Numbers

* IntelliJ Reformat NpcActions.java

* Convert Magic Numbers In Dye.java

* Convert More Magic Numbers In NpcActions.java

* Convert More NpcActions.java Magic Numbers

* Plugins: Replace Magic Numbers

* Skills: Cooking: Replaced all Item/Object Magic Numbers & Fixed Mackerel spelling

* Food: Fixed Mackerel spelling

* Skills: Fishing: Replace Magic Numbers

* Skills: Mining: Replace Magic Numbers

* IntelliJ Code Reformat Changed Files
2023-01-30 00:11:12 +00:00
Josh Shippam da8471673f JFrame Links to Vars & Add Some Args (#561)
* Changed JFrame Links to Variables in ClientSettings.java
* -qol/-fixes sets true BILINEAR_MINIMAP_FILTERING, FIX_TRANSPARENCY_OVERFLOW & FULL_512PX_VIEWPORT
* -no-nav/-disable-nav sets false SHOW_NAVBAR
2023-01-28 23:27:03 +00:00
Josh Shippam 7f79dff665 Random Fixes (#554)
* Shops: Fixed stock amount in "Nurmof's Pickaxe Shop"

* ConfigLoader:Fix server_debug key/value

* Fix "players" Command Text
2023-01-28 05:32:52 +00:00
Josh Shippam aa6dbba8e2 Firemaking: Fix some text (#548) 2023-01-26 03:31:05 +00:00
Josh Shippam 66a554aeeb Update README & Start Converting Java To Kotlin (#539)
* Rename .java to .kt

* DiscordBot Java -> Kotlin

* Rename .java to .kt

* ConfigLoader Java -> Kotlin

* Update ReadMe For Latest Using Parabot Locally

* Rename .java to .kt

* GameConstants Java -> Kotlin

* Add Missing "server_test_version" Field To ServerConfig.Sample.json
2023-01-26 02:15:33 +00:00
Dark98 9fd4b470c8 Setup GH Actions For Windows Single-Player 2022-08-22 05:44:54 +01:00
Josh Shippam 5dea59f903 Various Changes (#533)
* Add Shield Blocking Emote For Two NPC's

* Fix KARAMBWAN HP Restore Amount

* Add Link Command To Discord Bot

* Github Actions Update
2022-08-22 05:22:00 +01:00
darkaidz98@gmail.com 81cd126a33 Revert Library Updates To Fix Server 2022-01-29 10:45:52 +00:00
Josh Shippam 54a3e5cdec Various Changes (#523)
* 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
2022-01-27 01:32:17 +00:00
Dark98 c5c4471a4f Added Current World To Client Title 2022-01-08 01:54:00 +00:00
Dark98 500441d551 Added/Fixed Right Click Banking For Fadli(Duel Arena Banker) 2022-01-08 00:46:56 +00:00
Dark98 803346323b Fix Discord Bot Derp 2022-01-08 00:18:35 +00:00
Josh ShippamandDanial e1a8d85408 Second World Setup (#518)
* 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>
2021-12-31 03:47:48 +00:00
Josh ShippamandDanial 1c5b400f00 Merge The File&Game Servers Into One Module (#519)
* 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>
2021-11-23 00:29:25 +00:00
Dark98 ba7f84fc45 Only Print Loaded Plugins When Debug Enabled
(cherry picked from commit 2629186cc0)
2021-11-09 02:07:21 +00:00
Dark98 f30a936ff6 Revert "Update Client Title Logo"
woops this broke the cache
This reverts commit 97f1eb72e4.

(cherry picked from commit 7a2a6d362b)
2021-11-09 02:06:54 +00:00
Dark98 abe34d86b1 Add Plugins/Kotlin Support To Maven
(cherry picked from commit 546669ead0)
2021-11-09 02:06:49 +00:00
Dark98 97f1eb72e4 Update Client Title Logo
If The Cache Has Already Been Downloaded You Will Need To Delete It & Let The Client ReDownload It
2021-10-28 22:41:19 +01:00
Josh Shippam c2f325b4e7 Plugins Fixup / Conversion(#511)
* Server: Ripped PluginService From Astreaus-V2

This Removes The Need For Plugin MetaData

* Plugins: Handle Emote Tab Run Buttons

* Add Some Settings Button Plugins

Brightness Buttons
Music Volume Buttons
Walk/Run Buttons
Toggle SplitPrivate-Chat

* Fix Player Still Running With 0 Energy

Fixes Players Continuing To Run For The Rest Of Their Current Movement Task Even If They Run Out Of Energy
2021-10-26 04:47:33 +01:00
7d64e2298f Plugins System (#510)
* Started Ripping Plugin System From Astraeus

*Currently only ClickingButtons Support
*Also Started Using The Logout Button Plugin From Astraeus

* NpcFirstClickEvent setup for plugins

also made Man & Women chat work through this

* Server: Add Google Collect Lib

* Server: NpcSecondClickEvent setup for plugins

also handle pickpocketing npc clicking through plugin

* Server: NpcThirdClickEvent setup for plugins

* Server: Remove conflicting action for Secondclicking npc id 3

* Server: ItemFirstClickEvent setup for plugins

Also Handle Yo-Yo First Click Through This

* Server: ItemOnItemEvent setup for plugins

Also Handle Black Candle Lighting With Tinderbox Through this

* Server: ItemOnNpcEvent setup for plugins

* Server: ItemOnObjectEvent setup for plugins

Also Handle Fillable Items Through This

* Server: ItemSecondClickEvent & ItemThirdClickEvent setup for plugins

Also Handle Yo-Yo Actions Through This

* Server: ObjectFirstClickEvent setup for plugins

Also Handle FirstClick Mining Actions Through This

* Server: ObjectSecondClickEvent setup for plugins

Also Handle Stall Thieving Actions Through This

* Server: ObjectThirdClickEvent setup for plugins

* Server: ObjectFourthClickEvent setup for plugins

Also Handle Fourth Click Farming Object Actions Through This

* Server: MagicOnItemEvent setup for plugins

Also Handle SuperHeat Through This

* More mage training arena (#509)

* Fixup points display

* Only allow players to deposit up to 12k at one time

* Apple damage and play animation

* Update order or prices

* Update Telekinetic.java

(cherry picked from commit ab3b1e9731)

Co-authored-by: RedSparr0w <RedSparr0w@users.noreply.github.com>
Co-authored-by: Danial <admin@redsparr0w.com>
2021-10-09 00:20:57 +01:00
Dark98 a693615e2e Server:JavaCord: Allow Displaying PlayerCount Or Server Website 2021-10-06 02:46:48 +01:00
Dark98 ace41cddb0 Server: Use JavaCord 3.1.1 2021-06-13 23:28:09 +01:00
dark98 7261568e2d Added Player Morphing to Ring Of Stone & Easter Ring 2021-04-02 23:01:48 +01:00
dark98 22db0c22f4 Add a toggle for Total Characters Registered kn Website 2021-03-15 23:45:38 +00:00
dark98 3bf473129d Rename & Repackage 2021-03-11 00:30:16 +00:00
dark98 caa4625efa Ignore Build Jars 2021-03-10 22:53:32 +00:00
Josh Shippam 5da2ebcffe Update README.md 2021-03-08 03:21:58 +00:00
Josh Shippam e3b98a53c0 Welcome Interface Fixup (#421)
Fixed last logged in from IP
Various other changes/fixes
2020-11-09 14:34:36 -05:00
Josh Shippam cd690fe31d Misc Fixes (#403)
* Fixed Ghostly Cape Equipping in Cape Slot

* Fixed Jumping Out Of Varrock Lumber Yard

* Changed All Quests To addOrDropItem

* Fixed Right Click in Java 10
2020-05-22 20:57:31 -04:00
Josh Shippam b94157f01b Remove Accidentally Added Import (#285) 2019-12-13 02:34:23 +00:00
Josh Shippam 23951e9af6 Implement Ring Of Forging (#283) 2019-12-13 01:05:25 +00:00
Josh Shippam 4490de88c4 Merge pull request #151 from Dark98/master
Fix Onyx Amulet Stringing
2019-11-09 22:06:19 +00:00
Dark98 58dab39d3b Fix Onyx Amulet Stringing 2019-11-09 22:05:29 +00:00
Josh Shippam 8ef0b3662e Merge pull request #150 from Dark98/master
Fix Highscores problem & only Save Highscores for Mod & Lower
2019-11-09 21:53:13 +00:00
Dark98 6b4b1eddf7 Fix Highscores problem & only Save Highscores for Mod & Lower 2019-11-09 21:51:05 +00:00
Dark98 c2a768a354 Merge https://github.com/dginovker/2006rebotted 2019-11-09 21:49:22 +00:00
Josh Shippam 3a50391304 Update Cache Path to 2006rebotted (#149)
Cool
2019-11-09 16:45:58 -05:00
Dark98 c152a1c8d9 Update Cache Path to 2006rebotted 2019-11-09 21:36:24 +00:00
Josh Shippam 52414ce985 Merge pull request #125 from Dark98/master
Read Comment
2019-10-28 00:26:46 +00:00
Dark98 912a08c423 Read Comment
Made firstTimeTutorial handle the inital login stuff instead of it being ran with the dialogue
made the warning about the bank pin send for all players
fixed weight calculation on first login(closes #109)
2019-10-28 00:25:30 +00:00
Josh Shippam 365e4a13be Merge pull request #111 from RedSparr0w/commands-tele
Refactor commands, Add click to tele command
2019-10-26 02:29:58 +01:00
Josh Shippam 551e785b94 Merge pull request #106 from RedSparr0w/champions-guild
fixup champions guild
2019-10-25 15:17:41 +01:00
Josh Shippam aa0e46bd16 Merge pull request #103 from RedSparr0w/black-knight-fortress-fixes
[Final?] Black knight fortress fixes
2019-10-25 03:04:59 +01:00
Josh Shippam cfdffea92b Merge pull request #100 from RedSparr0w/fix-black-knight-quest-some-more-
fix black knights quest rewards
2019-10-25 01:03:45 +01:00
Josh Shippam bd6b34f4a5 Merge pull request #98 from Dark98/master
Remove Heatmap Code from Server
2019-10-24 23:02:23 +01:00
Dark98 30c0207ef9 Merge branch 'master' of https://github.com/dginovker/2006rebotted 2019-10-24 23:00:31 +01:00
Dark98 95285fa786 Remove Heatmap Code 2019-10-24 23:00:21 +01:00
Josh Shippam 7217295d37 Merge pull request #97 from RedSparr0w/knights-sword-fix
fix cupboard object spawning - Knights Sword Quest
2019-10-24 22:59:19 +01:00
Josh Shippam 7570b61245 Merge pull request #95 from Dark98/master
Made Notes Stackable
2019-10-24 22:25:20 +01:00
Dark98 abc412e011 Made Notes Stackable 2019-10-24 22:23:28 +01:00
Josh Shippam a3be2f3d90 Merge pull request #89 from RedSparr0w/patch-3
fixup sheep shearer/black knight
2019-10-23 15:54:46 +01:00
Josh Shippam db800ca7e6 Merge pull request #82 from Dark98/master
MrExtremez Fixes
2019-10-22 21:31:21 +01:00
Josh Shippam 90654b9dec Merge pull request #78 from RedSparr0w/fix-pure-essence
Allow player to mine Pure Essence
2019-10-22 03:04:35 +01:00
Josh Shippam fe5d715691 Merge pull request #73 from Dark98/master
Fix Deposit & Withdraw "X" For Banking
2019-10-21 23:33:52 +01:00
Dark98 571501ed21 Fix Deposit & Withdraw "X" For Banking
Thanks to https://www.rune-server.ee/runescape-development/rs2-server/help/659176-2006redone-pi-bank-x-option-not-working-solved.html
2019-10-21 23:31:49 +01:00
Josh Shippam 5156f09352 Merge pull request #71 from Dark98/master
Finally "Fix" Discordbot ::commands
2019-10-21 01:48:07 +01:00
Josh Shippam fc0ee0179b Merge pull request #67 from Dark98/master
Fix Herblore EXP For New Accounts
2019-10-21 01:26:23 +01:00
Dark98 7c42a83c22 Fix Herblore EXP For New Accounts 2019-10-21 01:25:51 +01:00
Josh Shippam dbb4ac970a Merge pull request #66 from Dark98/master
Discord Bot Update
2019-10-21 01:22:24 +01:00
Dark98 d589c83975 Discord Bot Update
Bot Activity Now Displays Current Players Online(Updated Every Minute? don't really understand game ticks xD)
Fixed ::commands Command
Added HeatMap & Issues Commands
2019-10-21 01:20:39 +01:00
Josh Shippam 0e231cef7e 2006ReBot Update (#54)
Separated commands into own classes
added a few more simple af commands to make bot a bit more useful
2019-10-12 20:23:03 -04:00
Josh Shippam 6cfca2886a Voting Setup & Made SettingsLoader a tiny bit cleaner (#53) 2019-10-12 15:58:55 -04:00
Josh Shippam 5b4c669d64 Multiple Changes Check Commits (#48)
* Temp Hiscores & SettingsLoader changes

 Registered Accounts cycle count change

* EverythingRS Heatmap
2019-10-10 10:59:59 -04:00
Josh Shippam 7b9e2f7163 Initial Discordbot Integration (#37) 2019-10-08 14:19:34 -04:00