Compare commits

...

115 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
1854 changed files with 45378 additions and 16678 deletions
+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>
+263 -12
View File
@@ -7,14 +7,59 @@
</component>
<component name="ChangeListManager">
<list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<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>
@@ -23,18 +68,53 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-7" />
<option name="width" value="1294" />
<option name="height" value="1407" />
<component 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="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
<property name="project.structure.last.edited" value="Project" />
<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">
@@ -48,7 +128,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.GameEngine">
<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" />
@@ -72,11 +152,11 @@
</configuration>
<configuration name="GameEngine" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.rebotted.GameEngine" />
<module name="2006rebotted" />
<option name="WORKING_DIRECTORY" value="2006Redone Server" />
<module name="2006Redone_Server.main" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/2006Redone Server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="redone.*" />
<option name="PATTERN" value="com.rebotted.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
@@ -91,12 +171,24 @@
</list>
<recent_temporary>
<list>
<item itemvalue="Application.GameEngine" />
<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>
@@ -107,15 +199,59 @@
<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>
@@ -137,4 +273,119 @@
</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>
+34 -1
View File
@@ -1,2 +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
/LocalGame.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.
-7
View File
@@ -1,7 +0,0 @@
/* AUTOMATICALLY GENERATED ON Tue Apr 16 17:20:59 EDT 2002*/
/* DO NOT EDIT */
grant {
permission java.security.AllPermission;
};
+3 -4
View File
@@ -7,6 +7,7 @@ import java.math.BigInteger;
public class ClientSettings {
public static String SNOW_MONTH = ".12";
/**
* The Servers Name
*/
@@ -14,7 +15,7 @@ public class ClientSettings {
/**
* The Servers Website
*/
public final static String SERVER_WEBSITE = "www.2006rebotted.tk";
public final static String SERVER_WEBSITE = "www.rsrebotted.com";
/**
* The Servers Ip
*
@@ -22,7 +23,7 @@ public class ClientSettings {
* on localhost (Assuming you're running Client and LocalGame respectively)
*
*/
public static String SERVER_IP = "2006rebotted.hopto.org";
public static String SERVER_IP = "127.0.0.1";
/**
* The Npc Bits for the Server
*/
@@ -34,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();
+90 -120
View File
@@ -29,7 +29,13 @@ import java.util.Date;
*/
@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);
@@ -393,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++;
}
@@ -518,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) {
@@ -610,7 +620,7 @@ public class Game extends RSApplet {
if (RSInterface.interfaceCache[j2].parentID == backDialogID) {
activeInterfaceType = 3;
}
return;
return true;
}
}
}
@@ -624,6 +634,7 @@ public class Game extends RSApplet {
determineMenuSize();
}
}
return false;
}
public void saveMidi(boolean flag, byte abyte0[]) {
@@ -3045,8 +3056,7 @@ public class Game extends RSApplet {
inputTaken = true;
super.clickMode3 = 0;
}
processMenuClick();
if (fullScreenBackDialogID == -1) {
if (!processMenuClick()) {
processMainScreenClick();
processTabClick();
processChatModeClick();
@@ -3449,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) {
@@ -4759,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;
@@ -4772,7 +4786,7 @@ public class Game extends RSApplet {
if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx") || inputString.equals("::togglerender") || inputString.equals("::togglegfx")) {
graphicsEnabled = !graphicsEnabled;
}
if (myPrivilege == 2) {
if (myPrivilege >= 0) {
if (inputString.equals("::clientdrop")) {
dropClient();
}
@@ -4791,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);
@@ -4881,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);
}
@@ -5353,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) {
@@ -5391,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;
@@ -5549,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;
}
@@ -5595,6 +5605,7 @@ public class Game extends RSApplet {
inputTaken = true;
anInt1039 = anInt886;
}
processMinimapActions();
boolean flag = false;
while (!flag) {
flag = true;
@@ -5771,7 +5782,6 @@ public class Game extends RSApplet {
backDialogID = -1;
openInterfaceID = -1;
invOverlayInterfaceID = -1;
fullScreenBackDialogID = -1;
fullScreenInterfaceId = -1;
anInt1018 = -1;
aBoolean1149 = false;
@@ -5978,7 +5988,6 @@ public class Game extends RSApplet {
}
}
int j3 = j2;
int k3 = j1;
anIntArrayArray901[j2][j1] = 99;
@@ -7475,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;
@@ -7486,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;
@@ -7502,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();
@@ -8477,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;
}
@@ -8495,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;
@@ -9512,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;
@@ -10876,10 +10901,6 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11011,10 +11032,6 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11076,9 +11093,6 @@ public class Game extends RSApplet {
if (backDialogID != -1) {
backDialogID = -1;
}
if (fullScreenBackDialogID != k15) {
fullScreenBackDialogID = k15;
}
if (fullScreenInterfaceId != k15) {
fullScreenInterfaceId = k9;
}
@@ -11210,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();
@@ -11330,10 +11313,6 @@ public class Game extends RSApplet {
backDialogID = -1;
inputTaken = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11387,10 +11366,6 @@ public class Game extends RSApplet {
needDrawTabArea = true;
tabAreaAltered = true;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11523,10 +11498,6 @@ public class Game extends RSApplet {
inputTaken = true;
aBoolean1149 = false;
}
if (fullScreenBackDialogID != -1) {
fullScreenBackDialogID = -1;
welcomeScreenRaised = true;
}
if (fullScreenInterfaceId != -1) {
fullScreenInterfaceId = -1;
}
@@ -11536,7 +11507,7 @@ public class Game extends RSApplet {
public Game() {
//Test if they're on 32-bit, warn them if they are
if (!System.getProperty("os.arch").contains("64"))
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)");
@@ -11730,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;
@@ -12126,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,
+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);
+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();
@@ -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