Compare commits

...

69 Commits

Author SHA1 Message Date
Sandro Coutinho 605a434edf [BUGFIX] Running in 1-tick (#414) 2020-08-04 18:50:08 -04:00
Daniel Ginovker e10ad156a9 Update README.md 2020-08-04 18:11:00 -04:00
Daniel Ginovker eebc60084f Make project setup easier with Maven (#411)
* Remove a bunch of .ideas and class files to see if it makes the setup easier

* remove some .idea's and imkls

* Remove a ton of .class files

* [TASK] Switched to maven instead of gradle

* [TASK] Added target to gitignore

* Remove ignored files

* [TASK] Fixed file_server source

* [TASK] Fixed client source

* [BUGFIX] Main Class

* [BUGFIX] Fixed SLF4J

* [TASK] Server Libs cleanup

* Update setup guide/debug

* Maven cli compile instructions

* [TASK] Jar building

* Update runServer and runFileServer.sh

Co-authored-by: Sandro Coutinho <sandro@farrelltech.org>
2020-08-04 17:57:19 -04:00
Daniel Ginovker 6684364b64 Fix passing through gate to training grounds + make ::shop bots tele to current loc first try (#410) 2020-08-04 13:27:24 -04:00
Daniel Ginovker d2e8945578 Fix old player shops not appearing (#409)
* Add check that players are over total level 50, but shop items check is broken

* Bots now only appear when they meet reqs! Woot!

* Fix old bots not appearing
2020-08-03 13:59:02 -04:00
Daniel Ginovker 1a911f1ad0 Non-spammy player shops (#407)
* Add check that players are over total level 50, but shop items check is broken

* Bots now only appear when they meet reqs! Woot!
2020-08-03 13:28:43 -04:00
Daniel Ginovker 707783552f Make ::players show everyone, even for non-mods (#406) 2020-08-03 11:05:45 -04:00
Daniel Ginovker c1df673033 Make bots stay after restart (#405) 2020-08-03 10:52:16 -04:00
Damion 6085111d7c Region factory (#404)
* Split region loading and object population to factory class

* Implement changes, disable CommandConsole

* You guys don't omit /build/
2020-06-16 21:43:41 -04:00
Daniel Ginovker 5725a64abc Add gameplay image 2020-06-11 20:44:56 -04:00
Josh Shippam cd690fe31d Misc Fixes (#403)
* Fixed Ghostly Cape Equipping in Cape Slot

* Fixed Jumping Out Of Varrock Lumber Yard

* Changed All Quests To addOrDropItem

* Fixed Right Click in Java 10
2020-05-22 20:57:31 -04:00
Mr Extremez af578c400a Few small changes (#402)
- Fixed dragon battleaxe special
- Fixed banks in canifis and al kharid
- Added battlestaff enchanting
- Made fight caves entrance spawn at correct coords
- Did some small cleanup
2020-05-07 18:34:51 -04:00
dginovker 3387cd5f07 Fix conflicts 2020-05-07 18:33:56 -04:00
Mr Extremez b4371d3129 A few things (#401)
- Can't attack players or npcs through doors/walls anymore
- Cleaned up a few small bits of code
- Added a few new boundaries to the boundary system
- Removed dialogue asking are you sure you want to empty your inventory for admins
2020-04-10 20:03:28 -04:00
Mr Extremez 43f4b14dbf Various thing (#400)
- Nearly perfected fight caves now (should fix wave spawning, some dialogue bugs, instance issues)
- Added fully working monkey gree grees
- Fixed somes skill interface typos
- Added ability to dye goblin mails
- Fixed restless ghost quest interface typo
- Clarified herb cleaning required level message
2020-03-24 13:46:01 -04:00
dginovker a55a0fdefb latest compile 2020-03-18 10:05:56 -04:00
Mr Extremez 774d05f1e3 Update ItemData.java (#399)
Should fix the bank note bug hopefully
2020-03-18 10:02:02 -04:00
dginovker a9afe18014 Latest server compile 2020-03-13 20:53:10 -04:00
Mr Extremez 5706bc9853 Some quick patches (#398)
- Bank all should now work for all items again
- Fixed al kharid gate not functioning
- Added unique cabbage pickable for Falador
- Fixed desert disguise wrongly being noted
- Reformatted some of the food code

Closes #397
Closes #395

(I also included @Qweqker changes so that will fix lumbridge bank boundary and adds his new cabbage effect)

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
2020-03-13 20:36:20 -04:00
Qweqker f9a9eae356 Bank Adjustment, Cabbage Patch (Pun intended) (#396)
* Added Cabbage ID for the cabbage that is supposed to spawn south of falador
Moved unique food dialogue inside the text handler to avoid duplicate messages
Added unique message for south of falador cabbage

* Adjusted Lumbridge Bank Boundary

Co-authored-by: Qweqker <qweqker@mail.com>
2020-03-13 20:33:52 -04:00
dginovker 801525fb0c update website urls 2020-03-12 19:42:04 -04:00
Mr Extremez cb65d89297 Update (#394)
Closes #393
- Sophanem city gates now functioning
Closes #392
- Improved rug travel, added missing travel options
Closes #391
- Added those curtains, along with many more curtains and other functional objects
Closes #390
- Dramen branch now untradeable/same with staff
Closes #389
- Lumbridge door should no longer get stuck, should fix other doors aswell
Closes #388
- Added Rasolo npc spawn
Closes #385
- Added missing fishing guild spawns
Closes #384
- Added missing port khazard npcs and a few other missing npcs too
Closes #379
- Added smelt x option
Closes #334
- Fixed dragon dagger store price and fixed high alch/low alch value for it
Closes #278
- Fixed strange numbers on runecrafting interface
Closes #244
-These were previously fixed

Also included:
- Added recieving random gems when mining (thanks to ben for pointing this out)
- Reduced door usage delay
- Random cleanup and deleted some unsued files/code
- Fixed many npc item drop names (thanks to iizyy for pointing them out)
- Fixed a few wizard tower doors
- Did more cleanup with the some of the old boundary methods
- Tidied up the discord commands and added the proper urls for them
2020-03-12 19:13:22 -04:00
Qweqker db58bc868b Player Death and Level Up Sounds, Cutscene Support (#383)
* Added Player death Sound
Added a ton of Level Up Sounds (Some I do not know)

* Added command to play "quicksongs"

* adjusted chat message to properly name the command

* Added Camera functionality for cutscenes
Added Camera shake functionality for cutscenes/barrows/anything else
Added Camera reset functionality to return the player to the normal player view
Added some details on what each added method does
Refactored some of the method names for uniformity

* Added some commands to test the cutscene/camera features that were added in PlayerAssistant.java

Co-authored-by: Qweqker <qweqker@mail.com>
Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
2020-03-06 18:53:53 -05:00
Mr Extremez e5799200d7 A few things (#382)
- Added a distance check for item on object packet
- Added cook x functionality
- Removed a fair amount of dead code
- Did some renaming and fixed some typos
- Cleaned up a lot of the smithing code
- Added a new boundary system to reduce code clutter
- Fixed a firemaking bug
2020-03-06 18:52:10 -05:00
nocommento 804ceae886 Fix for issue #364 - staffs are now supported when enchanting jewellery (#381)
* Added staff support when enchanting (issue #364)

* Added staff support when enchanting (issue #364)
2020-02-28 17:51:05 -05:00
Daniel Ginovker 174bdf5bfd Make farming not nuke & latest build (#378)
* Farming Skill, Orb Charging, Battle Staff Creation, etc

- Farming Skill Added
- Orb charging implemented
- Battle staff creation implemented
- Cleaned up some code
- Stuck command will now tele you from further out in wildy if you are not in combat
- Fixed an issue with amulet of glory
- Added forcechats for npcs at Gnome Agility Course, and for Cows, Ducks and Sheeps just like in actual osrs
- Added base for God Book preaching

* Remove setting farm level to 1

* Fix runServer.sh, patch farming skill nuke and latest build :)

Co-authored-by: Mr Extremez <aeggers90@hotmail.com>
2020-02-19 08:46:42 -05:00
Mr Extremez ef6968b283 Farming Skill, Orb Charging, Battle Staff Creation, etc (#377)
- Farming Skill Added
- Orb charging implemented
- Battle staff creation implemented
- Cleaned up some code
- Stuck command will now tele you from further out in wildy if you are not in combat
- Fixed an issue with amulet of glory
- Added forcechats for npcs at Gnome Agility Course, and for Cows, Ducks and Sheeps just like in actual osrs
- Added base for God Book preaching
2020-02-19 08:46:00 -05:00
Damion 9b220ec47c Implemented Command Processor (#375)
* Added CommandConsole and CommandProcessor Interface

* Added two commands, ListPlayers and Stop

* Registered commands with CommandConsole

* Added request for console from main.

Made help prompt not print after requesting help...

* Moved some files around

You didn't see anything

* Bug fix

* swap `break;` for `continue;`

* *cough* bug fix
2020-02-15 13:47:56 -05:00
Danial 02c7c30582 Misc changes (#376)
* Allow shop spawn anywhere if develop account + misc

* update client

* Update localhost client

* fixup
2020-02-14 07:57:26 -05:00
dginovker 34a1fe0e04 Merge branch 'mrextremez-newchanges' 2020-02-11 20:01:37 -05:00
dginovker 56e2c43251 New setup instructions + server jar 2020-02-11 19:59:49 -05:00
dginovker dc4edd3c32 Easier setup 2020-02-11 19:59:47 -05:00
dbrownidau 73da47ad18 Move shutdown call outside for loop. 2020-02-11 19:59:47 -05:00
dbrownidau 71256292eb Added block on main thread until tick scheduler shutdown. 2020-02-11 19:59:47 -05:00
dbrownidau 91c0da9932 Fix doco 2020-02-11 19:59:46 -05:00
dbrownidau 2dee7d2d2b Adjust formatting 2020-02-11 19:59:46 -05:00
dbrownidau 20568c8aaf Synchronization lock not required for scheduleAtFixedRate(new Runnable(){}) https://stackoverflow.com/a/35498230 2020-02-11 19:59:46 -05:00
dbrownidau 5faa526cf2 Moved main loop into FixedRate scheduler. Added sync lock on runnable. 2020-02-11 19:59:46 -05:00
dginovker c4160a3eba New setup instructions + server jar 2020-02-11 19:47:39 -05:00
dginovker 4a134a819e Easier setup 2020-02-11 18:53:00 -05:00
dginovker 95cdf3a029 Merge branch 'dbrownidau-fixedratetickloop' 2020-02-11 18:26:22 -05:00
dginovker e20cf57adf Merge branch 'fixedratetickloop' of https://github.com/dbrownidau/2006rebotted into dbrownidau-fixedratetickloop 2020-02-11 18:24:45 -05:00
Mr Extremez 217f341d7d quick
- removed some extra warnings lol
2020-02-10 00:42:02 -06:00
Mr Extremez 5ab79b1128 Range/Specials/Clean up
- Added correct range distance for all range weapons
- Fixed whip special attack when using on npcs
- Removed some warnings
- Refactored combat some
- Fixed a few typos
- Deleted some dead code
- Fixed bug where you could kill players with auto retaliate outside of the wilderness if you were already fighting them when they ran out

Closes #146
Closes #352

Also from a previous patch
Closes #329
2020-02-10 00:40:21 -06:00
dbrownidau 1d95da80b7 Move shutdown call outside for loop. 2020-02-10 14:09:56 +11:00
dbrownidau b665504c4b Added block on main thread until tick scheduler shutdown. 2020-02-10 10:35:19 +11:00
dbrownidau b855a98842 Fix doco 2020-02-10 01:35:40 +11:00
dbrownidau 00efcbbde9 Adjust formatting 2020-02-10 01:31:12 +11:00
dbrownidau fb1321c8e0 Synchronization lock not required for scheduleAtFixedRate(new Runnable(){}) https://stackoverflow.com/a/35498230 2020-02-10 01:29:57 +11:00
dbrownidau 3eb6e87019 Moved main loop into FixedRate scheduler. Added sync lock on runnable. 2020-02-10 00:38:52 +11:00
dginovker 2bef5158c4 readd runserver.sh 2020-02-06 02:59:29 +00:00
Daniel Ginovker e5e1495b4d [WIP] New setup (#371)
* Cleanup

* Add build file

* The great migration

* Restore MINA to 1.1.7

* Removed .gradle

* Added flatdir for libs with no artifact repository

* Add README.md, rename Implementation-Title

* New setup ease

* Update reademe and modules.xml

Co-authored-by: Damion <the@dbrown.id.au>
2020-02-03 17:40:24 -05:00
Damion 02b4df2666 Implementation of Gradle build framework (#369)
* Cleanup

* Add build file

* The great migration

* Restore MINA to 1.1.7

* Removed .gradle

* Added flatdir for libs with no artifact repository

* Add README.md, rename Implementation-Title
2020-02-03 17:13:57 -05:00
Daniel Ginovker 54f42aaf8a Convert item definitions into JSON form and fix shop prices (#367)
* Created itemdef.json with same content as itemdefs.gsu. Still need to read from it

* Converted a lot of IDs, not all

* All the runelocus shop items are in realshopvalues.json, all the old ones are in the regular json. Keeping this commit just in case something goes horribly, horribly wrong.

* Verified shop values are correct
2020-02-01 10:52:28 -05:00
Mr Extremez cbb7c7ba10 Various things enjoy! (#368)
* Various things enjoy!

- Added dairy churning
- Fixed soft clay so it uses 1 at a time
- Fixed spinning so it uses 1 at a time
- Added working cooking gloves
- Fixed mining animation glitch
- Fixed rune essence spam
- Added fix for tanning saying you do not have enough coins when you did
- Added working ecofuntus prayer training
- Added tiara binding and usage
- Added proper locate on rune talismans
- Can no longer pickpocket npc as it is dying
- No longer thieve men when trying to talk to them
- Improved birds nest to match accurately to rs
- Added desert heating system
- Cleaned up dialogue handler some
- Added chat emotes for dialogues
- Did some cleaning up
- Every possible item that has an empty option can now be emptied
- Cleaned up sheep shearing and improved it
- Added man npc dialogue
- Added back npc facing
- Added random messages when logging in on login screen
- Added player and staff player count for discord and ingame commands
- Improving the hopping stones at lighthouse, better, but not perfect
- You will no longer ever login and be at 0, 0 coordinates you will be automically moved to lumbridge
- Added a few new npc definitions
- Disabled rune mist requirement for admins
- Added getId command for admins to easily find item item ids
- Added working global chat
[::yell, ::hideyell will hide yells, 30 second delay for regular players, can not yell if you are muted or if word is blocked by filter, includes saving]
- Made a few changes to weight (should hopefully fix some of the weight bugs)

closes #366
closes #358
closes #331
closes #356
closes #234
closes #270
closes #309

* quick patch

- welcome screen bug fixed

* Cooking distance patch

- Cooking distance patch
2020-01-27 08:02:43 -05:00
dginovker 1d86d055a5 Merge commit w. Mr Extremez 2020-01-27 08:02:18 -05:00
Mr Extremez e2c675c392 Woodcutting animation fix (#363)
- Shouldn't copy other players anim anymore if more than 1 person is woodcutting

closes #173
2020-01-14 07:28:34 -05:00
dginovker eafe99af0a Latest compile 2020-01-13 07:53:55 -05:00
Mr Extremez 60239a38cf A few changes (#362)
- Stalls now dissapear when thieving them
- Added the missing coal rock in barbarian village
- Added some height level checks for object spawns
2020-01-13 07:53:18 -05:00
Daniel Ginovker 85a0406d9b Add rogues bank (#361) 2020-01-11 21:45:16 -05:00
dginovker dded6b8fd0 2.0 client notif 2020-01-10 18:15:01 -05:00
Mr Extremez db1f5ed785 Some fixes (#359)
- Added message of the week to welcome screen interface
- Added face north when clicking compass
- Disabled the blank tab on game frame
- Fixed all of the dialogue issues I could find in rune mysteries
- Fixed a few typos and did a very minor clean up in the dialogue file still a lot more planned soon
- Disabled resizable on the client seeing as it doesnt work correct currently anyways
2020-01-08 18:27:59 -05:00
Gptaqbc b1eaacf93c Door fix to facilitate Rune Mysteries script (#350)
Now some doors doesnt have forcemove anymore.
2020-01-07 17:57:08 -05:00
MitchvanWijngaarden c48b2575e9 fixed essence mining when multiple people are mining (#349) 2020-01-07 17:56:53 -05:00
dginovker cad66fdcc8 Latest compile 2020-01-06 07:41:36 -05:00
Daniel Ginovker d3a15b1aad Update README.md 2020-01-03 17:23:16 -05:00
Mr Extremez fdbb05597a A few fun fixes (#348)
- Ranging guild now works
- Fletching should no longer randomly stop if more than on person is doing it
- Added dragon longsword special attack

Closes #346
Closes #216
Closes #245
2020-01-03 09:12:09 -05:00
Gptaqbc 6b9d1d5881 Resolved couple special attacks issues(Whip, magic long bows, draggon daggers) (#347)
Resolved couple special attacks issues(Whip, magic long bows, draggon daggers)

I also discovered some issues about the special attack. There is no delay between the special attack and the next hit and the dragon longsword special attack doesnt work at all.
2020-01-02 18:35:04 -05:00
dginovker e3e74a6a25 Track github discord invites 2020-01-01 21:21:46 -05:00
1594 changed files with 111876 additions and 81786 deletions
+1
View File
@@ -3,3 +3,4 @@
.idea/workspace.xml
**/.idea/workspace.xml
**/.idea/*
*.iml
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
-2
View File
@@ -1,2 +0,0 @@
# Default ignored files
/workspace.xml
-178
View File
@@ -1,178 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/2006Redone Server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/2006Redone file_server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/2006Redone Client/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/commons-lang3-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/javac++.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/mina.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j-nop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/xpp3-1.1.4c.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/xstream-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/javac++.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mina.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/2006Redone Server/libs" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/2006Redone Server/libs" recursive="false" />
</library>
</orderEntry>
<orderEntry type="library" name="libs" level="project" />
<orderEntry type="library" name="commons-lang3-3.1" level="project" />
</component>
</module>
-11
View File
@@ -1,11 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="2006rebotted:jar">
<output-path>$PROJECT_DIR$/CompiledServer/artifacts/2006rebotted_jar</output-path>
<root id="archive" name="2006rebotted.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="2006rebotted" />
</root>
</artifact>
</component>
-11
View File
@@ -1,11 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="localhost_2006rebotted:jar">
<output-path>$PROJECT_DIR$/CompiledServer/artifacts/localhost_2006rebotted_jar</output-path>
<root id="archive" name="localhost_2006rebotted.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="2006rebotted" />
</root>
</artifact>
</component>
-16
View File
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CheckStyle-IDEA">
<option name="configuration">
<map>
<entry key="checkstyle-version" value="8.25" />
<entry key="copy-libs" value="true" />
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
<entry key="scan-before-checkin" value="false" />
<entry key="scanscope" value="JavaOnly" />
<entry key="suppress-errors" value="false" />
</map>
</option>
</component>
</project>
-17
View File
@@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="commons-lang3-3.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/javac++.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mina.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
-7
View File
@@ -1,7 +0,0 @@
<component name="libraryTable">
<library name="libs">
<CLASSES />
<JAVADOC />
<SOURCES />
</library>
</component>
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/CompiledServer" />
</component>
</project>
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/2006rebotted.iml" filepath="$PROJECT_DIR$/.idea/2006rebotted.iml" />
</modules>
</component>
</project>
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
-175
View File
@@ -1,175 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="localhost_2006rebotted:jar" />
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class" afterDir="false" />
</list>
<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="FileColors">
<fileColor scope="Local Unit Tests" color="#161c22" />
<fileColor scope="Android Instrumented Tests" color="#161c22" />
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>math.sq</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-7" />
<option name="width" value="1294" />
<option name="height" value="1407" />
</component>
<component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
<component name="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="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
<component name="RunManager" selected="Application.GameEngine">
<configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Client" />
<module name="2006rebotted" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="FileServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.apollo.jagcached.FileServer" />
<module name="2006rebotted" />
<option name="WORKING_DIRECTORY" value="2006Redone file_server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.apollo.jagcached.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GameEngine" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.rebotted.GameEngine" />
<module name="2006rebotted" />
<option name="WORKING_DIRECTORY" value="2006Redone Server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="redone.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Application.FileServer" />
<item itemvalue="Application.GameEngine" />
<item itemvalue="Application.Client" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.GameEngine" />
<item itemvalue="Application.FileServer" />
<item itemvalue="Application.Client" />
</list>
</recent_temporary>
</component>
<component name="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="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="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>
</project>
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
+1
View File
@@ -0,0 +1 @@
/target/
@@ -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>RS2006</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
@@ -1,3 +0,0 @@
Manifest-Version: 1.0
Main-Class: Main
@@ -1,3 +0,0 @@
Manifest-Version: 1.0
Main-Class: Client
-2
View File
@@ -1,2 +0,0 @@
/Client.class
/LocalGame.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.
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.
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

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