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

Commit 218d535

Browse files
IceLittyIceLitty
committed
2.7.0.0 Pre 21
1 parent 7911d15 commit 218d535

File tree

13 files changed

+2218
-1611
lines changed

13 files changed

+2218
-1611
lines changed

‎WpfMinecraftCommandHelper2/AllSelData.cs‎

Lines changed: 1027 additions & 952 deletions
Large diffs are not rendered by default.

‎WpfMinecraftCommandHelper2/At.xaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Grid HorizontalAlignment="Left" Height="30" Margin="10,88,0,0" VerticalAlignment="Top" Width="660">
2222
<CheckBox x:Name="dxCheck" Content="动量X" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top" Click="dxCheck_Checked"/>
2323
<Controls:NumericUpDown x:Name="dx" Minimum="-1000000" Maximum="1000000" Interval="5" StringFormat="" Margin="84,0,436,4" Height="25" IsEnabled="False" />
24-
<CheckBox x:Name="dyCheck" Content="动量Y" HorizontalAlignment="Left" Margin="229,4,0,0" VerticalAlignment="Top" Click="dyCheck_Checked"/>
24+
<CheckBox x:Name="dyCheck" Content="动量Y" HorizontalAlignment="Left" Margin="228,4,0,0" VerticalAlignment="Top" Click="dyCheck_Checked"/>
2525
<Controls:NumericUpDown x:Name="dy" Minimum="-1000000" Maximum="1000000" Interval="5" StringFormat="" Margin="302,2,218,2" Height="25" IsEnabled="False" />
2626
<CheckBox x:Name="dzCheck" Content="动量Z" HorizontalAlignment="Left" Margin="447,4,0,0" VerticalAlignment="Top" Click="dzCheck_Checked"/>
2727
<Controls:NumericUpDown x:Name="dz" Minimum="-1000000" Maximum="1000000" Interval="5" StringFormat="" Margin="520,2,0,2" Height="25" IsEnabled="False" />
@@ -97,6 +97,10 @@
9797
<CheckBox x:Name="rideCheck" Content="骑乘对象" HorizontalAlignment="Left" Margin="7,6,0,0" VerticalAlignment="Top" Checked="rideCheck_Checked"/>
9898
<ComboBox x:Name="rideEntity" HorizontalAlignment="Left" Margin="108,4,0,0" VerticalAlignment="Top" Width="166" IsEnabled="False"/>
9999
</Grid>
100+
<Grid HorizontalAlignment="Left" Height="30" Margin="236,19,0,0" VerticalAlignment="Top" Width="222">
101+
<CheckBox x:Name="tagCheck" Content="标签" HorizontalAlignment="Left" Margin="0,6,0,0" VerticalAlignment="Top" Click="tagCheck_Click"/>
102+
<TextBox x:Name="tags" HorizontalAlignment="Left" Height="23" Margin="53,2,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="164" IsEnabled="False"/>
103+
</Grid>
100104

101105
</Grid>
102106
</Controls:MetroWindow>

‎WpfMinecraftCommandHelper2/At.xaml.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ private void appLanguage()
8484
handCheck.Content = templang[34];
8585
rideCheck.Content = templang[35];
8686
AtHelpStr = templang[36];
87+
tagCheck.Content = templang[37];
8788
} catch (Exception) { /* throw; */ }
8889
}
8990

@@ -282,6 +283,10 @@ private void createBtn_Click(object sender, RoutedEventArgs e)
282283
extra += "type=" + asd.getAt(type.SelectedIndex) + ",";
283284
}
284285
}
286+
if (tagCheck.IsChecked.Value)
287+
{
288+
extra += "tag=" + tags.Text + ",";
289+
}
285290
if (extra.Length != 0)
286291
{
287292
extra = extra.Remove(extra.Length - 1, 1);
@@ -620,5 +625,17 @@ private void rideCheck_Checked(object sender, RoutedEventArgs e)
620625
rideEntity.IsEnabled = false;
621626
}
622627
}
628+
629+
private void tagCheck_Click(object sender, RoutedEventArgs e)
630+
{
631+
if (tagCheck.IsChecked.Value)
632+
{
633+
tags.IsEnabled = true;
634+
}
635+
else
636+
{
637+
tags.IsEnabled = false;
638+
}
639+
}
623640
}
624641
}

‎WpfMinecraftCommandHelper2/Item.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<Button x:Name="checkBtn" Content="检索" HorizontalAlignment="Left" Margin="753,525,0,0" VerticalAlignment="Top" Width="75" Click="checkBtn_Click"/>
136136
<Button x:Name="helpBtn" Content="？" HorizontalAlignment="Left" Margin="833,525,0,0" VerticalAlignment="Top" Width="75" Click="helpBtn_Click"/>
137137
<Grid HorizontalAlignment="Left" Height="64" Margin="192,82,0,0" VerticalAlignment="Top" Width="281">
138-
<Controls:NumericUpDown x:Name="tabItemMeta" Minimum="0" Maximum="100" Interval="5" StringFormat="" Margin="0,3,0,33" Height="28" Value="0" />
138+
<Controls:NumericUpDown x:Name="tabItemMeta" Minimum="0" Maximum="2147483647" Interval="5" StringFormat="" Margin="0,3,0,33" Height="28" Value="0" />
139139
<Controls:NumericUpDown x:Name="tabItemCount" Minimum="0" Maximum="64" Interval="5" StringFormat="" Margin="0,36,0,0" Height="28" Value="1" />
140140
</Grid>
141141
<Button x:Name="copyBtn" Content="复制" HorizontalAlignment="Left" Margin="673,525,0,0" VerticalAlignment="Top" Width="75" Click="copyBtn_Click"/>

‎WpfMinecraftCommandHelper2/Item.xaml.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ private void appLanguage()
135135
private int globalItemCount = 0;
136136
private int globalItemSelMeta = 0;
137137
private int globalHideSelIndex = 0;
138+
private string globalColor = "16777215";
138139

139140
private string atStr = "未设置AT变量！";
140141
private string finalStr = "";
@@ -366,7 +367,8 @@ private string NLReturn()
366367
}
367368
if (tabItemColorCheck.IsChecked.Value)
368369
{
369-
NLStr += "color:" + Convert.ToString(int.Parse(tabItemColor.Value.Value.ToString()), 10) + ",";
370+
globalColor = Convert.ToString(int.Parse(tabItemColor.Value.Value.ToString()), 10);
371+
NLStr += "color:" + globalColor + ",";
370372
}
371373
if (NLStr != "display:{")
372374
{
@@ -600,7 +602,7 @@ private void tabItemGetEnchantBook_Click(object sender, RoutedEventArgs e)
600602

601603
public string[] returnStr()
602604
{
603-
return new string[] { globalEnchString, globalNLString, globalAttrString, globalAttrStringLess, globalUnbreaking, globalHideflag, globalCommand };
605+
return new string[] { globalEnchString, globalNLString, globalAttrString, globalAttrStringLess, globalUnbreaking, globalHideflag, globalCommand, globalColor };
604606
}
605607

606608
public int[] returnStrAdver()

‎WpfMinecraftCommandHelper2/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void appLanguage(List<string> templanglist)
4646
FloatAboutTitle = templanglist[11];
4747
FloatWarningTitle = templanglist[12];
4848
FloatErrorTitle = templanglist[13];
49-
this.Title = "Minecraft Command Helper v2.7.0.0 Pre 20 - " + templanglist[14];
49+
this.Title = "Minecraft Command Helper v2.7.0.0 Pre 21 - " + templanglist[14];
5050
itemBtn.Title = templanglist[15];
5151
spBtn.Title = templanglist[17];
5252
potionBtn.Title = templanglist[18];

‎WpfMinecraftCommandHelper2/Particle.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ private void appLanguage()
5555
}
5656

5757
private string finalStr = "";
58+
private int particleSel = 0;
5859

5960
private void clear()
6061
{
@@ -115,6 +116,7 @@ private void clearBtn_Click(object sender, RoutedEventArgs e)
115116
private void createBtn_Click(object sender, RoutedEventArgs e)
116117
{
117118
int langIndex = tabParticleSel.SelectedIndex;
119+
particleSel = tabParticleSel.SelectedIndex;
118120
string particleOut = "/particle ";
119121
//particle
120122
AllSelData asd = new AllSelData();
@@ -166,6 +168,8 @@ private void checkBtn_Click(object sender, RoutedEventArgs e)
166168
checkbox.Show();
167169
}
168170

171+
public int returnParticleSel() { return particleSel; }
172+
169173
private void helpBtn_Click(object sender, RoutedEventArgs e)
170174
{
171175
this.ShowMessageAsync(FloatHelpTitle, ParticleHelpStr, MessageDialogStyle.Affirmative, new MetroDialogSettings() { AffirmativeButtonText = FloatConfirm, NegativeButtonText = FloatCancel });

‎WpfMinecraftCommandHelper2/Potion.xaml.cs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,6 @@ private void createBtn_Click(object sender, RoutedEventArgs e)
376376
finalStr.Replace(@"\u00A7", @"\\u00A7");
377377
finalStr = "/setblock ~ ~1 ~ standing_sign 0 replace {Text1:\"{text:\\\"" + PotionClickMe + "\\\",clickEvent:{action:\\\"run_command\\\",value:\\\"/blockdata ~ ~-1 ~ {Command:" + finalStr + ",}\\\"}}\"}";
378378
}
379-
Check checkbox = new Check();
380-
checkbox.showText(finalStr);
381-
checkbox.Show();
382379
}
383380

384381
private void copyBtn_Click(object sender, RoutedEventArgs e)
@@ -388,14 +385,19 @@ private void copyBtn_Click(object sender, RoutedEventArgs e)
388385

389386
private void checkBtn_Click(object sender, RoutedEventArgs e)
390387
{
391-
string temp = "/* API LIST */\r\n";
392-
temp += "globalPotionString: \r\n";
393-
temp += "\t" + globalPotionString + "\r\n";
394-
temp += "globalPotionYN: \r\n";
395-
temp += "\t" + globalPotionYN + "";
388+
//string temp = "/* API LIST */\r\n";
389+
//temp += "globalPotionString: \r\n";
390+
//temp += "\t" + globalPotionString + "\r\n";
391+
//temp += "globalPotionYN: \r\n";
392+
//temp += "\t" + globalPotionYN + "\r\n";
393+
//temp += "globalPotionNBT: \r\n";
394+
//temp += "\t" + globalPotionNBT + "";
395+
//Check checkbox = new Check();
396+
//checkbox.showText(temp);
397+
//checkbox.ShowDialog();
396398
Check checkbox = new Check();
397-
checkbox.showText(temp);
398-
checkbox.ShowDialog();
399+
checkbox.showText(finalStr);
400+
checkbox.Show();
399401
}
400402

401403
private void helpBtn_Click(object sender, RoutedEventArgs e)

‎WpfMinecraftCommandHelper2/Scoreboard.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
66
xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours;assembly=MahApps.Metro"
77
WindowStartupLocation="CenterScreen" GlowBrush="{DynamicResource AccentColorBrush}" ShowIconOnTitleBar="False" Icon="MinecraftCommandHelper.ico"
8-
Title="指令帮助 / NBT表" Height="477.465" Width="717.563">
8+
Title="指令帮助 / NBT表" Height="477.465" Width="714.563">
99
<Grid>
1010
<ComboBox x:Name="tabScoreCommand" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="690" SelectionChanged="tabScoreCommand_SelectionChanged"/>
1111
<ComboBox x:Name="tabScoreAtVar" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top" Width="690" SelectionChanged="tabScoreAtVar_SelectionChanged"/>

‎WpfMinecraftCommandHelper2/Scoreboard.xaml.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ private void tabScoreAtVar_SelectionChanged(object sender, SelectionChangedEvent
208208
{
209209
tabScoreBox.Text = "特殊说明、举例：\r\n\r\n例如@e[type=!Player]则可以搜索到非玩家的实体，@e[name=!IceLitty]则可以搜索名称不为IceLitty的实体。\r\n\r\n@a、p、r都只能选择玩家实体，@e除外。\r\n\r\n如果前四个参数分别是x、y、z、r的时候可以省略标签直接写值，例如@e[1,3,2,5,type=Player]则是选择坐标在(1,3,2)处，半径为5的范围内搜索玩家。";
210210
}
211+
else if (tabScoreAtVar.SelectedIndex == 24)
212+
{
213+
tabScoreBox.Text = "选择器举例：@e[tag=tag1]\r\n\r\n可以选定所有含有{Tags:[{\"tag1\"}]}NBT标签的实体。";
214+
}
211215
else
212216
{
213217
tabScoreBox.Text = "";
@@ -290,7 +294,7 @@ private void tabScoreData2_SelectionChanged(object sender, SelectionChangedEvent
290294
else if (tabScoreData2.SelectedIndex == 8)
291295
{
292296
//实体皆有的标签
293-
tabScoreBox.Text = "{Glowing:0} 1代表这个实体发光。\r\n\r\n{id:Zombie} 此标签代表这个实体的种类，可以填除玩家之外的任何种类。\r\n\r\n{Pos:[0:0.0d,1:0.0d,2:0.0d]} 代表实体所在坐标，012分别代表xyz。\r\n\r\n{Motion:[0:0.0d,1:0.0d,2:0.0d]} 代表实体的运动方向和运动速度，012分别代表xyz，速度单位为米/Tick。\r\n\r\n{Rotation:[0:0.0d,1:0.0d]} 0代表绕Y轴顺时针旋转的角度（yaw），西面为0.0d，最大360度。1代表从水平线上下旋转的角度（pitch），水平线为0，值从-90到90度。\r\n\r\n{FallDistance:0.0f} 代表实体坠落的距离，值越高将获得更多的摔落伤害。\r\n\r\n{Fire:0s} 默认为-20s，无火焰。数值代表离燃烧状态结束还剩多少Tick。\r\n\r\n{Air:0s} 在空气中最高值为300s，可以在水下憋15秒才开始扣血。如果值为0s则下水就开始每秒1滴血的速度扣血。\r\n\r\n{OnGround:0b} 如果接触地面，则为1b，不接触则为0b。\r\n\r\n{Dimension:0} 未知用法。实体只在正常世界值为0，下界为-1，末地为1。\r\n\r\n{Invulnerable:0b} 值为1b则表示不会受到任何的伤害，例如喷溅药水和鱼钩，TNT等，但是仍可被创造模式的玩家所攻击/破坏。\r\n\r\n{PortalCooldown:0} 传送冷却的倒计时，每次传送后此值将设置为900Tick（45秒），然后逐渐降为0。\r\n\r\n{UUIDMost:} 实体UUID区间的最大量。\r\n\r\n{UUIDLeast:} 实体UUID区间的最小量。\r\n\r\n{UUID:} 实体的UUID，在实体加载后将被移除。（1.9移除）\r\n\r\n{CustomName:\"Dinnerbone\"} 实体的自定义名称。\r\n\r\n{CustomNameVisible:0b} 实体是否拥有自定义名称，0b为否，1b为是。\r\n\r\n{Silent:0b} 0b为默认，1b为静音。\r\n\r\n{Riding:{}} 实体的骑乘标签。（1.9移除）\r\n {id等:} 实体的所有标签。\r\n ... 实体的所有标签。\r\n\r\n{Passengers:[]} 实体的骑乘标签。\r\n [0:{...},1:{}] 实体所骑乘的标签。\r\n {id:Zombie,Passengers:[...]}\r\n\r\n{CommandStats:{}} 关于最后命令执行修改的信息标识计分板的参数相关项。\r\n {SuccessCountObjective:0b} 最后一个成功执行的命令中对象的名字，值为0b或1b。\r\n {SuccessCountName:\"\"} 最后一个成功执行的命令中玩家的名字，值为string类型玩家名。\r\n {AffectedBlocksObjectuve:0} 最后一个命令更改了多少的方块，值为int型数字。\r\n {AffectedBlocksName:\"\"} 最后一个命令更改了多少方块的玩家的名字，值为string类型玩家名。\r\n {AffectedEntitiesObjective:0} 同上，改变实体。\r\n {AffectedEntitiesName:\"\"} 同上，改变实体。\r\n {AffectedItemsObjective:0} 同上，改变物品。\r\n {AffectedItemsName:\"\"} 同上，改变物品。\r\n {QueryResultObjective:0} 同上，搜索结果。\r\n {QueryResultName:\"\"} 同上，搜索结果。";
297+
tabScoreBox.Text = "{Glowing:0} 1代表这个实体发光。\r\n\r\n{Tags:[{\"tag1\"},{\"tag2\"}]} 给实体加上tags，用于选择器的选择。\r\n\r\n{id:Zombie} 此标签代表这个实体的种类，可以填除玩家之外的任何种类。\r\n\r\n{Pos:[0:0.0d,1:0.0d,2:0.0d]} 代表实体所在坐标，012分别代表xyz。\r\n\r\n{Motion:[0:0.0d,1:0.0d,2:0.0d]} 代表实体的运动方向和运动速度，012分别代表xyz，速度单位为米/Tick。\r\n\r\n{Rotation:[0:0.0d,1:0.0d]} 0代表绕Y轴顺时针旋转的角度（yaw），西面为0.0d，最大360度。1代表从水平线上下旋转的角度（pitch），水平线为0，值从-90到90度。\r\n\r\n{FallDistance:0.0f} 代表实体坠落的距离，值越高将获得更多的摔落伤害。\r\n\r\n{Fire:0s} 默认为-20s，无火焰。数值代表离燃烧状态结束还剩多少Tick。\r\n\r\n{Air:0s} 在空气中最高值为300s，可以在水下憋15秒才开始扣血。如果值为0s则下水就开始每秒1滴血的速度扣血。\r\n\r\n{OnGround:0b} 如果接触地面，则为1b，不接触则为0b。\r\n\r\n{Dimension:0} 未知用法。实体只在正常世界值为0，下界为-1，末地为1。\r\n\r\n{Invulnerable:0b} 值为1b则表示不会受到任何的伤害，例如喷溅药水和鱼钩，TNT等，但是仍可被创造模式的玩家所攻击/破坏。\r\n\r\n{PortalCooldown:0} 传送冷却的倒计时，每次传送后此值将设置为900Tick（45秒），然后逐渐降为0。\r\n\r\n{UUIDMost:} 实体UUID区间的最大量。\r\n\r\n{UUIDLeast:} 实体UUID区间的最小量。\r\n\r\n{UUID:} 实体的UUID，在实体加载后将被移除。（1.9移除）\r\n\r\n{CustomName:\"Dinnerbone\"} 实体的自定义名称。\r\n\r\n{CustomNameVisible:0b} 实体是否拥有自定义名称，0b为否，1b为是。\r\n\r\n{Silent:0b} 0b为默认，1b为静音。\r\n\r\n{Riding:{}} 实体的骑乘标签。（1.9移除）\r\n {id等:} 实体的所有标签。\r\n ... 实体的所有标签。\r\n\r\n{Passengers:[]} 实体的骑乘标签。\r\n [0:{...},1:{}] 实体所骑乘的标签。\r\n {id:Zombie,Passengers:[...]}\r\n\r\n{CommandStats:{}} 关于最后命令执行修改的信息标识计分板的参数相关项。\r\n {SuccessCountObjective:0b} 最后一个成功执行的命令中对象的名字，值为0b或1b。\r\n {SuccessCountName:\"\"} 最后一个成功执行的命令中玩家的名字，值为string类型玩家名。\r\n {AffectedBlocksObjectuve:0} 最后一个命令更改了多少的方块，值为int型数字。\r\n {AffectedBlocksName:\"\"} 最后一个命令更改了多少方块的玩家的名字，值为string类型玩家名。\r\n {AffectedEntitiesObjective:0} 同上，改变实体。\r\n {AffectedEntitiesName:\"\"} 同上，改变实体。\r\n {AffectedItemsObjective:0} 同上，改变物品。\r\n {AffectedItemsName:\"\"} 同上，改变物品。\r\n {QueryResultObjective:0} 同上，搜索结果。\r\n {QueryResultName:\"\"} 同上，搜索结果。";
294298
}
295299
else if (tabScoreData2.SelectedIndex == 9)
296300
{
@@ -500,7 +504,7 @@ private void tabScoreData2_SelectionChanged(object sender, SelectionChangedEvent
500504
}
501505
else if (tabScoreData2.SelectedIndex == 60)
502506
{
503-
tabScoreBox.Text = "命令方块：\r\n{CommandStats:{}} 命令激发状态\r\n {...} 见之前内容。\r\n{Lock:\"\"} 上锁。\r\n{Command:\"\"} 命令。\r\n{SuccessCount:0} 成功执行次数。\r\n{LastOutput:\"\"} 最后输出。\r\n{TrackOutput:0b} 是否保留输出。\r\n{powered:0b} 1b为接受到红石信号。\r\n{auto:0b} 1b为自动执行。";
507+
tabScoreBox.Text = "命令方块：\r\n{CommandStats:{}} 命令激发状态\r\n {...} 见之前内容。\r\n{Lock:\"\"} 上锁。\r\n{Command:\"\"} 命令。\r\n{SuccessCount:0} 成功执行次数。\r\n{LastOutput:\"\"} 最后输出。\r\n{TrackOutput:0b} 是否保留输出。\r\n{powered:0b} 1b为接受到红石信号。\r\n{auto:0b} 1b为自动执行。\r\n{conditionMet:1b} 1b为指向它的命令方块执行成功，0b为失败，如遇上非连锁命令方块则始终为1b。";
504508
}
505509
else if (tabScoreData2.SelectedIndex == 61)
506510
{
@@ -528,7 +532,7 @@ private void tabScoreData2_SelectionChanged(object sender, SelectionChangedEvent
528532
}
529533
else if (tabScoreData2.SelectedIndex == 67)
530534
{
531-
tabScoreBox.Text = "音乐盒：\r\n{note:0b} 音阶\r\n/playsound指令全部声音wiki链接：http://minecraft.gamepedia.com/Sounds.json\r\n{powered:0b} 1b则接受到红石信号。\r\n\r\n唱片机：\r\n{Record:0} 0表示无唱片，此外其他值会覆盖RecordItem内的设置。\r\n{RecordItem:{}} 物品NBT，只能包含一种物品，多种物品请设置带NBT的箱子方块。";
535+
tabScoreBox.Text = "音乐盒：\r\n{note:0b} 音阶\r\n/playsound指令全部声音wiki链接：http://minecraft.gamepedia.com/Sounds.json \r\n{powered:0b} 1b则接受到红石信号。\r\n\r\n唱片机：\r\n{Record:0} 0表示无唱片，此外其他值会覆盖RecordItem内的设置。\r\n{RecordItem:{}} 物品NBT，只能包含一种物品，多种物品请设置带NBT的箱子方块。";
532536
}
533537
else if (tabScoreData2.SelectedIndex == 68)
534538
{

0 commit comments

Comments
 (0)