Skip to content
This repository was archived by the owner on May 30, 2025. It is now read-only.

Commit 306375a

Browse files
authored
Add files via upload
1 parent 0c4a585 commit 306375a

File tree

1 file changed

+45
-24
lines changed

1 file changed

+45
-24
lines changed

main.py

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,16 +1810,21 @@ def run_mc(self):
18101810
if self.runtime_ver.startswith("Vanilla"): #Checking for selected version before running minecraft.
18111811
if self.login_method == "Microsoft Account":
18121812
try:
1813-
self.mc_ver = data["selected-version"].strip("Vanilla: ")
1813+
if data["selected-version"].startswith("Vanilla: snapshot"):
1814+
print(data["selected-version"])
1815+
mcdonalds = data["selected-version"]
1816+
self.mc_ver = mcdonalds.partition(' ')[2]
1817+
print(self.mc_ver)
1818+
else:
1819+
self.mc_ver = data["selected-version"].strip("Vanilla: ")
18141820
self.detected_ver = "" # yet another small hack
18151821
if connected == True:
18161822
if self.mc_ver.startswith("release"):
18171823
self.detected_ver = self.mc_ver.strip("release ")
1818-
elif self.mc_ver.startswith("snapshot"):
1819-
split_string = self.mc_ver.split(' ')
1820-
new_string_list = split_string[1:]
1821-
new_string = ' '.join(new_string_list)
1822-
self.detected_ver = new_string
1824+
elif self.mc_ver.startswith("snapshot "):
1825+
print(self.mc_ver)
1826+
self.detected_ver = self.mc_ver.partition(' ')[2]
1827+
print(self.detected_ver)
18231828
elif connected == False:
18241829
self.detected_ver = self.mc_ver
18251830

@@ -1854,18 +1859,24 @@ def run_mc(self):
18541859
try:
18551860
self.usr = data["User-info"][0]["username"]
18561861
self.pwd = self.pwd1
1857-
self.mc_ver = data["selected-version"].strip("Vanilla: ")
1862+
1863+
if data["selected-version"].startswith("Vanilla: snapshot"):
1864+
print(data["selected-version"])
1865+
mcdonalds = data["selected-version"]
1866+
self.mc_ver = mcdonalds.partition(' ')[2]
1867+
print(self.mc_ver)
1868+
else:
1869+
self.mc_ver = data["selected-version"].strip("Vanilla: ")
18581870
self.detected_ver = ""
18591871

18601872
# This is done to get only the version number, cutting out the rest of the string including whitespace
18611873
if connected == True:
18621874
if self.mc_ver.startswith("release"):
18631875
self.detected_ver = self.mc_ver.strip("release ")
1864-
elif self.mc_ver.startswith("snapshot"):
1865-
split_string = self.mc_ver.split(' ')
1866-
new_string_list = split_string[1:]
1867-
new_string = ' '.join(new_string_list)
1868-
self.detected_ver = new_string
1876+
elif self.mc_ver.startswith("snapshot "):
1877+
print(self.mc_ver)
1878+
self.detected_ver = self.mc_ver.partition(' ')[2]
1879+
print(self.detected_ver)
18691880
elif connected == False:
18701881
self.detected_ver = self.mc_ver
18711882

@@ -1918,16 +1929,21 @@ def run_mc(self):
19181929
try:
19191930
self.usr = data["User-info"][0]["username"]
19201931
self.pwd = self.pwd1
1921-
self.mc_ver = data["selected-version"].strip("Vanilla: ")
1932+
if data["selected-version"].startswith("Vanilla: snapshot"):
1933+
print(data["selected-version"])
1934+
mcdonalds = data["selected-version"]
1935+
self.mc_ver = mcdonalds.partition(' ')[2]
1936+
print(self.mc_ver)
1937+
else:
1938+
self.mc_ver = data["selected-version"].strip("Vanilla: ")
19221939

19231940
if connected == True:
19241941
if self.mc_ver.startswith("release"):
19251942
self.detected_ver = self.mc_ver.strip("release ")
1926-
elif self.mc_ver.startswith("snapshot"):
1927-
split_string = self.mc_ver.split(' ')
1928-
new_string_list = split_string[1:]
1929-
new_string = ' '.join(new_string_list)
1930-
self.detected_ver = new_string
1943+
elif self.mc_ver.startswith("snapshot "):
1944+
print(self.mc_ver)
1945+
self.detected_ver = self.mc_ver.partition(' ')[2]
1946+
print(self.detected_ver)
19311947
elif connected == False:
19321948
self.detected_ver = self.mc_ver
19331949

@@ -1974,15 +1990,20 @@ def run_mc(self):
19741990
elif self.login_method == "ElyBy Login":
19751991
self.ely_authenticate()
19761992

1977-
self.mc_ver = data["selected-version"].strip("Vanilla: ")
1993+
if data["selected-version"].startswith("Vanilla: snapshot"):
1994+
print(data["selected-version"])
1995+
mcdonalds = data["selected-version"]
1996+
self.mc_ver = mcdonalds.partition(' ')[2]
1997+
print(self.mc_ver)
1998+
else:
1999+
self.mc_ver = data["selected-version"].strip("Vanilla: ")
19782000

19792001
if self.mc_ver.startswith("release"):
19802002
self.detected_ver = self.mc_ver.strip("release ")
1981-
elif self.mc_ver.startswith("snapshot"):
1982-
split_string = self.mc_ver.split(' ')
1983-
new_string_list = split_string[1:]
1984-
new_string = ' '.join(new_string_list)
1985-
self.detected_ver = new_string
2003+
elif self.mc_ver.startswith("snapshot "):
2004+
print(self.mc_ver)
2005+
self.detected_ver = self.mc_ver.partition(' ')[2]
2006+
print(self.detected_ver)
19862007

19872008

19882009
try:

0 commit comments

Comments
 (0)