2006Scape

2006-Scape/2006Scape

mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00

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
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
halogod35	fa7418929e	Various Additions and Fixes (#571 ) * 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	2023-02-02 02:48:04 +00:00
halogod35	d7a70fdfdc	Various Fixes (#570 ) * Grammatical fixes * Fixed longsword combat styles	2023-02-01 02:44:02 +00:00
Josh Shippam	ec77731ff5	Fix NoSuchElementException In Discord Link Command (#569 )	2023-02-01 02:43:45 +00:00
MatthewBishop	64d4990c99	Farming task (#567 ) * 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>	2023-02-01 02:43:30 +00:00
Josh Shippam	0754b24aa7	Implemented & Adapted RobGob69's Server ControlPanel (#568 )	2023-01-30 22:27:20 +00:00
halogod35	32947bbd15	Shop update (#566 ) * Updated shops * Updated shops * Updated shops * Updated shops * Updated shops forgot to beautify * Updated Shops Replaced IDs with NPC IDs (Credit: Matthew Bishop)	2023-01-30 19:36:47 +00:00
halogod35	d5490bd39d	Updated general stores to buy and sell all items (#565 ) * 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	2023-01-30 00:40:09 +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
halogod35	15d6b9f35a	Added Shop assistants, Fixed #551 and #563 (#564 ) * 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 * Added shop assistants, fixed issues #551 and #563 Added shop assistants to Al-Kharid, Edgeville, Falador, Karamja, Lumbridge, Rimmington, Varrock, and Zanaris. Changed Lumbridge assistant to Varrock Swordshop assistant Changed Varrock assistant's shop from Lumby to Varrock * Added shop assistants, fixed issues #551 and #563 Added shop assistants to Al-Kharid, Edgeville, Falador, Karamja, Lumbridge, Rimmington, Varrock, and Zanaris. Changed Lumbridge assistant to Varrock Swordshop assistant Changed Varrock assistant's shop from Lumby to Varrock	2023-01-29 21:57:46 +00:00
halogod35	ccf628f0b1	Updated shops to have era accurate names, items, and quantities (#562 ) * 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	2023-01-29 19:24:32 +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
Pazaz	62b26c5585	Functional navbar (toggleable in ClientSettings) (#560 ) * Fixed client frame offsets/padding * Functional navbar (toggleable in ClientSettings)	2023-01-28 22:06:05 +00:00
Pazaz	e517be1bfb	3 configurable graphics fixes in ClientSettings (#558 )	2023-01-28 20:39:12 +00:00
Pazaz	afdf369104	Fixed client frame offsets/padding (#557 )	2023-01-28 20:37:33 +00:00
dependabot[bot]	8e750096cd	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>	2023-01-28 05:36:50 +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
MatthewBishop	6e69dea45a	Redo StaticNpcList constants (#553 ) * Redo StaticNpcList constants * Added items and objects * Update NpcAggressive.java	2023-01-28 05:32:32 +00:00
MatthewBishop	e46b7142c3	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>	2023-01-28 05:31:19 +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
MatthewBishop	8cf8a4db2c	Bugfix: NPC Combat and Damage Application (#541 )	2023-01-26 01:48:54 +00:00
MatthewBishop	1ad531d244	Replace clipping files with loading straight from the cache. (#540 ) * 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	2023-01-25 19:15:31 +00:00
AugustasK	f56402845b	Implemented functionality where user can search for traps in some chests (#534 ) * Initial commit * Implemented cooldown timer and added ardougne castle chest * Refactoring * Removing unused variable	2023-01-20 16:48:45 +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
Olivier	7514826803	Merge pull request #527 * 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)	2022-04-19 03:40:19 +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
Teddy	63055f9181	East falador staircase was falling into the last if which was teleporting the player to a void (#522 ) Co-authored-by: Sad Emu <wcpro111@gmail.com>	2022-01-22 03:32:48 +00:00
Teddy	9a3cf5867a	Added jad ranged attack projectile (#521 ) Co-authored-by: Sad Emu <wcpro111@gmail.com>	2022-01-20 23:53:19 +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 Shippam	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 Shippam	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
Danial	d23b176a28	Make file server optional if cache already downloaded (#514 ) (cherry picked from commit `669573c660`)	2021-11-09 02:06:46 +00:00
Danial	c1202e8989	Couple of fixups (#513 ) * 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`)	2021-11-09 02:06:42 +00:00
dginovker	0e1edb79b6	Fix UNIX file path replace for plugins	2021-10-30 21:22:17 -04: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
Josh Shippam	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
Danial	ab3b1e9731	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	2021-10-06 02:22:42 +01:00
Danial	2d8ae82086	Telekinetic grab and stuff (#508 ) * tidy up * Tidy up check for space * Telekinetic base * Don't allow player to pickup statue * Tidy up item pickup * fixup, statue spawn * Update telekinetic grab * 2nd option for guardian statue * handle telegrab on statue * Allow picking up global drops with telekinetic grab * Check if player can see/reach item * Update PickupItem.java * Allow pasting into chatbox * camera stuff * fixup clipboard stuff * Update PlayerAssistant.java * Update Commands.java * Add mazes initial * Tidy up the clipboard pasting * Update mazes * Calculate new position of statue * fixup telegrab * More tidy up, remove constant running of container * more tidy up.. * Handle moving statues * remove the statue from global drops * Update MagicOnFloorItems.java * Show telekinetic interface * Make public accessable * Only show items to player that are on the same height level * Moving statues around, Spawning * Reward exp, points, law runes * Show points, mazes completed * Add comment * Add observable statue (still needs work) * Fixup where camera focuses * Load items when player changes level * Graveyard base * Add a couple more checks * Update Player.java * Update Commands.java * Make sure statue is visible when player appears at maze * [Mage training arena] Graveyard * Update MageTrainingArena.java * Update MageTrainingArena.java * Update ItemHandler.java	2021-10-05 04:01:16 +01:00
Danial	c526aa5f4d	[Mage Training Arena] Enchanting, and some other stuff (#507 ) * Handle some more stairs... * Remove message sent to player * Bolts/Tips making * Tidy up * Free alchs occasionally within training arena * [Mage Training Arena] Enchanting * Remove enchanting room specific items when leaving area	2021-10-02 17:38:45 +00:00
Danial	865ef4ed29	Process client arguments, Auto login option (#506 ) * Process client arguments, Auto login 1st argument = server IP 2nd argument = username 3rd argument = password * Simplify * Fixup server XP rate	2021-10-02 17:38:17 +00:00
Danial	bbe1587e20	Mage Training Arena and stuff (#504 ) * Fixup door/stairs in mage training arena * Fixup bedsheets, should be worn on head, not weapon slot * [Mage Training Arena] spawn rewards guardian * [Mage Training Arena] Add arena teleports (non functioning) * Just adding some comments * [Mage Training Arena] Basic mage training arena stuff * [Mage Training Arena] Allow shop to open and show items correctly * [Mage Training Arena] Show shop prices when clicked * noclip * [Mage Training Arena] Add 2nd option handler (filler) * [Mage Training Arena] Be able to purchase stuff, lock bones to peaches * Update MageArena.java * [Mage Training Arena] setup boundary * Readability * Tidy up enchanting * MageArena -> MageTrainingArena * Create Alchemy.java * Update RSInterface.java * [Mage Training Arena] Spawn entrance npcs * [Mage Training Arena] Initial Alchemy * [Mage Training Arena] Add comments * [Mage Training Arena] Handle alchemy while in arena * [Mage Training Arena] Show interface for alchemy room * [Mage Training Arena] Display values, Search cupboards * [Mage Training Arena] Don't allow the player to wear items from the Alchemy game * [Mage Training Arena] Announce when items are changing * Don't allow the player to bring any coins with them * Sort by values * [Mage Training Arena] Allow alching items etc * Update method name * Show magic tab after using alch even if can't alch * [Mage Training Arena] Coin collector - temp * [Mage Training Arena] Give player points, take items, add bonus xp, add bank items * [Mage Training Arena] Remove items when player leaves the alchemy training area * Fixup staffs for runes, Tidy up checks Was missing all Mystic staff	2021-09-30 22:25:48 +01:00
Danial	8589277ece	Implement Party Room, A bunch of client side changes, Other stuff (#503 ) * Fixup Discord links * Fix required level to chop Dramen tree * More Discord link fixes * Show bots as (store) * Fixup port move to port 8080 as used by file server * Fixup report handler * Some client changes * minor changes Show mod status * Show item value on ground * Mark stores and players differently on mini map * Some tidy up * default to world 1 * Update trade with text * revert nodeID changes * Update RS Guide name * Remove some command aliases * Log bots and players differently * Fixup * minor changes * Fixup colors * Update RSInterface.java * Settings for controlling options * Add memory command * Update server skill magic numbers * Update server skill magic numbers * Update colors for ground item text * Update .gitignore * Update player health value more often * Add in game item/NPC/object search * Item amounts and value displayed * Update examine text * Start with volume off * Fixup tab 7 still showing with other interfaces * Fixup search * Fixup entering numbers after letter in amounts * minor fixup * fix indentation * change type of value * Fixup values shown * Fix when clicking while tab 7 open * Fixup negative amounts * Update some method names * Fixup method name * tidy up method values * Initial move for overlays * Update more method names, variables * Update debug menu * Update experience info area * Update Signlink.java * more refactoring/deob * Tidy up * refresh skills * Update method name, debug display * fixup * Show wrench icon on custom settings tab * alignment * Modify zoom * Use smaller numbers for exp/h * Update interface command * tidy up * Fixup tele location * Fixup if interface doesn't exist * Add some interface options * Update checks * Open bank interface for item search TODO: change title maybe not display in chat change options for items? change command to searchitem - open the bank interface, open a text input interface * re-fix * Show open interface ID * Update bank string shown * Update search function * Scroll zooming * Only fill chat with search if not searching for an item * add comments * Change system update message * Remove fps command * Increase draw distance * fixup * Draw distance option * [Party Room] Fix party room stairs * Add new free slots method to check for stackable items counting as a free slot * [Party Room] Deposit/Withdraw items all working * [Party Room] Fully working * [Party Room] Don't spawn balloons on the table Players cannot pickup the items * Fixup boundary * Drop items in random amounts up to 4 stacks * Update swampy boat to work * Minor fixup * Update Game.java * Move player name up slightly * Update some naming * Tidy up * Add ectoplasm agility shortcuts * Update ObjectsActions.java * Ectofuntus stuff * fixup * Ectofuntus bone grinder get status * auto worship * Allow claiming ecto-tokens * change variable * fixup * Make use of GameConstants.WORLD * Randomize bot passwords * Don't show player shops as online * Update opening oysters * Update GemCutting.java * Dragontooth island transport * Ectofuntus stuff * More constants * Bill teach travel to Mos Le'Harmless and back Also able to explore the whole ship * Use better looking buttons * Update .gitignore	2021-09-28 23:40:34 +01:00
Danial	d30e833dd8	Update server skill magic numbers (#502 )	2021-09-23 08:34:58 -04:00
Danial	06b509c4d0	Update how player shop is handled (#501 ) * Update how player shop is handled * Squashed commit of the following: commit `5be0778dc9` Author: Danial <admin@redsparr0w.com> Date: Sun Sep 19 14:24:12 2021 +1200 minor fixup commit `ef3b63b54f` Author: Danial <admin@redsparr0w.com> Date: Sun Sep 19 14:11:27 2021 +1200 Add docker compose file for running servers in containers * Update DialogueHandler.java * Fix for models out of bounds * Revert "Squashed commit of the following:" This reverts commit `d27d3c357c`. * Other shop tidy up Show shops as combat level 0 Remove items from shop when shop logs off	2021-09-20 13:18:40 +01:00
Danial	8cceeeddd4	Add docker compose file for running servers in containers (#500 ) * Add docker compose file for running servers in containers * minor fixup	2021-09-19 18:06:16 +00:00
Daniel Ginovker	d7f0ce9877	Create LICENSE	2021-08-27 12:04:20 -04:00
dependabot[bot]	2f020a9688	Bump jackson-databind from 2.10.1 to 2.10.5.1 in /2006Scape Server (#479 ) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.10.1 to 2.10.5.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-06-13 23:48:23 +01:00
dependabot[bot]	84332d7851	Bump xstream from 1.4.10-java7 to 1.4.17 in /2006Scape file_server (#496 ) Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.10-java7 to 1.4.17. - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-06-13 23:48:07 +01:00
dependabot[bot]	fddf797bf1	Merge pull request #497 * Bump xstream from 1.4.11.1 to 1.4.17 in /2006Scape Server	2021-06-13 23:47:06 +01:00
Dark98	ace41cddb0	Server: Use JavaCord 3.1.1	2021-06-13 23:28:09 +01:00
coco-bandicoot	3f2295a4d3	Food Update: All stews, gnomish foods, and some misc foods/drinks (#494 ) - Adds all stew food items to the Food class - Adds all gnomish food items(including the premade ones!) to the Food class - Added Fruit Blast and Pineapple Punch (including premade versions) to the Food class (the rest boost stats like beers/pots so did not add) - Added Rabbit, Ugthanki meat, Roast Bird meat, Thin Snail meat, Spider on stick, Spider on shaft, Roast Rabbit, Lean snail meat, Roast beast meat, Fat snail meat, Cooked slimy eel, Cooked chompy, Cooked fishcake, Rainbow fish, Cave eel, Cooked jubbly, Lava eel, Banana stew and Chocolatey milk to the Food class - Chocolate bomb unique eat text - "It heals some health." text added to default food items without unique eating text	2021-05-13 13:16:37 +01:00
Jeremy	e1fde5c1d3	Replace get npc name associate array method to indexed array method (#493 )	2021-04-23 17:03:04 +01:00
Olivier	48d7b09bdd	Easter Event + Ectotokens (#492 ) * New NPC Spawns for Port Phasmatys Added most NPCs in Port Phasmatys including the ghost villagers, sailors, guards, Robin, Ak-Haranu, and more. * ObjectActions for Ectofuntus and Energy Barrier The Ectofuntus is now fully accessible and Port Phasmatys can be accessed through the energy barrier. * Added Ak-Haranu's Exotic Shop Ak-Haranu now sells Bolt Racks. * Fixed Ectofuntus Worship Fixed minor issue with Ectofuntus Worship * Gravingas Exclamations Gravingas exclaims different messages while protesting Necrovarus in Port Phasmatys. * Easter Event Updates - Added Easter Bunny - Added temporary Easter Quest - Added Dialogues between player and Easter Bunny - Added player save data for Ecto-tokens (Port Phasmatys) and data for the easter event (easterEvent) * Delete .DS_Store * Delete .DS_Store * Delete .DS_Store * Adding DS_Store to .gitignore	2021-04-06 18:51:04 +01:00
dark98	7261568e2d	Added Player Morphing to Ring Of Stone & Easter Ring	2021-04-02 23:01:48 +01:00
Olivier	d5b74825d4	Port Phasmatys Update I (#485 ) * New NPC Spawns for Port Phasmatys Added most NPCs in Port Phasmatys including the ghost villagers, sailors, guards, Robin, Ak-Haranu, and more. * ObjectActions for Ectofuntus and Energy Barrier The Ectofuntus is now fully accessible and Port Phasmatys can be accessed through the energy barrier. * Added Ak-Haranu's Exotic Shop Ak-Haranu now sells Bolt Racks. * Fixed Ectofuntus Worship Fixed minor issue with Ectofuntus Worship * Gravingas Exclamations Gravingas exclaims different messages while protesting Necrovarus in Port Phasmatys.	2021-03-31 00:57:35 +01:00
Nathan Aclander	a52832348a	Fix typo pointing to incorrect Client dir (#481 )	2021-03-16 12:41:59 +00: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
Olivier	f22b9553c6	Added Random Dialogue for Man and Woman NPCs (#476 ) * Update DialogueHandler.java * Update NpcActions.java * Update DialogueHandler.java	2021-02-15 11:17:51 -05:00
Nick Gal	440a559c64	Fix gem check being rolled twice. (#474 )	2021-02-05 18:25:46 -05:00
Olivier	b65ab89a53	Dialogue Action for High Priest (#471 ) - Added Dialogue Action for High Priest (Entrana)	2021-02-05 18:25:25 -05:00
Nick Gal	15ab625349	Fix bug where leveling up while Smelting would consume ores. (#473 ) * Fix bug where leveling up while Smelting would consume ores. * Making sending message before adding skill xp more consistent. If you level up while smelting iron, playerSkillProp[13] gets cleared and getItemName will fallback to Unarmed	2021-02-03 20:32:34 -05:00
Nick Gal	fa167bacd3	Fix call to NpcAggressive.isAggressive (#472 )	2021-01-29 01:43:30 -05:00
Olivier	12951be954	Added Lost City Dialogues + Entrana Dialogues (#470 ) Added Dialogue for the following NPCs - High Priest (Entrana) - Warrior, Wizard, Monk and Archer (Lost City) - Shamus (Lost City)	2020-12-31 16:06:07 -05:00
Daniel Ginovker	2a4d7ebd22	Create second dialogue (#469 ) * Add fix for maven encoding on Linux machines * Fix dialoguehandler length	2020-12-31 13:52:44 -05:00
Olivier	4ff45dd6c5	Added Npcs on Entrana (#468 ) - Added Fishing Spots - Added High Priest - Added Monks - Added Firebird of Entrana - Added Chickens	2020-12-31 12:59:14 -05:00
Olivier	efb450fc60	Added GFX for Dark Wizard Spell (#466 ) Dark Wizards now cast the correct spell	2020-12-30 22:02:54 -05:00
Olivier	aca32c72c5	Added Level Up Songs (#465 ) - Each skill has a corresponding level up song - Some skills (Attack, Magic, Cooking) have multiple level up songs (Milestones like 99 or 10, 20, 30 etc.)	2020-12-30 22:02:47 -05:00
Olivier	6bbf8f1b09	Added SFX for Dark Wizard (#467 ) -Adds block sound and attack sound for wizards	2020-12-30 22:02:09 -05:00
Olivier	108af403d8	Combat Sound Fixes (#462 ) * Combat Sound Fixes - Added all sounds for chickens - Added proper sounds for sword and dagger - Added some sounds for thief and farmer - Fixed dds sound effect * Update CombatSounds.java	2020-12-30 13:06:36 -05:00
Olivier	f5306da6e4	Fixed Player Unarmed Animations (#463 ) - Player now correctly blocks attacks when unarmed - Player now has correct animations for all fight modes	2020-12-30 13:06:18 -05:00
Olivier	5559d10037	Added Death Song (#464 ) - Plays the death song when you respawn after dying	2020-12-30 13:06:06 -05:00
Arisu	c0b33add46	Fixed firemaking log duplication & deletion (#456 )	2020-12-29 12:15:26 -05:00
Olivier	af98c46371	Added Animations for Guard NPC (#459 ) Guard NPC now has proper animations..	2020-12-29 11:58:56 -05:00
Arisu	90b36be5ae	Fixed users being able to make blank passwords (#458 )	2020-12-29 11:58:37 -05:00
Arisu	3ade7141a6	Fixed wrong smelting response when trading & made full iron helm use 2 bars (#457 )	2020-12-29 11:58:24 -05:00
Arisu	6040241343	Added cheese and tomato to consumables (#455 )	2020-12-29 11:56:26 -05:00
Olivier	39096c403d	Re: Guard SFX (#461 ) Added SFX for Guard attack and block	2020-12-29 11:56:05 -05:00
Olivier	3b74dd2a0c	Added SFX when player takes damage (#454 ) Player makes sound when he takes damage	2020-12-28 15:36:01 -05:00
Olivier	27c6c91fcb	Fixed SFX for Unarmed Melee (#453 ) Fixed a glitch where the player would make a strange axe sound instead of the actual punch/kick sound.	2020-12-28 15:35:27 -05:00
Olivier	ca36e516ad	Added PNPC Command for Admins (#449 ) - Admins can now turn into NPCs using the following commands "playnpc" or "pnpc".	2020-12-18 08:41:12 -05:00
Olivier	8819a0b9f9	NPC Interaction (lostCity) (#445 ) - Players can now properly interact with Monk, Archer, Wizard and Warrior - Player can now interact with Shamus	2020-12-17 09:01:22 -05:00
Olivier	e524b2fa0b	Added Dialogue Options (lostCity) (#446 ) - Added Dialogue Options for Warrior and Shamus	2020-12-17 09:00:58 -05:00
Mr Extremez	ec7a4b0b74	Quick fix for monkey gree gree's (#447 )	2020-12-17 09:00:31 -05:00
Daniel Ginovker	953419b33a	Add fix for maven encoding on Linux machines (#448 )	2020-12-17 08:55:02 -05:00
Olivier	3065b682e3	Lost City Progress Saves (#443 ) - Added lostCity to playersave.java	2020-12-16 15:10:14 -05:00
JohnsonMichaels123	2e1ad6c205	Populated Taverley (Kaqemeex, Sanfew and Druids) (#442 ) - Druids now spawn all around Taverley - Kaqemeex spawns at the Druidic Circle (Druidic Ritual Quest) - Sanfew spawn near Herblore Shop (Druidic Ritual Quest)	2020-12-15 15:09:43 -05:00
JohnsonMichaels123	93b811bcaa	Lost City Required for Dragon Longsword / Dagger (#441 ) - Lost City completion is required to equip dragon longsword and dragon dagger	2020-12-15 08:00:33 -05:00
JohnsonMichaels123	06ae65534c	Added Quest Completion Condition for Lost City (#440 ) - Teleporting through Lumbridge Swamp Shed completes Lost City - Reward is given (3QP + Access to Zanaris)	2020-12-15 08:00:05 -05:00
JohnsonMichaels123	59b9dbf460	Updated Actions for Spirit Tree and Leprechaun (#435 ) - Leprechaun spawns at tree w/ sfx and quest conditions - Tree Spirit spawns at tree w/ sfx and quest conditions	2020-12-14 15:33:38 -05:00
JohnsonMichaels123	252171c209	Added integer for leprechaunSpawned (lostCity) (#436 ) - An integer checks if leprechaun is spawned (Lost City)	2020-12-14 15:25:02 -05:00
JohnsonMichaels123	169602b62b	Updated Lost City Progression and Max Quest Points (#437 ) - Lost City progression can be opened - Changed Max Quest Points	2020-12-14 15:24:48 -05:00
dginovker	b718346b4a	Move Lostcity to correct loc	2020-12-14 15:22:11 -05:00
dginovker	0cba36b2f7	Merge branch 'master' of https://github.com/2006rebotted/2006rebotted	2020-12-14 15:21:21 -05:00
Daniel Ginovker	0c94fbedc8	Add Jognson's Lost City (#434 )	2020-12-13 19:22:42 -05:00
dginovker	5ef14d6a9d	Add Jognson's Lost City	2020-12-13 19:21:54 -05:00
JohnsonMichaels123	aa57744d2a	Lost City Rewards Added (#433 ) Lost City Reward gives the player 3 quest points and access to Zanaris.	2020-12-13 18:27:24 -05:00
JohnsonMichaels123	38b4dbcf00	Level Up Fireworks GFX (#429 ) When player levels up, makes the fireworks effect.	2020-12-13 15:56:24 -05:00
JohnsonMichaels123	aea9ebbf0e	Added NPCs for Lost City Quest (#430 ) Added NPCs Monk, Wizard, Archer and Warrior west of Lumbridge swamp for quest "Lost City".	2020-12-13 15:56:15 -05:00
JohnsonMichaels123	f9bc9d2dff	Lost City Value for Quest Progression (#431 ) Added an int to store the progression of Lost City (lostCity).	2020-12-13 15:55:59 -05:00
JohnsonMichaels123	935a172b68	Fixed Rasolo The Merchant's Shop (#432 ) Fixed an issue where Rasolo the Merchant would open up the Fishing Guild Shop instead of his own.	2020-12-13 15:55:45 -05:00
JohnsonMichaels123	d3146dffb5	Spade Animation / SFX (#428 ) - Spade now plays animation and sound.	2020-12-13 15:55:26 -05:00
JohnsonMichaels123	c239af25ad	Sound Effects for Protection Prayers (#427 ) - Adds Sound Effects for Protection Prayers - Adds Sound Effect when Protection Prayers are disabled	2020-12-11 08:29:03 -05:00
JohnsonMichaels123	34ec942adc	Song when player levels up a skill (#426 ) Just plays a short song when a player levels up his skill.	2020-12-11 08:28:13 -05:00
Daniel Ginovker	dcf09b2a41	Fixcrashesnov2020 (#425 ) * Trycatch Discord Activity * Another exception catch	2020-11-17 21:51:16 -05:00
Daniel Ginovker	09437f5b4e	Trycatch Discord Activity (#424 )	2020-11-17 21:37:08 -05: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
Peter Farber	ebd55e6e8d	Mining Fixes \| Yell Command Fix (#420 ) * Fixed Yell Command * Added Mining Sounds. Fixed Addy and Mith Pickages.	2020-09-29 11:57:10 -04:00
Daniel Ginovker	dbb96f1257	Revert "[BUGFIX] Running in 1-tick (#414 )" (#419 ) This reverts commit `605a434edf`.	2020-09-04 20:14:44 -04:00
dginovker	64b422adeb	Fix for bootleg fix	2020-09-04 09:01:36 -04:00
dginovker	fd0bfda8a7	Bootleg fix for NPC aggro crash	2020-09-04 08:57:03 -04:00
Daniel Ginovker	9011688d2a	Update README.md	2020-09-01 10:30:02 -04:00
Sandro Coutinho	8a6cf6f1ae	[FEATURE] Data will now use json (#417 ) * [FEATURE] Item data is now loaded from json * [TASK] Renamed the old method into it's new use * [TASK] Removed unused code * [FEATURE] Added some more json's * [CLEANUP] Code cleanup * [FEATURE] NPC drops are now in json * [CLEANUP] Removed testing class	2020-08-13 12:50:04 -04:00
Sandro Coutinho	09343c6a8c	[BUGFIX] Al-Kharid & Shantay Pass banks, fixed waterskins (4) (#418 )	2020-08-09 19:45:16 -04:00
Daniel Ginovker	d9c91bb616	Make it build all submodules, not just server	2020-08-05 14:27:53 -04:00
Sandro Coutinho	0e63e0fa4e	Npc aggression fix (#416 ) * [BUGFIX] Running in 1-tick * [BUGFIX] Fixed NPC Aggression	2020-08-04 20:04:57 -04:00
Daniel Ginovker	dc397ba8d4	Create maven.yml	2020-08-04 19:44:22 -04:00
dependabot[bot]	057e92300f	Bump mysql-connector-java in /2006Redone file_server (#413 ) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.23 to 8.0.16. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.23...8.0.16) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-04 19:22:22 -04:00
dependabot[bot]	9facf855a1	Bump xstream from 1.4.1 to 1.4.10-java7 in /2006Redone file_server (#412 ) Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.1 to 1.4.10-java7. - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-08-04 19:22:16 -04:00
Daniel Ginovker	4bd24204fc	Update client IP (#415 )	2020-08-04 19:21:34 -04:00
Sandro Coutinho	605a434edf	[BUGFIX] Running in 1-tick (#414 )	2020-08-04 18:50:08 -04:00
Daniel Ginovker	e10ad156a9	Update README.md	2020-08-04 18:11:00 -04:00
Daniel Ginovker	eebc60084f	Make project setup easier with Maven (#411 ) * Remove a bunch of .ideas and class files to see if it makes the setup easier * remove some .idea's and imkls * Remove a ton of .class files * [TASK] Switched to maven instead of gradle * [TASK] Added target to gitignore * Remove ignored files * [TASK] Fixed file_server source * [TASK] Fixed client source * [BUGFIX] Main Class * [BUGFIX] Fixed SLF4J * [TASK] Server Libs cleanup * Update setup guide/debug * Maven cli compile instructions * [TASK] Jar building * Update runServer and runFileServer.sh Co-authored-by: Sandro Coutinho <sandro@farrelltech.org>	2020-08-04 17:57:19 -04:00
Daniel Ginovker	6684364b64	Fix passing through gate to training grounds + make ::shop bots tele to current loc first try (#410 )	2020-08-04 13:27:24 -04:00
Daniel Ginovker	d2e8945578	Fix old player shops not appearing (#409 ) * Add check that players are over total level 50, but shop items check is broken * Bots now only appear when they meet reqs! Woot! * Fix old bots not appearing	2020-08-03 13:59:02 -04:00
Daniel Ginovker	1a911f1ad0	Non-spammy player shops (#407 ) * Add check that players are over total level 50, but shop items check is broken * Bots now only appear when they meet reqs! Woot!	2020-08-03 13:28:43 -04:00
Daniel Ginovker	707783552f	Make ::players show everyone, even for non-mods (#406 )	2020-08-03 11:05:45 -04:00
Daniel Ginovker	c1df673033	Make bots stay after restart (#405 )	2020-08-03 10:52:16 -04:00
Damion	6085111d7c	Region factory (#404 ) * Split region loading and object population to factory class * Implement changes, disable CommandConsole * You guys don't omit /build/	2020-06-16 21:43:41 -04:00
Daniel Ginovker	5725a64abc	Add gameplay image	2020-06-11 20:44:56 -04: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
Mr Extremez	af578c400a	Few small changes (#402 ) - Fixed dragon battleaxe special - Fixed banks in canifis and al kharid - Added battlestaff enchanting - Made fight caves entrance spawn at correct coords - Did some small cleanup	2020-05-07 18:34:51 -04:00
dginovker	3387cd5f07	Fix conflicts	2020-05-07 18:33:56 -04:00
Mr Extremez	b4371d3129	A few things (#401 ) - Can't attack players or npcs through doors/walls anymore - Cleaned up a few small bits of code - Added a few new boundaries to the boundary system - Removed dialogue asking are you sure you want to empty your inventory for admins	2020-04-10 20:03:28 -04:00
Mr Extremez	43f4b14dbf	Various thing (#400 ) - Nearly perfected fight caves now (should fix wave spawning, some dialogue bugs, instance issues) - Added fully working monkey gree grees - Fixed somes skill interface typos - Added ability to dye goblin mails - Fixed restless ghost quest interface typo - Clarified herb cleaning required level message	2020-03-24 13:46:01 -04:00
dginovker	a55a0fdefb	latest compile	2020-03-18 10:05:56 -04:00
Mr Extremez	774d05f1e3	Update ItemData.java (#399 ) Should fix the bank note bug hopefully	2020-03-18 10:02:02 -04:00
dginovker	a9afe18014	Latest server compile	2020-03-13 20:53:10 -04:00
Mr Extremez	5706bc9853	Some quick patches (#398 ) - Bank all should now work for all items again - Fixed al kharid gate not functioning - Added unique cabbage pickable for Falador - Fixed desert disguise wrongly being noted - Reformatted some of the food code Closes #397 Closes #395 (I also included @Qweqker changes so that will fix lumbridge bank boundary and adds his new cabbage effect) Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2020-03-13 20:36:20 -04:00
Qweqker	f9a9eae356	Bank Adjustment, Cabbage Patch (Pun intended) (#396 ) * Added Cabbage ID for the cabbage that is supposed to spawn south of falador Moved unique food dialogue inside the text handler to avoid duplicate messages Added unique message for south of falador cabbage * Adjusted Lumbridge Bank Boundary Co-authored-by: Qweqker <qweqker@mail.com>	2020-03-13 20:33:52 -04:00
dginovker	801525fb0c	update website urls	2020-03-12 19:42:04 -04:00
Mr Extremez	cb65d89297	Update (#394 ) Closes #393 - Sophanem city gates now functioning Closes #392 - Improved rug travel, added missing travel options Closes #391 - Added those curtains, along with many more curtains and other functional objects Closes #390 - Dramen branch now untradeable/same with staff Closes #389 - Lumbridge door should no longer get stuck, should fix other doors aswell Closes #388 - Added Rasolo npc spawn Closes #385 - Added missing fishing guild spawns Closes #384 - Added missing port khazard npcs and a few other missing npcs too Closes #379 - Added smelt x option Closes #334 - Fixed dragon dagger store price and fixed high alch/low alch value for it Closes #278 - Fixed strange numbers on runecrafting interface Closes #244 -These were previously fixed Also included: - Added recieving random gems when mining (thanks to ben for pointing this out) - Reduced door usage delay - Random cleanup and deleted some unsued files/code - Fixed many npc item drop names (thanks to iizyy for pointing them out) - Fixed a few wizard tower doors - Did more cleanup with the some of the old boundary methods - Tidied up the discord commands and added the proper urls for them	2020-03-12 19:13:22 -04:00
Qweqker	db58bc868b	Player Death and Level Up Sounds, Cutscene Support (#383 ) * Added Player death Sound Added a ton of Level Up Sounds (Some I do not know) * Added command to play "quicksongs" * adjusted chat message to properly name the command * Added Camera functionality for cutscenes Added Camera shake functionality for cutscenes/barrows/anything else Added Camera reset functionality to return the player to the normal player view Added some details on what each added method does Refactored some of the method names for uniformity * Added some commands to test the cutscene/camera features that were added in PlayerAssistant.java Co-authored-by: Qweqker <qweqker@mail.com> Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2020-03-06 18:53:53 -05:00
Mr Extremez	e5799200d7	A few things (#382 ) - Added a distance check for item on object packet - Added cook x functionality - Removed a fair amount of dead code - Did some renaming and fixed some typos - Cleaned up a lot of the smithing code - Added a new boundary system to reduce code clutter - Fixed a firemaking bug	2020-03-06 18:52:10 -05:00
nocommento	804ceae886	Fix for issue #364 - staffs are now supported when enchanting jewellery (#381 ) * Added staff support when enchanting (issue #364) * Added staff support when enchanting (issue #364)	2020-02-28 17:51:05 -05:00
Daniel Ginovker	174bdf5bfd	Make farming not nuke & latest build (#378 ) * Farming Skill, Orb Charging, Battle Staff Creation, etc - Farming Skill Added - Orb charging implemented - Battle staff creation implemented - Cleaned up some code - Stuck command will now tele you from further out in wildy if you are not in combat - Fixed an issue with amulet of glory - Added forcechats for npcs at Gnome Agility Course, and for Cows, Ducks and Sheeps just like in actual osrs - Added base for God Book preaching * Remove setting farm level to 1 * Fix runServer.sh, patch farming skill nuke and latest build :) Co-authored-by: Mr Extremez <aeggers90@hotmail.com>	2020-02-19 08:46:42 -05:00
Mr Extremez	ef6968b283	Farming Skill, Orb Charging, Battle Staff Creation, etc (#377 ) - Farming Skill Added - Orb charging implemented - Battle staff creation implemented - Cleaned up some code - Stuck command will now tele you from further out in wildy if you are not in combat - Fixed an issue with amulet of glory - Added forcechats for npcs at Gnome Agility Course, and for Cows, Ducks and Sheeps just like in actual osrs - Added base for God Book preaching	2020-02-19 08:46:00 -05:00
Damion	9b220ec47c	Implemented Command Processor (#375 ) * Added CommandConsole and CommandProcessor Interface * Added two commands, ListPlayers and Stop * Registered commands with CommandConsole * Added request for console from main. Made help prompt not print after requesting help... * Moved some files around You didn't see anything * Bug fix * swap `break;` for `continue;` * cough bug fix	2020-02-15 13:47:56 -05:00
Danial	02c7c30582	Misc changes (#376 ) * Allow shop spawn anywhere if develop account + misc * update client * Update localhost client * fixup	2020-02-14 07:57:26 -05:00
dginovker	34a1fe0e04	Merge branch 'mrextremez-newchanges'	2020-02-11 20:01:37 -05:00
dginovker	56e2c43251	New setup instructions + server jar	2020-02-11 19:59:49 -05:00
dginovker	dc4edd3c32	Easier setup	2020-02-11 19:59:47 -05:00
dbrownidau	73da47ad18	Move shutdown call outside for loop.	2020-02-11 19:59:47 -05:00
dbrownidau	71256292eb	Added block on main thread until tick scheduler shutdown.	2020-02-11 19:59:47 -05:00
dbrownidau	91c0da9932	Fix doco	2020-02-11 19:59:46 -05:00
dbrownidau	2dee7d2d2b	Adjust formatting	2020-02-11 19:59:46 -05:00
dbrownidau	20568c8aaf	Synchronization lock not required for scheduleAtFixedRate(new Runnable(){}) https://stackoverflow.com/a/35498230	2020-02-11 19:59:46 -05:00
dbrownidau	5faa526cf2	Moved main loop into FixedRate scheduler. Added sync lock on runnable.	2020-02-11 19:59:46 -05:00
dginovker	c4160a3eba	New setup instructions + server jar	2020-02-11 19:47:39 -05:00
dginovker	4a134a819e	Easier setup	2020-02-11 18:53:00 -05:00
dginovker	95cdf3a029	Merge branch 'dbrownidau-fixedratetickloop'	2020-02-11 18:26:22 -05:00
dginovker	e20cf57adf	Merge branch 'fixedratetickloop' of https://github.com/dbrownidau/2006rebotted into dbrownidau-fixedratetickloop	2020-02-11 18:24:45 -05:00
Mr Extremez	217f341d7d	quick - removed some extra warnings lol	2020-02-10 00:42:02 -06:00
Mr Extremez	5ab79b1128	Range/Specials/Clean up - Added correct range distance for all range weapons - Fixed whip special attack when using on npcs - Removed some warnings - Refactored combat some - Fixed a few typos - Deleted some dead code - Fixed bug where you could kill players with auto retaliate outside of the wilderness if you were already fighting them when they ran out Closes #146 Closes #352 Also from a previous patch Closes #329	2020-02-10 00:40:21 -06:00
dbrownidau	1d95da80b7	Move shutdown call outside for loop.	2020-02-10 14:09:56 +11:00
dbrownidau	b665504c4b	Added block on main thread until tick scheduler shutdown.	2020-02-10 10:35:19 +11:00
dbrownidau	b855a98842	Fix doco	2020-02-10 01:35:40 +11:00
dbrownidau	00efcbbde9	Adjust formatting	2020-02-10 01:31:12 +11:00
dbrownidau	fb1321c8e0	Synchronization lock not required for scheduleAtFixedRate(new Runnable(){}) https://stackoverflow.com/a/35498230	2020-02-10 01:29:57 +11:00
dbrownidau	3eb6e87019	Moved main loop into FixedRate scheduler. Added sync lock on runnable.	2020-02-10 00:38:52 +11:00
dginovker	2bef5158c4	readd runserver.sh	2020-02-06 02:59:29 +00:00
Daniel Ginovker	e5e1495b4d	[WIP] New setup (#371 ) * Cleanup * Add build file * The great migration * Restore MINA to 1.1.7 * Removed .gradle * Added flatdir for libs with no artifact repository * Add README.md, rename Implementation-Title * New setup ease * Update reademe and modules.xml Co-authored-by: Damion <the@dbrown.id.au>	2020-02-03 17:40:24 -05:00
Damion	02b4df2666	Implementation of Gradle build framework (#369 ) * Cleanup * Add build file * The great migration * Restore MINA to 1.1.7 * Removed .gradle * Added flatdir for libs with no artifact repository * Add README.md, rename Implementation-Title	2020-02-03 17:13:57 -05:00
Daniel Ginovker	54f42aaf8a	Convert item definitions into JSON form and fix shop prices (#367 ) * Created itemdef.json with same content as itemdefs.gsu. Still need to read from it * Converted a lot of IDs, not all * All the runelocus shop items are in realshopvalues.json, all the old ones are in the regular json. Keeping this commit just in case something goes horribly, horribly wrong. * Verified shop values are correct	2020-02-01 10:52:28 -05:00
Mr Extremez	cbb7c7ba10	Various things enjoy! (#368 ) * Various things enjoy! - Added dairy churning - Fixed soft clay so it uses 1 at a time - Fixed spinning so it uses 1 at a time - Added working cooking gloves - Fixed mining animation glitch - Fixed rune essence spam - Added fix for tanning saying you do not have enough coins when you did - Added working ecofuntus prayer training - Added tiara binding and usage - Added proper locate on rune talismans - Can no longer pickpocket npc as it is dying - No longer thieve men when trying to talk to them - Improved birds nest to match accurately to rs - Added desert heating system - Cleaned up dialogue handler some - Added chat emotes for dialogues - Did some cleaning up - Every possible item that has an empty option can now be emptied - Cleaned up sheep shearing and improved it - Added man npc dialogue - Added back npc facing - Added random messages when logging in on login screen - Added player and staff player count for discord and ingame commands - Improving the hopping stones at lighthouse, better, but not perfect - You will no longer ever login and be at 0, 0 coordinates you will be automically moved to lumbridge - Added a few new npc definitions - Disabled rune mist requirement for admins - Added getId command for admins to easily find item item ids - Added working global chat [::yell, ::hideyell will hide yells, 30 second delay for regular players, can not yell if you are muted or if word is blocked by filter, includes saving] - Made a few changes to weight (should hopefully fix some of the weight bugs) closes #366 closes #358 closes #331 closes #356 closes #234 closes #270 closes #309 * quick patch - welcome screen bug fixed * Cooking distance patch - Cooking distance patch	2020-01-27 08:02:43 -05:00
dginovker	1d86d055a5	Merge commit w. Mr Extremez	2020-01-27 08:02:18 -05:00
Mr Extremez	e2c675c392	Woodcutting animation fix (#363 ) - Shouldn't copy other players anim anymore if more than 1 person is woodcutting closes #173	2020-01-14 07:28:34 -05:00
dginovker	eafe99af0a	Latest compile	2020-01-13 07:53:55 -05:00
Mr Extremez	60239a38cf	A few changes (#362 ) - Stalls now dissapear when thieving them - Added the missing coal rock in barbarian village - Added some height level checks for object spawns	2020-01-13 07:53:18 -05:00
Daniel Ginovker	85a0406d9b	Add rogues bank (#361 )	2020-01-11 21:45:16 -05:00
dginovker	dded6b8fd0	2.0 client notif	2020-01-10 18:15:01 -05:00
Mr Extremez	db1f5ed785	Some fixes (#359 ) - Added message of the week to welcome screen interface - Added face north when clicking compass - Disabled the blank tab on game frame - Fixed all of the dialogue issues I could find in rune mysteries - Fixed a few typos and did a very minor clean up in the dialogue file still a lot more planned soon - Disabled resizable on the client seeing as it doesnt work correct currently anyways	2020-01-08 18:27:59 -05:00
Gptaqbc	b1eaacf93c	Door fix to facilitate Rune Mysteries script (#350 ) Now some doors doesnt have forcemove anymore.	2020-01-07 17:57:08 -05:00
MitchvanWijngaarden	c48b2575e9	fixed essence mining when multiple people are mining (#349 )	2020-01-07 17:56:53 -05:00
dginovker	cad66fdcc8	Latest compile	2020-01-06 07:41:36 -05:00
Daniel Ginovker	d3a15b1aad	Update README.md	2020-01-03 17:23:16 -05:00
Mr Extremez	fdbb05597a	A few fun fixes (#348 ) - Ranging guild now works - Fletching should no longer randomly stop if more than on person is doing it - Added dragon longsword special attack Closes #346 Closes #216 Closes #245	2020-01-03 09:12:09 -05:00
Gptaqbc	6b9d1d5881	Resolved couple special attacks issues(Whip, magic long bows, draggon daggers) (#347 ) Resolved couple special attacks issues(Whip, magic long bows, draggon daggers) I also discovered some issues about the special attack. There is no delay between the special attack and the next hit and the dragon longsword special attack doesnt work at all.	2020-01-02 18:35:04 -05:00
dginovker	e3e74a6a25	Track github discord invites	2020-01-01 21:21:46 -05:00
dginovker	9272195db6	Merge branch 'master' of https://github.com/dginovker/2006rebotted	2020-01-01 17:58:04 -05:00
dginovker	3437877fb2	Made creating a new acc more obvious	2020-01-01 17:57:42 -05:00
MitchvanWijngaarden	33ef596bd3	Closes #343 . Allows multiple players to steal from a stall at the same tick. (#344 )	2020-01-01 12:51:12 -05:00
Mr Extremez	d1c2150c60	Random stuff (#342 ) - added poison arrows to usable arrows - cleaned up some code - changed ardougne tele to correct coords - enabled pest control (although it needs a lot of work still) - fixed some typos - made beads drop a bit more often, so its more accurate like real rs	2019-12-31 12:42:53 -05:00
dginovker	e8bfe7f88a	Fix ::Stuck & stacktrace (regression)	2019-12-30 23:47:23 -05:00
Gptaqbc	e88c5eaca8	Fixed the delay on banking a non stackable item (#341 ) Brought back old code as what I previously did affected the time it takes to bank items.	2019-12-30 23:25:01 -05:00
DavidVarbit	1b5f185944	* Fix: Runes are consumed even if you cant tele from wildy after level 20 #337 (#340 ) * Cleaned up Spell teleports	2019-12-30 18:53:09 -05:00
Gptaqbc	c27e629da2	Bank stuff (#339 ) * Fixed dcing on picking up items when inventory is full that I introduced * Added Shantay Pass bank area and changed Jukats shop stock	2019-12-30 15:37:27 -05:00
dginovker	bd97bdca3c	Quick compile	2019-12-30 13:48:25 -05:00
Gptaqbc	6ce09f3091	Fixed dcing on picking up items when inventory is full that I introduced (#338 )	2019-12-30 13:45:05 -05:00
dginovker	e6e18efe34	December 30th update early :)	2019-12-29 20:28:42 -05:00
Daniel Ginovker	c87f135e97	Fixed some items dcing client (#330 )	2019-12-27 12:47:56 -05:00
dginovker	54dc827dfa	Tee output so we can see if there's a server crash	2019-12-27 12:46:34 -05:00
dginovker	094c3f79dc	Merge branch 'master' of https://github.com/dginovker/2006rebotted	2019-12-26 00:44:51 -05:00
dginovker	8e68d9739c	update readme	2019-12-26 00:44:41 -05:00
Daniel Ginovker	43a0f3e9f1	Gptaqbc new stuff 6 (#328 ) * Some stuff on weight Some stuff on weight * Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog * removed a shitload of '== true' I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that. * Fixed drop issue * Fixed duel arena, changed some chat message so they are all the same, changed Additem Fixed duel arena: > 98% completed duel (the winning duel sound is still missing) > Added forfeiting > Added checks to prevent tbing, teleothers, teleport and logout from duel > Remove the check for same IP to disable duel Item Assistant: > Changed the AddItem method so it now drops items on the ground if inventory is full Cleaned some stuff while I was at it... * Update ItemAssistant.java Oupsie * Resolving my issues * Allow walking during movement * Why won't commit work Co-authored-by: Gptaqbc <56596815+Gptaqbc@users.noreply.github.com>	2019-12-26 00:33:18 -05:00
Daniel Ginovker	e8685c97d0	Remove prices.txt, which isn't used anymore it seems (#326 ) * Remove prices.txt, which isn't used anymore it seems * Actually git rm the file too...	2019-12-25 21:31:32 -05:00
dginovker	b79103ed79	Add link to PR guide	2019-12-25 20:28:36 -05:00
Gptaqbc	aa6b9a9aa0	New stuff 6 (#325 ) * Some stuff on weight Some stuff on weight * Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog * removed a shitload of '== true' I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that. * Fixed drop issue	2019-12-25 16:09:25 -05:00
Gptaqbc	5f500280b2	New stuff 6 (#324 ) * Some stuff on weight Some stuff on weight * Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog * removed a shitload of '== true' I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.	2019-12-25 13:01:24 -05:00
dginovker	1c2deaacb6	Make setup instructions easier	2019-12-24 19:58:26 -05:00
Gptaqbc	287018346b	Some stuff on weight (#323 ) * Some stuff on weight Some stuff on weight * Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog	2019-12-24 13:40:50 -05:00
Gptaqbc	850b09e6fc	New stuff 5 (#322 ) * Refactored smithing and added cannonball making in there too (?) as the interface have an option for it. Refactored smithing and added cannonball making in there too (?) as the interface have an option for it. * Added check for hammer when smithing Added check for hammer when smithing	2019-12-24 12:57:01 -05:00
dginovker	9759d004eb	latest compile	2019-12-23 22:42:22 -05:00
Gptaqbc	10070843e6	New stuff 4 (#319 ) * Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk * Commented clipping server side check so we can work on it Commented and brought back the old code so gates works while we work in the clipping check server side. * Added Canifis bank to the bank boolean * Fixed the drops problem * Added cannonball making, fixed some typos, added some command for admin to get 999k hp and prayer points(usefull for debugging) New feature: - Cannonball making New Commands: - ::hp - ::pray * Update DwarfCannon.java	2019-12-23 22:38:24 -05:00
Gptaqbc	b1b06e9cb9	Refactored smithing and added cannonball making in there too (?) as the interface have an option for it. (#320 ) Refactored smithing and added cannonball making in there too (?) as the interface have an option for it.	2019-12-23 22:37:55 -05:00
Daniel Ginovker	1702a9b726	Make 8 spaces 4 (#317 )	2019-12-23 12:54:42 -05:00
Mr Extremez	32bbf1e003	Quick patch (#316 ) - Fixed npc drops/anims - Fixed some combat sounds that were not working - Made Kalphite Queen a multi area	2019-12-23 12:23:04 -05:00
dginovker	bc4320ee68	fix drops	2019-12-22 17:35:10 -05:00
Gptaqbc	b07dd8cfb7	New stuff 4 (#315 ) * Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk * Commented clipping server side check so we can work on it Commented and brought back the old code so gates works while we work in the clipping check server side. * Added Canifis bank to the bank boolean * Fixed the drops problem	2019-12-22 17:34:35 -05:00
dginovker	7f7e00788e	latest compile	2019-12-22 16:03:42 -05:00
Gptaqbc	2790decd44	Added some sound, refactored fletching and arrowmaking a bit... I've … (#314 ) * Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk * Commented clipping server side check so we can work on it Commented and brought back the old code so gates works while we work in the clipping check server side. * Added Canifis bank to the bank boolean	2019-12-22 15:59:32 -05:00
Mr Extremez	c5c1c2fc35	Cats/kalphite queen/random (#313 ) - Did some work with the kalphite queen	2019-12-22 15:59:26 -05:00
Gptaqbc	17e5e7ea5c	Random stuff 3 (#312 ) * Make ::update automatically restart server as well * Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it * Fix noclip (NEEDS TESTING) * Revert "Fix noclip (#302)" This reverts commit `521ae52e4c`. * ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon -Removed the clip command from the client; -Fixed a typo in a dialogue; -Fixed mud battlestaff nto working as runes (water and earth); -Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot; * Snow improvement Nothing major * Fixed Click to teleport command Fixed Click to teleport command; * cleaned stuff * Update Commands.java * Fixed picking up items requiring 2 clicks when not standing on/near it. Fixed the sound so it doesnt repeat itself anymore if spamclicked. Fixed picking up items requiring 2 clicks when not standing on/near it. Fixed the sound so it doesnt repeat itself anymore if spamclicked. Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2019-12-22 00:05:59 -05:00
Gptaqbc	bda71ee34a	Random stuff 3 (#311 ) * Make ::update automatically restart server as well * Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it * Fix noclip (NEEDS TESTING) * Revert "Fix noclip (#302)" This reverts commit `521ae52e4c`. * ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon -Removed the clip command from the client; -Fixed a typo in a dialogue; -Fixed mud battlestaff nto working as runes (water and earth); -Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot; * Snow improvement Nothing major * Fixed Click to teleport command Fixed Click to teleport command; * cleaned stuff * Update Commands.java Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2019-12-21 18:46:34 -05:00
Gptaqbc	f6e8f2d851	Random stuff 3 (#308 ) * Make ::update automatically restart server as well * Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it * Fix noclip (NEEDS TESTING) * Revert "Fix noclip (#302)" This reverts commit `521ae52e4c`. * ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon -Removed the clip command from the client; -Fixed a typo in a dialogue; -Fixed mud battlestaff nto working as runes (water and earth); -Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot; * Snow improvement Nothing major * Fixed Click to teleport command Fixed Click to teleport command; * cleaned stuff Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2019-12-21 12:49:54 -05:00
dginovker	7157020ac6	Latest compile	2019-12-20 12:46:05 -05:00
dginovker	5ce95df4ea	Merge branch 'master' of https://github.com/dginovker/2006rebotted	2019-12-20 12:35:40 -05:00
dginovker	13977992d7	Fix most of the clipping (minor stuff with doors left)	2019-12-20 12:35:12 -05:00
Gptaqbc	2005be0948	Random stuff 3 (#307 ) * Make ::update automatically restart server as well * Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it * Fix noclip (NEEDS TESTING) * Revert "Fix noclip (#302)" This reverts commit `521ae52e4c`. * ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon -Removed the clip command from the client; -Fixed a typo in a dialogue; -Fixed mud battlestaff nto working as runes (water and earth); -Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot; * Snow improvement Nothing major Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2019-12-20 11:42:15 -05:00
MitchvanWijngaarden	0842e2bc9c	Added in ::prayer and ::energy commands, semi-closes #305 (#306 ) * Added in ::prayer and ::energy commands, closes #305 * Added in message prefix 'Run energy: ' and 'Prayer points: ' to ::prayer and ::energy commands.	2019-12-20 11:41:18 -05:00
Gptaqbc	a27b9e22f9	Random stuff 3 (#304 ) * Make ::update automatically restart server as well * Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it * Fix noclip (NEEDS TESTING) * Revert "Fix noclip (#302)" This reverts commit `521ae52e4c`. * ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon -Removed the clip command from the client; -Fixed a typo in a dialogue; -Fixed mud battlestaff nto working as runes (water and earth); -Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot; Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>	2019-12-19 22:50:15 -05:00
dginovker	00500a072b	Noclip fix thanks to ethan	2019-12-19 21:47:27 -05:00
Daniel Ginovker	cfa59f4a4d	Revert "Fix noclip (#302 )" (#303 ) This reverts commit `521ae52e4c`.	2019-12-18 20:02:13 -05:00
Daniel Ginovker	521ae52e4c	Fix noclip (#302 ) * Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it * Fix noclip (NEEDS TESTING)	2019-12-18 17:35:12 -05:00
Daniel Ginovker	62a22f8857	Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it (#301 )	2019-12-17 15:19:39 -05:00
Daniel Ginovker	223c3194a8	Fix bank packet exploit + fishing guild banking (#300 )	2019-12-17 15:11:59 -05:00
Daniel Ginovker	0653db8ad1	Fix some shop item prices (#296 )	2019-12-16 15:03:03 -05:00
dginovker	e0d795323b	Dec 15th update	2019-12-15 19:38:25 -05:00
dginovker	a16311ba15	Merge branch 'fix_packet_exploits'	2019-12-15 19:37:14 -05:00
Daniel Ginovker	f12181140b	Fix 32-bit java (#289 )	2019-12-15 19:33:23 -05:00
Daniel Ginovker	6bf8d407e0	Make ::update automatically restart server as well (#291 )	2019-12-15 19:33:16 -05:00
Gptaqbc	9ed0acfb04	Random fixes 2 (#294 ) * Make ::update automatically restart server as well * Added toggeable snow(only activable in december), added walking queue reset when using objects changing Z, made it so the wildy warning interface is appearing when entering in wildy For some reason the resetWalkingQueue added to the execute method wasnt doing anything so I manually added it to every interaction possible... LOL Wildy warning interface was appearing when clicking with player in wildy. I made it so it appears straight when walking 1 tile in wildy zone. Wont appears if player logs in wildy as he already knows this shit.	2019-12-15 19:33:03 -05:00
Mr Extremez	87eaaed36f	Fixes (#293 ) - Added ROL for player and npcs - Fixed Redemption now works for players and NPCs - Fixed prayer not updating on prayer tab when it goes down in points - Fixed not being able to use glories after trading them - Fixed item spawn crash (only affected some people such as myself and a few others)	2019-12-14 23:46:05 -05:00
dginovker	06d40b9a98	Fix banking packet exploit, & setup for a future of preventing packet exploits	2019-12-13 13:46:29 -05:00
dginovker	37322d4874	Latest updates	2019-12-12 23:11:24 -05:00
Josh Shippam	b94157f01b	Remove Accidentally Added Import (#285 )	2019-12-13 02:34:23 +00:00
Danial	c1a5cf449c	Shop fixes (#284 ) * Update ShopAssistant.java * Fixup fish selling/buying * fixup * tidy up * fixup 0 stock items being removed	2019-12-13 01:07:44 +00:00
Josh Shippam	23951e9af6	Implement Ring Of Forging (#283 )	2019-12-13 01:05:25 +00:00
Danial	2d58593be9	Fixup smelting (#281 ) * Fixup smelting * Move iron fail check, show message * revert * More smithing refactoring	2019-12-13 00:37:13 +00:00
Danial	9b160452ad	Update Commands (#280 ) * Show commands in interface * Update players command, add playershops command * Remove null command * Update Commands.class	2019-12-13 00:36:18 +00:00

3332 changed files with 550091 additions and 270121 deletions

									
										.github/workflows/maven.yml
									
		+38
		
												View File
												
				@@ -0,0 +1,38 @@

				# This workflow will build a Java project with Maven 

				# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

				name: Java CI with Maven

				on:

				  push:

				    branches: [ master ]

				  pull_request:

				    branches: [ master ]

				jobs:

				  build:

				    runs-on: ubuntu-latest

				    steps:

				    - uses: actions/checkout@v3

				    - name: Set up JDK 1.8

				      uses: actions/setup-java@v2

				      with:

				        distribution: 'zulu'

				        java-version: '8'

				        cache: 'maven'

				    - name: Build with Maven

				      id: build

				      run: |

				          mvn -B clean package

				          mkdir -p ~/artifacts

				          cp "2006Scape Client/target/client-1.0-jar-with-dependencies.jar" ~/artifacts/Client.jar

				          cp "2006Scape Server/target/server-1.0-jar-with-dependencies.jar" ~/artifacts/Server.jar

				          cp "2006Scape Server/ServerConfig.Sample.json" ~/artifacts/ServerConfig.json

				          cp SinglePlayer.bat ~/artifacts/

				          cp -r "2006Scape Server/plugins" ~/artifacts/

				          cp -r "2006Scape Server/data" ~/artifacts/

				    - name: Publish build to GH Actions

				      uses: actions/upload-artifact@v3

				      with:

				          path: ~/artifacts/*

				          name: 2006Scape-SinglePlayer

.gitignore

+13 -1

View File

@@ -1,5 +1,17 @@
 Redone\ Server/data/characters/
 Scape\ Server/data/characters/
 .idea/
 .idea/workspace.xml
 **/.idea/workspace.xml
 **/.idea/*
 */*.jar
 *.iml
 .DS_Store
 Scape Server/data/logs
 *.class
 *.project
 Scape Client/bin/
 *.prefs
 *.classpath
 # Ignore any json files in the server root (should only be config files, the sample file should still be updated)
 Scape Server/*.json

.idea/$PRODUCT_WORKSPACE_FILE$

Generated

-19

View File

@@ -1,19 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">
         <settings>
           <last-edited>1.7</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
         </settings>
       </state>
     </states>
   </component>
 </project>

.idea/.gitignore

Generated

-2

View File

@@ -1,2 +0,0 @@
 # Default ignored files
 /workspace.xml

.idea/2006rebotted.iml

Generated

-178

View File

@@ -1,178 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/2006Redone Server/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/2006Redone file_server/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/2006Redone Client/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/commons-lang3-3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/javac++.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/mina.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j-nop.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/xpp3-1.1.4c.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone Server/libs/xstream-1.4.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/javac++.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mina.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="file://$MODULE_DIR$/2006Redone Server/libs" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
         <jarDirectory url="file://$MODULE_DIR$/2006Redone Server/libs" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="library" name="libs" level="project" />
     <orderEntry type="library" name="commons-lang3-3.1" level="project" />
   </component>
 </module>

									
										.idea/artifacts/2006rebotted_jar.xml
									
Generated

		-11
	
												View File
											
				@@ -1,11 +0,0 @@

				<component name="ArtifactManager">

				  <artifact type="jar" name="2006rebotted:jar">

				    <output-path>$PROJECT_DIR$/CompiledServer/artifacts/2006rebotted_jar</output-path>

				    <root id="archive" name="2006rebotted.jar">

				      <element id="directory" name="META-INF">

				        <element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF" />

				      </element>

				      <element id="module-output" name="2006rebotted" />

				    </root>

				  </artifact>

				</component>

									
										.idea/artifacts/localhost_2006rebotted_jar.xml
									
Generated

		-11
	
												View File
											
				@@ -1,11 +0,0 @@

				<component name="ArtifactManager">

				  <artifact type="jar" name="localhost_2006rebotted:jar">

				    <output-path>$PROJECT_DIR$/CompiledServer/artifacts/localhost_2006rebotted_jar</output-path>

				    <root id="archive" name="localhost_2006rebotted.jar">

				      <element id="directory" name="META-INF">

				        <element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF" />

				      </element>

				      <element id="module-output" name="2006rebotted" />

				    </root>

				  </artifact>

				</component>

									
										.idea/checkstyle-idea.xml
									
Generated

		-16
	
												View File
											
				@@ -1,16 +0,0 @@

				<?xml version="1.0" encoding="UTF-8"?>

				<project version="4">

				  <component name="CheckStyle-IDEA">

				    <option name="configuration">

				      <map>

				        <entry key="checkstyle-version" value="8.25" />

				        <entry key="copy-libs" value="true" />

				        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />

				        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />

				        <entry key="scan-before-checkin" value="false" />

				        <entry key="scanscope" value="JavaOnly" />

				        <entry key="suppress-errors" value="false" />

				      </map>

				    </option>

				  </component>

				</project>

									
										.idea/libraries/commons_lang3_3_1.xml
									
Generated

		-17
	
												View File
											
				@@ -1,17 +0,0 @@

				<component name="libraryTable">

				  <library name="commons-lang3-3.1">

				    <CLASSES>

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/javac++.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mina.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />

				      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />

				    </CLASSES>

				    <JAVADOC />

				    <SOURCES />

				  </library>

				</component>

									
										.idea/libraries/libs.xml
									
Generated

		-7
	
												View File
											
				@@ -1,7 +0,0 @@

				<component name="libraryTable">

				  <library name="libs">

				    <CLASSES />

				    <JAVADOC />

				    <SOURCES />

				  </library>

				</component>

									
										.idea/misc.xml
									
Generated

		-6
	
												View File
											
				@@ -1,6 +0,0 @@

				<?xml version="1.0" encoding="UTF-8"?>

				<project version="4">

				  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">

				    <output url="file://$PROJECT_DIR$/CompiledServer" />

				  </component>

				</project>

									
										.idea/modules.xml
									
Generated

		-8
	
												View File
											
				@@ -1,8 +0,0 @@

				<?xml version="1.0" encoding="UTF-8"?>

				<project version="4">

				  <component name="ProjectModuleManager">

				    <modules>

				      <module fileurl="file://$PROJECT_DIR$/.idea/2006rebotted.iml" filepath="$PROJECT_DIR$/.idea/2006rebotted.iml" />

				    </modules>

				  </component>

				</project>

									
										.idea/vcs.xml
									
Generated

		-6
	
												View File
											
				@@ -1,6 +0,0 @@

				<?xml version="1.0" encoding="UTF-8"?>

				<project version="4">

				  <component name="VcsDirectoryMappings">

				    <mapping directory="" vcs="Git" />

				  </component>

				</project>

									
										.idea/workspace.xml
									
Generated

		-140
	
												View File
											
				@@ -1,140 +0,0 @@

				<?xml version="1.0" encoding="UTF-8"?>

				<project version="4">

				  <component name="ArtifactsWorkspaceSettings">

				    <artifacts-to-build>

				      <artifact name="localhost_2006rebotted:jar" />

				    </artifacts-to-build>

				  </component>

				  <component name="ChangeListManager">

				    <list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">

				      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />

				    </list>

				    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />

				    <option name="SHOW_DIALOG" value="false" />

				    <option name="HIGHLIGHT_CONFLICTS" value="true" />

				    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

				    <option name="LAST_RESOLUTION" value="IGNORE" />

				  </component>

				  <component name="FindInProjectRecents">

				    <findStrings>

				      <find>math.sq</find>

				    </findStrings>

				  </component>

				  <component name="Git.Settings">

				    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />

				  </component>

				  <component name="ProjectFrameBounds">

				    <option name="x" value="-7" />

				    <option name="width" value="1294" />

				    <option name="height" value="1407" />

				  </component>

				  <component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />

				  <component name="PropertiesComponent">

				    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />

				    <property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />

				    <property name="project.structure.last.edited" value="Project" />

				    <property name="project.structure.proportion" value="0.15" />

				    <property name="project.structure.side.proportion" value="0.2" />

				  </component>

				  <component name="RunDashboard">

				    <option name="ruleStates">

				      <list>

				        <RuleState>

				          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />

				        </RuleState>

				        <RuleState>

				          <option name="name" value="StatusDashboardGroupingRule" />

				        </RuleState>

				      </list>

				    </option>

				  </component>

				  <component name="RunManager" selected="Application.GameEngine">

				    <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">

				      <option name="MAIN_CLASS_NAME" value="Client" />

				      <module name="2006rebotted" />

				      <method v="2">

				        <option name="Make" enabled="true" />

				      </method>

				    </configuration>

				    <configuration name="FileServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">

				      <option name="MAIN_CLASS_NAME" value="org.apollo.jagcached.FileServer" />

				      <module name="2006rebotted" />

				      <option name="WORKING_DIRECTORY" value="2006Redone file_server" />

				      <extension name="coverage">

				        <pattern>

				          <option name="PATTERN" value="org.apollo.jagcached.*" />

				          <option name="ENABLED" value="true" />

				        </pattern>

				      </extension>

				      <method v="2">

				        <option name="Make" enabled="true" />

				      </method>

				    </configuration>

				    <configuration name="GameEngine" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">

				      <option name="MAIN_CLASS_NAME" value="com.rebotted.GameEngine" />

				      <module name="2006rebotted" />

				      <option name="WORKING_DIRECTORY" value="2006Redone Server" />

				      <extension name="coverage">

				        <pattern>

				          <option name="PATTERN" value="redone.*" />

				          <option name="ENABLED" value="true" />

				        </pattern>

				      </extension>

				      <method v="2">

				        <option name="Make" enabled="true" />

				      </method>

				    </configuration>

				    <list>

				      <item itemvalue="Application.FileServer" />

				      <item itemvalue="Application.GameEngine" />

				      <item itemvalue="Application.Client" />

				    </list>

				    <recent_temporary>

				      <list>

				        <item itemvalue="Application.GameEngine" />

				        <item itemvalue="Application.FileServer" />

				        <item itemvalue="Application.Client" />

				      </list>

				    </recent_temporary>

				  </component>

				  <component name="SvnConfiguration">

				    <configuration />

				  </component>

				  <component name="TaskManager">

				    <task active="true" id="Default" summary="Default task">

				      <changelist id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="" />

				      <created>1572306880139</created>

				      <option name="number" value="Default" />

				      <option name="presentableId" value="Default" />

				      <updated>1572306880139</updated>

				    </task>

				    <servers />

				  </component>

				  <component name="Vcs.Log.Tabs.Properties">

				    <option name="TAB_STATES">

				      <map>

				        <entry key="MAIN">

				          <value>

				            <State>

				              <option name="COLUMN_ORDER" />

				            </State>

				          </value>

				        </entry>

				      </map>

				    </option>

				    <option name="RECENT_FILTERS">

				      <map>

				        <entry key="Branch">

				          <value>

				            <list />

				          </value>

				        </entry>

				        <entry key="User">

				          <value>

				            <list />

				          </value>

				        </entry>

				      </map>

				    </option>

				  </component>

				</project>

2006Redone Client/.classpath

-6

View File

@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

2006Redone Client/.gradle/4.10/fileChanges/last-build.bin

BIN

View File

Binary file not shown.

2006Redone Client/.gradle/4.10/fileHashes/fileHashes.bin

BIN

View File

Binary file not shown.

2006Redone Client/.gradle/4.10/fileHashes/fileHashes.lock

BIN

View File

Binary file not shown.

2006Redone Client/.gradle/4.10/gc.properties

View File

2006Redone Client/.gradle/4.10/taskHistory/taskHistory.bin

BIN

View File

Binary file not shown.

2006Redone Client/.gradle/4.10/taskHistory/taskHistory.lock

BIN

View File

Binary file not shown.

2006Redone Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock

BIN

View File

Binary file not shown.

									
										2006Redone Client/.gradle/buildOutputCleanup/cache.properties
									
		-2
	
												View File
											
				@@ -1,2 +0,0 @@

				#Tue Jun 18 15:12:25 EDT 2019

				gradle.version=4.10

2006Redone Client/.gradle/buildOutputCleanup/outputFiles.bin

BIN

View File

Binary file not shown.

2006Redone Client/.gradle/vcs-1/gc.properties

View File

2006Redone Client/.project

-17

View File

@@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>RS2006</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

2006Redone Client/.settings/org.eclipse.jdt.core.prefs

-11

View File

@@ -1,11 +0,0 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

2006Redone Client/2006Redone Client.iml

-11

View File

@@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>