mikeysasse merge prep

This commit is contained in:
dginovker 2019-11-02 17:24:01 -04:00
parent 80d0e74b32
commit 5e3d85718d
13 changed files with 608 additions and 35 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
production/* production/*
.idea/* .idea/*
.idea/

2
.idea/misc.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_222 (2)" project-jdk-type="JavaSDK"> <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" /> <output url="file://$PROJECT_DIR$/CompiledServer" />
</component> </component>
</project> </project>

579
.idea/workspace.xml generated
View file

@ -1,7 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="" /> <list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" 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" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/ServerConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/ServerConstants.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/data/eco/grand_exchange_db.emp" beforeDir="false" afterPath="$PROJECT_DIR$/Server/data/eco/grand_exchange_db.emp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -11,24 +23,196 @@
<component name="DefaultGradleProjectSettings"> <component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" /> <option name="isMigrated" value="true" />
</component> </component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/PlayerDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="385" column="19" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
<folding>
<element signature="e#6796#6797#0" expanded="true" />
<element signature="e#6819#6820#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/portal/PlayerSQLManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="91" selection-start-line="91" selection-end-line="91" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#591#592#0" expanded="true" />
<element signature="e#618#619#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="452">
<caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="422">
<caret line="57" column="7" lean-forward="true" selection-start-line="57" selection-start-column="7" selection-end-line="57" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/TeleportManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="63" column="83" selection-start-line="63" selection-start-column="83" selection-end-line="63" selection-end-column="83" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/item/StarterPackPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/guild/RangingGuildPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/player/LoginValidationPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>tutorial</find>
<find>login</find>
<find>starter</find>
<find>setlastlogin</find>
<find>HOME</find>
<find>home teleport</find>
<find>mystical foresig</find>
</findStrings>
<dirStrings>
<dir>C:\Users\Michael\Desktop\rsps_trash\rs2009\Server\src\plugin\interaction\item</dir>
</dirStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java" />
<option value="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" />
<option value="$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java" />
<option value="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" />
<option value="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-7" />
<option name="width" value="1294" />
<option name="height" value="1407" />
</component>
<component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" /> <component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
<item name="rs2009" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
<item name="rs2009" type="462c0819:PsiDirectoryNode" />
<item name="Server" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
<item name="rs2009" type="462c0819:PsiDirectoryNode" />
<item name="Server" type="462c0819:PsiDirectoryNode" />
<item name="tutorial" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="Downloaded.Files.Path.Enabled" value="false" /> <property name="Downloaded.Files.Path.Enabled" value="false" />
<property name="Repository.Attach.Annotations" value="false" /> <property name="Repository.Attach.Annotations" value="false" />
<property name="Repository.Attach.JavaDocs" value="false" /> <property name="Repository.Attach.JavaDocs" value="false" />
<property name="Repository.Attach.Sources" value="false" /> <property name="Repository.Attach.Sources" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/Server/data" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
</component> <property name="restartRequiresConfirmation" value="false" />
<component name="RecentsManager"> <property name="settings.editor.selected.configurable" value="editing.templates" />
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="org.runite" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
@ -43,19 +227,6 @@
</option> </option>
</component> </component>
<component name="RunManager" selected="Application.Server"> <component name="RunManager" selected="Application.Server">
<configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.runite.Client" />
<module name="09Scape" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.runite.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.runite.GameLaunch" /> <option name="MAIN_CLASS_NAME" value="org.runite.GameLaunch" />
<module name="09Scape" /> <module name="09Scape" />
@ -100,12 +271,10 @@
<item itemvalue="Application.Management" /> <item itemvalue="Application.Management" />
<item itemvalue="Application.Server" /> <item itemvalue="Application.Server" />
<item itemvalue="Application.GameLaunch" /> <item itemvalue="Application.GameLaunch" />
<item itemvalue="Application.Client" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.Server" /> <item itemvalue="Application.Server" />
<item itemvalue="Application.Client" />
<item itemvalue="Application.GameLaunch" /> <item itemvalue="Application.GameLaunch" />
<item itemvalue="Application.Management" /> <item itemvalue="Application.Management" />
</list> </list>
@ -124,17 +293,383 @@
</task> </task>
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Image Layers" />
<window_info id="Designer" />
<window_info id="UI Designer" />
<window_info id="Capture Tool" />
<window_info id="Favorites" side_tool="true" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18004769" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Version Control" weight="0.32969603" />
<window_info anchor="bottom" id="Terminal" weight="0.32969603" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Messages" weight="0.32967034" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32969603" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3289166" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.3998441" />
<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="right" id="Palette" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="right" id="Maven" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Palette&#9;" />
<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" />
</layout>
</component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" /> <option name="COLUMN_ORDER" />
</State> </State>
</value> </value>
</entry> </entry>
</map> </map>
</option> </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="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/system/mysql/SQLManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/system/script/ScriptCompiler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
<caret line="86" column="37" lean-forward="true" selection-start-line="86" selection-start-column="37" selection-end-line="86" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/Server.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="40" column="7" lean-forward="true" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/travel/glider/Gliders.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-292">
<caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/travel/glider/GliderPulse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79">
<caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/skill/free/cooking/CookingPulse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="52" column="60" lean-forward="true" selection-start-line="52" selection-start-column="60" selection-end-line="52" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/inter/LoginInterfacePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/state/StateManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-708">
<caret line="21" column="35" lean-forward="true" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="71" column="31" selection-start-line="71" selection-start-column="31" selection-end-line="71" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialIslandPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="46" column="65" lean-forward="true" selection-start-line="46" selection-start-column="65" selection-end-line="46" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="93" column="18" lean-forward="true" selection-start-line="93" selection-start-column="18" selection-end-line="93" selection-end-column="18" />
<folding>
<element signature="e#27874#27875#0" expanded="true" />
<element signature="e#27898#27899#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2159">
<caret line="149" column="7" lean-forward="true" selection-start-line="149" selection-start-column="7" selection-end-line="149" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/tools/PlayerLoader.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/tools/firewatch/Firewatch.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BrotherBraceDialogue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/object/ShootingStarPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="228" column="41" selection-start-line="228" selection-start-column="41" selection-end-line="228" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/plugin/PluginManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="161" column="53" selection-start-line="161" selection-start-column="53" selection-end-line="161" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/DoomsayerTogglePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="17" selection-start-line="17" selection-end-line="17" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/consumable/PotionPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="28" column="31" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/plugin/InitializablePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/barrows/BarrowsActivityPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="40" selection-start-line="40" selection-end-line="40" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/guild/RangingGuildPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/item/StarterPackPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/portal/PlayerSQLManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="91" selection-start-line="91" selection-end-line="91" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/PlayerDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="385" column="19" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
<folding>
<element signature="e#6796#6797#0" expanded="true" />
<element signature="e#6819#6820#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/player/LoginValidationPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#591#592#0" expanded="true" />
<element signature="e#618#619#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="452">
<caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/TeleportManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="63" column="83" selection-start-line="63" selection-start-column="83" selection-end-line="63" selection-end-column="83" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="422">
<caret line="57" column="7" lean-forward="true" selection-start-line="57" selection-start-column="7" selection-end-line="57" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<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>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>09Scape</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component> </component>
</project> </project>

View file

@ -1,12 +1,12 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.source=1.7

View file

@ -48,12 +48,12 @@ public final class ServerConstants {
/** /**
* The start location for a fresh account. * The start location for a fresh account.
*/ */
public static final Location START_LOCATION = Location.create(3088, 3491, 0); public static final Location START_LOCATION = Location.create(3232, 3231, 0);
/** /**
* The main home teleport location. * The main home teleport location.
*/ */
public static final Location HOME_LOCATION = Location.create(3088, 3491, 0); public static final Location HOME_LOCATION = Location.create(3221, 3218, 0);
/** /**
* The teleport destinations. * The teleport destinations.

View file

@ -127,8 +127,7 @@ public final class LoginReadEvent extends IoReadEvent {
/** /**
* Handles the login procedure after we check an acc is registered & certified. * Handles the login procedure after we check an acc is registered & certified.
* @param username the username. * @param details the player details.
* @param password the password.
* @param session the session. * @param session the session.
* @param buffer the byte buffer. * @param buffer the byte buffer.
* @param opcode the opcode. * @param opcode the opcode.

View file

@ -83,11 +83,7 @@ public final class PhantuwtiFantstuwiFarSight extends DialoguePlugin {
break; break;
case 20: case 20:
interpreter.sendDialogues(npc, FacialExpression.NORMAL, "A lot of our time is spent adressing everyday sorts of", "things, plus we meditate a lot and ehhance our", "powers of mystical foresight."); interpreter.sendDialogues(npc, FacialExpression.NORMAL, "A lot of our time is spent adressing everyday sorts of", "things, plus we meditate a lot and ehhance our", "powers of mystical foresight.");
stage = 21; stage = 31;
break;
case 21:
interpreter.sendDialogues(npc, FacialExpression.NORMAL, "A lot of our time is spent adressing everyday sorts of", "things, plus we meditate a lot and ehhance our", "powers of mystical foresight.");
stage = 21;
break; break;
case 30: case 30:
interpreter.sendDialogues(npc, FacialExpression.NORMAL, "Unfortunately no, sorry, but if adventure is what you", "seek, try checking through your quest list!"); interpreter.sendDialogues(npc, FacialExpression.NORMAL, "Unfortunately no, sorry, but if adventure is what you", "seek, try checking through your quest list!");

View file

@ -0,0 +1,42 @@
package plugin.tutorial;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.node.item.Item;
import org.crandor.plugin.InitializablePlugin;
import org.crandor.plugin.Plugin;
import org.crandor.plugin.PluginManifest;
import org.crandor.plugin.PluginType;
/**
* Basic starter until tutorial is completed.
*
* @author Michael Sasse (https://github.com/mikeysasse/)
*/
@InitializablePlugin
@PluginManifest(type = PluginType.LOGIN)
public class BasicStarter implements Plugin<Player> {
private static final int[][] STARTER_ITEMS = { { 1351, 1 }, { 590, 1 },
{ 303, 1 }, { 315, 1 }, { 1925, 1 }, { 1931, 1 }, { 2309, 1 },
{ 1265, 1 }, { 1205, 1 }, { 1277, 1 }, { 1171, 1 }, { 841, 1 },
{ 882, 25 }, { 556, 25 }, { 558, 15 }, { 555, 6 }, { 557, 4 },
{ 559, 2 } };
public BasicStarter() { }
@Override
public Plugin<Player> newInstance(Player player) throws Throwable {
System.out.println(player.getDetails().getLastLogin());
if (player.getDetails().getLastLogin() == 0) {
for (int[] item : STARTER_ITEMS) {
player.getInventory().add(new Item(item[0], item[1]));
}
}
return this;
}
@Override
public Object fireEvent(String identifier, Object... args) {
return null;
}
}