v2.8.7.2

Author: IceLitty

WpfMinecraftCommandHelper2/FixColorCode.xaml.cs

@@ -97,8 +97,17 @@ private string fixColorCode(string str)
             {
                 str = str.Replace("§", @"\\u00A7");
                 str = str.Replace("\\\"","\\\\\\\\\"").Replace("\"", "\\\\\\\"");
-                if (fixColorSelSign.IsChecked.Value) str = "/setblock ~ ~1 ~ standing_sign 0 replace {Text1:\"{\\\"text\\\":\\\"请点击我\\\",\\\"clickEvent\\\":{\\\"action\\\":\\\"run_command\\\",\\\"value\\\":\\\"" + str + "\\\"}}\",Text2:\"{\\\"text\\\":\\\"Ctrl+鼠标中键可抓取\\\"}\",Text3:\"\",Text4:\"\"}";
-                else str = "/setblock ~ ~1 ~ standing_sign 0 replace {Text1:\"{\\\"text\\\":\\\"请点击我\\\",\\\"clickEvent\\\":{\\\"action\\\":\\\"run_command\\\",\\\"value\\\":\\\"/blockdata ~ ~-1 ~ {Command:" + str + "}\\\"}}\",Text2:\"{\\\"text\\\":\\\"Ctrl+鼠标中键可抓取\\\"}\",Text3:\"\",Text4:\"\"}";
+                if (fixColorSelSign.IsChecked.Value)
+                    str =
+                        "/setblock ~ ~1 ~ standing_sign 0 replace {Text1:\"{\\\"text\\\":\\\"请点击我\\\",\\\"clickEvent\\\":{\\\"action\\\":\\\"run_command\\\",\\\"value\\\":\\\"" +
+                        str + "\\\"}}\",Text2:\"{\\\"text\\\":\\\"Ctrl+鼠标中键可抓取\\\"}\",Text3:\"\",Text4:\"\"}";
+                else
+                {
+                    str = str.Replace("\\\\\\\"", "\\\\\\\\\\\"");
+                    str =
+                        "/setblock ~ ~1 ~ standing_sign 0 replace {Text1:\"{\\\"text\\\":\\\"请点击我\\\",\\\"clickEvent\\\":{\\\"action\\\":\\\"run_command\\\",\\\"value\\\":\\\"/blockdata ~ ~-1 ~ {Command:\\\\\\\"" +
+                        str + "\\\\\\\"}\\\"}}\",Text2:\"{\\\"text\\\":\\\"Ctrl+鼠标中键可抓取\\\"}\",Text3:\"\",Text4:\"\"}";
+                }
             }
             return str;
         }

WpfMinecraftCommandHelper2/Item.xaml.cs

@@ -374,7 +374,7 @@ private void createBtn_Click(object sender, RoutedEventArgs e)
                 finalStr = give + finalString + "}";
             }
             //判断是否含有颜色代码
-            if (finalStr.IndexOf("§") != -1)
+            if (finalStr.IndexOf("§", StringComparison.Ordinal) != -1)
             {
                 FixColorCode fcc = new FixColorCode();
                 fcc.setStr(finalStr);

WpfMinecraftCommandHelper2/MainWindow.xaml.cs

@@ -30,7 +30,7 @@ public MainWindow()
         private bool isUpdate = false;
         private bool isNeedUpdate = false;
         private bool preview = false;
-        private string version = "2.8.7.1";
+        private string version = "2.8.7.2";
         private string getversion = "0.0.0.0";
         private string passversion = "0.0.0.0";
         private bool error1 = false;

WpfMinecraftCommandHelper2/OtherMap.xaml

@@ -19,8 +19,9 @@
             <Button x:Name="tabOther1WordHelp" Content="?" HorizontalAlignment="Left" Width="31" Margin="0,0,0,1" Click="tabOther1WordHelp_Click" Style="{DynamicResource SquareButtonStyle}"/>
             <Label x:Name="OtherFlyWord" Content="浮空字" HorizontalAlignment="Left" Margin="36,0,0,0" VerticalAlignment="Top"/>
             <Button x:Name="tabOther1WordCreate" Content="生成" HorizontalAlignment="Left" VerticalAlignment="Top" Width="38" Margin="543,0,0,0" Click="tabOther1WordCreate_Click" Style="{DynamicResource SquareButtonStyle}"/>
-            <TextBox x:Name="tabOther1Word" HorizontalAlignment="Left" Height="23" Margin="100,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="395"/>
+            <TextBox x:Name="tabOther1Word" HorizontalAlignment="Left" Height="23" Margin="100,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="369"/>
             <Button x:Name="tabOther1WordRemove" Content="移除" HorizontalAlignment="Left" VerticalAlignment="Top" Width="38" Margin="500,0,0,0" Click="tabOther1WordRemove_Click" Style="{DynamicResource SquareButtonStyle}"/>
+            <Button x:Name="tabOther1WordColor" Content="§" HorizontalAlignment="Left" VerticalAlignment="Top" Width="21" Margin="474,0,0,0" Style="{DynamicResource SquareButtonStyle}" Click="tabOther1WordColor_Click"/>
         </Grid>
         <Grid HorizontalAlignment="Left" Height="26" Margin="10,72,0,0" VerticalAlignment="Top" Width="591">
             <Button x:Name="tabOther1ItemFlyHelp" Content="?" HorizontalAlignment="Left" VerticalAlignment="Top" Width="31" Click="tabOther1ItemFlyHelp_Click" Style="{DynamicResource SquareButtonStyle}"/>

WpfMinecraftCommandHelper2/OtherMap.xaml.cs

@@ -284,6 +284,11 @@ private void tabOther1WordRemove_Click(object sender, RoutedEventArgs e)
             checkbox.Show();
         }
 
+        private void tabOther1WordColor_Click(object sender, RoutedEventArgs e)
+        {
+            tabOther1Word.Text = tabOther1Word.Text += "§";
+        }
+
         private void tabOther1WordCreate_Click(object sender, RoutedEventArgs e)
         {
             if (mcVersion == "1.8" || mcVersion == "1.9/1.10")
@@ -294,6 +299,14 @@ private void tabOther1WordCreate_Click(object sender, RoutedEventArgs e)
             {
                 finalStr = "/summon armor_stand ~ ~1 ~ {Tags:[\"HoloText\"],PersistenceRequired:1b,DisabledSlots:2039583,Invulnerable:1b,NoGravity:1b,Invisible:1b,CustomName:\"" + tabOther1Word.Text + "\",CustomNameVisible:true}";
             }
+            //判断是否含有颜色代码
+            if (finalStr.IndexOf("§", StringComparison.Ordinal) != -1)
+            {
+                FixColorCode fcc = new FixColorCode();
+                fcc.setStr(finalStr);
+                fcc.ShowDialog();
+                finalStr = fcc.getStr();
+            }
             Check checkbox = new Check();
             checkbox.showText(finalStr);
             checkbox.Show();

WpfMinecraftCommandHelper2/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.8.7.1")]
-[assembly: AssemblyFileVersion("2.8.7.1")]
+[assembly: AssemblyVersion("2.8.7.2")]
+[assembly: AssemblyFileVersion("2.8.7.2")]