Merge pull request #3 from PCL-Community/Silverteal-commits

完成基础功能

Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

@@ -1076,6 +1076,7 @@ SystemBrowser:
                     Uuid = Mid(Uuid, 1, 32 - 5) & (Long.Parse(Right(Uuid, 5), Globalization.NumberStyles.AllowHexSpecifier) + 1).ToString("X")
                 Loop
         End Select
+        Log("[Uuid-Fix]登录使用的 Uuid：" & Uuid)
         Return Uuid
     End Function
     '根据用户名返回对应 UUID，需要多线程
@@ -1103,8 +1104,14 @@ SystemBrowser:
         Return Uuid
     End Function
     Public Function McLoginLegacyUuid(Name As String)
-        Dim FullUuid As String = StrFill(Name.Length.ToString("X"), "0", 16) & StrFill(GetHash(Name).ToString("X"), "0", 16)
-        Return FullUuid.Substring(0, 12) & "3" & FullUuid.Substring(13, 3) & "9" & FullUuid.Substring(17, 15)
+        Dim NameHash As String = GetStringMD5("OfflinePlayer:" & Name)
+        Dim PendingVariant As Integer = Conversion.Val("&H" & NameHash(16))
+        PendingVariant = (PendingVariant Mod 4) + 8
+        Dim FinalVarient As String = PendingVariant.ToString("X")
+        Dim FinalHash As String = NameHash.Substring(0, 12) & "3" & NameHash.Substring(13, 3) & FinalVarient & NameHash.Substring(17, 15)
+        Return FinalHash.ToUpper()
+        'Dim FullUuid As String = StrFill(Name.Length.ToString("X"), "0", 16) & StrFill(GetHash(Name).ToString("X"), "0", 16)
+        'Return FullUuid.Substring(0, 12) & "3" & FullUuid.Substring(13, 3) & "9" & FullUuid.Substring(17, 15)
     End Function
 
 #End Region

Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml

@@ -11,21 +11,17 @@
                 <local:MyCard x:Name="CardSkin" Margin="0,15" Title="离线 UUID 和皮肤">
                     <StackPanel Margin="25,40,25,15">
                         <local:MyHint Text="由于PCL-Community专门版本的修改，此部分选项可能工作不正常或完全不工作" IsWarn="False" Margin="0,0,0,10" />
-                        <Grid Margin="-1,0,0,0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <local:MyRadioBox Text="默认 UUID 和皮肤" x:Name="RadioSkinType0" Height="22" Tag="LaunchSkinType/0" Grid.Row="0" ToolTip="通过登录时的用户名生成UUID。和服务器的兼容性好" />
-
-                                <local:MyRadioBox Text="Steve" x:Name="RadioSkinType1" Height="22" Tag="LaunchSkinType/1" Grid.Row="1" />
-                                <local:MyRadioBox Text="Alex" x:Name="RadioSkinType2" Height="22" Tag="LaunchSkinType/2" Grid.Row="2" />
-
-                            <local:MyRadioBox Text="正版玩家 UUID 和皮肤" x:Name="RadioSkinType3" Height="22" Tag="LaunchSkinType/3" Grid.Row="3" ToolTip="使用指定正版玩家的UUID登录" />
-                            <local:MyRadioBox Text="默认 UUID 和自定义皮肤" x:Name="RadioSkinType4" Height="22" Tag="LaunchSkinType/4" Grid.Row="4" ToolTip="使用默认UUID的同时以资源包的形式加载自定义皮肤。&#xa;使用此方式更换的皮肤在多人游戏中仅自己可见，且会替换游戏中所有的该角色。" />
+                    <Grid Margin="-1,0,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                            <local:MyRadioBox Text="默认" x:Name="RadioSkinType0" Tag="LaunchSkinType/0" Grid.Column="0" ToolTip="通过登录时的用户名生成 UUID 。和服务器的兼容性好" />
+                            <local:MyRadioBox Text="Steve（当前版本不支持）" x:Name="RadioSkinType1" Tag="LaunchSkinType/1" Grid.Column="3" IsEnabled="False" Visibility="Hidden" />
+                            <local:MyRadioBox Text="Alex（当前版本不支持）" x:Name="RadioSkinType2" Tag="LaunchSkinType/2" Grid.Column="3" IsEnabled="False" Visibility="Hidden" />
+                            <local:MyRadioBox Text="正版玩家" x:Name="RadioSkinType3" Tag="LaunchSkinType/3" Grid.Column="1" ToolTip="使用指定正版玩家的 UUID 登录" />
+                            <local:MyRadioBox Text="默认 UUID 自定义皮肤" x:Name="RadioSkinType4" Tag="LaunchSkinType/4" Grid.Column="2" ToolTip="使用默认 UUID 的同时以资源包的形式加载自定义皮肤。&#xa;使用此方式更换的皮肤在多人游戏中仅自己可见，且会替换游戏中所有的该角色。" />
                         </Grid>
                         <Grid x:Name="PanSkinID" Margin="0,14,0,2" Visibility="Collapsed">
                             <Grid.ColumnDefinitions>