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

Commit 3611b8a

Browse files
IceLittyIceLitty
committed
v2.8.6.4
1 parent b6afe7d commit 3611b8a

File tree

7 files changed

+30
-31
lines changed

7 files changed

+30
-31
lines changed

‎WpfMinecraftCommandHelper2/AllSelData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ public AllSelData()
472472
"minecraft:glass",
473473
"minecraft:glass_pane",
474474
"minecraft:glass_bottle",
475-
"minecraft:totem",
475+
"minecraft:totem_of_undying",
476476
"minecraft:grass",
477477
"minecraft:grass_path",
478478
"minecraft:record_11",

‎WpfMinecraftCommandHelper2/Effect.xaml.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ private void clearBtn_Click(object sender, RoutedEventArgs e)
112112

113113
private void createBtn_Click(object sender, RoutedEventArgs e)
114114
{
115+
int level = (int)tabEffectLevel.Value.Value - 1;
115116
if (tabEffectSel.SelectedIndex < 0)
116117
{
117118
tabEffectSel.SelectedIndex = 0;
@@ -132,23 +133,23 @@ private void createBtn_Click(object sender, RoutedEventArgs e)
132133
{
133134
if (tabEffectHide.IsChecked.Value == true)
134135
{
135-
andAt += asd.getEffect(tabEffectSel.SelectedIndex, true) + " " + tabEffectTime.Value + " " + tabEffectLevel.Value + " true";
136+
andAt += asd.getEffect(tabEffectSel.SelectedIndex, true) + " " + tabEffectTime.Value + " " + level + " true";
136137
}
137138
else
138139
{
139-
andAt += asd.getEffect(tabEffectSel.SelectedIndex, true) + " " + tabEffectTime.Value + " " + tabEffectLevel.Value;
140+
andAt += asd.getEffect(tabEffectSel.SelectedIndex, true) + " " + tabEffectTime.Value + " " + level;
140141
}
141142

142143
}
143144
else if (tabEffectSelName.IsChecked.Value == true)
144145
{
145146
if (tabEffectHide.IsChecked.Value == true)
146147
{
147-
andAt += asd.getEffect(tabEffectSel.SelectedIndex, false) + " " + tabEffectTime.Value + " " + tabEffectLevel.Value + " true";
148+
andAt += asd.getEffect(tabEffectSel.SelectedIndex, false) + " " + tabEffectTime.Value + " " + level + " true";
148149
}
149150
else
150151
{
151-
andAt += asd.getEffect(tabEffectSel.SelectedIndex, false) + " " + tabEffectTime.Value + " " + tabEffectLevel.Value;
152+
andAt += asd.getEffect(tabEffectSel.SelectedIndex, false) + " " + tabEffectTime.Value + " " + level;
152153
}
153154
}
154155
else

‎WpfMinecraftCommandHelper2/Firework.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Label x:Name="FireworkFlyTime" Content="飞行时间（Tick）：" HorizontalAlignment="Left" Margin="0,6,0,0" VerticalAlignment="Top"/>
2626
<Label x:Name="FireworkX" Content="坐标X：" HorizontalAlignment="Left" Margin="0,36,0,0" VerticalAlignment="Top"/>
2727
<Label x:Name="FireworkFlyHeight" Content="飞行高度：" HorizontalAlignment="Left" Margin="300,8,0,0" VerticalAlignment="Top"/>
28-
<Controls:NumericUpDown x:Name="tabFireFlight" Minimum="0" Maximum="10" StringFormat="" Margin="375,6,10,30" Height="28" Value="2" />
28+
<Controls:NumericUpDown x:Name="tabFireFlight" Minimum="-5" Maximum="10" StringFormat="" Margin="375,6,10,30" Height="28" Value="2" />
2929
<Label x:Name="FireworkY" Content="Y：" HorizontalAlignment="Left" Margin="202,36,0,0" VerticalAlignment="Top"/>
3030
<Controls:NumericUpDown x:Name="tabFireY" Minimum="-1000000" Maximum="1000000" StringFormat="" Margin="231,36,207,0" Height="28" Value="0" IsEnabled="False" />
3131
<Label x:Name="FireworkZ" Content="Z：" HorizontalAlignment="Left" Margin="374,36,0,0" VerticalAlignment="Top"/>

‎WpfMinecraftCommandHelper2/Firework.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,11 @@ private void listFlush()
205205
}
206206
}
207207

208+
public string returnCmd()
209+
{
210+
return finalStr;
211+
}
212+
208213
private void clearBtn_Click(object sender, RoutedEventArgs e)
209214
{
210215
clear();

‎WpfMinecraftCommandHelper2/MainWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public MainWindow()
2929
private bool isUpdate = false;
3030
private bool isNeedUpdate = false;
3131
private bool preview = false;
32-
private string version = "2.8.6.3";
32+
private string version = "2.8.6.4";
3333
private string getversion = "0.0.0.0";
3434
private string passversion = "0.0.0.0";
3535
private bool error1 = 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.6.3")]
53-
[assembly: AssemblyFileVersion("2.8.6.3")]
52+
[assembly: AssemblyVersion("2.8.6.4")]
53+
[assembly: AssemblyFileVersion("2.8.6.4")]

‎WpfMinecraftCommandHelper2/Summon.xaml.cs

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ namespace WpfMinecraftCommandHelper2
1111
/// </summary>
1212
public partial class Summon : MetroWindow
1313
{
14+
AllSelData asd = new AllSelData();
15+
1416
public Summon()
1517
{
1618
InitializeComponent();
1719
appLanguage();
18-
AllSelData asd = new AllSelData();
1920
for (int i = 0; i < asd.getAtListCount(); i++)
2021
{
2122
tabSumosType.Items.Add(asd.getAtNameList(i));
@@ -379,7 +380,6 @@ private void clear()
379380
{
380381
clear(i);
381382
}
382-
AllSelData asd = new AllSelData();
383383
for (int i = 0; i < asd.getItemNameListCount(); i++)
384384
{
385385
if (asd.getItem(i) == "minecraft:sand") { FallingSandItemSel.SelectedIndex = i; continue; }
@@ -811,7 +811,6 @@ private void tabSumosHasHeadID_Click(object sender, RoutedEventArgs e)
811811
tabSumosHeadID.IsEnabled = true;
812812
tabSumosHead.IsEnabled = false;
813813
globalSumosTempSel = tabSumosHead.SelectedIndex;
814-
AllSelData asd = new AllSelData();
815814
int tempIndex = 0;
816815
for (int i = 0; i < asd.getItemNameListCount(); i++)
817816
{
@@ -934,7 +933,6 @@ private void tabSumosClear_Click(object sender, RoutedEventArgs e)
934933

935934
private void tabSumosCreate_Click(object sender, RoutedEventArgs e)
936935
{
937-
AllSelData asd = new AllSelData();
938936
string sumosText = "ArmorItems:[";
939937
int equipCount = 0;
940938
if (mcVersion == "1.8")
@@ -1687,7 +1685,6 @@ private void tabSumosRiding_Click(object sender, RoutedEventArgs e)
16871685
{
16881686
if (mcVersion == "1.8")
16891687
{
1690-
AllSelData asd = new AllSelData();
16911688
string finaltext = "/summon " + asd.getAt(tabSumosType.SelectedIndex) + " ~ ~1 ~ {Riding:{";
16921689
if (sumosRidingNBT != "")
16931690
{
@@ -1722,7 +1719,6 @@ private void tabSumosRidingClear_Click(object sender, RoutedEventArgs e)
17221719

17231720
private void tabSumosEgg_Click(object sender, RoutedEventArgs e)
17241721
{
1725-
AllSelData asd = new AllSelData();
17261722
if (sumosFinalStr.IndexOf('{') != -1)
17271723
{
17281724
string temp = sumosFinalStr.Substring(sumosFinalStr.IndexOf('{') + 1, sumosFinalStr.Length - sumosFinalStr.IndexOf('{') - 2);
@@ -1803,7 +1799,6 @@ private void tabSumosEEnderman_Click(object sender, RoutedEventArgs e)
18031799
private void tabSumosType_SelectionChanged(object sender, SelectionChangedEventArgs e)
18041800
{
18051801
allVisInit();
1806-
AllSelData asd = new AllSelData();
18071802
if (asd.getAt(tabSumosType.SelectedIndex) == "Villager" || asd.getAt(tabSumosType.SelectedIndex) == "minecraft:villager")
18081803
{
18091804
SummonVHeader.Visibility = Visibility.Visible;
@@ -2104,7 +2099,6 @@ private void tabVillagerNext_Click(object sender, RoutedEventArgs e)
21042099
private void listFlush()
21052100
{
21062101
pageList.Items.Clear();
2107-
AllSelData asd = new AllSelData();
21082102
for (int i = 0; i <= tabVillagerMaxIndex; i++)
21092103
{
21102104
if (i < globalVillagerMaxValue)
@@ -2152,7 +2146,6 @@ private void tabVillagerAMetaCheck_Click(object sender, RoutedEventArgs e)
21522146

21532147
private void tabVillagerAGet_Click(object sender, RoutedEventArgs e)
21542148
{
2155-
AllSelData asd = new AllSelData();
21562149
if (asd.getItem(tabVillagerA.SelectedIndex) == "minecraft:splash_potion" || asd.getItem(tabVillagerA.SelectedIndex) == "minecraft:lingering_potion" || asd.getItem(tabVillagerA.SelectedIndex) == "minecraft:potion")
21572150
{
21582151
string[] receive = tabVillagerGetPotion();
@@ -2186,7 +2179,6 @@ private void tabVillagerBMetaCheck_Click(object sender, RoutedEventArgs e)
21862179

21872180
private void tabVillagerBGet_Click(object sender, RoutedEventArgs e)
21882181
{
2189-
AllSelData asd = new AllSelData();
21902182
if (asd.getItem(tabVillagerB.SelectedIndex) == "minecraft:splash_potion" || asd.getItem(tabVillagerB.SelectedIndex) == "minecraft:lingering_potion" || asd.getItem(tabVillagerB.SelectedIndex) == "minecraft:potion")
21912183
{
21922184
string[] receive = tabVillagerGetPotion();
@@ -2220,7 +2212,6 @@ private void tabVillagerCMetaCheck_Click(object sender, RoutedEventArgs e)
22202212

22212213
private void tabVillagerCGet_Click(object sender, RoutedEventArgs e)
22222214
{
2223-
AllSelData asd = new AllSelData();
22242215
if (asd.getItem(tabVillagerC.SelectedIndex) == "minecraft:splash_potion" || asd.getItem(tabVillagerC.SelectedIndex) == "minecraft:lingering_potion" || asd.getItem(tabVillagerC.SelectedIndex) == "minecraft:potion")
22252216
{
22262217
string[] receive = tabVillagerGetPotion();
@@ -2360,7 +2351,6 @@ private string[] HorseItemGet()
23602351
itembox.ShowDialog();
23612352
string[] temp = itembox.returnStr();
23622353
int[] temp0 = itembox.returnStrAdver();
2363-
AllSelData asd = new AllSelData();
23642354
if (temp[10] == string.Empty)
23652355
{
23662356
return new string[] { asd.getItem(temp0[0]), temp0[1].ToString(), temp0[2].ToString(), string.Empty };
@@ -3183,7 +3173,6 @@ private void FrameHasItem_Click(object sender, RoutedEventArgs e)
31833173

31843174
private void FrameGetItemBtn_Click(object sender, RoutedEventArgs e)
31853175
{
3186-
AllSelData asd = new AllSelData();
31873176
Item itembox = new Item();
31883177
itembox.ShowDialog();
31893178
string[] temp = itembox.returnStr();
@@ -3364,8 +3353,16 @@ private void tabSpawnerClear_Click(object sender, RoutedEventArgs e)
33643353
clear(3);
33653354
}
33663355

3356+
private string SpawnerOtherStr = string.Empty;
3357+
33673358
private void tabSpawnerGetNBT_Click(object sender, RoutedEventArgs e)
33683359
{
3360+
if (asd.getAt(tabSpawnerShowType.SelectedIndex) == "minecraft:fireworks_rocket")
3361+
{
3362+
Firework fwbox = new Firework();
3363+
string fireworkCmd = fwbox.returnCmd();
3364+
SpawnerOtherStr = fireworkCmd.Substring(fireworkCmd.IndexOf('{'), fireworkCmd.Length - fireworkCmd.IndexOf('{') - 1) + ",";
3365+
}
33693366
if (sumosFinalStr != "" && sumosFinalStr.IndexOf('{') != -1)
33703367
{
33713368
globalSummonNBT = sumosFinalStr.Substring(sumosFinalStr.IndexOf('{') + 1, sumosFinalStr.LastIndexOf('}') - sumosFinalStr.IndexOf('{') - 1);
@@ -3398,7 +3395,6 @@ private void tabSpawnerCreate_Click(object sender, RoutedEventArgs e)
33983395
}
33993396
if (tabSpawnerAddToInv.IsChecked.Value)
34003397
{
3401-
AllSelData asd = new AllSelData();
34023398
firstText = "";
34033399
if (asd.getAt(tabSpawnerShowType.SelectedIndex) == "TippedArrow")
34043400
{
@@ -3407,20 +3403,19 @@ private void tabSpawnerCreate_Click(object sender, RoutedEventArgs e)
34073403
}
34083404
else
34093405
{
3410-
if (mcVersion == "1.8") { firstText = "/give @p minecraft:mob_spawner 1 0 {BlockEntityTag:{id:\"MobSpawner\",EntityId:" + asd.getAt(tabSpawnerShowType.SelectedIndex) + ",SpawnData:{"; }
3411-
else { firstText = "/give @p minecraft:mob_spawner 1 0 {BlockEntityTag:{id:\"MobSpawner\",SpawnData:{id:\"" + asd.getAt(tabSpawnerShowType.SelectedIndex) + "\","; }
3406+
if (mcVersion == "1.8") { firstText = "/give @p minecraft:mob_spawner 1 0 {BlockEntityTag:{id:\"MobSpawner\",EntityId:" + asd.getAt(tabSpawnerShowType.SelectedIndex) + ",SpawnData:{" + SpawnerOtherStr; }
3407+
else { firstText = "/give @p minecraft:mob_spawner 1 0 {BlockEntityTag:{id:\"MobSpawner\",SpawnData:{id:\"" + asd.getAt(tabSpawnerShowType.SelectedIndex) + "\"," + SpawnerOtherStr; }
34123408
}
34133409
}
34143410
else
34153411
{
3416-
AllSelData asd = new AllSelData();
34173412
string dx = "", dy = "", dz = "";
34183413
if (tabSpawnerX.Value == 0) dx = "~"; else dx = tabSpawnerX.Value.ToString();
34193414
if (tabSpawnerY.Value == 0) dy = "~"; else dy = tabSpawnerY.Value.ToString();
34203415
if (tabSpawnerZ.Value == 0) dz = "~"; else dz = tabSpawnerZ.Value.ToString();
34213416
firstText = "";
3422-
if (mcVersion == "1.8") { firstText = "/setblock " + dx + " " + dy + " " + dz + " minecraft:mob_spawner 0 replace {BlockEntityTag:{id:\"MobSpawner\",EntityId:" + asd.getAt(tabSpawnerShowType.SelectedIndex) + ",SpawnData:{"; }
3423-
else { firstText = "/setblock " + dx + " " + dy + " " + dz + " minecraft:mob_spawner 0 replace {BlockEntityTag:{id:\"MobSpawner\",SpawnData:{id:" + asd.getAt(tabSpawnerShowType.SelectedIndex) + "\","; }
3417+
if (mcVersion == "1.8") { firstText = "/setblock " + dx + " " + dy + " " + dz + " minecraft:mob_spawner 0 replace {BlockEntityTag:{id:\"MobSpawner\",EntityId:" + asd.getAt(tabSpawnerShowType.SelectedIndex) + ",SpawnData:{" + SpawnerOtherStr; }
3418+
else { firstText = "/setblock " + dx + " " + dy + " " + dz + " minecraft:mob_spawner 0 replace {BlockEntityTag:{id:\"MobSpawner\",SpawnData:{id:" + asd.getAt(tabSpawnerShowType.SelectedIndex) + "\"," + SpawnerOtherStr; }
34243419
}
34253420
string secondText = "";
34263421
if (tabSpawnerHasName.IsChecked.Value) secondText += "CustomName:\"" + tabSpawnerName.Text + "\",";
@@ -3433,7 +3428,6 @@ private void tabSpawnerCreate_Click(object sender, RoutedEventArgs e)
34333428
secondText += "}";
34343429
if (!tabSpawnerHasItemNL.IsChecked.Value)
34353430
{
3436-
AllSelData asd = new AllSelData();
34373431
secondText += ",display:{Name:\"" + asd.getAtNameList(tabSpawnerShowType.SelectedIndex) + "\"}";
34383432
}
34393433
else
@@ -3449,7 +3443,6 @@ private void tabSpawnerCreate_Click(object sender, RoutedEventArgs e)
34493443
{
34503444
if (mcVersion == "1.8")
34513445
{
3452-
AllSelData asd = new AllSelData();
34533446
thirdText += "{Type:\"" + asd.getAt(tabSpawner1Type.SelectedIndex) + "\",Weight:" + tabSpawner1Weight.Value + ",Properties:{" + edata1 + "}}";
34543447
if (tabSpawner2.IsChecked.Value)
34553448
{
@@ -3466,7 +3459,6 @@ private void tabSpawnerCreate_Click(object sender, RoutedEventArgs e)
34663459
}
34673460
else
34683461
{
3469-
AllSelData asd = new AllSelData();
34703462
thirdText += "{Weight:" + tabSpawner1Weight.Value + ",Entity:{id:\"" + asd.getAt(tabSpawner1Type.SelectedIndex) + "\"," + edata1 + "}}";
34713463
if (tabSpawner2.IsChecked.Value)
34723464
{
@@ -3526,6 +3518,7 @@ private void tabSpawnerCreate_Click(object sender, RoutedEventArgs e)
35263518
spawnerFinalStr = firstText + secondText + thirdText + "}}";
35273519
}
35283520
spawnerFinalStr = spawnerFinalStr.Replace(",,", ",");
3521+
SpawnerOtherStr = string.Empty;
35293522
}
35303523

35313524
private void tabSpawnerCopy_Click(object sender, RoutedEventArgs e)

0 commit comments

Comments
 (0)