Skip to content

Commit 66eb962

Browse files
committed
Remove 07th-mod server connectivity check
1 parent 2b12943 commit 66eb962

File tree

3 files changed

+1
-31
lines changed

3 files changed

+1
-31
lines changed

cli.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ def main(*, game_name, game_path, mod_type, mod_options=[], is_steam=True):
2424
logger.setGlobalLogger(sys.stdout)
2525
sys.stderr = logger.StdErrRedirector(sys.stdout)
2626
common.Globals.scanForExecutables()
27-
gui_main.check07thModServerConnection()
2827
modList = gui_main.getModList()
2928
subModList = gui_main.getSubModConfigList(modList)
3029
print("\n")

cli_interactive.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ def warnIfSavesIncompatible(fullInstallConfig):
171171
gui_main.installerCommonStartupTasks()
172172

173173
common.Globals.scanForExecutables()
174-
gui_main.check07thModServerConnection()
175174
modList = gui_main.getModList()
176175
subModList = gui_main.getSubModConfigList(modList) #type: List[SubModConfig]
177176

main.py

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,6 @@
3838
except ImportError:
3939
from urllib2 import urlopen, Request, HTTPError
4040

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-
6841
def getModList(is_developer=True):
6942
if is_developer and os.path.exists('installData.json'):
7043
return common.getModList("installData.json", isURL=False)
@@ -277,9 +250,8 @@ def doInstallerInit():
277250
# Run remaining init tasks concurrently
278251
t_getSubModConfig = common.makeThread(thread_getSubModConfigList)
279252
t_unimportantTasks = common.makeThread(thread_unimportantTasks)
280-
t_check07thModServer = common.makeThread(check07thModServerConnection)
281253

282-
common.startAndJoinThreads([t_getSubModConfig, t_unimportantTasks, t_check07thModServer])
254+
common.startAndJoinThreads([t_getSubModConfig, t_unimportantTasks])
283255

284256
if common.Globals.DEVELOPER_MODE:
285257
fileVersionManagement.Developer_ValidateVersionDataJSON(t_getSubModConfig.result)

0 commit comments

Comments
 (0)