Fix typo and support rich text

zeng-github01 · zeng-github01 · commit 585938d15955 · 2024-07-15T00:12:14.000+08:00
diff --git a/CDK/CDKCommand.cs b/CDK/CDKCommand.cs
@@ -32,51 +32,53 @@ public class CDKCommand : IRocketCommand
 
         public void Execute(IRocketPlayer caller,string[] args)
         {
+            var isRich = Main.Instance.Configuration.Instance.EnableRichText;
             if(args.Length == 1)
               {
                 if (!Main.Instance.Database.IsPurchased(UnturnedPlayer.FromName(caller.DisplayName), args[0]))
                 {
                     switch (RedeemCDK(UnturnedPlayer.FromName(caller.DisplayName), args[0]))
                     {
                         case EKeyReemeResult.Success:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("success"));
+                            UnturnedChat.Say(caller, Main.Instance.Translate("success"), isRich);
                             break;
                         case EKeyReemeResult.Redeemed:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("already_redeemed"), UnityEngine.Color.red);
+                            UnturnedChat.Say(caller, Main.Instance.Translate("already_redeemed"), UnityEngine.Color.red, isRich);
                             break;
                         case EKeyReemeResult.KeyNotFound:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("key_dones't_exist"), UnityEngine.Color.red);
+                            UnturnedChat.Say(caller, Main.Instance.Translate("key_dones't_exist"), UnityEngine.Color.red, isRich);
                             break;
                         case EKeyReemeResult.MaxRedeemed:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("maxcount_reached"), UnityEngine.Color.red);
+                            UnturnedChat.Say(caller, Main.Instance.Translate("maxcount_reached"), UnityEngine.Color.red, isRich);
                             break;
                         case EKeyReemeResult.Renewed:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("key_renewed"));
+                            UnturnedChat.Say(caller, Main.Instance.Translate("key_renewed"), isRich);
                             break;
                         case EKeyReemeResult.Error:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("error"), UnityEngine.Color.red);
+                            UnturnedChat.Say(caller, Main.Instance.Translate("error"), UnityEngine.Color.red, isRich);
                             break;
                         case EKeyReemeResult.PlayerNotMatch:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("player_not_match"), UnityEngine.Color.red);
+                            UnturnedChat.Say(caller, Main.Instance.Translate("player_not_match"), UnityEngine.Color.red, isRich);
                             break;
                         case EKeyReemeResult.KeyNotValid:
-                            UnturnedChat.Say(caller, Main.Instance.Translate("cdk_config_error"), UnityEngine.Color.red);
+                            UnturnedChat.Say(caller, Main.Instance.Translate("cdk_config_error"), UnityEngine.Color.red, isRich);
                             break;
                     }
                 }
                 else
                 {
-                    UnturnedChat.Say(caller, Main.Instance.Translate("already_purchased"), UnityEngine.Color.red);
+                    UnturnedChat.Say(caller, Main.Instance.Translate("already_purchased"), UnityEngine.Color.red, isRich);
                 }
              }
             else
             {
-                UnturnedChat.Say(caller, Main.Instance.Translate("invaild_param",Syntax), UnityEngine.Color.red);
+                UnturnedChat.Say(caller, Main.Instance.Translate("invalid_param",Syntax), UnityEngine.Color.red, isRich);
             }
         }
 
         private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)
         {
+            var isRich = Main.Instance.Configuration.Instance.EnableRichText;
             var Database = Main.Instance.Database;
             try
             {
@@ -123,7 +125,7 @@ private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)
                                 if (!player.GiveItem(Convert.ToUInt16(listItem[i]), Convert.ToByte(listAmount[i])))
                                 {
                                     UnturnedChat.Say(player, Main.Instance.Translate("items_give_fail"),
-                                        UnityEngine.Color.red);
+                                        UnityEngine.Color.red, isRich);
                                 }
                             }
                         }
@@ -154,16 +156,16 @@ private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)
                             {
                                 case Rocket.API.RocketPermissionsProviderResult.Success:
                                     UnturnedChat.Say(player,
-                                        Main.Instance.Translate("permission_granted", cdkdata.GrantPermissionGroup));
+                                        Main.Instance.Translate("permission_granted", cdkdata.GrantPermissionGroup), isRich);
                                     break;
                                 case Rocket.API.RocketPermissionsProviderResult.DuplicateEntry:
                                     UnturnedChat.Say(player,
                                         Main.Instance.Translate("permission_duplicate_entry",
-                                            cdkdata.GrantPermissionGroup), UnityEngine.Color.yellow);
+                                            cdkdata.GrantPermissionGroup), UnityEngine.Color.yellow, isRich);
                                     break;
                                 default:
                                     UnturnedChat.Say(player, Main.Instance.Translate("permission_grant_error",cdkdata.GrantPermissionGroup),
-                                        UnityEngine.Color.red);
+                                        UnityEngine.Color.red, isRich);
                                     break;
                             }
                         }
diff --git a/CDK/Config.cs b/CDK/Config.cs
@@ -20,6 +20,7 @@ public class Config : IRocketPluginConfiguration
         public string DatabaseCDKTableName;
         public string DatabaseRedeemLogTableName;
         public int DatabasePort;
+        public bool EnableRichText;
 
         public void LoadDefaults()
         {
@@ -33,6 +34,7 @@ public void LoadDefaults()
             DatabaseCDKTableName = "cdk";
             DatabaseRedeemLogTableName = "redeemedlog";
             DatabasePort = 3306;
+            EnableRichText = false;
             //CDKs = new List<CDK>() { new CDK() { Key = "Key", Items = "100,1000,1500",XP = 111 , RedeemPermission = "Test",GrantPermissionGroup="VIP1" ,MaxCount = 100,CurrentCount = 0,Vehicle = 1,Money = 1000 } };  
         }
     }
diff --git a/CDK/Main.cs b/CDK/Main.cs
@@ -63,7 +63,7 @@ private void PlayerConnect(UnturnedPlayer player)
                 {"key_renewed","Your key has been renewed!" },
                 {"key_expired","Your key has been expired:{0}" },
                 {"already_purchased","You already purchased this permission group" },
-                {"invaild_param","Wrong usage.usage:{0}"},
+                {"invalid_param","Wrong usage.usage:{0}"},
                 {"player_not_match","This CDK not belong to you!" },
                 {"cdk_config_error","CDK configuration error.please contact server owner!" }
             };

Original file line number	Diff line number	Diff line change
`@@ -32,51 +32,53 @@ public class CDKCommand : IRocketCommand`
`32`	`32`
`33`	`33`	`public void Execute(IRocketPlayer caller,string[] args)`
`34`	`34`	`{`
	`35`	`+ var isRich = Main.Instance.Configuration.Instance.EnableRichText;`
`35`	`36`	`if(args.Length == 1)`
`36`	`37`	`{`
`37`	`38`	`if (!Main.Instance.Database.IsPurchased(UnturnedPlayer.FromName(caller.DisplayName), args[0]))`
`38`	`39`	`{`
`39`	`40`	`switch (RedeemCDK(UnturnedPlayer.FromName(caller.DisplayName), args[0]))`
`40`	`41`	`{`
`41`	`42`	`case EKeyReemeResult.Success:`
`42`		`- UnturnedChat.Say(caller, Main.Instance.Translate("success"));`
	`43`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("success"), isRich);`
`43`	`44`	`break;`
`44`	`45`	`case EKeyReemeResult.Redeemed:`
`45`		`- UnturnedChat.Say(caller, Main.Instance.Translate("already_redeemed"), UnityEngine.Color.red);`
	`46`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("already_redeemed"), UnityEngine.Color.red, isRich);`
`46`	`47`	`break;`
`47`	`48`	`case EKeyReemeResult.KeyNotFound:`
`48`		`- UnturnedChat.Say(caller, Main.Instance.Translate("key_dones't_exist"), UnityEngine.Color.red);`
	`49`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("key_dones't_exist"), UnityEngine.Color.red, isRich);`
`49`	`50`	`break;`
`50`	`51`	`case EKeyReemeResult.MaxRedeemed:`
`51`		`- UnturnedChat.Say(caller, Main.Instance.Translate("maxcount_reached"), UnityEngine.Color.red);`
	`52`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("maxcount_reached"), UnityEngine.Color.red, isRich);`
`52`	`53`	`break;`
`53`	`54`	`case EKeyReemeResult.Renewed:`
`54`		`- UnturnedChat.Say(caller, Main.Instance.Translate("key_renewed"));`
	`55`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("key_renewed"), isRich);`
`55`	`56`	`break;`
`56`	`57`	`case EKeyReemeResult.Error:`
`57`		`- UnturnedChat.Say(caller, Main.Instance.Translate("error"), UnityEngine.Color.red);`
	`58`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("error"), UnityEngine.Color.red, isRich);`
`58`	`59`	`break;`
`59`	`60`	`case EKeyReemeResult.PlayerNotMatch:`
`60`		`- UnturnedChat.Say(caller, Main.Instance.Translate("player_not_match"), UnityEngine.Color.red);`
	`61`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("player_not_match"), UnityEngine.Color.red, isRich);`
`61`	`62`	`break;`
`62`	`63`	`case EKeyReemeResult.KeyNotValid:`
`63`		`- UnturnedChat.Say(caller, Main.Instance.Translate("cdk_config_error"), UnityEngine.Color.red);`
	`64`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("cdk_config_error"), UnityEngine.Color.red, isRich);`
`64`	`65`	`break;`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`else`
`68`	`69`	`{`
`69`		`- UnturnedChat.Say(caller, Main.Instance.Translate("already_purchased"), UnityEngine.Color.red);`
	`70`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("already_purchased"), UnityEngine.Color.red, isRich);`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`else`
`73`	`74`	`{`
`74`		`- UnturnedChat.Say(caller, Main.Instance.Translate("invaild_param",Syntax), UnityEngine.Color.red);`
	`75`	`+ UnturnedChat.Say(caller, Main.Instance.Translate("invalid_param",Syntax), UnityEngine.Color.red, isRich);`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)`
`79`	`80`	`{`
	`81`	`+ var isRich = Main.Instance.Configuration.Instance.EnableRichText;`
`80`	`82`	`var Database = Main.Instance.Database;`
`81`	`83`	`try`
`82`	`84`	`{`
`@@ -123,7 +125,7 @@ private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)`
`123`	`125`	`if (!player.GiveItem(Convert.ToUInt16(listItem[i]), Convert.ToByte(listAmount[i])))`
`124`	`126`	`{`
`125`	`127`	`UnturnedChat.Say(player, Main.Instance.Translate("items_give_fail"),`
`126`		`- UnityEngine.Color.red);`
	`128`	`+ UnityEngine.Color.red, isRich);`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`	`}`
`@@ -154,16 +156,16 @@ private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)`
`154`	`156`	`{`
`155`	`157`	`case Rocket.API.RocketPermissionsProviderResult.Success:`
`156`	`158`	`UnturnedChat.Say(player,`
`157`		`- Main.Instance.Translate("permission_granted", cdkdata.GrantPermissionGroup));`
	`159`	`+ Main.Instance.Translate("permission_granted", cdkdata.GrantPermissionGroup), isRich);`
`158`	`160`	`break;`
`159`	`161`	`case Rocket.API.RocketPermissionsProviderResult.DuplicateEntry:`
`160`	`162`	`UnturnedChat.Say(player,`
`161`	`163`	`Main.Instance.Translate("permission_duplicate_entry",`
`162`		`- cdkdata.GrantPermissionGroup), UnityEngine.Color.yellow);`
	`164`	`+ cdkdata.GrantPermissionGroup), UnityEngine.Color.yellow, isRich);`
`163`	`165`	`break;`
`164`	`166`	`default:`
`165`	`167`	`UnturnedChat.Say(player, Main.Instance.Translate("permission_grant_error",cdkdata.GrantPermissionGroup),`
`166`		`- UnityEngine.Color.red);`
	`168`	`+ UnityEngine.Color.red, isRich);`
`167`	`169`	`break;`
`168`	`170`	`}`
`169`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public class Config : IRocketPluginConfiguration`
`20`	`20`	`public string DatabaseCDKTableName;`
`21`	`21`	`public string DatabaseRedeemLogTableName;`
`22`	`22`	`public int DatabasePort;`
	`23`	`+ public bool EnableRichText;`
`23`	`24`
`24`	`25`	`public void LoadDefaults()`
`25`	`26`	`{`
`@@ -33,6 +34,7 @@ public void LoadDefaults()`
`33`	`34`	`DatabaseCDKTableName = "cdk";`
`34`	`35`	`DatabaseRedeemLogTableName = "redeemedlog";`
`35`	`36`	`DatabasePort = 3306;`
	`37`	`+ EnableRichText = false;`
`36`	`38`	`//CDKs = new List<CDK>() { new CDK() { Key = "Key", Items = "100,1000,1500",XP = 111 , RedeemPermission = "Test",GrantPermissionGroup="VIP1" ,MaxCount = 100,CurrentCount = 0,Vehicle = 1,Money = 1000 } };`
`37`	`39`	`}`
`38`	`40`	`}`