Change EssLang structure

uEssentials · Jul 9, 2016 · a4aaee4 · a4aaee4
1 parent 7623da2
commit a4aaee4
Show file tree

Hide file tree

Showing 50 changed files with 381 additions and 585 deletions.
diff --git a/src/Api/Command/CommandResult.cs b/src/Api/Command/CommandResult.cs
@@ -86,13 +86,13 @@ public class CommandResult {
 
         /// <summary>
         /// Commonly indicate that an given argument is invalid, and send the
-        /// give <paramref name="lang"/> to sender.
+        /// give <paramref name="key"/> to sender.
         /// </summary>
-        /// <param name="lang">Translation entry</param>
+        /// <param name="key">Translation entry</param>
         /// <param name="args">Arguments of translation entry</param>
         /// <returns></returns>
-        public static CommandResult Lang(EssLang lang, params object[] args) {
-            return new CommandResult(lang.GetMessage(args), ResultType.LANG);
+        public static CommandResult Lang(string key, params object[] args) {
+            return new CommandResult(EssLang.Translate(key, args), ResultType.LANG);
         }
 
         /// <summary>

diff --git a/src/Commands/CommandBack.cs b/src/Commands/CommandBack.cs
@@ -40,12 +40,12 @@ public class CommandBack : EssCommand {
             var player = src.ToPlayer();
 
             if (!player.HasMetadata("back_pos")) {
-                return CommandResult.Lang(EssLang.NOT_DIED_YET);
+                return CommandResult.Lang("NOT_DIED_YET");
             }
 
             var backPosition = player.GetMetadata<Vector3>("back_pos");
             src.ToPlayer().Teleport(backPosition);
-            EssLang.RETURNED.SendTo(src);
+            EssLang.Send(src, "RETURNED");
 
             return CommandResult.Success();
         }

diff --git a/src/Commands/CommandBoom.cs b/src/Commands/CommandBoom.cs
@@ -65,7 +65,7 @@ public class CommandBoom : EssCommand {
                         var found = UPlayer.TryGet(args[0], player => Explode(player.Position));
 
                         if (!found) {
-                            return CommandResult.Lang(EssLang.PLAYER_NOT_FOUND, args[0]);
+                            return CommandResult.Lang("PLAYER_NOT_FOUND", args[0]);
                         }
                     }
                     break;
@@ -76,7 +76,7 @@ public class CommandBoom : EssCommand {
                     if (pos.HasValue) {
                         Explode(pos.Value);
                     } else {
-                        return CommandResult.Lang(EssLang.INVALID_COORDS, args[0], args[1], args[2]);
+                        return CommandResult.Lang("INVALID_COORDS", args[0], args[1], args[2]);
                     }
                     break;
 

diff --git a/src/Commands/CommandClearInventory.cs b/src/Commands/CommandClearInventory.cs
@@ -40,13 +40,13 @@ public class CommandClearInventory : EssCommand {
                     return CommandResult.ShowUsage();
                 }
             } else if (!src.HasPermission(Permission + ".other")) {
-                return CommandResult.Lang(EssLang.COMMAND_NO_PERMISSION);
+                return CommandResult.Lang("COMMAND_NO_PERMISSION");
             }
 
             var player = args.Length > 0 ? args[0].ToPlayer : src.ToPlayer();
 
             if (player == null) {
-                return CommandResult.Lang(EssLang.PLAYER_NOT_FOUND, args[0]);
+                return CommandResult.Lang("PLAYER_NOT_FOUND", args[0]);
             }
 
             var playerInventory = player.Inventory;
@@ -97,7 +97,7 @@ public class CommandClearInventory : EssCommand {
             player.UnturnedPlayer.clothing.askWearVest(0, 0, new byte[0], true);
             removeUnequipped();
 
-            EssLang.INVENTORY_CLEAN.SendTo(player);
+            EssLang.Send(player, "INVENTORY_CLEAN");
 
             return CommandResult.Success();
         }

diff --git a/src/Commands/CommandEssentials.cs b/src/Commands/CommandEssentials.cs
@@ -105,7 +105,7 @@ public class CommandEssentials : EssCommand {
             switch (args[0].ToLowerString) {
                 case "savedata":
                     if (!src.HasPermission("essentials.savedata")) {
-                        return CommandResult.Lang(EssLang.COMMAND_NO_PERMISSION);
+                        return CommandResult.Lang("COMMAND_NO_PERMISSION");
                     }
                     UEssentials.ModuleManager.GetModule<KitModule>().IfPresent(m => {
                         m.KitManager.CooldownData.Save();
@@ -117,7 +117,7 @@ public class CommandEssentials : EssCommand {
 
                 case "reload":
                     if (!src.HasPermission("essentials.reload")) {
-                        return CommandResult.Lang(EssLang.COMMAND_NO_PERMISSION);
+                        return CommandResult.Lang("COMMAND_NO_PERMISSION");
                     }
                     if (args.Length == 1) {
                         src.SendMessage("Reloading all...");

diff --git a/src/Commands/CommandExperience.cs b/src/Commands/CommandExperience.cs
@@ -43,33 +43,33 @@ public class CommandExperience : EssCommand {
             }
 
             if (!args[0].IsInt) {
-                return CommandResult.Lang(EssLang.INVALID_NUMBER, args[0]);
+                return CommandResult.Lang("INVALID_NUMBER", args[0]);
             }
 
             var amount = args[0].ToInt;
 
             if (amount > MAX_INPUT_VALUE || amount < -MAX_INPUT_VALUE) {
-                return CommandResult.Lang(EssLang.NUMBER_BETWEEN, -MAX_INPUT_VALUE, MAX_INPUT_VALUE);
+                return CommandResult.Lang("NUMBER_BETWEEN", -MAX_INPUT_VALUE, MAX_INPUT_VALUE);
             }
 
             if (args.Length == 2) {
                 if (args[1].Is("*")) {
                     UServer.Players.ForEach(p => GiveExp(p, amount));
 
                     if (amount >= 0) {
-                        EssLang.EXPERIENCE_GIVEN.SendTo(src, amount, EssLang.EVERYONE);
+                        EssLang.Send(src, "EXPERIENCE_GIVEN", amount, EssLang.Translate("EVERYONE"));
                     } else {
-                        EssLang.EXPERIENCE_TAKE.SendTo(src, -amount, EssLang.EVERYONE);
+                        EssLang.Send(src, "EXPERIENCE_TAKE", -amount, EssLang.Translate("EVERYONE"));
                     }
                 } else if (!args[1].IsValidPlayerName) {
-                    return CommandResult.Lang(EssLang.PLAYER_NOT_FOUND, args[1]);
+                    return CommandResult.Lang("PLAYER_NOT_FOUND", args[1]);
                 } else {
                     var player = args[1].ToPlayer;
 
                     if (amount >= 0) {
-                        EssLang.EXPERIENCE_GIVEN.SendTo(src, amount, player.DisplayName);
+                        EssLang.Send(src, "EXPERIENCE_GIVEN", amount, player.DisplayName);
                     } else {
-                        EssLang.EXPERIENCE_TAKE.SendTo(src, -amount, player.DisplayName);
+                        EssLang.Send(src, "EXPERIENCE_TAKE", -amount, player.DisplayName);
                     }
 
                     GiveExp(player, amount);
@@ -94,9 +94,9 @@ public class CommandExperience : EssCommand {
             }
 
             if (amount >= 0)
-                EssLang.EXPERIENCE_RECEIVED.SendTo(player, amount);
+                EssLang.Send(player, "EXPERIENCE_RECEIVED", amount);
             else
-                EssLang.EXPERIENCE_LOST.SendTo(player, -amount);
+                EssLang.Send(player, "EXPERIENCE_LOST", -amount);
 
             player.UnturnedPlayer.skills.Experience = playerExp;
             player.UnturnedPlayer.skills.askSkills(player.CSteamId);

diff --git a/src/Commands/CommandFreeze.cs b/src/Commands/CommandFreeze.cs
@@ -47,24 +47,24 @@ public class CommandFreeze : EssCommand {
                     .Where(player => !player.HasComponent<FrozenPlayer>())
                     .ForEach(player => {
                         player.AddComponent<FrozenPlayer>();
-                        EssLang.FROZEN_PLAYER.SendTo(player, src.DisplayName);
+                        EssLang.Send(player, "FROZEN_PLAYER", src.DisplayName);
                     });
 
-                EssLang.FROZEN_ALL.SendTo(src);
+                EssLang.Send(src, "FROZEN_ALL");
             } else {
                 var found = UPlayer.TryGet(args[0], player => {
                     if (player.HasComponent<FrozenPlayer>()) {
-                        EssLang.ALREADY_FROZEN.SendTo(src, player.DisplayName);
+                        EssLang.Send(src, "ALREADY_FROZEN", player.DisplayName);
                     } else {
                         player.AddComponent<FrozenPlayer>();
 
-                        EssLang.FROZEN_SENDER.SendTo(src, player.DisplayName);
-                        EssLang.FROZEN_PLAYER.SendTo(player, src.DisplayName);
+                        EssLang.Send(src, "FROZEN_SENDER", player.DisplayName);
+                        EssLang.Send(player, "FROZEN_PLAYER", src.DisplayName);
                     }
                 });
 
                 if (!found) {
-                    return CommandResult.Lang(EssLang.PLAYER_NOT_FOUND, args[0]);
+                    return CommandResult.Lang("PLAYER_NOT_FOUND", args[0]);
                 }
             }
 

diff --git a/src/Commands/CommandHome.cs b/src/Commands/CommandHome.cs
@@ -54,7 +54,7 @@ public class CommandHome : EssCommand {
             var playerId = player.CSteamId;
 
             if (Cooldown.HasEntry(playerId)) {
-                return CommandResult.Lang(EssLang.USE_COOLDOWN,
+                return CommandResult.Lang("USE_COOLDOWN",
                     TimeUtil.FormatSeconds((uint) Cooldown.GetRemainingTime(playerId)));
             }
 
@@ -63,11 +63,11 @@ public class CommandHome : EssCommand {
 
             if (player.RocketPlayer.Stance == EPlayerStance.DRIVING ||
                 player.RocketPlayer.Stance == EPlayerStance.SITTING) {
-                return CommandResult.Lang(EssLang.CANNOT_TELEPORT_DRIVING);
+                return CommandResult.Lang("CANNOT_TELEPORT_DRIVING");
             }
 
             if (!BarricadeManager.tryGetBed(player.CSteamId, out position, out angle)) {
-                return CommandResult.Lang(EssLang.WITHOUT_BED);
+                return CommandResult.Lang("WITHOUT_BED");
             }
 
             var homeCommand = UEssentials.Config.HomeCommand;
@@ -80,13 +80,13 @@ public class CommandHome : EssCommand {
             }
 
             if (delay > 0) {
-                EssLang.TELEPORT_DELAY.SendTo(src, TimeUtil.FormatSeconds((uint) delay));
+                EssLang.Send(src, "TELEPORT_DELAY", TimeUtil.FormatSeconds((uint) delay));
             }
 
             var task = Tasks.New(t => {
                 Delay.Remove(playerId.m_SteamID);
                 player.Teleport(position, angle);
-                EssLang.TELEPORTED_BED.SendTo(src);
+                EssLang.Send(src, "TELEPORTED_BED");
             }).Delay(delay*1000);
 
             task.Go();

diff --git a/src/Commands/CommandJump.cs b/src/Commands/CommandJump.cs
@@ -48,14 +48,14 @@ public class CommandJump : EssCommand {
             var eyePos = player.GetEyePosition(dist);
 
             if (!eyePos.HasValue) {
-                return CommandResult.Lang(EssLang.JUMP_NO_POSITION);
+                return CommandResult.Lang("JUMP_NO_POSITION");
             }
 
             var point = eyePos.Value;
             point.y += 6;
 
             player.Teleport(point);
-            EssLang.JUMPED.SendTo(src, point.x, point.y, point.z);
+            EssLang.Send(src, "JUMPED", point.x, point.y, point.z);
 
             return CommandResult.Success();
         }

diff --git a/src/Commands/CommandKickAll.cs b/src/Commands/CommandKickAll.cs
@@ -38,18 +38,18 @@ public class CommandKickAll : EssCommand {
             var players = new List<UPlayer>(UServer.Players);
 
             if (players.Count == 0) {
-                return CommandResult.Lang(EssLang.NO_PLAYERS_FOR_KICK);
+                return CommandResult.Lang("NO_PLAYERS_FOR_KICK");
             }
 
-            var noReasonMessage = EssLang.KICK_NO_SPECIFIED_REASON.GetMessage();
+            var noReasonMessage = EssLang.Translate("KICK_NO_SPECIFIED_REASON");
 
             players.ForEach(player => {
                 player.Kick(args.IsEmpty
                     ? noReasonMessage
                     : args.Join(0));
             });
 
-            EssLang.KICKED_ALL.SendTo(src, players.Count);
+            EssLang.Send(src, "KICKED_ALL", players.Count);
 
             return CommandResult.Success();
         }

diff --git a/src/Commands/CommandKill.cs b/src/Commands/CommandKill.cs
@@ -42,14 +42,14 @@ public class CommandKill : EssCommand {
             if (args[0].Is("*")) {
                 UServer.Players.ForEach(p => p.Kill());
 
-                EssLang.KILL_ALL.SendTo(src);
+                EssLang.Send(src, "KILL_ALL");
             } else if (args[0].IsValidPlayerName) {
                 var target = args[0].ToPlayer;
                 target.Kill();
 
-                EssLang.KILL_PLAYER.SendTo(src, target.DisplayName);
+                EssLang.Send(src, "KILL_PLAYER", target.DisplayName);
             } else {
-                EssLang.PLAYER_NOT_FOUND.SendTo(src, args[0]);
+                EssLang.Send(src, "PLAYER_NOT_FOUND", args[0]);
             }
 
             return CommandResult.Success();

diff --git a/src/Commands/CommandKillAnimals.cs b/src/Commands/CommandKillAnimals.cs
@@ -46,7 +46,7 @@ public class CommandKillAnimals : EssCommand {
                 killedCount++;
             });
 
-            EssLang.KILLED_ANIMALS.SendTo(src, killedCount);
+            EssLang.Send(src, "KILLED_ANIMALS", killedCount);
 
             return CommandResult.Success();
         }

diff --git a/src/Commands/CommandKillZombies.cs b/src/Commands/CommandKillZombies.cs
@@ -46,7 +46,7 @@ public class CommandKillZombies : EssCommand {
                 killedCount++;
             });
 
-            EssLang.KILLED_ZOMBIES.SendTo(src, killedCount);
+            EssLang.Send(src, "KILLED_ZOMBIES", killedCount);
 
             return CommandResult.Success();
         }

diff --git a/src/Commands/CommandMaxSkills.cs b/src/Commands/CommandMaxSkills.cs
@@ -43,7 +43,7 @@ public class CommandMaxSkills : EssCommand {
             }
 
             pSkills.askSkills(player.CSteamId);
-            EssLang.MAX_SKILLS.SendTo(player);
+            EssLang.Send(player, "MAX_SKILLS");
         };
 
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
@@ -59,24 +59,24 @@ public class CommandMaxSkills : EssCommand {
                 }
 
                 if (!args[0].IsBool) {
-                    return CommandResult.Lang(EssLang.INVALID_BOOLEAN, args[0]);
+                    return CommandResult.Lang("INVALID_BOOLEAN", args[0]);
                 }
 
                 if (args.Length == 2 && !src.HasPermission(Permission + ".other")) {
-                    return CommandResult.Lang(EssLang.COMMAND_NO_PERMISSION);
+                    return CommandResult.Lang("COMMAND_NO_PERMISSION");
                 }
 
                 var overpower = args[0].ToBool;
                 var targetPlayer = args.Length == 2 ? args[1].ToPlayer : src.ToPlayer();
 
                 if (targetPlayer == null) {
-                    return CommandResult.Lang(EssLang.PLAYER_NOT_FOUND, args[1]);
+                    return CommandResult.Lang("PLAYER_NOT_FOUND", args[1]);
                 }
 
                 GiveMaxSkills(targetPlayer, overpower);
 
                 if (src.IsConsole || src.ToPlayer() != targetPlayer) {
-                    EssLang.MAX_SKILLS_TARGET.SendTo(src, targetPlayer.DisplayName);
+                    EssLang.Send(src, "MAX_SKILLS_TARGET", targetPlayer.DisplayName);
                 }
             }
 

diff --git a/src/Commands/CommandPing.cs b/src/Commands/CommandPing.cs
@@ -38,15 +38,15 @@ public class CommandPing : EssCommand {
                     return CommandResult.ShowUsage();
                 }
 
-                EssLang.PING.SendTo(src, src.ToPlayer().Ping);
+                EssLang.Send(src, "PING", src.ToPlayer().Ping);
             } else {
                 var target = args[0].ToPlayer;
 
                 if (target == null) {
-                    return CommandResult.Lang(EssLang.PLAYER_NOT_FOUND, args[0]);
+                    return CommandResult.Lang("PLAYER_NOT_FOUND", args[0]);
                 }
 
-                EssLang.PING_OTHER.SendTo(src, target.DisplayName, target.Ping);
+                EssLang.Send(src, "PING_OTHER", target.DisplayName, target.Ping);
             }
 
             return CommandResult.Success();