Fix Windows Defender virus reporting problem

by Remove Costuar/Fody

Source/GrasscutterTools/GrasscutterTools.csproj

@@ -42,6 +42,12 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Resources\Newtonsoft.Json.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
@@ -220,6 +226,7 @@
     <Content Include="Resources\en-us\Quest.txt" />
     <Content Include="Resources\en-us\Scene.txt" />
     <Content Include="Resources\en-us\Weapon.txt" />
+    <None Include="Resources\Newtonsoft.Json.dll" />
     <Content Include="Resources\ru-ru\Animal.txt" />
     <Content Include="Resources\ru-ru\Artifact.txt" />
     <Content Include="Resources\ru-ru\ArtifactCat.txt" />
@@ -278,17 +285,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Costura.Fody">
-      <Version>5.7.0</Version>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Fody">
-      <Version>6.6.3</Version>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
     <PackageReference Include="Resource.Embedder">
       <Version>2.2.0</Version>
     </PackageReference>

Source/GrasscutterTools/Program.cs

@@ -17,6 +17,8 @@
  * 
  **/
 using System;
+using System.Globalization;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
@@ -27,6 +29,33 @@ namespace GrasscutterTools
 {
     internal static class Program
     {
+        static Program()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += OnResolveAssembly;
+        }
+
+        private static Assembly OnResolveAssembly(object sender, ResolveEventArgs args)
+        {
+            //var executingAssembly = Assembly.GetExecutingAssembly();
+            //var assemblyName = new AssemblyName(args.Name);
+
+            //var path = assemblyName.Name + ".dll";
+            //if (assemblyName.CultureInfo.Equals(CultureInfo.InvariantCulture) == false)
+            //    path = $@"{assemblyName.CultureInfo}\{path}";
+            //using (var stream = executingAssembly.GetManifestResourceStream(path))
+            //{
+            //    if (stream == null) return null;
+            //    var assemblyRawBytes = new byte[stream.Length];
+            //    stream.Read(assemblyRawBytes, 0, assemblyRawBytes.Length);
+            //    return Assembly.Load(assemblyRawBytes);
+            //}
+
+            // 手工加载嵌入的dll文件
+            if (new AssemblyName(args.Name).Name == "Newtonsoft.Json")
+                return Assembly.Load(Resources.Newtonsoft_Json);
+            return null;
+        }
+
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>

Source/GrasscutterTools/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("GrasscutterTools")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Grasscutter Command Generator")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("jie65535")]
 [assembly: AssemblyProduct("GrasscutterTools")]
 [assembly: AssemblyCopyright("Copyright © jie65535 2022")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("jie65535")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 会使此程序集中的类型
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0")]
+[assembly: AssemblyVersion("1.6.1")]
 [assembly: AssemblyFileVersion("1.0.0")]

Source/GrasscutterTools/Properties/Resources.Designer.cs

@@ -94,7 +94,10 @@ namespace GrasscutterTools.Properties {
         ///28020305:冰冻雪猪
         ///28020306:雪猪
         ///28020307:野林猪
-        ///28020308: 冰冻雪 [字符串的其余部分被截断]"; 的本地化字符串。
+        ///28020308:冰冻雪猪
+        ///28020309:「大雪猪王」
+        ///28020401:北地犬
+        /// [字符串的其余部分被截断]"; 的本地化字符串。
         /// </summary>
         internal static string Animal {
             get {
@@ -103,46 +106,46 @@ namespace GrasscutterTools.Properties {
         }
         
         /// <summary>
-        ///   查找类似 51110: 异国之盏
+        ///   查找类似 20412:迷误者之灯
-        ///51111: 异国之盏
+        ///20413:迷误者之灯
-        ///51112: 异国之盏
+        ///20422:翠蔓的智者
-        ///51113: 异国之盏
+        ///20423:翠蔓的智者
-        ///51114: 异国之盏
+        ///20432:月桂的宝冠
-        ///51120: 归乡之羽
+        ///20433:月桂的宝冠
-        ///51121: 归乡之羽
+        ///20442:迷宫的游人
-        ///51122: 归乡之羽
+        ///20443:迷宫的游人
-        ///51123: 归乡之羽
+        ///20452:贤智的定期
-        ///51124: 归乡之羽
+        ///20453:贤智的定期
-        ///51130: 感别之冠
+        ///20513:迷误者之灯
-        ///51131: 感别之冠
+        ///20514:迷误者之灯
-        ///51132: 感别之冠
+        ///20523:翠蔓的智者
-        ///51133: 感别之冠
+        ///20524:翠蔓的智者
-        ///51134: 感别之冠
+        ///20533:月桂的宝冠
-        ///51140: 故人之心
+        ///20534:月桂的宝冠
-        ///51141: 故人之心
+        ///20543:迷宫的游人
-        ///51142: 故人之心
+        ///20544:迷宫的游人
-        ///51143: 故人之心
+        ///20553:贤智的定期
-        ///51144: 故人之心
+        ///20554:贤智的定期
-        ///51150: 逐光之石
+        ///21412:如蜜的终宴
-        ///51151: 逐光之石
+        ///21413:如蜜的终宴
-        ///51152: 逐光之石
+        ///21422:裁断的翎羽
-        ///51153: 逐光之石
+        ///21423:裁断的翎羽
-        ///51154: 逐光之石
+        ///21432:沙王的投影
-        ///51210: 异国之盏
+        ///21433:沙王的投影
-        ///51211: 异国之盏
+        ///21442:梦中的铁花
-        ///51212: 异国之盏
+        ///21443:梦中的铁花
-        ///51213: 异国之盏
+        ///21452:沉金的岁月
-        ///51214: 异国之盏
+        ///21453:沉金的岁月
-        ///51220: 归乡之羽
+        ///21513:如蜜的终宴
-        ///51221: 归乡之羽
+        ///21514:如蜜的终宴
-        ///51222: 归乡之羽
+        ///21523:裁断的翎羽
-        ///51223: 归乡之羽
+        ///21524:裁断的翎羽
-        ///51224: 归乡之羽
+        ///21533:沙王的投影
-        ///51230: 感别之冠
+        ///21534:沙王的投影
-        ///51231: 感别之冠
+        ///21543:梦中的铁花
-        ///51232: 感别之冠
+        ///21544:梦中的铁花
-        ///51233: 感别之冠
+        ///21553:沉金的岁月
-        ///51234 [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///21554 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Artifact {
             get {
@@ -151,7 +154,9 @@ namespace GrasscutterTools.Properties {
         }
         
         /// <summary>
-        ///   查找类似 51: 行者之心
+        ///   查找类似 20:深林的记忆
+        ///21:饰金之梦
+        ///51:行者之心
         ///52:勇士之心
         ///53:守护之心
         ///54:奇迹
@@ -346,10 +351,15 @@ namespace GrasscutterTools.Properties {
         ///1056:九条裟罗
         ///1057:荒泷一斗
         ///1058:八重神子
+        ///1059:鹿野院平藏
         ///1060:夜兰
         ///1062:埃洛伊
         ///1063:申鹤
-        ///1064: 云堇
        /// [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///1064:云堇
+        ///1065:久岐忍
+        ///1066:神里绫人
+        ///1067:柯莱
+        ///1068:多 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Avatar {
             get {
@@ -507,6 +517,8 @@ namespace GrasscutterTools.Properties {
         ////give 102 x1880200
         ///设置世界等级
         ////prop wl 8
+        ///点亮地图
+        ////prop unlockmap 1
         ///一键解锁深渊
         ////prop ut 12
         ///设置纪行等级
@@ -529,8 +541,8 @@ namespace GrasscutterTools.Properties {
         ////give 224 x10000
         ///十万原石
         ////give 201 x100000
-        ///十万摩拉
+        ///一亿摩拉
-        ////give 202 x100000
+        ////give 202 x100000000
         ///重载配置
         ////reload
         ///重登
@@ -542,9 +554,7 @@ namespace GrasscutterTools.Properties {
         ///清空背包
         ////clear all lv90 r5 5*
         ///清空武器
-        ////clear wp lv90 r5 5*
+        //// [字符串的其余部分被截断]&quot;; 的本地化字符串。
-        ///清空圣遗物
-        /// [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string CustomCommands {
             get {
@@ -598,7 +608,9 @@ namespace GrasscutterTools.Properties {
         ///071:华紫樱绯
         ///076:苍流踏花
         ///081:素霓伣天
-        /// 的本地化字符串。
+        ///091:提纳里池（非原名）
+        ///092:钟离池（非原名）
+        ///093:猎人之径池（非原名） 的本地化字符串。
         /// </summary>
         internal static string GachaBennerPrefab {
             get {
@@ -685,8 +697,6 @@ namespace GrasscutterTools.Properties {
         /// <summary>
         ///   查找类似 101:角色经验
         ///102:冒险阅历
-        ///103: 星尘
-        ///104: 星辉
         ///105:好感经验
         ///106:原粹树脂
         ///107:传说钥匙
@@ -723,12 +733,18 @@ namespace GrasscutterTools.Properties {
         ///138:完璧玉符
         ///139:降魔玉符
         ///140:幽蕴砺石
+        ///141:花簇簇的漂流物
         ///142:战策碎珀
+        ///143:巧思手记
+        ///144:随想草稿
+        ///145:古铁钱
         ///201:原石
         ///202:摩拉
         ///203:创世结晶
         ///204:洞天宝钱
-        ///210: 原粹精珀（废弃 [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///314:声望经验·稻妻
+        ///315:声望经验·蒙德
+        ///316:声 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Item {
             get {
@@ -737,36 +753,38 @@ namespace GrasscutterTools.Properties {
         }
         
         /// <summary>
-        ///   查找类似 21010101: 丘丘人
+        ///   查找类似 20010101:草史莱姆
-        ///21020101: 木盾丘丘暴徒
-        ///21020201: 火斧丘丘暴徒
-        ///21020202: 火斧丘丘暴徒
-        ///21020301: 岩盾丘丘暴徒
-        ///21020401: 丘丘霜铠王
-        ///21020501: 丘丘岩盔王
-        ///21020601: 冰盾丘丘暴徒
-        ///21020701: 雷斧丘丘暴徒
-        ///21020703: 雷斧丘丘暴徒
-        ///21020801: 丘丘雷兜王
-        ///20010101: 草史莱姆
         ///20010201:大型草史莱姆
         ///20010202:大型草史莱姆
         ///20010301:风史莱姆
+        ///20010302:风史莱姆
         ///20010401:大型风史莱姆
+        ///20010402:大型风史莱姆
         ///20010403:大型风史莱姆
-        ///29010101: 裂空的魔龙
+        ///20010501:雷史莱姆
-        ///29010102: 裂空的魔龙
+        ///20010502:雷史莱姆
-        ///29010103: 裂空的魔龙
+        ///20010601:大型雷史莱姆
-        ///29010104: 裂空的魔龙
+        ///20010602:大型雷史莱姆
-        ///29020101: 北风的王狼，奔狼的领主
+        ///20010604:大型雷史莱姆
-        ///29020102: 北风的王狼，奔狼的领主
+        ///20010701:变异雷史莱姆
-        ///29030103: 「公子」
+        ///20010702:变异雷史莱姆
-        ///29030106: 「公子」
+        ///20010703:变异雷史莱姆
-        ///29040101: 若陀龙王
+        ///20010801:冰史莱姆
-        ///29040102: 若陀龙王
+        ///20010802:冰史莱姆
-        ///29040103: 若陀龙王
+        ///20010803:冰史莱姆
-        ///29040104: 若陀龙王
+        ///20010901:大型冰史莱姆
-        ///290401 [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///20010902:大型冰史莱姆
+        ///20010903:大型冰史莱姆
+        ///20010904:大型冰史莱姆
+        ///20011001:水史莱姆
+        ///20011002:水史莱姆
+        ///20011101:大型水史莱姆
+        ///20011102:大型水史莱姆
+        ///20011103:大型水史莱姆
+        ///20011201:火史莱姆
+        ///20011202:火史莱姆
+        ///20011203:火史莱姆
+        ///20011301:大型 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Monster {
             get {
@@ -774,6 +792,16 @@ namespace GrasscutterTools.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] Newtonsoft_Json {
+            get {
+                object obj = ResourceManager.GetObject("Newtonsoft_Json", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找类似 版本名：{0}
         ///更新时间：{1}
@@ -841,13 +869,13 @@ namespace GrasscutterTools.Properties {
         ///player.**
         ///server.*
         ///server.**
-        ///player.changescene
+        ///permission
-        ///player.clear
+        ///player.clearinv
+        ///player.clearinv.others
         ///player.enterdungeon
         ///player.enterdungeon.others
         ///player.give
         ///player.give.others
-        ///player.godmode
         ///player.heal
         ///player.heal.others
         ///player.killcharacter
@@ -863,7 +891,7 @@ namespace GrasscutterTools.Properties {
         ///player.setstats
         ///player.setstats.others
         ///player.settalent
-        ///play [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///p [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Permissions {
             get {
@@ -881,28 +909,20 @@ namespace GrasscutterTools.Properties {
         }
         
         /// <summary>
-        ///   查找类似 30302: 女神像解锁$HIDDEN - 
+        ///   查找类似 30302:女神像解锁$HIDDEN - [N/A] 362713143
-        ///30303: 女神像解锁$HIDDEN - 
+        ///30303:女神像解锁$HIDDEN - [N/A] 715511863
-        ///30304: 女神像解锁$HIDDEN - 
+        ///30304:女神像解锁$HIDDEN - [N/A] 163018255
-        ///30305: 女神像解锁$HIDDEN - 
+        ///30305:女神像解锁$HIDDEN - [N/A] 3694648119
-        ///30306: 女神像解锁$HIDDEN - 
+        ///30306:女神像解锁$HIDDEN - [N/A] 3223799591
-        ///30307: 女神像解锁$HIDDEN - 
+        ///30307:女神像解锁$HIDDEN - [N/A] 1232757671
-        ///30308: 女神像解锁$HIDDEN - 
+        ///30308:女神像解锁$HIDDEN - [N/A] 3056513767
-        ///30309: 女神像解锁$HIDDEN - 
+        ///30309:女神像解锁$HIDDEN - [N/A] 2426653367
-        ///30310: 女神像解锁$HIDDEN - 
+        ///30310:女神像解锁$HIDDEN - [N/A] 2003131071
-        ///30311: 女神像解锁$HIDDEN - 
+        ///30311:女神像解锁$HIDDEN - [N/A] 105277231
-        ///30312: 女神像解锁$HIDDEN - 
+        ///30312:女神像解锁$HIDDEN - [N/A] 3391806215
-        ///30313: 女神像解锁$HIDDEN - 
+        ///30313:女神像解锁$HIDDEN - [N/A] 1357500887
-        ///30314: 女神像解锁$HIDDEN - 
+        ///30314:女神像解锁$HIDDEN - [N/A] 3054344935
-        ///30315: 女神像解锁$HIDDEN - 
+        ///30315:女神像 [字符串的其余部分被截断]&quot;; 的本地化字符串。
-        ///30316: 女神像解锁$HIDDEN - 
-        ///30317: 女神像解锁$HIDDEN - 
-        ///30600: 昔日的风 - 在庙宇门口跟安柏见面
-        ///30601: 昔日的风 - 与安柏对话
-        ///30602: 昔日的风 - 进入庙宇
-        ///30603: 昔日的风 - 探索庙宇深处
-        ///30604: 昔日的风 - 退出秘境
-        ///30607: 昔日的风 - (test [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Quest {
             get {
@@ -929,38 +949,34 @@ namespace GrasscutterTools.Properties {
         }
         
         /// <summary>
-        ///   查找类似 1: 提瓦特
+        ///   查找类似 1: BigWorld_LevelStreaming
-        ///2: 提瓦特
+        ///2: BigWorld_LevelStreaming
         ///3: 提瓦特
-        ///4: 金苹果群岛
+        ///4: 金苹果群岛(1.6)
         ///5: 渊下宫
         ///6: 层岩巨渊·地下矿区
         ///7: 三界路飨祭
-        ///2001: 罗浮洞
+        ///9: 金苹果群岛(2.8)
-        ///2002: 翠黛峰
-        ///2003: 清琼岛
-        ///2004: 绘绮庭
-        ///2201: 尘歌壶室内_蒙德
-        ///2202: 尘歌壶室内_璃月
-        ///2203: 尘歌壶室内_稻妻
-        ///20008: 深入狼之殿
-        ///20008: 丘丘人大本营(test)
-        ///20008: 丘丘人巢穴(test)
-        ///20007: 小岩洞据点(test)
-        ///20007: 小岩洞据点(test)
-        ///20007: 小岩洞秘境(test)
-        ///20006: 遗迹遇险点(test)
-        ///20006: 丘丘人小据点(test)
-        ///20006: 丘丘人大据点(test)
-        ///1006: 密林、废墟与龙之泪
-        ///1017: 壶中天
-        ///1019: 洞天云海地城玩法测试(test)
-        ///1011: 角色战斗测试(test)
-        ///50002: 低温关卡白盒(test)
         ///1001: 移动平台性能测试(test)
-        ///50003: 战斗性能测试(test)
+        ///1002: ClimbTest2
-        ///50004: 电桩电源白盒(test)
+        ///1003: TheBigWorld
-        ///50027: 圣遗物新因子测试关卡3(t [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///1004: Knight_Inside_Test
+        ///1005: ChurchSteal
+        ///1006: 密林、废墟与龙之泪
+        ///1008: ChurchLobby
+        ///1009: AngelShare
+        ///1011: 角色战斗测试(test)
+        ///1013: SneakAdvancedTest
+        ///1015: 飞翔是勇气的奖励
+        ///1016: 飞翔是勇气的奖励
+        ///1017: 壶中天
+        ///1018: Chateau
+        ///1019: 洞天云海地城玩法测试(test)
+        ///1023: Level_Yurenzhong
+        ///1024: 黑夜循环地城(test)
+        ///1030: TestIntercept_LiYue
+        ///1031: 爬塔丘丘人模板(test)
+        ///1032: 云海白 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Scene {
             get {
@@ -1045,11 +1061,16 @@ namespace GrasscutterTools.Properties {
         ///11413:腐殖之剑
         ///11414:天目影打刀
         ///11415:辰砂之纺锤
+        ///11416:笼钓瓶一心
+        ///11419:「一心传」名刀
+        ///11420:「一心传」名刀
+        ///11421:「一心传」名刀
         ///11501:风鹰剑
         ///11502:天空之刃
         ///11503:苍古自由之誓
         ///11504:斫峰之刃
         ///11505:磐岩结绿
+        ///11506:磐岩结绿
         ///11507:凭虚
         ///11509:雾切之回光
         ///11510:波乱月白经津
@@ -1060,10 +1081,7 @@ namespace GrasscutterTools.Properties {
         ///12303:白铁大剑
         ///12304:石英大剑
         ///12305:以理服人
-        ///12306: 飞天大御剑
+        ///12306: [字符串的其余部分被截断]&quot;; 的本地化字符串。
-        ///12401: 西风大剑
-        ///12402: 钟剑
-        ///1 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string Weapon {
             get {

Source/GrasscutterTools/Properties/Resources.resx

@@ -273,4 +273,7 @@
   <data name="GOODImportSuccess" xml:space="preserve">
     <value>导入成功!</value>
   </data>
+  <data name="Newtonsoft_Json" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Newtonsoft.Json.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>