Skip to content

Commit 6022394

Browse files
hazelcodehazelcode
committed
Rename EntityTargets to Targets and rename Entity selectors with Match suffix
1 parent 73dd5ac commit 6022394

19 files changed

Lines changed: 151 additions & 151 deletions

‎Core/Chat.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ namespace SteveSharp.Core
88
public static class Chat
99
{
1010
public static void Say(string msg) => FunctionBuilder.Add(Str.Chat.Say(msg));
11-
public static void Tell(EntityTarget targets, string message) => FunctionBuilder.Add(Str.Chat.Tell(targets, message));
11+
public static void Tell(Targets targets, string message) => FunctionBuilder.Add(Str.Chat.Tell(targets, message));
1212
public static void Tell(string targets, string message) => FunctionBuilder.Add(Str.Chat.Tell(targets, message));
13-
public static void Tellraw(EntityTarget targets, TextComponent[] text) => FunctionBuilder.Add(Str.Chat.Tellraw(targets, text));
13+
public static void Tellraw(Targets targets, TextComponent[] text) => FunctionBuilder.Add(Str.Chat.Tellraw(targets, text));
1414
public static void Tellraw(string targets, TextComponent[] text) => FunctionBuilder.Add(Str.Chat.Tellraw(targets, text));
15-
public static void Tellraw(EntityTarget targets, TextComponent text) => FunctionBuilder.Add(Str.Chat.Tellraw(targets, text));
15+
public static void Tellraw(Targets targets, TextComponent text) => FunctionBuilder.Add(Str.Chat.Tellraw(targets, text));
1616
public static void Tellraw(string targets, TextComponent text) => FunctionBuilder.Add(Str.Chat.Tellraw(targets, text));
1717
}
1818
}

‎Core/Effect.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
namespace SteveSharp.Core;
55

66
public static class Effect {
7-
public static void Give(EntityTarget targets, StatusEffect effect, bool infinite = false, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, infinite, amplifier));
7+
public static void Give(Targets targets, StatusEffect effect, bool infinite = false, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, infinite, amplifier));
88
public static void Give(string targets, StatusEffect effect, bool infinite = false, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, infinite, amplifier));
99

10-
public static void Give(EntityTarget targets, StatusEffect effect, int seconds, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, seconds, amplifier));
10+
public static void Give(Targets targets, StatusEffect effect, int seconds, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, seconds, amplifier));
1111
public static void Give(string targets, StatusEffect effect, int seconds, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, seconds, amplifier));
1212

13-
public static void Give(EntityTarget targets, string effect, bool infinite = false, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, infinite, amplifier));
13+
public static void Give(Targets targets, string effect, bool infinite = false, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, infinite, amplifier));
1414
public static void Give(string targets, string effect, bool infinite = false, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, infinite, amplifier));
1515

16-
public static void Give(EntityTarget targets, string effect, int seconds, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, seconds, amplifier));
16+
public static void Give(Targets targets, string effect, int seconds, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, seconds, amplifier));
1717
public static void Give(string targets, string effect, int seconds, int amplifier = 0) => FunctionBuilder.Add(Str.Effect.Give(targets, effect, seconds, amplifier));
1818

1919
public static void Clear() => FunctionBuilder.Add(Str.Effect.Clear());
2020

21-
public static void Clear(EntityTarget targets) => FunctionBuilder.Add(Str.Effect.Clear(targets));
21+
public static void Clear(Targets targets) => FunctionBuilder.Add(Str.Effect.Clear(targets));
2222
public static void Clear(string targets) => FunctionBuilder.Add(Str.Effect.Clear(targets));
2323

24-
public static void Clear(EntityTarget targets, StatusEffect effect) => FunctionBuilder.Add(Str.Effect.Clear(targets, effect));
24+
public static void Clear(Targets targets, StatusEffect effect) => FunctionBuilder.Add(Str.Effect.Clear(targets, effect));
2525
public static void Clear(string targets, StatusEffect effect) => FunctionBuilder.Add(Str.Effect.Clear(targets, effect));
2626

27-
public static void Clear(EntityTarget targets, string effect) => FunctionBuilder.Add(Str.Effect.Clear(targets, effect));
27+
public static void Clear(Targets targets, string effect) => FunctionBuilder.Add(Str.Effect.Clear(targets, effect));
2828
public static void Clear(string targets, string effect) => FunctionBuilder.Add(Str.Effect.Clear(targets, effect));
2929
}

‎Core/EnchantCommand.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
namespace SteveSharp.Core;
55

66
public static class EnchantCommand {
7-
public static void Enchant(EntityTarget targets, Enchantment enchantment) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment));
8-
public static void Enchant(EntityTarget targets, Enchantment enchantment, int level) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment, level));
9-
public static void Enchant(EntityTarget targets, string enchantment) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment));
10-
public static void Enchant(EntityTarget targets, string enchantment, int level) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment, level));
7+
public static void Enchant(Targets targets, Enchantment enchantment) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment));
8+
public static void Enchant(Targets targets, Enchantment enchantment, int level) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment, level));
9+
public static void Enchant(Targets targets, string enchantment) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment));
10+
public static void Enchant(Targets targets, string enchantment, int level) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment, level));
1111
public static void Enchant(string targets, string enchantment) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment));
1212
public static void Enchant(string targets, string enchantment, int level) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment, level));
1313
public static void Enchant(string targets, Enchantment enchantment) => FunctionBuilder.Add(Str.EnchantCommand.Enchant(targets, enchantment));

‎Core/Entity.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ namespace SteveSharp.Core
55
{
66
public static class Entity
77
{
8-
public static string Selected(string match = "") { if (match == "") return "@s"; else return "@s[" + match + "]"; }
9-
public static string AllPlayers(string match = "") { if (match == "") return "@a"; else return "@a[" + match + "]"; }
10-
public static string RandomPlayer(string match = "") { if (match == "") return "@r"; else return "@r[" + match + "]"; }
11-
public static string NearestPlayer(string match = "") { if (match == "") return "@p"; else return "@p[" + match + "]"; }
12-
public static string AllEntities(string match = "") { if (match == "") return "@e"; else return "@e[" + match + "]"; }
8+
public static string SelectedMatch(string match) => "@s[" + match + "]";
9+
public static string AllPlayersMatch(string match) => "@a[" + match + "]";
10+
public static string RandomPlayerMatch(string match) => "@r[" + match + "]";
11+
public static string NearestPlayerMatch(string match) => "@p[" + match + "]";
12+
public static string AllEntitiesMatch(string match) => "@e[" + match + "]";
1313
/// <summary>
1414
/// This method selects an entity with specific matches, recommended if you want to select an entity with specific matches.
1515
/// </summary>
1616
/// <returns></returns>
17-
public static void Custom(EntityTarget targets, int? limit = null, string[]? tags = null, string[]? scores = null, string? team = null, string? type = null, string? distance = null, string? area = null, string? level = null, string? gamemode = null, string? horizontalRotation = null, string? verticalRotation = null, string? sort = null)
17+
public static void Custom(Targets targets, int? limit = null, string[]? tags = null, string[]? scores = null, string? team = null, string? type = null, string? distance = null, string? area = null, string? level = null, string? gamemode = null, string? horizontalRotation = null, string? verticalRotation = null, string? sort = null)
1818
=> FunctionBuilder.Add(Str.Entity.Custom(targets, limit, tags, scores, team, type, distance, area, level, gamemode, horizontalRotation, verticalRotation, sort));
1919
public static void Custom(string targets, int? limit = null, string[]? tags = null, string[]? scores = null, string? team = null, string? type = null, string? distance = null, string? area = null, string? level = null, string? gamemode = null, string? horizontalRotation = null, string? verticalRotation = null, string? sort = null)
2020
=> FunctionBuilder.Add(Str.Entity.Custom(targets, limit, tags, scores, team, type, distance, area, level, gamemode, horizontalRotation, verticalRotation, sort));
21-
public static void Teleport(EntityTarget targets, string to) => FunctionBuilder.Add(Str.Entity.Teleport(targets, to));
21+
public static void Teleport(Targets targets, string to) => FunctionBuilder.Add(Str.Entity.Teleport(targets, to));
2222
public static void Teleport(string targets, string to) => FunctionBuilder.Add(Str.Entity.Teleport(targets, to));
2323
public static void Summon(EntityEnum entity, (int X, int Y, int Z) pos, string nbt = "{}") => FunctionBuilder.Add(Str.Entity.Summon(entity, pos, nbt));
2424
public static void Summon(EntityEnum entity, (string X, string Y, string Z) rel, string nbt = "{}") => FunctionBuilder.Add(Str.Entity.Summon(entity, rel, nbt));
2525
public static void Summon(EntityEnum entity, string[] pos, string nbt = "{}") => FunctionBuilder.Add(Str.Entity.Summon(entity, pos, nbt));
2626
public static void Summon(string entity, (int X, int Y, int Z) pos, string nbt = "{}") => FunctionBuilder.Add(Str.Entity.Summon(entity, pos, nbt));
2727
public static void Summon(string entity, (string X, string Y, string Z) rel, string nbt = "{}") => FunctionBuilder.Add(Str.Entity.Summon(entity, rel, nbt));
2828
public static void Summon(string entity, string[] pos, string nbt = "{}") => FunctionBuilder.Add(Str.Entity.Summon(entity, pos, nbt));
29-
public static void AddTag(EntityTarget targets, string tag) => FunctionBuilder.Add(Str.Entity.AddTag(targets, tag));
29+
public static void AddTag(Targets targets, string tag) => FunctionBuilder.Add(Str.Entity.AddTag(targets, tag));
3030
public static void AddTag(string targets, string tag) => FunctionBuilder.Add(Str.Entity.AddTag(targets, tag));
31-
public static void RemoveTag(EntityTarget targets, string tag) => FunctionBuilder.Add(Str.Entity.RemoveTag(targets, tag));
31+
public static void RemoveTag(Targets targets, string tag) => FunctionBuilder.Add(Str.Entity.RemoveTag(targets, tag));
3232
public static void RemoveTag(string targets, string tag) => FunctionBuilder.Add(Str.Entity.RemoveTag(targets, tag));
33-
public static void Kill(EntityTarget targets) => FunctionBuilder.Add(Str.Entity.Kill(targets));
33+
public static void Kill(Targets targets) => FunctionBuilder.Add(Str.Entity.Kill(targets));
3434
public static void Kill(string targets) => FunctionBuilder.Add(Str.Entity.Kill(targets));
3535
}
3636
}

‎Core/Execute.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ public static class Execute
77
{
88
const string[] defaults = null;
99
public static void Write(string execute, string[] commands = defaults) => FunctionBuilder.Add(Str.Execute.Write(execute, commands));
10-
public static void As(EntityTarget targets, string addition = "") => FunctionBuilder.Add(Str.Execute.As(targets, addition));
10+
public static void As(Targets targets, string addition = "") => FunctionBuilder.Add(Str.Execute.As(targets, addition));
1111
public static void As(string targets, string addition = "") => FunctionBuilder.Add(Str.Execute.As(targets, addition));
12-
public static void At(EntityTarget targets, string addition = "") => FunctionBuilder.Add(Str.Execute.At(targets, addition));
12+
public static void At(Targets targets, string addition = "") => FunctionBuilder.Add(Str.Execute.At(targets, addition));
1313
public static void At(string targets, string addition = "") => FunctionBuilder.Add(Str.Execute.At(targets, addition));
14-
public static void Asat(EntityTarget targets, string addition = "") => FunctionBuilder.Add(Str.Execute.Asat(targets, addition));
14+
public static void Asat(Targets targets, string addition = "") => FunctionBuilder.Add(Str.Execute.Asat(targets, addition));
1515
public static void Asat(string targets, string addition = "") => FunctionBuilder.Add(Str.Execute.Asat(targets, addition));
1616
public static void Unless(string arguments, string addition = "") => FunctionBuilder.Add(Str.Execute.Unless(arguments, addition));
1717
public static void If(string arguments, string addition = "") => FunctionBuilder.Add(Str.Execute.If(arguments, addition));
1818
public static void Summon(string entity, string[] pos, string addition = "") => FunctionBuilder.Add(Str.Execute.Summon(entity, pos, addition));
1919
public static void Store(string where, string at, string arguments, string addition = "") => FunctionBuilder.Add(Str.Execute.Store(where, at, arguments, addition));
20-
public static void StoreScore(string where, Score score, EntityTarget targets, string addition = "") => FunctionBuilder.Add(Str.Execute.StoreScore(where, score, targets, addition));
20+
public static void StoreScore(string where, Score score, Targets targets, string addition = "") => FunctionBuilder.Add(Str.Execute.StoreScore(where, score, targets, addition));
2121
public static void StoreScore(string where, Score score, string targets = "", string addition = "") => FunctionBuilder.Add(Str.Execute.StoreScore(where, score, targets, addition));
2222
}
2323
}

‎Core/Recipe.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
namespace SteveSharp.Core;
55

66
public static class Recipe {
7-
public static void Give(EntityTarget targets, string recipe) => FunctionBuilder.Add(Str.Recipe.Give(targets, recipe));
7+
public static void Give(Targets targets, string recipe) => FunctionBuilder.Add(Str.Recipe.Give(targets, recipe));
88
public static void Give(string targets, string recipe) => FunctionBuilder.Add(Str.Recipe.Give(targets, recipe));
9-
public static void Take(EntityTarget targets, string recipe) => FunctionBuilder.Add(Str.Recipe.Take(targets, recipe));
9+
public static void Take(Targets targets, string recipe) => FunctionBuilder.Add(Str.Recipe.Take(targets, recipe));
1010
public static void Take(string targets, string recipe) => FunctionBuilder.Add(Str.Recipe.Take(targets, recipe));
1111
}

‎Core/Score.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void Set(int count, string targets = "")
2828
{
2929
FunctionBuilder.Add(Str.Score.Set(id, count, targets));
3030
}
31-
public void Set(int count, EntityTarget targets)
31+
public void Set(int count, Targets targets)
3232
{
3333
FunctionBuilder.Add(Str.Score.Set(id, count, targets));
3434
}
@@ -40,47 +40,47 @@ public void Add(int count, string targets = "")
4040
{
4141
FunctionBuilder.Add(Str.Score.Add(id, count, targets));
4242
}
43-
public void Add(int count, EntityTarget targets)
43+
public void Add(int count, Targets targets)
4444
{
4545
FunctionBuilder.Add(Str.Score.Add(id, count, targets));
4646
}
4747
public static void Add(string id, int count, string targets = "")
4848
{
4949
FunctionBuilder.Add(Str.Score.Add(id, count, targets));
5050
}
51-
public static void Add(string id, int count, EntityTarget targets)
51+
public static void Add(string id, int count, Targets targets)
5252
{
5353
FunctionBuilder.Add(Str.Score.Add(id, count, targets));
5454
}
5555
public void Remove(int count, string targets = "")
5656
{
5757
FunctionBuilder.Add(Str.Score.Remove(id, count, targets));
5858
}
59-
public void Remove(int count, EntityTarget targets)
59+
public void Remove(int count, Targets targets)
6060
{
6161
FunctionBuilder.Add(Str.Score.Remove(id, count, targets));
6262
}
6363
public static void Remove(string id, int count, string targets = "")
6464
{
6565
FunctionBuilder.Add(Str.Score.Remove(id, count, targets));
6666
}
67-
public static void Remove(string id, int count, EntityTarget targets)
67+
public static void Remove(string id, int count, Targets targets)
6868
{
6969
FunctionBuilder.Add(Str.Score.Remove(id, count, targets));
7070
}
7171
public void Reset(string targets = "")
7272
{
7373
FunctionBuilder.Add(Str.Score.Reset(id, targets));
7474
}
75-
public void Reset(EntityTarget targets)
75+
public void Reset(Targets targets)
7676
{
7777
FunctionBuilder.Add(Str.Score.Reset(id, targets));
7878
}
7979
public static void Reset(string id, string targets = "")
8080
{
8181
FunctionBuilder.Add(Str.Score.Reset(id, targets));
8282
}
83-
public static void Reset(string id, EntityTarget targets)
83+
public static void Reset(string id, Targets targets)
8484
{
8585
FunctionBuilder.Add(Str.Score.Reset(id, targets));
8686
}
@@ -151,24 +151,24 @@ public static string Matches(string id, int value){
151151
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} %= #{b.id} {b.id}");
152152
return a;
153153
}
154-
public static Score operator + (Score a, EntityTarget b) {
155-
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} += {EntityTargetHandler.Get(b)} {a.id}");
154+
public static Score operator + (Score a, Targets b) {
155+
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} += {TargetsHandler.Get(b)} {a.id}");
156156
return a;
157157
}
158-
public static Score operator - (Score a, EntityTarget b) {
159-
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} -= {EntityTargetHandler.Get(b)} {a.id}");
158+
public static Score operator - (Score a, Targets b) {
159+
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} -= {TargetsHandler.Get(b)} {a.id}");
160160
return a;
161161
}
162-
public static Score operator * (Score a, EntityTarget b) {
163-
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} *= {EntityTargetHandler.Get(b)} {a.id}");
162+
public static Score operator * (Score a, Targets b) {
163+
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} *= {TargetsHandler.Get(b)} {a.id}");
164164
return a;
165165
}
166-
public static Score operator / (Score a, EntityTarget b) {
167-
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} /= {EntityTargetHandler.Get(b)} {a.id}");
166+
public static Score operator / (Score a, Targets b) {
167+
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} /= {TargetsHandler.Get(b)} {a.id}");
168168
return a;
169169
}
170-
public static Score operator % (Score a, EntityTarget b) {
171-
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} %= {EntityTargetHandler.Get(b)} {a.id}");
170+
public static Score operator % (Score a, Targets b) {
171+
FunctionBuilder.Add($"scoreboard players operation #{a.id} {a.id} %= {TargetsHandler.Get(b)} {a.id}");
172172
return a;
173173
}
174174
public static Score operator + (Score a, string b) {

0 commit comments

Comments
 (0)