Merge pull request #6 from Teyliu/JustNull

Add some missing patches from the BIE csproj

.gitignore

@@ -10,3 +10,4 @@
 /BepInEx/obj/Debug/net6.0
 /BepInEx/obj
 /BepInEx/bin/ReleaseMulti/net6.0
+/AlmanacPlantBank_Patch.cs

BepInEx/Patches/BaseTextObjects/InGameText_Patch.cs

@@ -1,4 +1,4 @@
-using HarmonyLib;
+using HarmonyLib;
 using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
@@ -17,11 +17,11 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.BaseTextObjects
 		private static void ShowText(InGameText __instance)
 		{
 
-#if MULTI_LANGUAGE
+			#if MULTI_LANGUAGE
 			TMP_FontAsset fontAsset = FontStore.LoadTMPFont(Utils.Language.ToString());
-#else
+			#else
 			TMP_FontAsset fontAsset = FontStore.LoadTMPFont();
-#endif
+			#endif
 			
 			foreach (TextMeshProUGUI txt in __instance.textMeshes)
 			{

BepInEx/Patches/BaseTextObjects/TMP_InputField_Patch.cs

@@ -1,4 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/BaseTextObjects/TextMeshProUGUI_Patch.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine.UI;
@@ -50,7 +51,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.BaseTextObjects
 					__instance.fontSize = 12;
 				}
 
-				if (__instance.text == "Полный Хаос" && __instance.transform.parent.parent.Find("Image").GetComponent<Image>().activeSprite.name == "Present")
+				if (__instance.text == "Полный Хаосs" && __instance.transform.parent.parent.Find("Image").GetComponent<Image>().activeSprite.name == "Present")
 				{
 					__instance.text += "\nБесконечно";
 				}

BepInEx/Patches/BaseTextObjects/TextMeshPro_Patch.cs

@@ -1,4 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/GameObjects/AbyssBagMenu_Patch.cs

@@ -1,7 +1,6 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
-
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 using UnityEngine.TextCore.Text;

BepInEx/Patches/GameObjects/AbyssCheckInBag_Patch.cs

@@ -1,7 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
-
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 using UnityEngine.TextCore.Text;

BepInEx/Patches/GameObjects/AbyssDevelopMenu_Patch.cs

@@ -1,6 +1,8 @@
 using System.Text.RegularExpressions;
 using HarmonyLib;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine.TextCore.Text;

BepInEx/Patches/GameObjects/AbyssMenu2_Patch.cs

@@ -1,7 +1,6 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
-
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 using UnityEngine.TextCore.Text;

BepInEx/Patches/GameObjects/AbyssMenu_Patch.cs

@@ -1,14 +1,13 @@
 using HarmonyLib;
-
-using TMPro;
 using System;
 using System.Collections.Generic;
+using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using Unity.VisualScripting;
 using UnityEngine;
 using System.Text.RegularExpressions;
 using UnityEngine.UI;
-
+using PvZ_Fusion_Translator__BepInEx_;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {

BepInEx/Patches/GameObjects/AbyssSettlementMenu_Patch.cs

@@ -1,6 +1,7 @@
 using HarmonyLib;
-using TMPro;
+using System;
 using System.Collections.Generic;
+using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using Unity.VisualScripting;
 using UnityEngine;

BepInEx/Patches/GameObjects/AbyssStoreMenu_Patch.cs

@@ -1,6 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects

BepInEx/Patches/GameObjects/BaseMenu_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
@@ -108,12 +108,8 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 
                     foreach(TextMeshProUGUI txt in mainTransform.GetComponentsInChildren<TextMeshProUGUI>())
                     {
-#if DEBUG
                         FileLoader.DumpUntranslatedStrings(txt.text);
                         txt.text = StringStore.TranslateText(txt.text);
-#else
-                        txt.text = StringStore.TranslateText(txt.text, true);
-#endif
                     }
                 }
             }

BepInEx/Patches/GameObjects/Board_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-using TMPro;
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/GameObjects/ButtonObjects/AbyssBuffButton_Patch.cs

@@ -1,12 +1,11 @@
 #if FIX
 using System.Text.RegularExpressions;
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 
-
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
 {
     [HarmonyPatch(typeof(AbyssBuffButton))]

BepInEx/Patches/GameObjects/ButtonObjects/AbyssCheckSellMenu_Patch.cs

@@ -1,6 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/GameObjects/ButtonObjects/AbyssLevelEnter_Patch.cs

@@ -1,6 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/GameObjects/ButtonObjects/Advanture_Btn_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/ButtonObjects/CustomLevelEnter_Patch.cs

@@ -1,7 +1,6 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
-
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/GameObjects/ButtonObjects/InGameBtn_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/ButtonObjects/NormalBtn_Patch.cs

@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HarmonyLib;
-using PvZ_Fusion_Translator__BepInEx_.AssetStore;
+using System;
 using TMPro;
+using PvZ_Fusion_Translator__BepInEx_.AssetStore;
+using UnityEngine;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
 {
@@ -16,9 +13,10 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
 		[HarmonyPatch(nameof(NormalBtn.OnMouseUpAsButton))]
 		public static void OnMouseUpAsButton(NormalBtn __instance)
 		{
-            foreach (TextMeshPro textMeshPro in __instance.GetComponentsInChildren<TextMeshPro>())
+            Transform banTransform = __instance.transform.GetChild(0);
+			if (banTransform != null)
 			{
-                textMeshPro.text = StringStore.TranslateText(textMeshPro.text);
+				banTransform.GetComponent<TextMeshPro>().text = StringStore.TranslateText(banTransform.GetComponent<TextMeshPro>().text);
 			}
         }
 	}

BepInEx/Patches/GameObjects/ButtonObjects/OptLanguageBtn_Patch.cs

@@ -1,4 +1,4 @@
-#if MULTI_LANGUAGE
+#if MULTI_LANGUAGE
 using HarmonyLib;
 using System.Collections.Generic;
 using System;
@@ -246,7 +246,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
         {
             if (type != "Textures" && type != "Audio") return;
 
-			if(type == "Textures")
+            if (type == "Textures")
             {
                 Utils.customTextures = !Utils.customTextures;
                 ConfigEntry<bool> customTexturesEntry;
@@ -318,7 +318,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
 					ToggleCustomAssets(toggleType);
                     if (toggleType == "Textures")
                     {
-                        FlashMessage(toggleData.Button, "<size=10>Toggled custom textures!\nRestart your game for everything to apply.", 0.1f);
+                        FlashMessage(toggleData.Button, "<size=10>Toggled custom textures!", 0.1f);
                     }
                     else if (toggleType == "Audio")
                     {

BepInEx/Patches/GameObjects/ButtonObjects/OptionBtn_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/ButtonObjects/PVPPotBtn_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/ButtonObjects/PauseMenu_Btn_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects

BepInEx/Patches/GameObjects/ButtonObjects/SaveMenuBtn_Patch.cs

@@ -1,6 +1,6 @@
-#if FIX
+#if FIX
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/ButtonObjects/UIButton_Patch.cs

@@ -5,7 +5,7 @@ using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.ButtonObjects
+namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {
     [HarmonyPatch(typeof(UIButton))]
     public static class UIButton_Patch

BepInEx/Patches/GameObjects/Close_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/CrisisZombieWindow_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/CustomSettings_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects

BepInEx/Patches/GameObjects/CustomSun_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/FruitNinjaSelectWindow_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/GardenPlant_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects

BepInEx/Patches/GameObjects/MainMenu_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 
@@ -11,15 +11,14 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
         private static bool _warningShown = false;
 
         [HarmonyPostfix]
-        [HarmonyPatch("AnimOver")]
+        [HarmonyPatch(nameof(MainMenu.AnimOver))]
         private static void AnimOver(MainMenu __instance)
         {
-			bool flag = _warningShown || NoticeMenu.Instance == null;
+            if (_warningShown || NoticeMenu.Instance == null)
-			if (!flag)
+                return;
-			{
+
             WarningStore.WarningReload(Utils.Language, NoticeMenu.Instance);
             _warningShown = true;
         }
     }
-    }
 }

BepInEx/Patches/GameObjects/MinorObjects/AbyssGoods_Patch.cs

@@ -1,6 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/GameObjects/MinorObjects/DY_Patch.cs

@@ -1,5 +1,6 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
+using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/Jigsaw_Patch.cs

@@ -1,10 +1,8 @@
 using HarmonyLib;
-// using Il2Cpp;
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
-
+namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
-namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects
 {
     [HarmonyPatch(typeof(JigsawClip))]
     public static class JigsawClip_Patch

BepInEx/Patches/GameObjects/MinorObjects/LanternUmbrella_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/MagnetBox_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/MagnetInterface_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/Money_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/Plant_Patch.cs

@@ -1,8 +1,7 @@
-#if FIX
 using HarmonyLib;
-
+using System;
-using PvZ_Fusion_Translator__BepInEx_.AssetStore;
+using System.Collections.Generic;
-using UnityEngine;
+using System.Text.RegularExpressions;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects
 {
@@ -47,4 +46,3 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects
         }
     }
 }
-#endif

BepInEx/Patches/GameObjects/MinorObjects/PlayerName_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/SelectYourPlants_Patch.cs

@@ -1,5 +1,6 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
+using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/TrainingDummy_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects
 {

BepInEx/Patches/GameObjects/MinorObjects/UltimateChomper_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects

BepInEx/Patches/GameObjects/MinorObjects/Zombie_Patch.cs

@@ -1,10 +1,11 @@
 using HarmonyLib;
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using System.Text.RegularExpressions;
 using UnityEngine;
-using TMPro;
-using System.Collections.Generic;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects.MinorObjects
 {

BepInEx/Patches/GameObjects/OtherMenu_Patch.cs

@@ -1,6 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/GameObjects/RogueCardWindow_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/RogueStartMenu_Patch.cs

@@ -1,13 +1,10 @@
 using HarmonyLib;
-// using Il2Cpp;
+using System;
 using TMPro;
-// using MelonLoader;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 using UnityEngine.TextCore.Text;
 using UnityEngine.UI;
-// using static MelonLoader.MelonLogger;
-// using static BepInEx.BepInEx;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects

BepInEx/Patches/GameObjects/ShootingMenu_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/ShootingSelectWindow_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-// using Il2Cpp;
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/TowerOption_Patch.cs

@@ -1,5 +1,5 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/TravelBuffOptionButton_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/GameObjects/TravelBuff_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {

BepInEx/Patches/GameObjects/TravelLookBuff_Patch.cs

@@ -1,6 +1,5 @@
-using System;
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/TravelLookMenu_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/TravelRefresh_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/GameObjects/TravelStore_Patch.cs

@@ -1,4 +1,4 @@
-using HarmonyLib;
+using HarmonyLib;
 using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
@@ -7,42 +7,33 @@ using UnityEngine;
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {
 	[HarmonyPatch(typeof(TravelStore))]
-    internal class TravelStore_Patch
+    public static class TravelStore_Patch
     {
         [HarmonyPatch(nameof(TravelStore.Update))]
 		[HarmonyPostfix]
 		private static void Update(TravelStore __instance)
         {
-			foreach (TextMeshProUGUI text in __instance.introduces)
+            foreach (TextMeshProUGUI intr in __instance.introduces)
-			{
+                StringStore.TranslateTextUI(intr);
-				text.text = StringStore.TranslateText(text.text);
+            foreach (var textMesh in __instance.points)
+                StringStore.TranslateTextUI(textMesh);
         }
 
-			Transform moneyTransform = __instance.transform.Find("Money");
+        [HarmonyPatch(nameof(TravelStore.RefreshBuff))]
-			if (moneyTransform != null)
-			{
-                StringStore.TranslateTextTransform(moneyTransform);
-			}
-
-            foreach (TextMeshProUGUI text in __instance.points)
-            {
-                text.text = StringStore.TranslateText(text.text);
-            }
-        }
-
-		[HarmonyPatch(nameof(TravelStore.SetText), new Type[] { typeof(string)})]
         [HarmonyPostfix]
-		private static void ShowText(TravelStore __instance)
+        private static void RefreshBuff(TravelStore __instance)
         {
-			foreach (TextMeshProUGUI text in __instance.introduces)
+            foreach (TravelBuff buff in __instance.travelBuffs)
             {
-				text.text = StringStore.TranslateText(text.text);
+                TextMeshProUGUI cost = buff.transform.GetChild(1).GetComponent<TextMeshProUGUI>();
-			}
+                if (!cost.text.Contains('0'))
-
+                    StringStore.TranslateTextUI(cost);
-            foreach (TextMeshProUGUI text in __instance.points)
+                cost.font = Resources.Load<TMP_FontAsset>("fonts/Dynamic");
-            {
-                text.text = StringStore.TranslateText(text.text);
             }
+            foreach (TextMeshProUGUI intr in __instance.introduces)
+                StringStore.TranslateTextUI(intr);
+            foreach (var textMesh in __instance.points)
+                StringStore.TranslateTextUI(textMesh);
         }
     }
 }

BepInEx/Patches/GameObjects/UIDifficulty_Patch.cs

@@ -1,7 +1,8 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
+using System.Text.RegularExpressions;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {
@@ -12,18 +13,11 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 		[HarmonyPostfix]
 		private static void Update(UIDifficulty __instance)
 		{
-
-			#if MULTI_LANGUAGE
-			TMP_FontAsset fontAsset = FontStore.LoadTMPFont(Utils.Language.ToString());
 			__instance.t.text = StringStore.TranslateText(__instance.t.text);
-			#else
+			foreach(TextMeshProUGUI text in __instance.GetComponentsInChildren<TextMeshProUGUI>())
-            TMP_FontAsset fontAsset = FontStore.LoadTMPFont();
+			{
-			string difficultyText = StringStore.patchesStore["Difficulty"]["Spanish"];
+				text.text = StringStore.TranslateText(text.text);
-			__instance.t.text = string.Format("Difficulty: {0}", GameAPP.difficulty);
+			}
-            #endif
-
-			__instance.t.autoSizeTextContainer = false;
-			__instance.t.font = fontAsset;
 		}
 	}
 }

BepInEx/Patches/GameObjects/UIZombieNum_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/Managers/AbyssDevelopMenu_Patch.cs

@@ -1,6 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers

BepInEx/Patches/Managers/AbyssMenu2_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/Managers/AbyssMenu_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/Managers/AlmanacMgrZombie_Patch.cs

@@ -1,5 +1,8 @@
-using HarmonyLib;
+using HarmonyLib;
+using System;
 using System.IO;
+using System.Linq;
+using System.Collections.Generic;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/Managers/AlmanacPlantBank_Patch.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using HarmonyLib;
 using Il2CppInterop.Runtime;
 using PvZ_Fusion_Translator__BepInEx_;

BepInEx/Patches/Managers/ChessManager_Patch.cs

@@ -1,12 +1,11 @@
 using HarmonyLib;
-
+using System;
-using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 using UnityEngine.TextCore.Text;
 using UnityEngine.UI;
 
-namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
+namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {
     [HarmonyPatch(typeof(ChessManager))]
     public static class ChessManager_Patch

BepInEx/Patches/Managers/CustomLevelShower_Patch.cs

@@ -1,6 +1,6 @@
-#if FIX
+#if FIX
 using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/Managers/DifficultyMgr_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers

BepInEx/Patches/Managers/DrawCardManager_Patch.cs

@@ -1,45 +1,61 @@
 using HarmonyLib;
+using System;
 using TMPro;
-using System.Collections.Generic;
+using Il2CppSystem.Collections.Generic;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
+using UnityEngine.TextCore.Text;
 
-namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
+namespace PvZ_Fusion_Translator__BepInEx_.Patches.GameObjects
 {
     [HarmonyPatch(typeof(DrawCardManager))]
     public static class DrawCardManager_Patch
     {
-        // Dùng chung xử lý cập nhật text
+        [HarmonyPatch(nameof(DrawCardManager.UpdateText))]
-        private static void TranslateAndApplyFont(Il2CppSystem.Collections.Generic.List<TextMeshProUGUI> texts)
+        [HarmonyPostfix]
+        private static void Postfix_UpdateText(DrawCardManager __instance)
         {
-                if (texts == null || texts.Count == 0) return;
+            Il2CppSystem.Collections.Generic.List<TextMeshProUGUI> texts = __instance.texts;
-
+            __instance.upName = StringStore.TranslateText(__instance.upName);
-                TMP_FontAsset fontAsset = FontStore.LoadTMPFont(Utils.Language.ToString());
+            if (texts != null && texts.Count > 0)
-
+            {
-                foreach (var textComponent in texts)
+                foreach (TextMeshProUGUI textComponent in texts)
+                {
+                    if (textComponent != null)
                     {
-                    if (textComponent == null) continue;
-
                         string translatedText = StringStore.TranslateText(textComponent.text);
+                        TMP_FontAsset fontAsset = FontStore.LoadTMPFont(Utils.Language.ToString());
                         textComponent.text = translatedText;
                         textComponent.font = fontAsset;
                     }
                 }
-
+            }
-        [HarmonyPostfix]
-        [HarmonyPatch(nameof(DrawCardManager.UpdateText))]
-        private static void Postfix_UpdateText(DrawCardManager __instance)
-        {
-            __instance.upName = StringStore.TranslateText(__instance.upName);
-            TranslateAndApplyFont(__instance.texts);
         }
 
-        [HarmonyPostfix]
+
+
         [HarmonyPatch(nameof(DrawCardManager.Update))]
+        [HarmonyPostfix]
         private static void Postfix_Update(DrawCardManager __instance)
         {
+            Il2CppSystem.Collections.Generic.List<TextMeshProUGUI> texts = __instance.texts;
             __instance.upName = StringStore.TranslateText(__instance.upName);
-            TranslateAndApplyFont(__instance.texts);
+
+            if (texts != null && texts.Count > 0)
+            {
+                foreach (TextMeshProUGUI textComponent in texts)
+                {
+                    if (textComponent != null)
+                    {
+                        string translatedText = StringStore.TranslateText(textComponent.text);
+                        TMP_FontAsset fontAsset = FontStore.LoadTMPFont(Utils.Language.ToString());
+                        textComponent.text = translatedText;
+                        textComponent.font = fontAsset;
+                    }
+                }
+            }
+
         }
     }
 }
+

BepInEx/Patches/Managers/EndlessMgr_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;

BepInEx/Patches/Managers/IZEMgr_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
@@ -7,7 +7,7 @@ using UnityEngine;
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
 {
     [HarmonyPatch(typeof(IZBottomMenu))]
-	public static class IZEMgr_Patch
+	public static class IZBottomMenu_Patch
     {
 		[HarmonyPatch(nameof(IZBottomMenu.ChangeString))]
 		[HarmonyPostfix]

BepInEx/Patches/Managers/InGameUIMgr_Patch.cs

@@ -1,4 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
+using System;
 
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;

BepInEx/Patches/Managers/InGameUI_Patch.cs

@@ -1,7 +1,8 @@
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
+using System.Text.RegularExpressions;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
 {
@@ -19,12 +20,10 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
 				__instance.transform.GetChild(5).GetComponent<TextMeshProUGUI>(),
 				__instance.transform.GetChild(5).GetChild(0).GetComponent<TextMeshProUGUI>(),
 				__instance.transform.GetChild(6).GetComponent<TextMeshProUGUI>(),
-					__instance.transform.GetChild(6).GetChild(0).GetComponent<TextMeshProUGUI>()
+				__instance.transform.GetChild(6).GetChild(0).GetComponent<TextMeshProUGUI>()};
-			};
 			TextMeshProUGUI[] array2 = array;
 			for (int i = 0; i < array2.Length; i++)
 			{
-
 				array2[i] = StringStore.TranslateText(array2[i]);
 				array2[i].text = array2[i].text.Replace("\n", " ");
 			}

BepInEx/Patches/Managers/OppositeBuffManager_Patch.cs

@@ -8,7 +8,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
 	[HarmonyPatch(typeof(OppositeBuffManager))]
 	public static class OppositeBuffManager_Patch
 	{
-		#if TESTING
+#if TESTING
 		[HarmonyPatch(nameof(OppositeBuffManager.InitBuffPool))]
 		[HarmonyPostfix]
 		private static void InitBuffPool(OppositeBuffManager __instance)
@@ -44,7 +44,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
 		{
 			foreach(TextMeshProUGUI text in __instance.textA_bad)
 			{
-				string stripText = text.text.Replace("但", "");
+				string stripText = text.text.Replace("?", "");
 				string translatedText = StringStore.TranslateText(stripText);
 				string replacementText = StringStore.translationString["但"] + translatedText;
 				text.text = replacementText;
@@ -66,7 +66,7 @@ namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers
 				text.text = StringStore.TranslateText(text.text);
 			}
 		}
-		#endif
+#endif
 
         [HarmonyPatch(nameof(OppositeBuffManager.SetText), new Type[] { typeof(TextMeshProUGUI), typeof(BuffType), typeof(int)})]
 		[HarmonyPostfix]

BepInEx/Patches/Managers/SaveMenu_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/Managers/TravelBuffMgr_Patch.cs

@@ -1,4 +1,4 @@
-using HarmonyLib;
+using HarmonyLib;
 using System;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers

BepInEx/Patches/Managers/UIMgr_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 
 namespace PvZ_Fusion_Translator__BepInEx_.Patches.Managers

BepInEx/Patches/OtherManagers/AchievementClip_Patch.cs

@@ -1,6 +1,8 @@
-using HarmonyLib;
+using HarmonyLib;
-using System.IO;
+using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using TMPro;
 using Newtonsoft.Json;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;

BepInEx/Patches/OtherManagers/GardenUI_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 using UnityEngine;
 

BepInEx/Patches/OtherManagers/MenuText_Patch.cs

@@ -1,6 +1,6 @@
-#if FIX
+#if FIX
 using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/Patches/OtherManagers/ThanksMenu_Patch.cs

@@ -1,5 +1,5 @@
-using HarmonyLib;
+using HarmonyLib;
-
+using System;
 using TMPro;
 using PvZ_Fusion_Translator__BepInEx_.AssetStore;
 

BepInEx/PvZ Fusion Translator [BepInEx].csproj

@@ -118,11 +118,21 @@
 		<Compile Include="Log.cs" />
 		<Compile Include="ModFeatures.cs" />
 		<Compile Include="AssetStore\AudioStore.cs" />
+		<Compile Include="Patches\GameObjects\Board_Patch.cs" />
+		<Compile Include="Patches\GameObjects\MinorObjects\Jigsaw_Patch.cs" />
+		<Compile Include="Patches\GameObjects\ShootingSelectWindow_Patch.cs" />
+		<Compile Include="Patches\GameObjects\FruitNinjaSelectWindow_Patch.cs" />
+		<Compile Include="Patches\GameObjects\RogueCardWindow_Patch.cs" />
+		<Compile Include="Patches\GameObjects\CrisisZombieWindow_Patch.cs" />
+		<Compile Include="Patches\GameObjects\RogueStartMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AbyssBagMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AbyssCheckInBag_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AbyssStoreMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AbyssSettlementMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\NormalBtn_Patch.cs" />
+		<Compile Include="Patches\GameObjects\ButtonObjects\UIButton_Patch.cs" />
+		<Compile Include="Patches\GameObjects\MinorObjects\TrainingDummy_Patch.cs" />
+		<Compile Include="Patches\GameObjects\MinorObjects\UltimateChomper_Patch.cs" />
 		<Compile Include="Patches\GameObjects\OtherMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\AbyssCheckSellMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\AbyssBuffButton_Patch.cs" />
@@ -140,7 +150,13 @@
 		<Compile Include="Patches\GameObjects\AbyssDevelopMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AbyssMenu2_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AbyssMenu_Patch.cs" />
+		<Compile Include="Patches\GameObjects\TowerOption_Patch.cs" />
+		<Compile Include="Patches\GameObjects\TravelLookBuff_Patch.cs" />
+		<Compile Include="Patches\GameObjects\ShootingMenu_Patch.cs" />
+		<Compile Include="Patches\GameObjects\TravelLookMenu_Patch.cs" />
+		<Compile Include="Patches\Managers\ChessManager_Patch.cs" />
 		<Compile Include="Patches\Managers\CustomLevelShower_Patch.cs" />
+		<Compile Include="Patches\Managers\DrawCardManager_Patch.cs" />
 		<Compile Include="Patches\Managers\SaveMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\TravelBuffOptionButton_Patch.cs" />
 		<Compile Include="Patches\OtherManagers\AchievementClip_Patch.cs" />
@@ -157,7 +173,7 @@
 		<Compile Include="Patches\GameObjects\NoticePauseMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\InGameBtn_Patch.cs" />
 		<Compile Include="Patches\BaseTextObjects\InGameText_Patch.cs" />
-		<Compile Include="Patches\Managers\InGameUIMgr_Patch.cs" />
+		<Compile Include="Patches\Managers\InGameUI_Patch.cs" />
 		<Compile Include="Patches\Managers\IZEMgr_Patch.cs" />
 		<Compile Include="Patches\OtherManagers\MenuText_Patch.cs" />
 		<Compile Include="Patches\Managers\OppositeBuffManager_Patch.cs" />