|
38 | 38 | except ImportError:
|
39 | 39 | from urllib2 import urlopen, Request, HTTPError
|
40 | 40 |
|
41 |
| -def check07thModServerConnection(): |
42 |
| - """ |
43 |
| - Makes sure that we can connect to the 07th-mod server, where the mod downloads are stored. |
44 |
| - This check is only required because Japan is blocked from downloading the 07th-mod website - the installer |
45 |
| - already downloads a file from Github during startup, which suffices to check the internet connection. |
46 |
| - This function/check can be removed if the block is removed. |
47 |
| - """ |
48 |
| - try: |
49 |
| - _ = common.downloadFile("https://07th-mod.com/", is_text=True) |
50 |
| - except Exception as error: |
51 |
| - traceback.print_exc() |
52 |
| - raise Exception("""------------------------------------------------------------------------ |
53 |
| -Error: Couldn't reach 07th Mod Server! (https://07th-mod.com/) |
54 |
| -
|
55 |
| -If you have a working internet connection, most likely you are in Japan, which is blocked from the 07th-mod server. |
56 |
| -Please visit https://www.07th-mod.com - if you get a "406 Not Acceptable" error, you are definitely blocked. |
57 |
| -As a workaround, VPNs like ProtonVPN could be used... |
58 |
| -
|
59 |
| -Otherwise, please check the following: |
60 |
| -- You have a working internet connection |
61 |
| -- Check if our website is down (https://07th-mod.com/) |
62 |
| -- Check our Wiki for more solutions: https://07th-mod.com/wiki/Installer/faq/#connection-troubleshooting |
63 |
| ------------------------------------------------------------------------- |
64 |
| -
|
65 |
| -Dev Error Message: {} |
66 |
| -""".format(error)) |
67 |
| - |
68 | 41 | def getModList(is_developer=True):
|
69 | 42 | if is_developer and os.path.exists('installData.json'):
|
70 | 43 | return common.getModList("installData.json", isURL=False)
|
@@ -277,9 +250,8 @@ def doInstallerInit():
|
277 | 250 | # Run remaining init tasks concurrently
|
278 | 251 | t_getSubModConfig = common.makeThread(thread_getSubModConfigList)
|
279 | 252 | t_unimportantTasks = common.makeThread(thread_unimportantTasks)
|
280 |
| - t_check07thModServer = common.makeThread(check07thModServerConnection) |
281 | 253 |
|
282 |
| - common.startAndJoinThreads([t_getSubModConfig, t_unimportantTasks, t_check07thModServer]) |
| 254 | + common.startAndJoinThreads([t_getSubModConfig, t_unimportantTasks]) |
283 | 255 |
|
284 | 256 | if common.Globals.DEVELOPER_MODE:
|
285 | 257 | fileVersionManagement.Developer_ValidateVersionDataJSON(t_getSubModConfig.result)
|
|
0 commit comments