Révision | feaee6cc82c172525d6df4290b4df41b136dfb4a (tree) |
---|---|
l'heure | 2018-10-11 05:26:16 |
Auteur | sebastian_bugiu <sebastian_ <bugiu@head...> |
Commiter | sebastian_bugiu <sebastian_ |
Added shutting the application down when closing the window.
@@ -2,24 +2,8 @@ | ||
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | 4 | <list default="true" id="7105e4c6-0867-4f2c-a066-e5ce5581c80a" name="Default" comment=""> |
5 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_badlogicgames_gdx_gdx_bullet_platform_natives_desktop_1_9_1.xml" afterDir="false" /> | |
6 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_badlogicgames_gdx_gdx_freetype_platform_natives_desktop_1_9_1.xml" afterDir="false" /> | |
7 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_badlogicgames_gdx_gdx_platform_natives_desktop_1_9_1.xml" afterDir="false" /> | |
8 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__net_java_jinput_jinput_platform_natives_linux_2_0_5.xml" afterDir="false" /> | |
9 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__net_java_jinput_jinput_platform_natives_osx_2_0_5.xml" afterDir="false" /> | |
10 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__net_java_jinput_jinput_platform_natives_windows_2_0_5.xml" afterDir="false" /> | |
11 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_natives_linux_2_9_2.xml" afterDir="false" /> | |
12 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_natives_osx_2_9_2.xml" afterDir="false" /> | |
13 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_natives_windows_2_9_2.xml" afterDir="false" /> | |
14 | - <change afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_main.iml" afterDir="false" /> | |
15 | - <change afterPath="$PROJECT_DIR$/.idea/modules/BlackholeDarksunServer2_test.iml" afterDir="false" /> | |
16 | - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> | |
17 | - <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" /> | |
18 | - <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> | |
19 | - <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" /> | |
20 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
21 | - <change beforePath="$PROJECT_DIR$/BlackholeDarksunServer2.iml" beforeDir="false" afterPath="$PROJECT_DIR$/BlackholeDarksunServer2.iml" afterDir="false" /> | |
22 | - <change beforePath="$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ServerEndPoint.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ServerEndPoint.java" afterDir="false" /> | |
6 | + <change beforePath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" afterDir="false" /> | |
23 | 7 | </list> |
24 | 8 | <ignored path="BlackholeDarksunServer2.iws" /> |
25 | 9 | <ignored path=".idea/workspace.xml" /> |
@@ -70,30 +54,8 @@ | ||
70 | 54 | <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false"> |
71 | 55 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java"> |
72 | 56 | <provider selected="true" editor-type-id="text-editor"> |
73 | - <state relative-caret-position="102"> | |
74 | - <caret line="108" column="45" selection-start-line="108" selection-start-column="45" selection-end-line="108" selection-end-column="45" /> | |
75 | - </state> | |
76 | - </provider> | |
77 | - </entry> | |
78 | - </file> | |
79 | - <file leaf-file-name="ConnectServerTask.java" pinned="false" current-in-tab="false"> | |
80 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/ConnectServerTask.java"> | |
81 | - <provider selected="true" editor-type-id="text-editor"> | |
82 | - <state relative-caret-position="247"> | |
83 | - <caret line="27" column="57" selection-start-line="27" selection-start-column="57" selection-end-line="27" selection-end-column="57" /> | |
84 | - <folding> | |
85 | - <element signature="e#653#654#0" expanded="true" /> | |
86 | - <element signature="e#699#700#0" expanded="true" /> | |
87 | - </folding> | |
88 | - </state> | |
89 | - </provider> | |
90 | - </entry> | |
91 | - </file> | |
92 | - <file leaf-file-name="Main.java" pinned="false" current-in-tab="false"> | |
93 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
94 | - <provider selected="true" editor-type-id="text-editor"> | |
95 | - <state relative-caret-position="161"> | |
96 | - <caret line="20" column="45" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" /> | |
57 | + <state relative-caret-position="382"> | |
58 | + <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" /> | |
97 | 59 | </state> |
98 | 60 | </provider> |
99 | 61 | </entry> |
@@ -101,12 +63,21 @@ | ||
101 | 63 | <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> |
102 | 64 | <entry file="file://$PROJECT_DIR$/build.gradle"> |
103 | 65 | <provider selected="true" editor-type-id="text-editor"> |
104 | - <state relative-caret-position="118"> | |
66 | + <state relative-caret-position="288"> | |
105 | 67 | <caret line="29" selection-start-line="29" selection-end-line="29" /> |
106 | 68 | </state> |
107 | 69 | </provider> |
108 | 70 | </entry> |
109 | 71 | </file> |
72 | + <file leaf-file-name="Main.java" pinned="false" current-in-tab="true"> | |
73 | + <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
74 | + <provider selected="true" editor-type-id="text-editor"> | |
75 | + <state relative-caret-position="255"> | |
76 | + <caret line="23" column="45" lean-forward="true" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" /> | |
77 | + </state> | |
78 | + </provider> | |
79 | + </entry> | |
80 | + </file> | |
110 | 81 | <file leaf-file-name="ServerEndPoint.java" pinned="false" current-in-tab="false"> |
111 | 82 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ServerEndPoint.java"> |
112 | 83 | <provider selected="true" editor-type-id="text-editor"> |
@@ -116,20 +87,11 @@ | ||
116 | 87 | </provider> |
117 | 88 | </entry> |
118 | 89 | </file> |
119 | - <file leaf-file-name="Endpoint.java" pinned="false" current-in-tab="false"> | |
120 | - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit/retrofit/1.9.0/f3908d76273ad2498add8bb89d7fb787f3061b1d/retrofit-1.9.0-sources.jar!/retrofit/Endpoint.java"> | |
90 | + <file leaf-file-name="APP_Game.java" pinned="false" current-in-tab="false"> | |
91 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java"> | |
121 | 92 | <provider selected="true" editor-type-id="text-editor"> |
122 | - <state relative-caret-position="136"> | |
123 | - <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> | |
124 | - </state> | |
125 | - </provider> | |
126 | - </entry> | |
127 | - </file> | |
128 | - <file leaf-file-name="APP_Game.class" pinned="false" current-in-tab="false"> | |
129 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0.jar!/headwayent/blackholedarksun/APP_Game.class"> | |
130 | - <provider selected="true" editor-type-id="text-editor"> | |
131 | - <state relative-caret-position="1444"> | |
132 | - <caret line="147" column="31" selection-start-line="147" selection-start-column="31" selection-end-line="147" selection-end-column="31" /> | |
93 | + <state relative-caret-position="1394"> | |
94 | + <caret line="149" column="31" selection-start-line="149" selection-start-column="31" selection-end-line="149" selection-end-column="31" /> | |
133 | 95 | </state> |
134 | 96 | </provider> |
135 | 97 | </entry> |
@@ -137,7 +99,7 @@ | ||
137 | 99 | <file leaf-file-name="ClientAPI.java" pinned="false" current-in-tab="false"> |
138 | 100 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ClientAPI.java"> |
139 | 101 | <provider selected="true" editor-type-id="text-editor"> |
140 | - <state relative-caret-position="289"> | |
102 | + <state relative-caret-position="442"> | |
141 | 103 | <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" /> |
142 | 104 | </state> |
143 | 105 | </provider> |
@@ -146,17 +108,35 @@ | ||
146 | 108 | <file leaf-file-name="ServerTable.java" pinned="false" current-in-tab="false"> |
147 | 109 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java"> |
148 | 110 | <provider selected="true" editor-type-id="text-editor"> |
149 | - <state relative-caret-position="17"> | |
111 | + <state relative-caret-position="119"> | |
150 | 112 | <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> |
151 | 113 | </state> |
152 | 114 | </provider> |
153 | 115 | </entry> |
154 | 116 | </file> |
155 | - <file leaf-file-name="GameServer.java" pinned="false" current-in-tab="true"> | |
117 | + <file leaf-file-name="GameServer.java" pinned="false" current-in-tab="false"> | |
156 | 118 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java"> |
157 | 119 | <provider selected="true" editor-type-id="text-editor"> |
158 | - <state relative-caret-position="68"> | |
159 | - <caret line="94" column="8" selection-start-line="94" selection-start-column="8" selection-end-line="94" selection-end-column="8" /> | |
120 | + <state relative-caret-position="1581"> | |
121 | + <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" /> | |
122 | + </state> | |
123 | + </provider> | |
124 | + </entry> | |
125 | + </file> | |
126 | + <file leaf-file-name="ServerVirtualizationService.java" pinned="false" current-in-tab="false"> | |
127 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> | |
128 | + <provider selected="true" editor-type-id="text-editor"> | |
129 | + <state relative-caret-position="850"> | |
130 | + <caret line="63" column="8" selection-start-line="63" selection-start-column="8" selection-end-line="63" selection-end-column="8" /> | |
131 | + </state> | |
132 | + </provider> | |
133 | + </entry> | |
134 | + </file> | |
135 | + <file leaf-file-name="ClientListener.java" pinned="false" current-in-tab="false"> | |
136 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> | |
137 | + <provider selected="true" editor-type-id="text-editor"> | |
138 | + <state relative-caret-position="578"> | |
139 | + <caret line="48" column="24" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" /> | |
160 | 140 | </state> |
161 | 141 | </provider> |
162 | 142 | </entry> |
@@ -398,6 +378,7 @@ | ||
398 | 378 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/world/WorldManagerServerSide.java" /> |
399 | 379 | <option value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java" /> |
400 | 380 | <option value="$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ServerEndPoint.java" /> |
381 | + <option value="$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java" /> | |
401 | 382 | </list> |
402 | 383 | </option> |
403 | 384 | </component> |
@@ -516,7 +497,7 @@ | ||
516 | 497 | <property name="WebServerToolWindowFactoryState" value="false" /> |
517 | 498 | <property name="aspect.path.notification.shown" value="true" /> |
518 | 499 | <property name="dynamic.classpath" value="false" /> |
519 | - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> | |
500 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/core-1.0-sources.jar!/" /> | |
520 | 501 | <property name="options.lastSelected" value="preferences.pluginManager" /> |
521 | 502 | <property name="options.splitter.details.proportions" value="0.2" /> |
522 | 503 | <property name="options.splitter.main.proportions" value="0.3" /> |
@@ -543,6 +524,8 @@ | ||
543 | 524 | <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> |
544 | 525 | </configuration> |
545 | 526 | <configuration name="Desktop" type="Application" factoryName="Application" singleton="true"> |
527 | + <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files (x86)/Java/jre1.8.0_162" /> | |
528 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> | |
546 | 529 | <option name="MAIN_CLASS_NAME" value="headwayEnt.BlackholeDarksunOnline.Server.Main" /> |
547 | 530 | <module name="BlackholeDarksunServer2_main" /> |
548 | 531 | <option name="PROGRAM_PARAMETERS" value="inputstate HeadwayEntertainment/Hotshot/session_debugging_state(3).txt ignore_args true" /> |
@@ -870,57 +853,58 @@ | ||
870 | 853 | <workItem from="1468935035956" duration="2810000" /> |
871 | 854 | <workItem from="1472052583402" duration="6106000" /> |
872 | 855 | <workItem from="1492885488854" duration="60000" /> |
873 | - <workItem from="1539022539750" duration="3382000" /> | |
856 | + <workItem from="1539022539750" duration="4663000" /> | |
857 | + <workItem from="1539191537027" duration="3768000" /> | |
874 | 858 | </task> |
875 | 859 | <servers /> |
876 | 860 | </component> |
877 | 861 | <component name="TimeTrackingManager"> |
878 | - <option name="totallyTimeSpent" value="80045000" /> | |
862 | + <option name="totallyTimeSpent" value="85094000" /> | |
879 | 863 | </component> |
880 | 864 | <component name="ToolWindowManager"> |
881 | 865 | <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" /> |
882 | 866 | <editor active="true" /> |
883 | 867 | <layout> |
884 | 868 | <window_info anchor="right" id="Palette" order="3" /> |
885 | - <window_info anchor="bottom" id="Event Log" order="16" sideWeight="0.53198296" side_tool="true" weight="0.32405347" /> | |
886 | - <window_info anchor="right" id="Maven Projects" order="6" /> | |
887 | - <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" /> | |
888 | - <window_info id="Capture Tool" /> | |
889 | - <window_info anchor="right" id="Designer" order="2" /> | |
890 | - <window_info anchor="bottom" id="Build" weight="0.32930845" /> | |
891 | - <window_info anchor="right" id="Database" order="0" weight="0.32995737" /> | |
892 | - <window_info anchor="right" id="Structure" order="10" side_tool="true" visible="true" weight="0.16151386" /> | |
893 | - <window_info anchor="right" id="Ant Build" order="8" weight="0.25" /> | |
894 | - <window_info id="UI Designer" order="0" /> | |
895 | - <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" visible="true" weight="0.35565314" /> | |
896 | 869 | <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.4978678" weight="0.32962137" /> |
897 | 870 | <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.47654584" weight="0.3270925" /> |
898 | 871 | <window_info id="Palette	" order="1" /> |
899 | - <window_info id="Image Layers" /> | |
900 | - <window_info anchor="right" id="Capture Analysis" /> | |
872 | + <window_info id="Image Layers" order="2" /> | |
873 | + <window_info anchor="right" id="Capture Analysis" order="7" /> | |
874 | + <window_info anchor="bottom" id="Event Log" order="16" sideWeight="0.53198296" side_tool="true" weight="0.32405347" /> | |
875 | + <window_info anchor="right" id="Maven Projects" order="6" /> | |
876 | + <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" /> | |
901 | 877 | <window_info anchor="bottom" id="Run" order="2" weight="0.32929516" /> |
902 | 878 | <window_info anchor="bottom" id="Version Control" order="10" weight="0.32929516" /> |
903 | 879 | <window_info anchor="bottom" id="Terminal" order="13" weight="0.32929516" /> |
904 | - <window_info active="true" content_ui="combo" id="Project" order="5" sideWeight="0.4940171" visible="true" weight="0.18656716" /> | |
905 | - <window_info anchor="bottom" id="Find" order="1" sideWeight="0.46801707" weight="0.31613612" /> | |
880 | + <window_info id="Capture Tool" order="2" /> | |
881 | + <window_info anchor="right" id="Designer" order="2" /> | |
882 | + <window_info content_ui="combo" id="Project" order="5" sideWeight="0.4940171" visible="true" weight="0.18869936" /> | |
883 | + <window_info anchor="right" id="Database" order="0" weight="0.32995737" /> | |
906 | 884 | <window_info anchor="right" id="Gradle" order="1" weight="0.19189766" /> |
907 | - <window_info anchor="right" id="Theme Preview" /> | |
885 | + <window_info anchor="right" id="Structure" order="10" sideWeight="0.5008518" side_tool="true" weight="0.17110874" /> | |
886 | + <window_info anchor="right" id="Ant Build" order="8" weight="0.25" /> | |
887 | + <window_info id="UI Designer" order="0" /> | |
888 | + <window_info anchor="right" id="Theme Preview" order="7" /> | |
889 | + <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.47867805" visible="true" weight="0.35565314" /> | |
908 | 890 | <window_info id="Favorites" order="3" side_tool="true" /> |
909 | - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" visible="true" weight="0.17110874" /> | |
910 | - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" /> | |
911 | - <window_info anchor="bottom" id="Java Enterprise" order="8" /> | |
891 | + <window_info id="Build Variants" order="2" sideWeight="0.50598294" side_tool="true" weight="0.19029851" /> | |
892 | + <window_info anchor="bottom" id="Find" order="1" sideWeight="0.46801707" weight="0.31613612" /> | |
893 | + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
894 | + <window_info anchor="right" id="Bean Validation" order="5" /> | |
912 | 895 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
913 | - <window_info id="Build Variants" order="2" sideWeight="0.50598294" side_tool="true" weight="0.19029851" /> | |
914 | 896 | <window_info anchor="bottom" id="Changes" order="7" /> |
915 | - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
897 | + <window_info anchor="bottom" id="Java Enterprise" order="8" /> | |
898 | + <window_info active="true" anchor="right" content_ui="combo" id="Hierarchy" order="9" visible="true" weight="0.17110874" /> | |
899 | + <window_info anchor="right" id="IDEtalk" order="4" /> | |
900 | + <window_info anchor="bottom" id="Android" order="15" weight="0.32929516" /> | |
901 | + <window_info anchor="bottom" id="Application Servers" order="11" /> | |
916 | 902 | <window_info anchor="bottom" id="Memory Monitor" order="12" side_tool="true" /> |
903 | + <window_info anchor="bottom" id="Build" order="17" weight="0.32930845" /> | |
904 | + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" /> | |
917 | 905 | <window_info id="Web" order="4" side_tool="true" /> |
918 | 906 | <window_info anchor="bottom" id="Message" order="0" /> |
919 | - <window_info anchor="right" id="Bean Validation" order="5" /> | |
920 | - <window_info anchor="bottom" id="Android" order="15" weight="0.32929516" /> | |
921 | 907 | <window_info anchor="bottom" id="IDEtalk Messages" order="9" /> |
922 | - <window_info anchor="bottom" id="Application Servers" order="11" /> | |
923 | - <window_info anchor="right" id="IDEtalk" order="4" /> | |
924 | 908 | </layout> |
925 | 909 | </component> |
926 | 910 | <component name="TypeScriptGeneratedFilesManager"> |
@@ -1010,7 +994,7 @@ | ||
1010 | 994 | <breakpoints-dialog> |
1011 | 995 | <breakpoints-dialog /> |
1012 | 996 | </breakpoints-dialog> |
1013 | - <option name="time" value="52" /> | |
997 | + <option name="time" value="53" /> | |
1014 | 998 | </breakpoint-manager> |
1015 | 999 | </component> |
1016 | 1000 | <component name="antWorkspaceConfiguration"> |
@@ -1018,13 +1002,6 @@ | ||
1018 | 1002 | <option name="FILTER_TARGETS" value="false" /> |
1019 | 1003 | </component> |
1020 | 1004 | <component name="editorHistoryManager"> |
1021 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/hotshotengine/renderer/plugins/particlefx/ParticleFXPlugin.java"> | |
1022 | - <provider selected="true" editor-type-id="text-editor"> | |
1023 | - <state> | |
1024 | - <caret line="9" selection-start-line="9" selection-end-line="9" /> | |
1025 | - </state> | |
1026 | - </provider> | |
1027 | - </entry> | |
1028 | 1005 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> |
1029 | 1006 | <provider selected="true" editor-type-id="text-editor"> |
1030 | 1007 | <state> |
@@ -1036,27 +1013,6 @@ | ||
1036 | 1013 | <provider selected="true" editor-type-id="text-editor"> |
1037 | 1014 | <state> |
1038 | 1015 | <caret line="98" column="48" selection-start-line="98" selection-start-column="48" selection-end-line="98" selection-end-column="48" /> |
1039 | - <folding> | |
1040 | - <element signature="imports" /> | |
1041 | - <element signature="e#914#915#0" /> | |
1042 | - <element signature="e#946#947#0" /> | |
1043 | - <element signature="e#1012#1013#0" /> | |
1044 | - <element signature="e#1055#1056#0" /> | |
1045 | - <element signature="e#1124#1125#0" /> | |
1046 | - <element signature="e#1170#1171#0" /> | |
1047 | - <element signature="e#5811#5812#0" /> | |
1048 | - <element signature="e#5849#5850#0" /> | |
1049 | - <element signature="e#5914#5915#0" /> | |
1050 | - <element signature="e#5959#5960#0" /> | |
1051 | - <element signature="e#6194#6195#0" /> | |
1052 | - <element signature="e#6244#6245#0" /> | |
1053 | - <element signature="e#6462#6463#0" /> | |
1054 | - <element signature="e#6491#6492#0" /> | |
1055 | - <element signature="e#6535#6536#0" /> | |
1056 | - <element signature="e#6571#6572#0" /> | |
1057 | - <element signature="e#6612#6613#0" /> | |
1058 | - <element signature="e#6649#6650#0" /> | |
1059 | - </folding> | |
1060 | 1016 | </state> |
1061 | 1017 | </provider> |
1062 | 1018 | </entry> |
@@ -1264,34 +1220,6 @@ | ||
1264 | 1220 | </state> |
1265 | 1221 | </provider> |
1266 | 1222 | </entry> |
1267 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> | |
1268 | - <provider selected="true" editor-type-id="text-editor"> | |
1269 | - <state> | |
1270 | - <caret line="48" column="24" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" /> | |
1271 | - <folding> | |
1272 | - <element signature="imports" /> | |
1273 | - <element signature="e#914#915#0" /> | |
1274 | - <element signature="e#946#947#0" /> | |
1275 | - <element signature="e#1012#1013#0" /> | |
1276 | - <element signature="e#1055#1056#0" /> | |
1277 | - <element signature="e#1124#1125#0" /> | |
1278 | - <element signature="e#1170#1171#0" /> | |
1279 | - <element signature="e#5811#5812#0" /> | |
1280 | - <element signature="e#5849#5850#0" /> | |
1281 | - <element signature="e#5914#5915#0" /> | |
1282 | - <element signature="e#5959#5960#0" /> | |
1283 | - <element signature="e#6194#6195#0" /> | |
1284 | - <element signature="e#6244#6245#0" /> | |
1285 | - <element signature="e#6462#6463#0" /> | |
1286 | - <element signature="e#6491#6492#0" /> | |
1287 | - <element signature="e#6535#6536#0" /> | |
1288 | - <element signature="e#6571#6572#0" /> | |
1289 | - <element signature="e#6612#6613#0" /> | |
1290 | - <element signature="e#6649#6650#0" /> | |
1291 | - </folding> | |
1292 | - </state> | |
1293 | - </provider> | |
1294 | - </entry> | |
1295 | 1223 | <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_MultiPlayerGame.java"> |
1296 | 1224 | <provider selected="true" editor-type-id="text-editor"> |
1297 | 1225 | <state> |
@@ -1367,13 +1295,6 @@ | ||
1367 | 1295 | </state> |
1368 | 1296 | </provider> |
1369 | 1297 | </entry> |
1370 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> | |
1371 | - <provider selected="true" editor-type-id="text-editor"> | |
1372 | - <state relative-caret-position="1445"> | |
1373 | - <caret line="98" selection-start-line="98" selection-end-line="98" /> | |
1374 | - </state> | |
1375 | - </provider> | |
1376 | - </entry> | |
1377 | 1298 | <entry file="file://$PROJECT_DIR$/res/gui.fxml"> |
1378 | 1299 | <provider selected="true" editor-type-id="text-editor"> |
1379 | 1300 | <state relative-caret-position="204"> |
@@ -1382,37 +1303,9 @@ | ||
1382 | 1303 | </provider> |
1383 | 1304 | <provider editor-type-id="JavaFX-Scene-Builder" /> |
1384 | 1305 | </entry> |
1385 | - <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java"> | |
1386 | - <provider selected="true" editor-type-id="text-editor"> | |
1387 | - <state relative-caret-position="286"> | |
1388 | - <caret line="501" column="12" selection-start-line="501" selection-start-column="12" selection-end-line="501" selection-end-column="12" /> | |
1389 | - </state> | |
1390 | - </provider> | |
1391 | - </entry> | |
1392 | - <entry file="file://$PROJECT_DIR$/build.gradle"> | |
1393 | - <provider selected="true" editor-type-id="text-editor"> | |
1394 | - <state relative-caret-position="118"> | |
1395 | - <caret line="29" selection-start-line="29" selection-end-line="29" /> | |
1396 | - </state> | |
1397 | - </provider> | |
1398 | - </entry> | |
1399 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
1400 | - <provider selected="true" editor-type-id="text-editor"> | |
1401 | - <state relative-caret-position="161"> | |
1402 | - <caret line="20" column="45" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" /> | |
1403 | - </state> | |
1404 | - </provider> | |
1405 | - </entry> | |
1406 | - <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java"> | |
1407 | - <provider selected="true" editor-type-id="text-editor"> | |
1408 | - <state relative-caret-position="102"> | |
1409 | - <caret line="108" column="45" selection-start-line="108" selection-start-column="45" selection-end-line="108" selection-end-column="45" /> | |
1410 | - </state> | |
1411 | - </provider> | |
1412 | - </entry> | |
1413 | 1306 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Tasks/ConnectServerTask.java"> |
1414 | 1307 | <provider selected="true" editor-type-id="text-editor"> |
1415 | - <state relative-caret-position="247"> | |
1308 | + <state relative-caret-position="255"> | |
1416 | 1309 | <caret line="27" column="57" selection-start-line="27" selection-start-column="57" selection-end-line="27" selection-end-column="57" /> |
1417 | 1310 | <folding> |
1418 | 1311 | <element signature="e#653#654#0" expanded="true" /> |
@@ -1444,7 +1337,7 @@ | ||
1444 | 1337 | </entry> |
1445 | 1338 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/ClientAPI.java"> |
1446 | 1339 | <provider selected="true" editor-type-id="text-editor"> |
1447 | - <state relative-caret-position="289"> | |
1340 | + <state relative-caret-position="442"> | |
1448 | 1341 | <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" /> |
1449 | 1342 | </state> |
1450 | 1343 | </provider> |
@@ -1454,20 +1347,70 @@ | ||
1454 | 1347 | </entry> |
1455 | 1348 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/Blackhole_Darksun/Net/ClientAPI/Tables/ServerTable.java"> |
1456 | 1349 | <provider selected="true" editor-type-id="text-editor"> |
1457 | - <state relative-caret-position="17"> | |
1350 | + <state relative-caret-position="119"> | |
1458 | 1351 | <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> |
1459 | 1352 | </state> |
1460 | 1353 | </provider> |
1461 | 1354 | </entry> |
1355 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0.jar!/headwayent/blackholedarksun/ServerVirtualizationService.class"> | |
1356 | + <provider selected="true" editor-type-id="text-editor"> | |
1357 | + <state relative-caret-position="186"> | |
1358 | + <caret line="34" column="11" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" /> | |
1359 | + </state> | |
1360 | + </provider> | |
1361 | + </entry> | |
1362 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/APP_Game.java"> | |
1363 | + <provider selected="true" editor-type-id="text-editor"> | |
1364 | + <state relative-caret-position="1394"> | |
1365 | + <caret line="149" column="31" selection-start-line="149" selection-start-column="31" selection-end-line="149" selection-end-column="31" /> | |
1366 | + </state> | |
1367 | + </provider> | |
1368 | + </entry> | |
1369 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/net/ClientListener.java"> | |
1370 | + <provider selected="true" editor-type-id="text-editor"> | |
1371 | + <state relative-caret-position="578"> | |
1372 | + <caret line="48" column="24" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" /> | |
1373 | + </state> | |
1374 | + </provider> | |
1375 | + </entry> | |
1376 | + <entry file="jar://$PROJECT_DIR$/lib/core-1.0-sources.jar!/headwayent/blackholedarksun/ServerVirtualizationService.java"> | |
1377 | + <provider selected="true" editor-type-id="text-editor"> | |
1378 | + <state relative-caret-position="850"> | |
1379 | + <caret line="63" column="8" selection-start-line="63" selection-start-column="8" selection-end-line="63" selection-end-column="8" /> | |
1380 | + </state> | |
1381 | + </provider> | |
1382 | + </entry> | |
1462 | 1383 | <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/GameServer.java"> |
1463 | 1384 | <provider selected="true" editor-type-id="text-editor"> |
1464 | - <state relative-caret-position="68"> | |
1465 | - <caret line="94" column="8" selection-start-line="94" selection-start-column="8" selection-end-line="94" selection-end-column="8" /> | |
1385 | + <state relative-caret-position="1581"> | |
1386 | + <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" /> | |
1387 | + </state> | |
1388 | + </provider> | |
1389 | + </entry> | |
1390 | + <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Controller.java"> | |
1391 | + <provider selected="true" editor-type-id="text-editor"> | |
1392 | + <state relative-caret-position="382"> | |
1393 | + <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" /> | |
1394 | + </state> | |
1395 | + </provider> | |
1396 | + </entry> | |
1397 | + <entry file="file://$PROJECT_DIR$/build.gradle"> | |
1398 | + <provider selected="true" editor-type-id="text-editor"> | |
1399 | + <state relative-caret-position="288"> | |
1400 | + <caret line="29" selection-start-line="29" selection-end-line="29" /> | |
1401 | + </state> | |
1402 | + </provider> | |
1403 | + </entry> | |
1404 | + <entry file="file://$PROJECT_DIR$/src/headwayEnt/BlackholeDarksunOnline/Server/Main.java"> | |
1405 | + <provider selected="true" editor-type-id="text-editor"> | |
1406 | + <state relative-caret-position="255"> | |
1407 | + <caret line="23" column="45" lean-forward="true" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" /> | |
1466 | 1408 | </state> |
1467 | 1409 | </provider> |
1468 | 1410 | </entry> |
1469 | 1411 | </component> |
1470 | 1412 | <component name="hg4idea.settings"> |
1413 | + <option name="CHECK_INCOMING_OUTGOING" value="true" /> | |
1471 | 1414 | <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" /> |
1472 | 1415 | </component> |
1473 | 1416 | <component name="masterDetails"> |
@@ -1,6 +1,7 @@ | ||
1 | 1 | package headwayEnt.BlackholeDarksunOnline.Server; |
2 | 2 | |
3 | 3 | import javafx.application.Application; |
4 | +import javafx.application.Platform; | |
4 | 5 | import javafx.fxml.FXMLLoader; |
5 | 6 | import javafx.scene.Parent; |
6 | 7 | import javafx.scene.Scene; |
@@ -11,6 +12,10 @@ | ||
11 | 12 | |
12 | 13 | public class Main extends Application { |
13 | 14 | |
15 | + static { | |
16 | + System.loadLibrary("lib/native-server-lib"); | |
17 | + } | |
18 | + | |
14 | 19 | public static final String TCP_PORT = "tcp_port"; |
15 | 20 | public static final String UDP_PORT = "udp_port"; |
16 | 21 |
@@ -38,7 +43,8 @@ | ||
38 | 43 | primaryStage.setScene(new Scene(root, 800, 600)); |
39 | 44 | primaryStage.show(); |
40 | 45 | primaryStage.setOnCloseRequest(event -> { |
41 | - | |
46 | + Platform.exit(); | |
47 | + System.exit(0); | |
42 | 48 | }); |
43 | 49 | controller.onConnectionButtonClick(null); |
44 | 50 | } |