653 Commits

Author SHA1 Message Date
ipkpjersi 7f1dc47c98 Fixed drawing plane higher than 0 (#662) 2024-12-28 13:56:17 +00:00
ipkpjersi 45b85d728f Updated login server error message (#663) 2024-12-28 13:55:03 +00:00
ipkpjersi d2fe8b0769 Refactoring follow player/NPC variables and NPC magic numbers (#659)
* Refactoring follow player/NPC variables

* Magic number refactoring

* Added more NPC refactoring

* More NPC refactoring

* More refactoring and removed GWD NPCs

GWD was added in 2007, not 2006, so there's absolutely no reason why this code should exist in the server.

* Removed more GWD NPCs

* Refactored remaining NPC IDs
2024-12-06 15:43:34 +00:00
ipkpjersi 20ccc2399a Added HQ logo (#651)
Pazaz sent me the cache with the updated HQ logo for the login screen so it no longer has artifacts/a pink pixel, I'm creating a new branch with this even though I don't know if this is the right location for the cache, oh well. I think this also contains missing models/midis.
2024-09-21 22:30:06 +01:00
ipkpjersi af522dbe1b Added custom print stream logging (#645)
* Added custom print stream

* Fixed custom print stream stack trace detection

* Implement custom print stream

* Fixed formatting

* Fixed custom info print stream

* Improved custom PrintStream
2024-09-21 18:45:17 +01:00
ipkpjersi db696431e6 Added cycle logging (#646)
* Added cycle logging

* Use properties for cycle logging

We may not want it since it can be kinda spammy, so we can toggle this feature. We probably want it though.

* Improved cycle logging
2024-09-21 18:36:45 +01:00
ipkpjersi 43775016ba Added uptime command and utility functions (#648)
* Added uptime command and utility functions

* Don't use NumberFormat it's slower
2024-09-21 04:22:26 +01:00
ipkpjersi 4fe3f446a4 Fixed stuck command and added home teleport command (#647)
With my custom print stream PR, this will also automatically log the player stuck command usage to a log file.
2024-09-21 04:20:51 +01:00
ipkpjersi 0120892521 Added automatic screenshots (#657)
* Added automatic screenshots

This branch is based off of the screenshots branch, but it will also require the develop branch to be merged first to not cause a git conflict with adding more QoL options to ClientSettings.java, so we'll want to pull the develop branch onto this branch eventually (or, I suppose, the master branch after it's merged).

In other words, we can add 2 new QoL settings to ClientSettings at a later time (after my develop branch fixes/improvements PR is merged).

* Fixed params for auto screenshots

* Added auto screenshots toggle

* Fixed auto screenshots var typo
2024-09-21 04:14:45 +01:00
ipkpjersi e404eadb3b Added NPC kill counts with message display (#644)
* Added kill counts with message display

* Fixed barrows chest count

* Preserve insertion order of NPC IDs for Constants

* Added KC command and interfaces

* Added more robustness to KC command

* Added alias and documentation to new commands

* Added more aliases for new commands

* Merged slayer KC interface names

* Preserve slayerkc nameToKills insertion order and formatting fix

* Updated comment

* Added missing boss NPC id

* Moved giant mole up in set

* Emptied out quest interface properly for kc

* Fixed whitespace

* Fixed formatting

* Hide boss KC messages by default
2024-09-21 02:40:58 +01:00
ipkpjersi fd731242dd Added Screenshots (#656)
* Added ability to take screenshots

Since we have a screenshots folder in the 2006Scape folder in the home path, we might as well make use of it.

* Removed duplicate screenshot warning message

We don't need a warning message for duplicate screenshots, if it takes screenshots that's good enough.

* Added subfolders option for screenshots

This allows for much more flexibility when it comes to screenshots because we can choose any number of levels of subfolders.

* Removed unused code

* Added check for screenshots

* Fixed screenshots NPE when logged out

* Added Local to titlebar when running locally

* Added sendMessage param for screenshots

* Default to send messages for screenshots

* Use the sendMessage variable

Oops lol

* Added ability to take screenshots

Since we have a screenshots folder in the 2006Scape folder in the home path, we might as well make use of it.

* Removed duplicate screenshot warning message

We don't need a warning message for duplicate screenshots, if it takes screenshots that's good enough.

* Added subfolders option for screenshots

This allows for much more flexibility when it comes to screenshots because we can choose any number of levels of subfolders.

* Removed unused code

* Added check for screenshots

* Fixed screenshots NPE when logged out

* Added Local to titlebar when running locally

* Added sendMessage param for screenshots

* Default to send messages for screenshots

* Use the sendMessage variable

Oops lol

* Added screenshots QOL option

* Use server name var for screenshots
2024-09-21 02:30:53 +01:00
ipkpjersi 86e7b93b3b Fixed magic attacks running up to NPCs and Players (#642)
* Fixed magic attacks running up to NPCs

* Fixed player running up to players when casting magic

* Updated comment
2024-09-21 01:39:27 +01:00
ipkpjersi cad090d8fe Various fixes and improvements (#640)
* Added more client settings for winter and hide roofs

* Removed unnecessary local var and added Javadoc comment

* Fixed dark wizards casting magic in melee range

* Added AttackType enum

* Removed extra asterisk

* Removed attackType magic numbers

* Enabled snow toggles by default

* Combined snow month into one variable

* Added option for fixes without custom settings

Added option for fixes (and QoL tab) without overriding specific features.

* Added more main args

* Fixed typo

* Added player sound saving

We have it for music, so why not for sounds too?

* Fixed typos

* Added closed client exception to ignores

* Fixed NPC definitions not loading

* Replaced NPC definitions XML with JSON

* Replaced NPCDefinition Array with HashMap

* Use err for early exit output

* Fixed KQ death causing client crash

It had the wrong anims.

* Added zoom level to debug info

* Added zoom level messages option

* Added fire breath attack type enum

* Replaced remaining fire breath attack types

* Fixed client lag

This should technically not be necessary, but it's more of a workaround due to server inefficiencies (if you kill a bunch of cows, your client will start to lag and you will even stack hits, I suspect it's due to the ground items) until we fix the server inefficiencies. There's not really any downsides in changing this from 5 to 100, so it's a good change for now.

* Make definitions private

* Fixed dark wizards not attacking back

* Improved comments

* Removed extra giant mole spawns

* Added mole lair rope action

* Only send yes chat head when talking to NPC

* Fixed removing item does not reset autocast

* Fixed picking up stackable items with full inv

* Fixed lvl 7 dark wizard anims

* Added confirm param to xprate command and fixed players command

* Removed usages of Misc.println

This hides which file the println is actually called from, so it's actually better to remove this helper.

* Don't move player when clicking on barrows check

This is both unauthentic and unnecessary.

* Removed unnecessary commented out code

We don't even need it commented out tbh.

* Fixed incorrect barrows NPC attack anims

* Improved slayer points message

* Fixed slayer task message cut off

* Might as well make this naming consistent

* Fixed typo

* Fixed stronghold slayer dungeon getting stuck in wall

* Require control key for zooming

It's too easy to accidentally zoom in/out with the scroll wheel, so let's make it so you need the control key held to scroll wheel zoom in/out.

* Added option for control key zooming

This way, it's off by default so it works the way it always did by default.

* Added alias for control key zoom

* Fixed quest interface not emptying out completely

* Updated slayer point dialogue to be more accurate

* Fixed compile error

* Fixed formatting

* More formatting fixes

* Added 5th click object handling (fixes pick-lock crash)

* Fixed lower level NPCs always hitting 0

* Fixed NPCs having incorrect max hit

Chickens were hitting 3's, ouch...

* Fixed NPCs still hitting 0s

This is much better now. Combat feels good.

* Fixed boss max hits

* Fixed al-kharid gate talking option

* Copied over max hits from spawns.json to npcDefinitions.json

This fixes a lot of NPCs. Many NPCs already seem to be correct.

* Added workaround preventing players stuck in level 28 wildy

* Changed comment to TODO

* Added control key zoom toggle

* Extracted config option to ClientSettings

* added message for control key zooming
2024-09-21 01:30:57 +01:00
halogod35 0e484985ad Update globaldrops.json (#634) 2023-03-21 02:41:16 +00:00
Josh Shippam e293bde96f Misc Changes (#633)
* Fix Weight Calculation For Add/Remove Item In ItemAssistant

* Re-Add Simple Stuck Command That Logs To Discord To Prevent Abuse

* Update Discord Log Chanel Var

* Fix int/interface Command

* Add World ID Check To DiscordBot Link Command

* Fix Java Warnings in DiscordBot Link Command
2023-03-20 23:35:25 +00:00
Josh Shippam d155a57380 Recalculate Weight When Buying/Selling Items (#632) 2023-03-02 00:25:55 +00:00
Josh Shippam a2d24978a4 Fix Firemaking in Dwarven Areas (#630)
Boundary Coords by @HaloGod35
2023-02-24 19:28:49 +00:00
Josh Shippam af7ae6185e Tag QoL Changes in ClientSettings.java With @QoL (#625) 2023-02-24 19:28:28 +00:00
halogod35 e679891a2d White Wolf Mountain fix (#629)
* Update spawns.json

* Update npc.json

* Update NpcEmotes.java

* Update spawns.json
2023-02-24 13:52:55 +00:00
Josh Shippam 48d3f64795 GameLogger Create Dir If Doesn't Exist (#628) 2023-02-24 02:45:34 +00:00
halogod35 83b2c119b3 Update Firemaking.java (#627) 2023-02-24 02:43:30 +00:00
halogod35 d4179ca6b7 Lumbridge Cow Pen update + Bug fixes (#626)
* Update npc.json

* Update spawns.json

* Update shops.json

* Update Shops.java

* Update Pickpocket.java
2023-02-24 01:26:33 +00:00
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
MatthewBishop 0105314d04 Add exception fallback to support more java (#618)
* Add exception fallback to support more java

* dark is lazy

* Update Food.java
2023-02-09 20:52:26 +00:00
MatthewBishop 58796561a3 Enum replacer (#617)
* Constants

* Update Enchanting.java

* Update Beverages.java

* Create ConstantReplacer.java
2023-02-09 19:48:17 +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
dependabot[bot] 491a7db451 Bump gson from 2.8.6 to 2.8.9 in /2006Scape Server (#528)
Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-07 21:46:37 +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
MatthewBishop e6ff7550f5 Fix getLevelforXP methods (#611)
* 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
2023-02-07 20:59:50 +00:00
dependabot[bot] a26d5cf7eb Bump jackson-databind from 2.10.5.1 to 2.12.7.1 in /2006Scape Server (#537)
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.10.5.1 to 2.12.7.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-07 04:54:46 +00:00
Josh Shippam 572c80b32e Fix Parabot Keyboard Input (#610) 2023-02-07 04:12:36 +00:00
MatthewBishop fad41f9947 Merge pull request #609
* tokkul pricing
2023-02-07 02:08:48 +00:00
Pazaz 9c5ea6ec1d Merge pull request #608
* fix: Remove Oracle JRE dependency for sound effects
2023-02-07 02:06:54 +00:00
MatthewBishop 81e6344dd8 Bug fixes (#603)
* Update Boundary.java

* fix xp to level up

* tomato shop

* fix longsword attack anim

* Update MeleeData.java

* fix dagger/longsword/shortsword anims

* Update MeleeData.java

* obby maul and warhammer interfaces and halberd anims

* Pickaxe anims

randomly uses the anim for either stab str or crush str. Cheaphax before system redesign

* adds razmires builder shop

* pom.xml update
2023-02-06 18:43:27 +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
MatthewBishop 2da0029a41 fix null session on bots (#588)
* Emergency Fix

* fix crash

* Update Player.java
2023-02-06 02:00:39 +00:00
MatthewBishop 9d5d1c57ac Emergency Fix (#587) 2023-02-06 01:06:37 +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
MatthewBishop eab153ee3f Def cleanup (#585)
* 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.
2023-02-05 22:30:29 +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 Shippam 1a2a7e2b9b Fix Darks Mistakes (#580)
Co-authored-by: MatthewBishop <55411296+matthewbishop@users.noreply.github.com>
2023-02-04 07:02:44 +00:00