Skip to content
This repository was archived by the owner on Sep 13, 2023. It is now read-only.

Commit 912f68d

Browse files
IceLittyIceLitty
committed
v2.8.4.6
1 parent 25e4118 commit 912f68d

File tree

5 files changed

+42
-17
lines changed

5 files changed

+42
-17
lines changed

‎WpfMinecraftCommandHelper2/AllSelData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ public AllSelData()
884884
"Fireball",
885885
"Chicken",
886886
"Arrow",
887-
"TippedArrow",
887+
"Arrow",//TippedArrow
888888
"SpectralArrow",
889889
"Zombie",
890890
"PigZombie",

‎WpfMinecraftCommandHelper2/MainWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public MainWindow()
5858

5959
private bool isUpdate = false;
6060
private bool preview = false;
61-
private string version = "2.8.4.5";
61+
private string version = "2.8.4.6";
6262
private string getversion = "0.0.0.0";
6363
private bool error1 = false;
6464
private bool error2 = false;

‎WpfMinecraftCommandHelper2/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
5050
// 方法是按如下所示使用“*”:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("2.8.4.5")]
53-
[assembly: AssemblyFileVersion("2.8.4.5")]
52+
[assembly: AssemblyVersion("2.8.4.6")]
53+
[assembly: AssemblyFileVersion("2.8.4.6")]

‎WpfMinecraftCommandHelper2/Summon.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@
181181
<TextBox x:Name="tabSumosTags" HorizontalAlignment="Left" Height="23" Margin="328,397,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="194" IsEnabled="False" AcceptsReturn="True" />
182182
<Grid HorizontalAlignment="Left" Height="74" Margin="542,144,0,0" VerticalAlignment="Top" Width="544">
183183
<CheckBox x:Name="tabSumosMotionCheck" Content="动量" HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="14" Click="tabSumosMotionCheck_Click"/>
184-
<Controls:NumericUpDown x:Name="tabSumosMotionY" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="223,3,167,39" Height="32" Value="0" IsEnabled="False" FontSize="14" HasDecimals="False" />
185-
<Controls:NumericUpDown x:Name="tabSumosMotionZ" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="382,3,10,39" Height="32" Value="0" IsEnabled="False" FontSize="14" HasDecimals="False" />
186-
<Controls:NumericUpDown x:Name="tabSumosMotionX" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="80,3,326,39" Height="32" Value="0" IsEnabled="False" FontSize="14" HasDecimals="False" />
184+
<Controls:NumericUpDown x:Name="tabSumosMotionY" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="223,3,167,39" Height="32" Value="0" IsEnabled="False" FontSize="14" />
185+
<Controls:NumericUpDown x:Name="tabSumosMotionZ" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="382,3,10,39" Height="32" Value="0" IsEnabled="False" FontSize="14" />
186+
<Controls:NumericUpDown x:Name="tabSumosMotionX" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="80,3,326,39" Height="32" Value="0" IsEnabled="False" FontSize="14" />
187187
<CheckBox x:Name="tabSumosDirection" Content="方向" HorizontalAlignment="Left" Margin="0,47,0,0" VerticalAlignment="Top" FontSize="14" Click="tabSumosDirection_Click"/>
188-
<Controls:NumericUpDown x:Name="tabSumosDirectionY" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="223,40,167,2" Height="32" Value="0" IsEnabled="False" FontSize="14" HasDecimals="False" />
189-
<Controls:NumericUpDown x:Name="tabSumosDirectionZ" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="382,40,10,2" Height="32" Value="0" IsEnabled="False" FontSize="14" HasDecimals="False" />
190-
<Controls:NumericUpDown x:Name="tabSumosDirectionX" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="80,40,326,2" Height="32" Value="0" IsEnabled="False" FontSize="14" HasDecimals="False" />
188+
<Controls:NumericUpDown x:Name="tabSumosDirectionY" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="223,40,167,2" Height="32" Value="0" IsEnabled="False" FontSize="14" />
189+
<Controls:NumericUpDown x:Name="tabSumosDirectionZ" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="382,40,10,2" Height="32" Value="0" IsEnabled="False" FontSize="14" />
190+
<Controls:NumericUpDown x:Name="tabSumosDirectionX" Minimum="-360" Maximum="360" Interval="0.2" StringFormat="" Margin="80,40,326,2" Height="32" Value="0" IsEnabled="False" FontSize="14" />
191191
</Grid>
192192
<GroupBox x:Name="groupBox" Header="Extra" HorizontalAlignment="Left" Margin="527,258,0,0" VerticalAlignment="Top" Height="280" Width="554">
193193
<Grid HorizontalAlignment="Left" Height="242" VerticalAlignment="Top" Width="544" Margin="0,0,-2,0">

‎WpfMinecraftCommandHelper2/Summon.xaml.cs

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ private void tabSumosCreate_Click(object sender, RoutedEventArgs e)
14751475
if (sumosText.Length > 0) { sumosText += ","; }
14761476
if (tabSumosHasPotion.IsChecked.Value)
14771477
{
1478-
sumosText += "tags:{CustomPotionEffects:[" + globalPotionString + "]}";
1478+
sumosText += "CustomPotionEffects:[" + globalPotionString + "]";
14791479
}
14801480
if (sumosText.Length > 0) { sumosText += ",pickup:" + tabSumosEpickup.Value.Value + "b"; } else { sumosText += "pickup:" + tabSumosEpickup.Value.Value + "b"; }
14811481
if (sumosText.Length > 0) { sumosText += ",damage:" + tabSumosEdamage.Value.Value + "d"; } else { sumosText += "damage:" + tabSumosEdamage.Value.Value + "d"; }
@@ -1620,12 +1620,20 @@ private void tabSumosRidingClear_Click(object sender, RoutedEventArgs e)
16201620
private void tabSumosEgg_Click(object sender, RoutedEventArgs e)
16211621
{
16221622
AllSelData asd = new AllSelData();
1623-
string temp = sumosFinalStr.Substring(sumosFinalStr.IndexOf('{') + 1);
1624-
string temp2 = temp.Substring(0, temp.Length - 1);
1625-
string sumosEggNBT = "{EntityTag:{id:\"" + asd.getAt(tabSumosType.SelectedIndex) + "\"," + temp2 + "}}";
1626-
sumosFinalStr = "/give @p minecraft:spawn_egg 1 0 " + sumosEggNBT;
1623+
if (sumosFinalStr.IndexOf('{') != -1)
1624+
{
1625+
string temp = sumosFinalStr.Substring(sumosFinalStr.IndexOf('{') + 1, sumosFinalStr.Length - sumosFinalStr.IndexOf('{') - 2);
1626+
sumosFinalStr = "/give @p minecraft:spawn_egg 1 0 {EntityTag:{id:\"" + asd.getAt(tabSumosType.SelectedIndex) + "\"," + temp + "}}";
1627+
}
1628+
else
1629+
{
1630+
sumosFinalStr = "/give @p minecraft:spawn_egg 1 0 {EntityTag:{id:\"" + asd.getAt(tabSumosType.SelectedIndex) + "\"}}";
1631+
}
1632+
//string temp = sumosFinalStr.Substring(sumosFinalStr.IndexOf('{') + 1);
1633+
//string temp2 = temp.Substring(0, temp.Length - 1);
1634+
//string sumosEggNBT = "{" + temp + "}";
16271635
Check cbox = new Check();
1628-
cbox.showText(sumosEggNBT, "");
1636+
cbox.showText(sumosFinalStr);
16291637
cbox.Show();
16301638
}
16311639

@@ -2646,6 +2654,14 @@ private void saveFavBtn_Click(object sender, RoutedEventArgs e)
26462654
saveFavStr += "|" + HorseChestList[14].Replace("|", "[MCH_SPLIT]");
26472655
saveFavStr += "|" + HorseChestList[15].Replace("|", "[MCH_SPLIT]");
26482656
saveFavStr += "|" + HorseChestList[16].Replace("|", "[MCH_SPLIT]");
2657+
//FallingSands
2658+
saveFavStr += "|" + FallingSandItemSel.SelectedIndex;
2659+
saveFavStr += "|" + FallingSandMeta.Value.Value;
2660+
saveFavStr += "|" + FallingSandLifeTime.Value.Value;
2661+
saveFavStr += "|" + FallingSandIsDrop.IsChecked.Value;
2662+
saveFavStr += "|" + FallingSandIsDamage.IsChecked.Value;
2663+
saveFavStr += "|" + FallingSandMaxDamage.Value.Value;
2664+
saveFavStr += "|" + FallingSandDamageCount.Value.Value;
26492665
//
26502666
List<string> wtxt = new List<string>();
26512667
wtxt.Add(saveFavStr);
@@ -2878,7 +2894,16 @@ private void readFavBtn_Click(object sender, RoutedEventArgs e)
28782894
HorseChestList[13] = readFavStr[178].Replace("|", "[MCH_SPLIT]");
28792895
HorseChestList[14] = readFavStr[179].Replace("|", "[MCH_SPLIT]");
28802896
HorseChestList[15] = readFavStr[180].Replace("|", "[MCH_SPLIT]");
2881-
HorseChestList[16] = readFavStr[171].Replace("|", "[MCH_SPLIT]");
2897+
HorseChestList[16] = readFavStr[181].Replace("|", "[MCH_SPLIT]");
2898+
//FallingSands
2899+
FallingSandItemSel.SelectedIndex = int.Parse(readFavStr[182]);
2900+
FallingSandMeta.Value = int.Parse(readFavStr[183]);
2901+
FallingSandLifeTime.Value = int.Parse(readFavStr[184]);
2902+
FallingSandIsDrop.IsChecked = bool.Parse(readFavStr[185]);
2903+
FallingSandIsDamage.IsChecked = bool.Parse(readFavStr[186]);
2904+
FallingSandMaxDamage.Value = int.Parse(readFavStr[187]);
2905+
FallingSandDamageCount.Value = int.Parse(readFavStr[188]);
2906+
//
28822907
this.ShowMessageAsync("", "已读取：" + loadNameList[loadResultIndex], MessageDialogStyle.Affirmative, new MetroDialogSettings() { AffirmativeButtonText = FloatConfirm, NegativeButtonText = FloatCancel, AnimateShow = false, AnimateHide = false });
28832908
}
28842909
loadResultIndex++;

0 commit comments

Comments
 (0)