@@ -1810,16 +1810,21 @@ def run_mc(self):
1810
1810
if self .runtime_ver .startswith ("Vanilla" ): #Checking for selected version before running minecraft.
1811
1811
if self .login_method == "Microsoft Account" :
1812
1812
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: " )
1814
1820
self .detected_ver = "" # yet another small hack
1815
1821
if connected == True :
1816
1822
if self .mc_ver .startswith ("release" ):
1817
1823
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 )
1823
1828
elif connected == False :
1824
1829
self .detected_ver = self .mc_ver
1825
1830
@@ -1854,18 +1859,24 @@ def run_mc(self):
1854
1859
try :
1855
1860
self .usr = data ["User-info" ][0 ]["username" ]
1856
1861
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: " )
1858
1870
self .detected_ver = ""
1859
1871
1860
1872
# This is done to get only the version number, cutting out the rest of the string including whitespace
1861
1873
if connected == True :
1862
1874
if self .mc_ver .startswith ("release" ):
1863
1875
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 )
1869
1880
elif connected == False :
1870
1881
self .detected_ver = self .mc_ver
1871
1882
@@ -1918,16 +1929,21 @@ def run_mc(self):
1918
1929
try :
1919
1930
self .usr = data ["User-info" ][0 ]["username" ]
1920
1931
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: " )
1922
1939
1923
1940
if connected == True :
1924
1941
if self .mc_ver .startswith ("release" ):
1925
1942
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 )
1931
1947
elif connected == False :
1932
1948
self .detected_ver = self .mc_ver
1933
1949
@@ -1974,15 +1990,20 @@ def run_mc(self):
1974
1990
elif self .login_method == "ElyBy Login" :
1975
1991
self .ely_authenticate ()
1976
1992
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: " )
1978
2000
1979
2001
if self .mc_ver .startswith ("release" ):
1980
2002
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 )
1986
2007
1987
2008
1988
2009
try :
0 commit comments