Compare commits

...

270 Commits

Author SHA1 Message Date
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
dginovker f39993e3d9 Latest compile + jars 2019-12-12 04:54:04 -05:00
Mr Extremez 6ad9d1f7e9 Random fixes (#273)
- Cant open nest if you do not have space
- Added working yo yo
- Added monks robe spawns
- Added ability to make god pages
- Removed a few warnings

closes #265
closes #262
closes #259
closes #243
2019-12-12 04:32:56 -05:00
Danial 8ec8a92d20 Fix for boots of lightness (#272) 2019-12-12 04:32:06 -05:00
Gptaqbc c891e4741e Added Winter theme and fixed couple items that werent wore in the correct slot (#271)
Added Winter theme and fixed couple items that werent wore in the correct slot
2019-12-12 04:31:21 -05:00
Daniel Ginovker 64ae22188f Small shop QoL (#267)
* Shop command clarification

* small syntax
2019-12-11 00:43:58 -05:00
Daniel Ginovker f3b47bb0d6 Added warning for 32-bit and > 1.8 Java versions (#264)
* Added warning for 32-bit and > 1.8 Java versions

* Clarify why
2019-12-10 19:21:45 -05:00
Daniel Ginovker dc4694c24c Remove rare protection, add all NPCs to a static list (#254) 2019-12-09 22:59:54 -05:00
Daniel Ginovker a9d720fbae Remove some perma aggro monsters (#252) 2019-12-09 18:50:39 -05:00
dginovker ba7daa72d5 Latest compile 2019-12-07 21:19:44 -05:00
Gptaqbc 55a35a26b2 A lot of fixes (#242)
* Fixed stuff related to shop trading

> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop

* Fixed some stuff related to agility

-Removed a useless obstacle in wilderness course that alowed insane xp gains;
-Added some 'flexibility' to some obstacles at agility pyramid;
-Removed useless vars;
-Added proper xp to obstacles;
-Added bonus xp for completing agility pyramid
-Most likely more;

***Animations still missing: Crossing gaps and jumping gaps***

* resolve conflicts

* delete old files

* A lot of fixes

Christmas Cracker (anim other player & text & admin right & rare protection)
Added check in stack value when withdrawing from bank to prevent losing items when max int value is reached
fixed double message on pickpocketing when in combat
Renamed methods
Removed unused methods
Removed admin restriction when trying to use the cannon
Cleaned KBD drops
Boots of lightness weight reduction is fixed
More...
2019-12-07 21:16:18 -05:00
Mr Extremez 8e524cdcda Couple quick fixes (#240)
- Fix global drops at KQ
- Should fix pickpocketing crash hopefully

closes #236
closes #233
2019-12-06 16:12:48 -05:00
dginovker 9c21669609 Merge branch 'misc2' of https://github.com/RedSparr0w/2006rebotted 2019-12-05 23:08:25 -05:00
dginovker 06798c5e90 Merge branch 'RedSparr0w-misc2' 2019-12-05 23:06:30 -05:00
RedSparr0w 8317f3f031 check player has completed tutorial island 2019-12-06 15:14:31 +13:00
dginovker d9d450f61e Latest compile 2019-12-05 12:58:10 -05:00
Mr Extremez 8af938548b More fixes (#235)
- Dwarf cannon can now be seen by anyone and not just the person who sets it down (they can also see the rotation now)
- Fixed doors being removed when clicking them
- Removed banking command for regular players
- Fixed nulodion now only gives if you have space
- Updated nulodion message so it doesnt say to find him at home
- Npcs wont follow you if you turn on the cantAttack comamand (for admins
- Fixed gate at KBD
- Fixed the gates at Ice giants in wildy

#closes 132
#closes 203
#closes 211
#closes 6

also this one should be closed from previous patch

#closes 219
2019-12-05 12:55:25 -05:00
dginovker 9fb110bb41 Latest compile, hopefully fix bug 2019-12-04 22:24:07 -05:00
Mr Extremez 402d732975 Some fixes (#231)
* Some fixes

- Changed lumbridge teleport to require 31 magic instead of 32
- Added back gaining items from thieving stalls
- Fixed dialgoue issue after leveling up skill (such as smithing)
- Made god capes untradable
- Removed cannon balls from shop (they werent supposed to be in there)

* refactor pickpocketing slightly

* more refactoring, actual random

* refactor, each stall has it's own respawn timer

* refactor argument names

* Update Stalls.java
2019-12-04 21:13:47 -05:00
RedSparr0w 199df17cf9 bots don't drop items 2019-12-02 21:00:16 +13:00
dginovker 256452114c latest compile 2019-12-01 19:08:27 -05:00
Gptaqbc e2cf6d2998 Agility fixes (#224)
* Fixed stuff related to shop trading

> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop

* Fixed some stuff related to agility

-Removed a useless obstacle in wilderness course that alowed insane xp gains;
-Added some 'flexibility' to some obstacles at agility pyramid;
-Removed useless vars;
-Added proper xp to obstacles;
-Added bonus xp for completing agility pyramid
-Most likely more;

***Animations still missing: Crossing gaps and jumping gaps***

* resolve conflicts

* delete old files
2019-12-01 19:03:29 -05:00
Danial 705f624a2b Add message showing how many coins you collected from your shop (#227) 2019-12-01 19:03:04 -05:00
dginovker fdac3e1422 Latest compile 2019-12-01 13:58:48 -05:00
dginovker 414c9c3d0d New .sh script paths 2019-12-01 13:55:30 -05:00
Danial bbb33d243e Fixup, Add new command (#226)
* refactor saving

* add command to change password

* cleanup
2019-12-01 13:40:54 -05:00
dginovker 930bc8d37b class cleanup + latest compile 2019-11-29 20:27:51 -05:00
Danial d4b16a25aa Fixup being able to kill monsters without correct slayer level (#220)
* Cannon only fire at npcs on same height level.

* Cannon cannot kill monsters if you do not have the slayer level
2019-11-29 00:04:53 -05:00
Danial 680a0c2ee0 Add more shop definitions, Add legends guild stores (#217)
* remove trailing \t add legends guil shop

* Add missing shops

* remove out of scope items (non 317)

* fix item id

* Add legends guild shop npc

* Add Legends Guild General Store.

* Update ShopHandler.java
2019-11-28 11:49:14 -05:00
Mr Extremez 68256e41d8 Some more minor clean up (#215)
* General clean up

- Reduced woodcutting code by alot, reverted the array to an enum
- Moved the login player method to the packet sender
- Deleted some dead code/cleaned up

* More random cleanup/refractoring

- Moved combat constants to combatconstants.java
- Moved dialogue options to dialogueoptions.java
- Deleted more dead code

* Replaced some poorly written methods

- refreshSkill, levelUp, and getTotalLevel all used way too much code for such a simple function so cleaned it up
- deleted a few other bits of dead code

* Fight caves

- Should fix fight caves npcs nulling out in the middle of your waves if they are too far away
- Also removed some unneeded scynchronization in itemassistant.java

* Gates

- Started cleaning up gate system, still can be improved a lot more
2019-11-28 11:47:06 -05:00
Daniel Ginovker 20303071de Updated setup guide for new refactor (#214) 2019-11-25 12:33:43 -05:00
Mr Extremez d876a923b9 Cleanup part 1 (#213)
* Clean up part 1

- Removed lots of dead code
- Removed unncessary files not in use
- Cleaned up small bits of code
- Removed a few warnings
- Server.java ---> GameEngine.java
- Constants.java ---> GameConstants.java

* Cape Dye

Rewrote cape dying

* Packaging

- redone ----> com.rebotted

* PacketSender/clean up

- ActionSender ---> PacketSender
- Moved many more packets to packetsender
- Cleaned up more dead code

* Merge Client/Player

- Merged Client.java with Player.java (both were doing same thing so redundant to have both)
- Removed some more dead code
- Tidy a few small things up

* Quests/more clean up

- Removed more dead code
- Made quests static in order to clean them up a bit

* More cleanup

- Removed some more of the dead quest code
- Correcting naming of some of the shop variables
2019-11-25 12:08:56 -05:00
Danial 3d1ae1b288 remove deleteItem2 → deleteItem (#212) 2019-11-24 23:07:52 -05:00
dginovker f1ea4810dd Merge fix: 2019-11-24 14:09:18 -05:00
dginovker c9c3888c20 runserver.sh loop update 2019-11-24 14:04:38 -05:00
dginovker a50f7d548b Merge branch 'RedSparr0w-bot' 2019-11-24 14:00:35 -05:00
dginovker fd31f57f5d Merged: 2019-11-24 13:59:52 -05:00
mikeysasse2 3650170a84 Fixed random trees everywhere (#209)
* Fixed random trees everywhere

* Npcs will no longer face southwest every time they take a step.
Added a fixed for walking forever after teleporting/region change (only tested that walking still works, never tested if the fix would resolve the issue).
You can now only click an object once per tick.
2019-11-24 13:48:02 -05:00
RedSparr0w 4e8832cded tidy up 2019-11-24 23:47:47 +13:00
RedSparr0w 4b78f6c136 give slayer xp on kill 2019-11-24 23:41:43 +13:00
dginovker 8393c0c928 Pmods can run ;:update 2019-11-24 01:00:38 -05:00
RedSparr0w 564f400007 check un noted version for buy price etc 2019-11-24 17:50:34 +13:00
RedSparr0w c3f4e831a3 trim the excess tabs 2019-11-24 16:43:02 +13:00
RedSparr0w 9d57cb6d1a Buy noted items from player owned stores 2019-11-24 16:37:03 +13:00
RedSparr0w ab57946a01 items are un noted when sold to shop 2019-11-24 16:28:31 +13:00
RedSparr0w f7d719c811 refactor saving 2019-11-24 16:27:10 +13:00
RedSparr0w 2498cff188 Only un note items if its not player owned 2019-11-24 15:38:46 +13:00
RedSparr0w 209b3b3bf3 Update HighscoresHandler.java 2019-11-24 13:16:10 +13:00
RedSparr0w 4f5c808298 Fixup highscores, ignore admin dev and bots 2019-11-24 13:02:53 +13:00
RedSparr0w 8920ff512a Face bot random direction 2019-11-24 00:13:17 +13:00
RedSparr0w 66cc2e47fe dont count bots toward player count, add playerBotCount 2019-11-23 21:22:48 +13:00
RedSparr0w e110ba296e Exclude bots from player counts 2019-11-23 21:08:51 +13:00
RedSparr0w 2104fd9918 Bots use normal chat, with effects 2019-11-23 20:40:56 +13:00
RedSparr0w 576bee32c3 lowercase item name 2019-11-23 17:39:38 +13:00
RedSparr0w c91027f25f lowercase metric 2019-11-23 17:32:12 +13:00
RedSparr0w 64ce050d10 add gp to lower prices 2019-11-23 17:25:19 +13:00
RedSparr0w bda929229e Fixup free space check 2019-11-23 17:07:13 +13:00
RedSparr0w 05a3a912f6 Add comments 2019-11-23 17:05:25 +13:00
RedSparr0w 4c42557332 Tidy up number formating 2019-11-23 17:01:18 +13:00
RedSparr0w f4ea14f2bf Fixup rounding for millions 2019-11-23 16:47:32 +13:00
RedSparr0w e42394fdbe Update ShopHandler.class 2019-11-23 16:26:06 +13:00
RedSparr0w 28b7163c6d Add another check to not remove items 2019-11-23 16:25:48 +13:00
RedSparr0w ded7cd28b8 Set currencyName 2019-11-23 16:13:24 +13:00
RedSparr0w 626d237a8e reset workspace 2019-11-23 15:53:01 +13:00
RedSparr0w 4445fc0871 Update workspace.xml 2019-11-23 15:05:30 +13:00
RedSparr0w e519d1b00b Fixup buying too many items 2019-11-23 14:58:44 +13:00
RedSparr0w 2b93d72a15 Add trade zones 2019-11-23 14:32:16 +13:00
RedSparr0w 2683ab888b Make it so bots cannot be attacked by npcs 2019-11-23 14:05:58 +13:00
RedSparr0w 3a4895590e fixup close shop, re-open shop 2019-11-23 14:01:42 +13:00
RedSparr0w a1ff2458f1 update close shop method 2019-11-23 13:48:46 +13:00
RedSparr0w 5a520fa316 Add close shop command 2019-11-23 13:29:17 +13:00
RedSparr0w aa61fc5cbf add ability to withdraw your profits 2019-11-23 12:38:41 +13:00
RedSparr0w b920549af0 don't charge player to withdraw items from their store 2019-11-23 12:02:22 +13:00
RedSparr0w 10c7adf74d fixup ordering of shop items 2019-11-23 11:39:03 +13:00
RedSparr0w d2cf6fac12 Take players appearance 2019-11-23 11:17:40 +13:00
RedSparr0w b940e8e859 Set custom prices 2019-11-23 11:05:43 +13:00
RedSparr0w e0925538c7 Remove items from players store/bank 2019-11-23 02:20:06 +13:00
RedSparr0w ca12809861 Semi functional player shops 2019-11-23 01:44:57 +13:00
RedSparr0w 3afb44615e Update shops.cfg 2019-11-23 01:43:52 +13:00
RedSparr0w bff9e44d8f remove logging 2019-11-22 21:25:57 +13:00
RedSparr0w d6ec93b199 Fixup shops 2019-11-22 21:23:36 +13:00
RedSparr0w abc3a9859f Merge remote-tracking branch 'upstream/master' into bot 2019-11-22 20:48:03 +13:00
RedSparr0w ae883964af Check if shop owned by player to sell items 2019-11-22 20:47:36 +13:00
RedSparr0w d62e5a8d70 increase total stores, decrease total items 2019-11-22 20:47:18 +13:00
RedSparr0w 544f266c8f Open player shop 2019-11-22 20:46:39 +13:00
RedSparr0w 23081c0eac Update ShopHandler.java 2019-11-22 20:45:58 +13:00
RedSparr0w 8b4969a882 Update bot properName 2019-11-22 20:45:42 +13:00
RedSparr0w e282778f22 Update BotHandler.java 2019-11-22 20:45:26 +13:00
RedSparr0w b6a590d44f Update PlayerAssistant.java 2019-11-22 20:45:18 +13:00
RedSparr0w 7627ed80eb Give bot same stats as player 2019-11-22 19:39:51 +13:00
RedSparr0w 0543919ed1 empty bots inventory 2019-11-22 19:26:26 +13:00
RedSparr0w a91dc597e9 update bots handling, spawn bot on player 2019-11-22 19:11:03 +13:00
RedSparr0w 07472a9a90 more stuff 2019-11-22 17:28:14 +13:00
RedSparr0w 6e3f76329a force logout on timeout 2019-11-22 16:40:18 +13:00
dginovker 03721c5c1a Emergency fix 2019-11-21 21:23:11 -05:00
dginovker 3c332cd653 Latest compile 2019-11-21 21:11:28 -05:00
Mr Extremez 34f2665858 Redemption Prayer/Fixes/Clues/Tidying up/Rares (#207)
- closes #205
- closes #197
- closes #145

Does the followiwng
- Adds functional redemption prayer
- Fixes max stack deletion when trading
- Adds toggle for clue scrolls, currently set on disabled until someone gets the time to finish clue scrolls
- Cleans up a few minor things
- Removes a few bits of dead code
- Re enables rare detection
2019-11-21 21:09:17 -05:00
RedSparr0w 447fc738d9 initial bots 2019-11-22 13:03:02 +13:00
Danial 4b3bb7ade7 Random slayer task amounts, Move unequiped item to same slot as weapon you are equiping (#206)
* tidy up

* Update DialogueHandler.java

* Slayer master gives specific difficulty tasks

* int

* tidy up

* replace difficulty int, with variable

* Dragons give lower amount needed to kill

* vail -> vial

* Update ObjectsActions.java

* tidy up

* tidy up

* tidy up

* Assign random amounts

* tidy up, remove magic numbers

* move rebinding of equip slot

* tidy up and move unequiped items to same inventory slot

* Drop castlewars flag when equiping a weapon

* vars

* tidy up
2019-11-21 14:10:30 -05:00
dginovker 92688def31 noip, thanks @Dark98 :) 2019-11-19 23:24:45 -05:00
Gptaqbc c0c6b40387 Fixed stuff related to shop trading (#202)
> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop
2019-11-19 13:11:16 -05:00
dginovker 820c6fafba Latest compile + crash fix 2019-11-18 16:31:10 -05:00
Danial 27b5f075bc bunch o changes (#200)
* Create cluescrolls.txt

* tidy up

* fixup ::item command

* tidy up

* fixup fight caves checker
2019-11-18 16:28:00 -05:00
dginovker 925c91406d Latest compile 2019-11-18 12:09:13 -05:00
Danial e5a0f84fcc Update Slayer (#196)
* tidy up

* Update DialogueHandler.java

* Slayer master gives specific difficulty tasks

* int

* tidy up
2019-11-18 12:01:03 -05:00
Danial 26ff191af3 Update drop handling, Allow rares, Remove some logging (#193)
* Fix local Parabot instructions

* Add kick command, and force logout function

* Allow rare items (phats etc)

* remove random server logging

* implement random drop amount

* fixup random events message
2019-11-17 19:31:18 -05:00
Mr Extremez 2b6ff7db02 Global drops/monks/al kharid furnance (#192)
closes #177
closes #136 (hp restoring works, couldn't find the anim tho)
closes #178 (should fix all the issues, let me know for sure)
Also removed the object does not exist message ingame for non admins and got rid of the isBotting code when clicking objects
2019-11-17 18:30:08 -05:00
dginovker 855f4b9ab7 Red's compile 2019-11-17 15:34:30 -05:00
Danial 4a2358945c Update Scrolls (#191)
* Fix local Parabot instructions

* Add kick command, and force logout function

* Update scroll handling
2019-11-17 15:33:10 -05:00
dginovker 92c5ac1f7e Latest compile 2019-11-17 14:59:20 -05:00
Gptaqbc e28bada221 New stuff again (#190)
* Fixes some agreesive monsters that should be unaggressive

Fixes some agreesive monsters that should be unaggressive

* more items

more items

* Update Item.java

* Fixed some items visual bugs - Helmet

Fixed some items visual bugs - Helmet

* Fixed trading issues.

Fuck up players couldnt trade because they were considered busy. Also fixed the trade screen that stays opened even when other player is out of it.

* removed shit that occured while fixing the conflict.

removed shit that occured while fixing the conflict.
2019-11-17 14:38:33 -05:00
Danial 8570b5f531 Minor tidy up, Update specials stats (#189)
* Fix local Parabot instructions

* Add kick command, and force logout function

* fixup abyss

* fixup tokkull selling

* tidy up

* update abyssal whip special accuracy

* update specials from wiki

* eh

* remove system log
2019-11-17 14:23:28 -05:00
dginovker 9dcc1eee0b Latest compile 2019-11-17 01:50:36 -05:00
Gptaqbc 9ed8ea8ae7 Next branch again (#187)
* Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system

Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system

* Fixed typo

Fixed typo

* Fixed item fuck up when wearing them. For example full helm trimmed and robes trimmed

Fixed item fuck up when wearing them. For example full helm trimmed and robes trimmed
2019-11-17 01:45:48 -05:00
Gptaqbc e8cbb975bc Fixes some agreesive monsters that should be unaggressive (#188)
Fixes some agreesive monsters that should be unaggressive
2019-11-17 01:45:10 -05:00
dginovker 3592cb7af9 Latest compile 2019-11-16 20:51:28 -05:00
Danial b13fa89de2 Fix Abyss, Fix selling for tokkull (#186)
* Fix local Parabot instructions

* Add kick command, and force logout function

* fixup abyss

* fixup tokkull selling
2019-11-16 20:50:13 -05:00
Daniel Ginovker 165f156814 Fix dark wizzies aggro, add more togglerender commands and add it to ::commands itself, fixed spam clicking tree gives a ton of logs (#185)
* Finish #167

* Fix #182

* Fixed #183
2019-11-16 18:17:54 -05:00
dginovker 7366de67e1 Fix localhost/live serv parabot jars 2019-11-14 13:39:08 -05:00
dginovker 982ae74d37 gitignore update 2019-11-11 15:49:24 -05:00
mikeysasse c827d46ca0 Projectile clipping, PassDoor fix (#176)
* Numbered packet sizes.
Corrected sound packet length to 6 from 5.
Corrected sound packet in server.
Teleport sound now plays correctly.
Corrected modern teleport animation playthrough.
Removed redundant teleport delay.

* Changed sendSound packet size back to 5 and removed type attribute to maintain compatibility with Parabot.

* After running around an object to attack the player will no longer wait a number of ticks to start attacking again.
Fixed an issue where walkTo being called from CycleEvents would not execute correctly.
Player will no longer face a killed npc after it respawns.
Added projectile clipping.
Added a new algorithm for player->player/npc following that accounts for projectile clipping.
2019-11-11 15:20:02 -05:00
dginovker a4e4b89d99 Latest compile! 2019-11-11 00:30:09 -05:00
Mr Extremez d14f4e5044 Changesftw (#172)
* Npc definitions/npc aggressiveness

Let me know how it works

* Error fix

fixes error
2019-11-11 00:26:47 -05:00
Daniel Ginovker e26f32439a Revert "Npc definitions/npc aggressiveness (#169)" (#171)
This reverts commit 2aef86ed25.
2019-11-11 00:22:35 -05:00
Daniel Ginovker 2f26fbe5fb Lag fixed :) (#170) 2019-11-11 00:21:40 -05:00
Mr Extremez 2aef86ed25 Npc definitions/npc aggressiveness (#169)
Let me know how it works
2019-11-11 00:20:00 -05:00
Danial 6cda5d5c78 Disable graphics, lower CPU & GPU usage (#168)
* Fix local Parabot instructions

* Add kick command, and force logout function

* Add graphics toggle option

* add alias
2019-11-10 23:32:33 -05:00
Mr Extremez d53ed61064 Finally should fix aggressiveness smh (#165)
closes #160

Let me know if this doesn't work, but hoping it does. My local testing had it working perfectly
2019-11-10 22:09:54 -05:00
dginovker 679fad7b18 latest compile 2019-11-10 19:50:19 -05:00
Gptaqbc dc3f561868 Faster shop restocking - Brought back normal stack of items in shops … (#164)
* Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system

Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system

* Fixed typo

Fixed typo
2019-11-10 19:46:24 -05:00
dginovker c6155eb529 4u Captcha 2019-11-10 13:00:54 -05:00
Gptaqbc 4db7ee6761 Fixed an issue with teleother that wasnt working at all. (#159)
Fixed an issue with teleother that wasnt working at all.
2019-11-10 12:26:41 -05:00
dginovker 8d14d76313 latest compile 2019-11-10 12:20:34 -05:00
Mr Extremez aaf0a48140 Fixes npc aggressiveness (#155)
closes #142
2019-11-10 12:18:00 -05:00
Danial 68013f3498 Add kick command, and force logout function (#154)
* Fix local Parabot instructions

* Add kick command, and force logout function
2019-11-10 12:17:47 -05:00
dginovker afd1da91e1 Latest compile 2019-11-09 18:14:00 -05:00
Josh Shippam 4490de88c4 Merge pull request #151 from Dark98/master
Fix Onyx Amulet Stringing
2019-11-09 22:06:19 +00:00
Dark98 58dab39d3b Fix Onyx Amulet Stringing 2019-11-09 22:05:29 +00:00
Josh Shippam 8ef0b3662e Merge pull request #150 from Dark98/master
Fix Highscores problem & only Save Highscores for Mod & Lower
2019-11-09 21:53:13 +00:00
Dark98 6b4b1eddf7 Fix Highscores problem & only Save Highscores for Mod & Lower 2019-11-09 21:51:05 +00:00
Dark98 c2a768a354 Merge https://github.com/dginovker/2006rebotted 2019-11-09 21:49:22 +00:00
Josh Shippam 3a50391304 Update Cache Path to 2006rebotted (#149)
Cool
2019-11-09 16:45:58 -05:00
Dark98 c152a1c8d9 Update Cache Path to 2006rebotted 2019-11-09 21:36:24 +00:00
dginovker e2f700de67 Merge branch 'master' of https://github.com/dginovker/2006rebotted 2019-11-09 15:36:46 -05:00
dginovker f13f0af171 2006rebotted rename + latest compile 2019-11-09 15:35:57 -05:00
Gptaqbc 2ade1073b9 Fixed issue #143 - When casting spells without autocast your player will always move next to the player you casted a spell on. (#147)
Fixed issue #143 - When casting spells without autocast your player will always move next to the player you casted a spell on.
2019-11-09 15:09:59 -05:00
dginovker 452ee7a637 Latest compile 2019-11-09 00:12:56 -05:00
Gptaqbc 87440ecd2a Removing double sell message "You sold x items for x gp". (#141)
* Update NpcHandler.class

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

* Update NpcHandler.java

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

closes #47

* Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix

- Added buy/sell X feature
- Fixed a lag with the buying loop when buying high amount. Instead of spam buying 1 at a  times it divide the amount to buy in equal parts and buy in increments.
- Cant remember at all I'll edit after eating.

* Removing double sell message "You sold x items for x gp".

Removing double sell message "You sold x items for x gp".

* Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice

Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice

* reverting stuff I broke in this file

reverting stuff I broke in this file
2019-11-09 00:09:33 -05:00
Gptaqbc dcc7984e27 Teleother (#144)
* Update NpcHandler.class

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

* Update NpcHandler.java

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

closes #47

* Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix

- Added buy/sell X feature
- Fixed a lag with the buying loop when buying high amount. Instead of spam buying 1 at a  times it divide the amount to buy in equal parts and buy in increments.
- Cant remember at all I'll edit after eating.

* Removing double sell message "You sold x items for x gp".

Removing double sell message "You sold x items for x gp".

* Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice

Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice

* reverting stuff I broke in this file

reverting stuff I broke in this file

* Teleother fixed

Teleother fixed.

* fixed an issue I forgot to test :)

fixed an issue I forgot to test :)
2019-11-09 00:08:56 -05:00
dginovker 0a11ce01d1 Fix localhost Parabot 2019-11-08 19:25:53 -05:00
dginovker 9db31e52c9 Latest compile 2019-11-06 11:10:27 -05:00
Mr Extremez ff75851cad Fixes run energy, aggressiveness, and highscores (#137)
* Update ShopAssistant.java

Adds ability to sell tokkul items back to shop for tokkul

* Fixes npc aggressiveness closes #132

* Fixes highscores for admin + ingame. Closes #131

* Caps run energy at 100%. Closes #135
2019-11-06 10:55:08 -05:00
dginovker a176bfa9cb Fix for Parabot localhost 2019-11-04 19:57:33 -05:00
Daniel Ginovker 16b23be1d5 fix artifacts (#134) 2019-11-04 18:34:42 -05:00
dginovker bb936bf809 latest compile 2019-11-03 22:10:46 -05:00
dginovker 5c4ca489ef Merge branch 'master' of https://github.com/dginovker/2006rebotted 2019-11-03 22:07:57 -05:00
dginovker fcb3fa255f Latest compile 2019-11-03 22:07:48 -05:00
Gptaqbc b02950045c Buy/sell x buying loop lagging issue fix general shop using fixes trading amount fix (#133)
* Update NpcHandler.class

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

* Update NpcHandler.java

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

closes #47

* Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix

- Added buy/sell X feature
- Fixed a lag with the buying loop when buying high amount. Instead of spam buying 1 at a  times it divide the amount to buy in equal parts and buy in increments.
- Cant remember at all I'll edit after eating.
2019-11-03 22:02:39 -05:00
dginovker dcf6cbdc45 Latest compile + .gitignore 2019-10-31 14:03:18 -04:00
Danial efc6b3c8be Misc changes (#129)
* fixup "cantattack" command

* remove duplicate code

* fix brimhaven vines

* fixup cluescroll drops

* add clicktotele alias

* check player has an axe

* remove duplicate item id
2019-10-30 21:21:19 -04:00
Daniel Ginovker 9950dbe315 Easier setup (#128)
* Simpler compilation steps

* Add images

* Added artifact METAs

* Artifact fix
2019-10-28 20:46:04 -04:00
3865 changed files with 257491 additions and 87449 deletions
+4
View File
@@ -1 +1,5 @@
2006Redone\ Server/data/characters/
.idea/
.idea/workspace.xml
**/.idea/workspace.xml
**/.idea/*
+1 -1
View File
@@ -7,7 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/2006Redone file_server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/2006Redone Client/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
+11
View File
@@ -0,0 +1,11 @@
<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>
+11
View File
@@ -0,0 +1,11 @@
<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>
+16
View File
@@ -0,0 +1,16 @@
<?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>
+3
View File
@@ -2,6 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/2006Redone_Server.iml" filepath="$PROJECT_DIR$/.idea/modules/2006Redone_Server.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/2006Redone_Server.main.iml" filepath="$PROJECT_DIR$/.idea/modules/2006Redone_Server.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/2006Redone_Server.test.iml" filepath="$PROJECT_DIR$/.idea/modules/2006Redone_Server.test.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/2006rebotted.iml" filepath="$PROJECT_DIR$/.idea/2006rebotted.iml" />
</modules>
</component>
+391
View File
@@ -0,0 +1,391 @@
<?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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/CompiledServer/" />
<ignored path="$PROJECT_DIR$/2006Redone Server/.gradle/" />
<ignored path="$PROJECT_DIR$/2006Redone Server/build/" />
<ignored path="$PROJECT_DIR$/2006Redone Server/out/" />
<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="ExternalProjectsData">
<projectState path="$PROJECT_DIR$/2006Redone Server">
<ProjectState />
</projectState>
</component>
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
<projects_view />
</state>
</system>
</component>
<component name="FileColors">
<fileColor scope="Local Unit Tests" color="#161c22" />
<fileColor scope="Android Instrumented Tests" color="#161c22" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="225">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Client/src/Client.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="16" selection-start-line="16" selection-end-line="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</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" extendedState="6">
<option name="x" value="417" />
<option name="y" value="82" />
<option name="width" value="1232" />
<option name="height" value="682" />
</component>
<component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="2006rebotted" type="b2602c69:ProjectViewProjectNode" />
<item name="2006rebotted" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="2006rebotted" type="b2602c69:ProjectViewProjectNode" />
<item name="2006rebotted" type="462c0819:PsiDirectoryNode" />
<item name="2006Redone Server" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1581465119980" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Server" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</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.Client">
<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="2006Redone_Server.main" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/2006Redone Server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.rebotted.*" />
<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.FileServer" />
<item itemvalue="Application.GameEngine" />
<item itemvalue="Application.Client" />
</list>
</recent_temporary>
</component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</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>
<workItem from="1576853591840" duration="1190000" />
<workItem from="1576854792240" duration="1663000" />
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1920" height="1036" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16207626" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32938644" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Messages" order="10" visible="true" weight="0.32938644" />
<window_info anchor="bottom" id="Build" order="11" weight="0.32938644" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Maven" order="4" />
<window_info anchor="right" id="Theme Preview" order="5" />
<window_info anchor="right" id="Capture Analysis" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Gradle" order="8" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<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>
<component name="WindowStateProjectService">
<state width="1877" height="266" key="GridCell.Tab.0.bottom" timestamp="1576858443106">
<screen x="0" y="40" width="1920" height="1040" />
</state>
<state width="1877" height="266" key="GridCell.Tab.0.bottom/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
<state width="1877" height="266" key="GridCell.Tab.0.center" timestamp="1576858443106">
<screen x="0" y="40" width="1920" height="1040" />
</state>
<state width="1877" height="266" key="GridCell.Tab.0.center/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
<state width="1877" height="266" key="GridCell.Tab.0.left" timestamp="1576858443105">
<screen x="0" y="40" width="1920" height="1040" />
</state>
<state width="1877" height="266" key="GridCell.Tab.0.left/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443105" />
<state width="1877" height="266" key="GridCell.Tab.0.right" timestamp="1576858443106">
<screen x="0" y="40" width="1920" height="1040" />
</state>
<state width="1877" height="266" key="GridCell.Tab.0.right/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/2006Redone Client/src/Client.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="16" selection-start-line="16" selection-end-line="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<last-edited>2006rebotted:jar</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.5" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<last-edited>No facets are configured</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>2006rebotted</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>commons-lang3-3.1</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: Client
+35
View File
@@ -0,0 +1,35 @@
/Animable.class
/Animable_Sub3.class
/Animable_Sub4.class
/Animable_Sub5.class
/Animation.class
/Background.class
/Censor.class
/Class11.class
/Class13.class
/Class18.class
/Class21.class
/Class29.class
/Class30_Sub1.class
/Class32.class
/Class33.class
/Class36.class
/Class39.class
/Class4.class
/Class40.class
/Class43.class
/Class47.class
/Class56.class
/Class56_Sub1.class
/Class56_Sub1_Sub1.class
/Class56_Sub1_Sub2.class
/Class6.class
/Client.class
/ClientSettings.class
/CollisionMap.class
/Decompressor.class
/DrawingArea.class
/DummyClass.class
/Entity.class
/EntityDef.class
/Flo.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+6 -8
View File
@@ -7,23 +7,23 @@ import java.math.BigInteger;
public class ClientSettings {
public static String SNOW_MONTH = ".12";
/**
* The Servers Name
*/
public final static String SERVER_NAME = "2006Redone";
public final static String SERVER_NAME = "2006rebotted";
/**
* The Servers Website
*/
public final static String SERVER_WEBSITE = "www.2006redone.org";
public final static String SERVER_WEBSITE = "www.rsrebotted.com";
/**
* The Servers Ip
*
* You dont have to change this, the client will automatically connect to the server
* on localhost
* You don't have to change this, the client will automatically connect to the server
* on localhost (Assuming you're running Client and LocalGame respectively)
*
*/
public static String SERVER_IP = "35.226.247.68";
//public final static String SERVER_IP = "127.0.0.1;
public static String SERVER_IP = "127.0.0.1";
/**
* The Npc Bits for the Server
*/
@@ -35,6 +35,4 @@ public class ClientSettings {
public static final BigInteger RSA_MODULUS = new BigInteger("91553247461173033466542043374346300088148707506479543786501537350363031301992107112953015516557748875487935404852620239974482067336878286174236183516364787082711186740254168914127361643305190640280157664988536979163450791820893999053469529344247707567448479470137716627440246788713008490213212272520901741443");
public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
}
+13
View File
@@ -2,6 +2,9 @@
// Jad home page: http://www.kpdus.com/jad.html
// Decompiler options: packimports(3)
import java.util.Calendar;
import java.util.GregorianCalendar;
public final class Flo {
public static void unpackConfig(StreamLoader streamLoader) {
@@ -17,6 +20,12 @@ public final class Flo {
cache[j].readValues(stream);
}
}
public static String getTodaysDate() {
Calendar date = new GregorianCalendar();
return date.get(Calendar.DAY_OF_MONTH) + "."+ (date.get(Calendar.MONTH) + 1) + "." + date.get(Calendar.YEAR);
}
private void readValues(Stream stream) {
do {
@@ -25,6 +34,10 @@ public final class Flo {
return;
} else if (i == 1) {
anInt390 = stream.read3Bytes();
Calendar date = new GregorianCalendar();
if ((date.get(Calendar.MONTH) + 1) == 12) {
anInt390 = 0xffffff;
}
method262(anInt390);
} else if (i == 2) {
anInt391 = stream.readUnsignedByte();
+137 -137
View File
@@ -1,8 +1,11 @@
/**
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
*/
import javax.swing.*;
import java.applet.AppletContext;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@@ -20,8 +23,19 @@ import java.text.DecimalFormatSymbols;
import java.util.Calendar;
import java.util.Date;
/**
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
*/
@SuppressWarnings("serial")
public class Game extends RSApplet {
private boolean graphicsEnabled = true;
public static int random(final float range) {
return (int) (java.lang.Math.random() * (range + 1));
}
public static String intToKOrMilLongName(int i) {
String s = String.valueOf(i);
@@ -385,7 +399,11 @@ public class Game extends RSApplet {
}
if (l == 0) {
if (i1 > 0 && i1 < 110) {
try {
textDrawingArea.method389(false, 4, 0, chatMessages[k], i1);
} catch (Exception e) {
}
}
j++;
}
@@ -510,9 +528,9 @@ public class Game extends RSApplet {
}
}
public void processMenuClick() {
public boolean processMenuClick() {
if (activeInterfaceType != 0) {
return;
return false;
}
int j = super.clickMode3;
if (spellSelected == 1 && super.saveClickX >= 516 && super.saveClickY >= 160 && super.saveClickX <= 765 && super.saveClickY <= 205) {
@@ -602,7 +620,7 @@ public class Game extends RSApplet {
if (RSInterface.interfaceCache[j2].parentID == backDialogID) {
activeInterfaceType = 3;
}
return;
return true;
}
}
}
@@ -616,6 +634,7 @@ public class Game extends RSApplet {
determineMenuSize();
}
}
return false;
}
public void saveMidi(boolean flag, byte abyte0[]) {
@@ -3037,8 +3056,7 @@ public class Game extends RSApplet {
inputTaken = true;
super.clickMode3 = 0;
}
processMenuClick();
if (fullScreenBackDialogID == -1) {
if (!processMenuClick()) {
processMainScreenClick();
processTabClick();
processChatModeClick();
@@ -3441,6 +3459,10 @@ public class Game extends RSApplet {
if (l >= 2000) {
l -= 2000;
}
if (l == 696) {
minimapInt1 = 0;
anInt1184 = 120;
}
if (l == 582) {
NPC npc = npcArray[i1];
if (npc != null) {
@@ -4751,7 +4773,7 @@ public class Game extends RSApplet {
inputDialogState = 0;
inputTaken = true;
}
} else if (backDialogID == -1 && fullScreenBackDialogID == -1) {
} else {
if (j >= 32 && j <= 122 && inputString.length() < 80) {
inputString += (char) j;
inputTaken = true;
@@ -4761,7 +4783,10 @@ public class Game extends RSApplet {
inputTaken = true;
}
if ((j == 13 || j == 10) && inputString.length() > 0) {
if (myPrivilege == 2) {
if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx") || inputString.equals("::togglerender") || inputString.equals("::togglegfx")) {
graphicsEnabled = !graphicsEnabled;
}
if (myPrivilege >= 0) {
if (inputString.equals("::clientdrop")) {
dropClient();
}
@@ -4780,18 +4805,6 @@ public class Game extends RSApplet {
if (inputString.equals("::dataon")) {
showInfo = !showInfo;
}
if (inputString.equals("::clip")) {
for (int k1 = 0; k1 < 4; k1++) {
for (int i2 = 1; i2 < 103; i2++) {
for (int k2 = 1; k2 < 103; k2++) {
aClass11Array1230[k1].anIntArrayArray294[i2][k2] = 0;
}
}
}
}
}
if (inputString.startsWith("::")) {
stream.createFrame(103);
@@ -4870,10 +4883,8 @@ public class Game extends RSApplet {
myPlayer.anInt1513 = j2;
myPlayer.anInt1531 = i3;
myPlayer.textCycle = 150;
if (myPrivilege == 2 || myPrivilege == 3) {
pushMessage(myPlayer.textSpoken, 2, "@cr2@" + myPlayer.name);
} else if (myPrivilege == 1) {
pushMessage(myPlayer.textSpoken, 2, "@cr1@" + myPlayer.name);
if (myPrivilege >= 1) {
pushMessage(myPlayer.textSpoken, 2, "@cr" + Math.min(2, myPrivilege) + "@" + myPlayer.name);
} else {
pushMessage(myPlayer.textSpoken, 2, myPlayer.name);
}
@@ -5342,6 +5353,16 @@ public class Game extends RSApplet {
chatNames[0] = s1;
chatMessages[0] = s;
}
public void processMinimapActions() {
int x = super.mouseX;
int y = super.mouseY;
if (x >= 551 && x <= 577 && y >= 7 && y <= 40) {
menuActionName[1] = "Face North";
menuActionID[1] = 696;
menuActionRow = 2;
}
}
public void processTabClick() {
if (super.clickMode3 == 1) {
@@ -5380,11 +5401,11 @@ public class Game extends RSApplet {
tabID = 6;
tabAreaAltered = true;
}
if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) {
/*if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) {
needDrawTabArea = true;
tabID = 7;
tabAreaAltered = true;
}
}*/
if (super.saveClickX >= 572 && super.saveClickX <= 602 && super.saveClickY >= 466 && super.saveClickY < 503 && tabInterfaceIDs[8] != -1) {
needDrawTabArea = true;
tabID = 8;
@@ -5538,9 +5559,9 @@ public class Game extends RSApplet {
menuActionName[0] = "Cancel";
menuActionID[0] = 1107;
menuActionRow = 1;
if(fullScreenBackDialogID != -1) {
if (fullScreenInterfaceId != -1) {
anInt886 = 0;
buildInterfaceMenu(0, RSInterface.interfaceCache[fullScreenBackDialogID], super.mouseX, 0, super.mouseY, 0);
buildInterfaceMenu(0, RSInterface.interfaceCache[fullScreenInterfaceId], super.mouseX, 0, super.mouseY, 0);
if (anInt886 != anInt1026) {
anInt1026 = anInt886;
}
@@ -5584,6 +5605,7 @@ public class Game extends RSApplet {
inputTaken = true;
anInt1039 = anInt886;
}
processMinimapActions();
boolean flag = false;
while (!flag) {
flag = true;
@@ -5760,7 +5782,6 @@ public class Game extends RSApplet {
backDialogID = -1;
openInterfaceID = -1;
invOverlayInterfaceID = -1;
fullScreenBackDialogID = -1;
fullScreenInterfaceId = -1;
anInt1018 = -1;
aBoolean1149 = false;
@@ -5967,7 +5988,6 @@ public class Game extends RSApplet {
}
}
int j3 = j2;
int k3 = j1;
anIntArrayArray901[j2][j1] = 99;
@@ -7464,9 +7484,9 @@ public class Game extends RSApplet {
}
public void drawGameScreen() {
if (fullScreenBackDialogID != -1 && (loadingStage == 2 || super.fullGameScreen != null)) {
if (fullScreenInterfaceId != -1 && (loadingStage == 2 || super.fullGameScreen != null)) {
if (loadingStage == 2) {
method119(anInt945, fullScreenBackDialogID);
method119(anInt945, fullScreenInterfaceId);
if (fullScreenInterfaceId != -1)
method119(anInt945, fullScreenInterfaceId);
anInt945 = 0;
@@ -7475,15 +7495,8 @@ public class Game extends RSApplet {
Texture.lineOffsets = gameScreenOffsets;
DrawingArea.setAllPixelsToZero();
welcomeScreenRaised = true;
RSInterface rSInterface = RSInterface.interfaceCache[fullScreenBackDialogID];
if (rSInterface.width == 512 && rSInterface.height == 334
&& rSInterface.type == 0) {
rSInterface.width = 765;
rSInterface.height = 503;
}
drawInterface(0, 0, rSInterface, 0);
if (fullScreenInterfaceId != -1) {
RSInterface class13_1 = RSInterface.interfaceCache[fullScreenInterfaceId];
if (openInterfaceID != -1) {
RSInterface class13_1 = RSInterface.interfaceCache[openInterfaceID];
if (class13_1.width == 512 && class13_1.height == 334
&& class13_1.type == 0) {
class13_1.width = 765;
@@ -7491,6 +7504,13 @@ public class Game extends RSApplet {
}
drawInterface(0, 0, class13_1, 0);
}
RSInterface rSInterface = RSInterface.interfaceCache[fullScreenInterfaceId];
if (rSInterface.width == 512 && rSInterface.height == 334
&& rSInterface.type == 0) {
rSInterface.width = 765;
rSInterface.height = 503;
}
drawInterface(0, 0, rSInterface, 0);
if (!menuOpen) {
processRightClick();
drawTooltip();
@@ -8466,10 +8486,12 @@ public class Game extends RSApplet {
if (anInt1055 == 1) {
multiOverlay.drawSprite(472, 296);
}
int k = 20;
int i1 = 0xffff00;
int x = baseX + (myPlayer.x - 6 >> 7);
int y = baseY + (myPlayer.y - 6 >> 7);
if (fpsOn) {
char c = '\u01FB';
int k = 20;
int i1 = 0xffff00;
if (super.fps < 15) {
i1 = 0xff0000;
}
@@ -8484,6 +8506,20 @@ public class Game extends RSApplet {
aTextDrawingArea_1271.method380("Mem:" + j1 + "k", c, 0xffff00, k);
k += 15;
}
if (showInfo) {
if (super.fps < 15)
i1 = 0xff0000;
aTextDrawingArea_1271.method385(0xffff00, "Fps:" + super.fps, 285, 5);
Runtime runtime = Runtime.getRuntime();
int j1 = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L);
i1 = 0xffff00;
if (j1 > 0x2000000 && lowMem)
i1 = 0xff0000;
k += 15;
aTextDrawingArea_1271.method385(0xffff00, "Mem:" + j1 + "k", 299, 5);
aTextDrawingArea_1271.method385(0xffff00, "Mouse X: " + super.mouseX + " , Mouse Y: " + super.mouseY, 314, 5);
aTextDrawingArea_1271.method385(0xffff00, "Coords: " + x + ", " + y, 329, 5);
}
if (anInt1104 != 0) {
int j = anInt1104 / 50;
int l = j / 60;
@@ -9501,13 +9537,13 @@ public class Game extends RSApplet {
if (loginScreenState == 3) {
chatTextDrawingArea.method382(0xffff00, c / 2, "Create a free account", c1 / 2 - 60, true);
int k = c1 / 2 - 35;
chatTextDrawingArea.method382(0xffffff, c / 2, "To create a new account you need to", k, true);
chatTextDrawingArea.method382(0xffffff, c / 2, "To create a new account just click", k, true);
k += 15;
chatTextDrawingArea.method382(0xffffff, c / 2, "go back to the main " + ClientSettings.SERVER_NAME + " webpage", k, true);
chatTextDrawingArea.method382(0xffffff, c / 2, "\"Cancel\" below, and click \"Existing User\".", k, true);
k += 15;
chatTextDrawingArea.method382(0xffffff, c / 2, "and choose the red 'create account'", k, true);
chatTextDrawingArea.method382(0xffffff, c / 2, "Log in with any credentials you want and an", k, true);
k += 15;
chatTextDrawingArea.method382(0xffffff, c / 2, "button at the top right of that page.", k, true);
chatTextDrawingArea.method382(0xffffff, c / 2, "account will automatically be created for you.", k, true);
k += 15;
int j1 = c / 2;
int i2 = c1 / 2 + 50;
@@ -9761,8 +9797,10 @@ public class Game extends RSApplet {
int j13 = stream.readUnsignedByte();
int k15 = anInt1268 + (j13 >> 4 & 7);
int l16 = anInt1269 + (j13 & 7);
if (k15 >= 0 && l16 >= 0 && k15 < 104 && l16 < 104)
if (k15 >= 0 && l16 >= 0 && k15 < 104 && l16 < 104) {
method130(-1, -1, j8, i11, l16, k5, plane, k15, 0);
}
return;
}
if (j == 151) {
@@ -9774,6 +9812,7 @@ public class Game extends RSApplet {
int i15 = k12 >> 2;
int k16 = k12 & 3;
int l17 = anIntArray1177[i15];
//System.out.println("id: " + j10 + " x:" + (this.baseX + anInt1268) + " y:" + (this.baseY + anInt1269));
if (l4 >= 0 && k7 >= 0 && l4 < 104 && k7 < 104)
method130(-1, j10, k16, l17, k7, i15, plane, l4, 0);
return;
@@ -10632,7 +10671,7 @@ public class Game extends RSApplet {
}
if (pktType == 174) {
int id = inStream.readUnsignedWord();
int type = inStream.readUnsignedByte();
int type = /*inStream.readUnsignedByte()*/1;
int delay = inStream.readUnsignedWord();
int volume = inStream.readUnsignedByte();
sound[currentSound] = id;
@@ -10862,10 +10901,6 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -10997,10 +11032,6 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11062,9 +11093,6 @@ public class Game extends RSApplet {
if (backDialogID != -1) {
backDialogID = -1;
}
if (fullScreenBackDialogID != k15) {
fullScreenBackDialogID = k15;
}
if (fullScreenInterfaceId != k15) {
fullScreenInterfaceId = k9;
}
@@ -11196,61 +11224,30 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
/*if (openInterfaceID != l7) {
openInterfaceID = l7;
}*/
if (inputDialogState != 0) {
inputDialogState = 0;
inputTaken = true;
}
/*
* 15244 = main Interface ID
* 17511 = Question Type
* 15819 = Christmas Type
* 15812 = Security Type
* 15801 = Item Scam Type
* 15791 = Password Safety
* 15774 = Good/Bad Password
* 15767 = Drama Type
*/
// 17511 = Question Type
// 15819 = Christmas Type
// 15812 = Security Type
// 15801 = Item Scam Type
// 15791 = Password Safety
// 15774 = Good/Bad Password
// 15767 = Drama Type
if (l7 == 15244) {
openInterfaceID = 15812;//secondary/bottom part
fullScreenBackDialogID = 15244;
/*} else if (l7 == 17511) {
openInterfaceID = 17511;
fullScreenBackDialogID = 15244;
} else if (l7 == 15819) {
openInterfaceID = 15819;
fullScreenBackDialogID = 15244;
} else if (l7 == 15812) {
openInterfaceID = 15812;
fullScreenBackDialogID = 15244;
} else if (l7 == 15801) {
openInterfaceID = 15801;
fullScreenBackDialogID = 15244;
} else if (l7 == 15791) {
openInterfaceID = 15791;
fullScreenBackDialogID = 15244;
} else if (l7 == 15774) {
openInterfaceID = 15774;
fullScreenBackDialogID = 15244;
} else if (l7 == 15767) {
openInterfaceID = 15767;
fullScreenBackDialogID = 15244;*/
} else {
openInterfaceID = l7;
}
if (Flo.getTodaysDate().contains(ClientSettings.SNOW_MONTH)) {
openInterfaceID = 15819;
} else {
openInterfaceID = 15801;
}
fullScreenInterfaceId = 15244;
} else {
openInterfaceID = l7;
}
aBoolean1149 = false;
pktType = -1;
return true;
return true;
}
if (pktType == 218) {
int i8 = inStream.method438();
@@ -11316,10 +11313,6 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11373,10 +11366,6 @@ public class Game extends RSApplet {
needDrawTabArea = true;
tabAreaAltered = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11407,6 +11396,7 @@ public class Game extends RSApplet {
Signlink.reporterror(s2);
resetLogout();
exception.printStackTrace();
}
return true;
}
@@ -11474,20 +11464,25 @@ public class Game extends RSApplet {
Model.anInt1685 = super.mouseX - 4;
Model.anInt1686 = super.mouseY - 4;
DrawingArea.setAllPixelsToZero();
// xxx disables graphics if(graphicsEnabled){
worldController.method313(xCameraPos, yCameraPos, xCameraCurve, zCameraPos, j, yCameraCurve);
worldController.clearObj5Cache();
updateEntities();
drawHeadIcon();
if(graphicsEnabled){
worldController.method313(xCameraPos, yCameraPos, xCameraCurve, zCameraPos, j, yCameraCurve);
worldController.clearObj5Cache();
updateEntities();
drawHeadIcon();
}
// Allow tabs to work
method37(k2);
// Allow stuff inside the tabs to work
draw3dScreen();
// Show overlays on main screen
aRSImageProducer_1165.drawGraphics(4, super.graphics, 4);
xCameraPos = l;
zCameraPos = i1;
yCameraPos = j1;
yCameraCurve = k1;
xCameraCurve = l1;
// }
if(graphicsEnabled) {
xCameraPos = l;
zCameraPos = i1;
yCameraPos = j1;
yCameraCurve = k1;
xCameraCurve = l1;
}
}
public void closeOpenInterfaces() {
@@ -11503,10 +11498,6 @@ public class Game extends RSApplet {
inputTaken = true;
aBoolean1149 = false;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11515,6 +11506,16 @@ public class Game extends RSApplet {
}
public Game() {
//Test if they're on 32-bit, warn them if they are
if (!System.getProperty("sun.arch.data.model").contains("64"))
{
JOptionPane.showMessageDialog(null, "You're running 32-bit java. This will definitely cause problems.\nYou can get the right Java 8 at AdoptOpenJDK.net", "You're running 32-bit Java!", JOptionPane.INFORMATION_MESSAGE);
System.out.println("Please upgrade to 64-bit java to avoid problems! (AdoptOpenJDK.net)");
}
if (Double.parseDouble(System.getProperty("java.specification.version")) >= 1.9) {
JOptionPane.showMessageDialog(null, "You're not running Java 8. If you're using Parabot, this will cause problems!\nYou can get Java 8 from AdoptOpenJDK.net", "You're not running Java 8!", JOptionPane.INFORMATION_MESSAGE);
System.out.println("Please downgrade to Java 8 to avoid problems! (AdoptOpenJDK.net)");
}
server = ClientSettings.SERVER_IP;
anIntArrayArray825 = new int[104][104];
friendsNodeIDs = new int[200];
@@ -11700,7 +11701,6 @@ public class Game extends RSApplet {
public static int anInt854;
public int anInt855;
public int openInterfaceID;
public int fullScreenBackDialogID = -1;
public int fullScreenInterfaceId = -1;
public int xCameraPos;
public int zCameraPos;
@@ -12096,7 +12096,7 @@ public class Game extends RSApplet {
public int anInt1289;
public static int tiara;
public static int anInt1290;
public boolean showInfo = true;
public boolean showInfo = false;
public static int anInt1401 = 256;
public static int[] anIntArray385 = new int[] { 12800, 12800, 12800, 12800, 12800, 12800,
12800, 12800, 12800, 12800, 12800, 12800,
@@ -12149,7 +12149,7 @@ public class Game extends RSApplet {
this.anInt1187 += (j << 1);
}
public final void keyPressed(KeyEvent keyevent)
public void keyPressed(KeyEvent keyevent)
{
super.keyPressed(keyevent);
switch (keyevent.getKeyCode())
+5 -1
View File
@@ -190,7 +190,11 @@ public final class ItemDef {
cacheIndex = (cacheIndex + 1) % 10;
ItemDef itemDef = cache[cacheIndex];
stream.currentOffset = streamIndices[i];
try {
stream.currentOffset = streamIndices[i];
} catch (Exception e) {
System.out.println("Itemdef issue? Apparently this ID is out of bounds: " + e);
}
itemDef.id = i;
itemDef.setDefaults();
itemDef.readValues(stream);
+28
View File
@@ -0,0 +1,28 @@
/**
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
*/
import java.applet.AppletContext;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.io.*;
import java.net.InetAddress;
import java.net.Socket;
import java.net.URL;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Calendar;
import java.util.Date;
/**
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
*/
@SuppressWarnings("serial")
public class LocalGame extends Game {
public LocalGame() {
super();
server = "127.0.0.1";
}
}
+1
View File
@@ -16,6 +16,7 @@ public final class Main {
*/
public static void main(String[] args) {
ClientSettings.SERVER_IP = "2006rebotted.hopto.org";
if (args.length > 1)
{
System.out.println("Running local");
+1 -1
View File
@@ -284,7 +284,7 @@ public class RSApplet extends Applet implements Runnable, MouseListener, MouseMo
}
@Override
public final void mouseMoved(MouseEvent mouseevent) {
public void mouseMoved(MouseEvent mouseevent) {
int i = mouseevent.getX();
int j = mouseevent.getY();
if (gameFrame != null) {
+1 -1
View File
@@ -10,7 +10,7 @@ final class RSFrame extends Frame {
public RSFrame(RSApplet RSApplet_, int i, int j) {
rsApplet = RSApplet_;
setTitle(ClientSettings.SERVER_NAME);
setResizable(true);
setResizable(false);
setMinimumSize(new Dimension(i + 8, j + 28));
setVisible(true);
toFront();
+8
View File
@@ -111,6 +111,14 @@ public final class RSInterface {
rsInterface.actions[l3] = null;
}
}
if(rsInterface.parentID == 3822) {
rsInterface.actions[2] = "Sell 10";
rsInterface.actions[3] = "Sell X";
}
if(rsInterface.id == 3900) {
rsInterface.actions[2] = "Buy 10";
rsInterface.actions[3] = "Buy X";
}
}
if (rsInterface.type == 3) {
rsInterface.aBoolean227 = stream.readUnsignedByte() == 1;
+2 -2
View File
@@ -278,7 +278,7 @@ public final class Signlink implements Runnable {
public static Synthesizer synthesizer = null;
public static String findcachedir() {
String path = System.getProperty("user.home") + "/.2006redone_file_system/";
String path = System.getProperty("user.home") + "/.2006rebotted_file_system/";
File file = new File(path);
if (!file.exists()) {
if (!file.mkdirs()) {
@@ -289,7 +289,7 @@ public final class Signlink implements Runnable {
}
public static String secondDir() {
File file = new File("C:/.2006redone_file_system/");
File file = new File("C:/.2006rebotted_file_system/");
if (!file.exists()) {
file.mkdirs();
}
+26 -26
View File
@@ -34,31 +34,31 @@ final class SizeConstants {
173, 228, 121, 83, 133, 68, 0
};
public static final int[] packetSizes = {
0, 0, 0, 0, 6, 0, 0, 0, 4, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, -2, 4, 3, 0, 0, 0,
0, 0, 0, 0, 5, 0, 0, 6, 0, 0,
9, 0, 0, -2, 0, 0, 0, 0, 0, 0,
-2, 1, 0, 0, 2, -2, 0, 0, 0, 0,
6, 3, 2, 4, 2, 4, 0, 0, 0, 4,
0, -2, 0, 0, 7, 2, 0, 6, 0, 0,
0, 0, 0, 0, 0, 0, 0, 2, 0, 1,
0, 2, 0, 0, -1, 4, 1, 0, 0, 0,
1, 0, 0, 0, 2, 0, 0, 15, 0, 0,
0, 4, 4, 0, 0, 0, -2, 0, 0, 0,
0, 0, 0, 0, 6, 0, 0, 0, 0, 0,
0, 0, 2, 0, 0, 0, 0, 14, 0, 0,
0, 4, 0, 0, 0, 0, 3, 0, 0, 0,
4, 0, 0, 0, 2, 0, 6, 0, 0, 0,
0, 3, 0, 0, 5, 0, 10, 6, 0, 0,
0, 0, 0, 0, 0, 2, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0, 0, 0,
4, 0, 0, 0, 0, 0, 3, 0, 2, 0,
0, 0, 0, 0, -2, 7, 0, 0, 2, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2, -2, 0, 0, 0, 0, 6, 0, 4, 3,
0, 0, 0, -1, 6, 0, 0
0, 0, 0, 0, 6, 0, 0, 0, 4, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //10
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, //20
0, 0, 0, 0, -2, 4, 3, 0, 0, 0, //30
0, 0, 0, 0, 5, 0, 0, 6, 0, 0, //40
9, 0, 0, -2, 0, 0, 0, 0, 0, 0, //50
-2, 1, 0, 0, 2, -2, 0, 0, 0, 0, //60
6, 3, 2, 4, 2, 4, 0, 0, 0, 4, //70
0, -2, 0, 0, 7, 2, 0, 6, 0, 0, //80
0, 0, 0, 0, 0, 0, 0, 2, 0, 1, //90
0, 2, 0, 0, -1, 4, 1, 0, 0, 0, //100
1, 0, 0, 0, 2, 0, 0, 15, 0, 0, //110
0, 4, 4, 0, 0, 0, -2, 0, 0, 0, //120
0, 0, 0, 0, 6, 0, 0, 0, 0, 0, //130
0, 0, 2, 0, 0, 0, 0, 14, 0, 0, //140
0, 4, 0, 0, 0, 0, 3, 0, 0, 0, //150
4, 0, 0, 0, 2, 0, 6, 0, 0, 0, //160
0, 3, 0, 0, 5, 0, 10, 6, 0, 0, //170
0, 0, 0, 0, 0, 2, 0, 0, 0, 0, //180
0, 0, 0, 0, 0, 0, -1, 0, 0, 0, //190
4, 0, 0, 0, 0, 0, 3, 0, 2, 0, //200
0, 0, 0, 0, -2, 7, 0, 0, 2, 0, //210
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, //220
8, 0, 0, 0, 0, 0, 0, 0, 0, 0, //230
2, -2, 0, 0, 0, 0, 6, 0, 4, 3, //240
0, 0, 0, -1, 6, 0, 0//250
};
}
@@ -200,7 +200,11 @@ public final class TextDrawingArea extends DrawingArea {
if (flag1) {
method392(aByteArrayArray1491[c], i + anIntArray1494[c] + 1, k + anIntArray1495[c] + 1, anIntArray1492[c], anIntArray1493[c], 0);
}
try {
method392(aByteArrayArray1491[c], i + anIntArray1494[c], k + anIntArray1495[c], anIntArray1492[c], anIntArray1493[c], j);
} catch (Exception e) {
}
}
i += anIntArray1496[c];
}
-16
View File
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="libs/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="libs/mina.jar"/>
<classpathentry kind="lib" path="libs/mysql-connector-java-5.1.23-bin.jar"/>
<classpathentry kind="lib" path="libs/slf4j-nop.jar"/>
<classpathentry kind="lib" path="libs/slf4j.jar"/>
<classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="libs/xstream-1.4.1.jar"/>
<classpathentry kind="lib" path="libs/everythingrs-api.jar"/>
<classpathentry kind="lib" path="libs/javacord-api-3.0.4.jar"/>
<classpathentry kind="lib" path="libs/json-20190722.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
</classpath>
+5
View File
@@ -1 +1,6 @@
/bin/
.gradle
.settings
.classpath
.project
settings.gradle
@@ -1,2 +0,0 @@
#Tue Jun 18 15:12:25 EDT 2019
gradle.version=4.10
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>2006Redone</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>
@@ -1,291 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
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.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
org.eclipse.jdt.core.formatter.comment.line_length=80
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_empty_lines=false
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
org.eclipse.jdt.core.formatter.join_wrapped_lines=true
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=80
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
@@ -1,3 +0,0 @@
eclipse.preferences.version=1
formatter_profile=_2006Redone
formatter_settings_version=12
@@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
-14
View File
@@ -1,14 +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" />
<orderEntry type="library" name="libs" level="project" />
<orderEntry type="library" name="libs1" level="project" />
<orderEntry type="library" name="libs2" level="project" />
</component>
</module>
+15
View File
@@ -0,0 +1,15 @@
# 2006rebotted - Game Server
This is the Game Server component of our emulated Runescape environment.
It's responsibility is to provide the instructions for the in-game world, its entities, and respond to player interactions.
Contained within is an implementation of the Runescape network protocol roughly around version 508.
When run, this java application will listen on TCP port 43594.
### Building the project
- `git clone https://github.com/dginovker/2006rebotted`
- `cd 2006rebotted/2006Redone\ Server/`
- `./gradlew build`
- `java -jar ./build/libs/2006rebotted.jar`
- You will also have to place a copy of the `data` folder in the same location as the jar.
+78
View File
@@ -0,0 +1,78 @@
plugins {
id 'java-library'
}
repositories {
jcenter()
flatDir {
dirs 'libs'
}
}
dependencies {
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.10.1'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.1'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.1'
// https://mvnrepository.com/artifact/org.json/json
compile group: 'org.json', name: 'json', version: '20190722'
// https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor
compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '4.3.1'
// https://mvnrepository.com/artifact/org.apache.mina/mina-core
compile group: 'org.apache.mina', name: 'mina-core', version: '1.1.7'
// https://mvnrepository.com/artifact/mysql/mysql-connector-java
compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.18'
// https://mvnrepository.com/artifact/io.netty/netty-all
compile group: 'io.netty', name: 'netty-all', version: '4.1.44.Final'
// https://mvnrepository.com/artifact/com.neovisionaries/nv-websocket-client
compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.9'
// https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.3.1'
// https://mvnrepository.com/artifact/com.squareup.okio/okio
compile group: 'com.squareup.okio', name: 'okio', version: '2.4.3'
// https://mvnrepository.com/artifact/org.slf4j/slf4j-api
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
// https://mvnrepository.com/artifact/org.ogce/xpp3
compile group: 'org.ogce', name: 'xpp3', version: '1.1.6'
// https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream
compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.11.1'
// https://mvnrepository.com/artifact/org.javacord/javacord-api
compile group: 'org.javacord', name: 'javacord-api', version: '3.0.4'
// https://mvnrepository.com/artifact/org.javacord/javacord-core
compile group: 'org.javacord', name: 'javacord-core', version: '3.0.4'
// From libs flatdir
compile name: 'everythingrs-api'
}
jar {
manifest {
attributes 'Implementation-Title': '2006rebotted',
'Implementation-Version': '0.1.0',
'Main-Class': 'com.rebotted.GameEngine'
}
from {
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
}
}

Some files were not shown because too many files have changed in this diff Show More