diff --git a/.gitignore b/.gitignore index 2a2b1d90..faafeb70 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ## files generated by popular Visual Studio add-ons. PrePatcher/Output +PostPatcher/Output # User-specific files *.suo diff --git a/Assembly-CSharp/Assembly-CSharp.csproj b/Assembly-CSharp/Assembly-CSharp.csproj index 337c16c9..0add8292 100644 --- a/Assembly-CSharp/Assembly-CSharp.csproj +++ b/Assembly-CSharp/Assembly-CSharp.csproj @@ -10,14 +10,14 @@ true packages latest + true - - + @@ -30,8 +30,8 @@ C:/Program Files (x86)/Steam/steamapps/common/Hollow Knight $(HOME)/.local/share/Steam/steamapps/common/Hollow Knight - $(GamePath)/hollow_knight_Data/Managed - + $(GamePath)/hollow_knight_Data/Managed + mono @@ -41,12 +41,23 @@ + + + + + + + + + + + @@ -58,13 +69,13 @@ - + - + - + @@ -72,16 +83,14 @@ - + - - - + - + - + .dll @@ -95,14 +104,14 @@ - + - + full bin\$(Configuration)\Assembly-CSharp.mm.xml @@ -120,20 +129,23 @@ all - + all - + - + false + + false + - + @@ -141,64 +153,16 @@ - - ../Vanilla/Assembly-CSharp.dll - False - - - ..\override\mscorlib.dll - - - ../Vanilla/netstandard.dll - - - ../JsonNet/Newtonsoft.Json.dll - - - ../Vanilla/PlayMaker.dll - False - - - ../Vanilla/UnityEngine.dll - - - ../Vanilla/UnityEngine.AnimationModule.dll - - - ../Vanilla/UnityEngine.AssetBundleModule.dll - - - ../Vanilla/UnityEngine.AudioModule.dll - - - ../Vanilla/UnityEngine.CoreModule.dll - - - ../Vanilla/UnityEngine.ImageConversionModule.dll - - - ../Vanilla/UnityEngine.IMGUIModule.dll - - - ../Vanilla/UnityEngine.InputLegacyModule.dll - - - ../Vanilla/UnityEngine.JSONSerializeModule.dll - - - ../Vanilla/UnityEngine.ParticleSystemModule.dll - - - ../Vanilla/UnityEngine.Physics2DModule.dll - - - ../Vanilla/UnityEngine.TextRenderingModule.dll - - - ../Vanilla/UnityEngine.UI.dll - - - ../Vanilla/UnityEngine.UIModule.dll - + + + + + + + + + + + diff --git a/Assembly-CSharp/Console.cs b/Assembly-CSharp/Console.cs index d9fb51a4..a29911f8 100644 --- a/Assembly-CSharp/Console.cs +++ b/Assembly-CSharp/Console.cs @@ -76,7 +76,8 @@ public void Start() string.Join(string.Empty, _messages.ToArray()), _fontSize, TextAnchor.LowerLeft, - new CanvasUtil.RectData(new Vector2(-5, -5), Vector2.zero, Vector2.zero, Vector2.one), + //new CanvasUtil.RectData(new Vector2(-5, -5), Vector2.zero, Vector2.zero, Vector2.one), + new CanvasUtil.RectData(Vector2.zero, Vector2.zero, Vector2.zero, Vector2.one), _font ); diff --git a/Assembly-CSharp/Language/Language.cs b/Assembly-CSharp/Language/Language.cs new file mode 100644 index 00000000..91c55d10 --- /dev/null +++ b/Assembly-CSharp/Language/Language.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.Reflection; +using UObject = UnityEngine.Object; +using USystemLanguage = UnityEngine.SystemLanguage; + +namespace Language; + +[Obsolete("Use `TeamCherry.Localization.Language` instead.")] +public static class Language +{ + public static void LoadLanguage() => COMPAT_LoadLanguage(); + public static void LoadAvailableLanguages() => COMPAT_LoadAvailableLanguages(); + public static string[] GetLanguages() => COMPAT_GetLanguages(); + public static bool SwitchLanguage(string langCode) => COMPAT_SwitchLanguage(langCode); + public static bool SwitchLanguage(LanguageCode code) => COMPAT_SwitchLanguage((TeamCherry.Localization.LanguageCode) code); + public static UObject GetAsset(string name) => COMPAT_GetAsset(name); + public static LanguageCode CurrentLanguage() => (LanguageCode) COMPAT_CurrentLanguage(); + public static string Get(string key) => COMPAT_Get(key); + public static IEnumerable GetSheets() => COMPAT_GetSheets(); + public static IEnumerable GetKeys(string sheetTitle) => COMPAT_GetKeys(sheetTitle); + public static bool Has(string key) => COMPAT_Has(key); + public static bool Has(string key, string sheet) => COMPAT_Has(key, sheet); + public static bool HasSheet(string sheet) => COMPAT_HasSheet(sheet); + public static LanguageCode LanguageNameToCode(USystemLanguage name) => (LanguageCode) COMPAT_LanguageNameToCode(name); + public static string GetInternal(string key, string sheetTitle) => COMPAT_Get(key, sheetTitle); + [MonoMod.MonoModLinkFrom("System.String TeamCherry.Localization.Language::Get(System.String,System.String)")] + public static string Get(string key, string sheetTitle) => Modding.ModHooks.LanguageGet(key, sheetTitle); + + private static void DoSwitch(LanguageCode newLang) => COMPAT_DoSwitch((TeamCherry.Localization.LanguageCode) newLang); + private static bool HasLanguageFile(string lang, string sheetTitle) => COMPAT_HasLanguageFile(lang, sheetTitle); + private static string GetLanguageFileContents(string sheetTitle) => COMPAT_GetLanguageFileContents(sheetTitle); + + // Keep these below the `[MonoMod.MonoModLinkFrom("TeamCherry.Localization.Language")]`, as the reverse order would cause a cyclic loop of methods calling themselves + // thanks to MonoMod resolving these links top-down + // which would make a `LinkTo(TCLL)->LinkFrom(TCLL)` into a fully recursive function ⟳ + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Void LoadLanguage()")] + [MonoMod.MonoModRemove] + private static extern void COMPAT_LoadLanguage(); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Void LoadAvailableLanguages()")] + [MonoMod.MonoModRemove] + private static extern void COMPAT_LoadAvailableLanguages(); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.String[] GetLanguages()")] + [MonoMod.MonoModRemove] + private static extern string[] COMPAT_GetLanguages(); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Boolean SwitchLanguage(System.String)")] + [MonoMod.MonoModRemove] + private static extern bool COMPAT_SwitchLanguage(string langCode); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Boolean SwitchLanguage(TeamCherry.Localization.LanguageCode)")] + [MonoMod.MonoModRemove] + private static extern bool COMPAT_SwitchLanguage(TeamCherry.Localization.LanguageCode code); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "UnityEngine.Object GetAsset(System.String)")] + [MonoMod.MonoModRemove] + private static extern UObject COMPAT_GetAsset(string name); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "TeamCherry.Localization.LanguageCode CurrentLanguage()")] + [MonoMod.MonoModRemove] + private static extern TeamCherry.Localization.LanguageCode COMPAT_CurrentLanguage(); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.String Get(System.String)")] + [MonoMod.MonoModRemove] + private static extern string COMPAT_Get(string key); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.String Get(System.String,System.String)")] + [MonoMod.MonoModRemove] + private static extern string COMPAT_Get(string key, string sheetTitle); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Collections.Generic.IEnumerable`1 GetSheets()")] + [MonoMod.MonoModRemove] + private static extern IEnumerable COMPAT_GetSheets(); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Collections.Generic.IEnumerable`1 GetKeys(System.String)")] + [MonoMod.MonoModRemove] + private static extern IEnumerable COMPAT_GetKeys(string sheetTitle); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Boolean Has(System.String)")] + [MonoMod.MonoModRemove] + private static extern bool COMPAT_Has(string key); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Boolean Has(System.String,System.String)")] + [MonoMod.MonoModRemove] + private static extern bool COMPAT_Has(string key, string sheet); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Boolean HasSheet(System.String)")] + [MonoMod.MonoModRemove] + private static extern bool COMPAT_HasSheet(string sheet); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "TeamCherry.Localization.LanguageCode LanguageNameToCode(UnityEngine.SystemLanguage)")] + [MonoMod.MonoModRemove] + private static extern TeamCherry.Localization.LanguageCode COMPAT_LanguageNameToCode(USystemLanguage name); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Void DoSwitch(TeamCherry.Localization.LanguageCode)")] + [MonoMod.MonoModRemove] + private static extern TeamCherry.Localization.LanguageCode COMPAT_DoSwitch(TeamCherry.Localization.LanguageCode name); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.Boolean HasLanguageFile(System.String,System.String)")] + [MonoMod.MonoModRemove] + private static extern bool COMPAT_HasLanguageFile(string lang, string sheetTitle); + [MonoMod.MonoModLinkTo("TeamCherry.Localization.Language", "System.String GetLanguageFileContents(System.String)")] + [MonoMod.MonoModRemove] + private static extern string COMPAT_GetLanguageFileContents(string sheetTitle); +} \ No newline at end of file diff --git a/Assembly-CSharp/Language/LanguageCode.cs b/Assembly-CSharp/Language/LanguageCode.cs new file mode 100644 index 00000000..5f3fce38 --- /dev/null +++ b/Assembly-CSharp/Language/LanguageCode.cs @@ -0,0 +1,211 @@ +namespace Language; + +// for backwards compatibility +public enum LanguageCode +{ + N = TeamCherry.Localization.LanguageCode.N, + AA = TeamCherry.Localization.LanguageCode.AA, + AB = TeamCherry.Localization.LanguageCode.AB, + AF = TeamCherry.Localization.LanguageCode.AF, + AM = TeamCherry.Localization.LanguageCode.AM, + AR = TeamCherry.Localization.LanguageCode.AR, + AR_SA = TeamCherry.Localization.LanguageCode.AR_SA, + AR_EG = TeamCherry.Localization.LanguageCode.AR_EG, + AR_DZ = TeamCherry.Localization.LanguageCode.AR_DZ, + AR_YE = TeamCherry.Localization.LanguageCode.AR_YE, + AR_JO = TeamCherry.Localization.LanguageCode.AR_JO, + AR_KW = TeamCherry.Localization.LanguageCode.AR_KW, + AR_BH = TeamCherry.Localization.LanguageCode.AR_BH, + AR_IQ = TeamCherry.Localization.LanguageCode.AR_IQ, + AR_MA = TeamCherry.Localization.LanguageCode.AR_MA, + AR_LY = TeamCherry.Localization.LanguageCode.AR_LY, + AR_OM = TeamCherry.Localization.LanguageCode.AR_OM, + AR_SY = TeamCherry.Localization.LanguageCode.AR_SY, + AR_LB = TeamCherry.Localization.LanguageCode.AR_LB, + AR_AE = TeamCherry.Localization.LanguageCode.AR_AE, + AR_QA = TeamCherry.Localization.LanguageCode.AR_QA, + AS = TeamCherry.Localization.LanguageCode.AS, + AY = TeamCherry.Localization.LanguageCode.AY, + AZ = TeamCherry.Localization.LanguageCode.AZ, + BA = TeamCherry.Localization.LanguageCode.BA, + BE = TeamCherry.Localization.LanguageCode.BE, + BG = TeamCherry.Localization.LanguageCode.BG, + BH = TeamCherry.Localization.LanguageCode.BH, + BI = TeamCherry.Localization.LanguageCode.BI, + BN = TeamCherry.Localization.LanguageCode.BN, + BO = TeamCherry.Localization.LanguageCode.BO, + BR = TeamCherry.Localization.LanguageCode.BR, + CA = TeamCherry.Localization.LanguageCode.CA, + CO = TeamCherry.Localization.LanguageCode.CO, + CS = TeamCherry.Localization.LanguageCode.CS, + CY = TeamCherry.Localization.LanguageCode.CY, + DA = TeamCherry.Localization.LanguageCode.DA, + DE = TeamCherry.Localization.LanguageCode.DE, + DE_AT = TeamCherry.Localization.LanguageCode.DE_AT, + DE_LI = TeamCherry.Localization.LanguageCode.DE_LI, + DE_CH = TeamCherry.Localization.LanguageCode.DE_CH, + DE_LU = TeamCherry.Localization.LanguageCode.DE_LU, + DZ = TeamCherry.Localization.LanguageCode.DZ, + EL = TeamCherry.Localization.LanguageCode.EL, + EN = TeamCherry.Localization.LanguageCode.EN, + EN_US = TeamCherry.Localization.LanguageCode.EN_US, + EN_AU = TeamCherry.Localization.LanguageCode.EN_AU, + EN_NZ = TeamCherry.Localization.LanguageCode.EN_NZ, + EN_ZA = TeamCherry.Localization.LanguageCode.EN_ZA, + EN_CB = TeamCherry.Localization.LanguageCode.EN_CB, + EN_TT = TeamCherry.Localization.LanguageCode.EN_TT, + EN_GB = TeamCherry.Localization.LanguageCode.EN_GB, + EN_CA = TeamCherry.Localization.LanguageCode.EN_CA, + EN_IE = TeamCherry.Localization.LanguageCode.EN_IE, + EN_JM = TeamCherry.Localization.LanguageCode.EN_JM, + EN_BZ = TeamCherry.Localization.LanguageCode.EN_BZ, + EO = TeamCherry.Localization.LanguageCode.EO, + ES = TeamCherry.Localization.LanguageCode.ES, + ES_MX = TeamCherry.Localization.LanguageCode.ES_MX, + ES_CR = TeamCherry.Localization.LanguageCode.ES_CR, + ES_DO = TeamCherry.Localization.LanguageCode.ES_DO, + ES_CO = TeamCherry.Localization.LanguageCode.ES_CO, + ES_AR = TeamCherry.Localization.LanguageCode.ES_AR, + ES_CL = TeamCherry.Localization.LanguageCode.ES_CL, + ES_PY = TeamCherry.Localization.LanguageCode.ES_PY, + ES_SV = TeamCherry.Localization.LanguageCode.ES_SV, + ES_NI = TeamCherry.Localization.LanguageCode.ES_NI, + ES_GT = TeamCherry.Localization.LanguageCode.ES_GT, + ES_PA = TeamCherry.Localization.LanguageCode.ES_PA, + ES_VE = TeamCherry.Localization.LanguageCode.ES_VE, + ES_PE = TeamCherry.Localization.LanguageCode.ES_PE, + ES_EC = TeamCherry.Localization.LanguageCode.ES_EC, + ES_UY = TeamCherry.Localization.LanguageCode.ES_UY, + ES_BO = TeamCherry.Localization.LanguageCode.ES_BO, + ES_HN = TeamCherry.Localization.LanguageCode.ES_HN, + ES_PR = TeamCherry.Localization.LanguageCode.ES_PR, + ET = TeamCherry.Localization.LanguageCode.ET, + EU = TeamCherry.Localization.LanguageCode.EU, + FA = TeamCherry.Localization.LanguageCode.FA, + FI = TeamCherry.Localization.LanguageCode.FI, + FJ = TeamCherry.Localization.LanguageCode.FJ, + FO = TeamCherry.Localization.LanguageCode.FO, + FR = TeamCherry.Localization.LanguageCode.FR, + FR_BE = TeamCherry.Localization.LanguageCode.FR_BE, + FR_CH = TeamCherry.Localization.LanguageCode.FR_CH, + FR_CA = TeamCherry.Localization.LanguageCode.FR_CA, + FR_LU = TeamCherry.Localization.LanguageCode.FR_LU, + FY = TeamCherry.Localization.LanguageCode.FY, + GA = TeamCherry.Localization.LanguageCode.GA, + GD = TeamCherry.Localization.LanguageCode.GD, + GL = TeamCherry.Localization.LanguageCode.GL, + GN = TeamCherry.Localization.LanguageCode.GN, + GU = TeamCherry.Localization.LanguageCode.GU, + HA = TeamCherry.Localization.LanguageCode.HA, + HI = TeamCherry.Localization.LanguageCode.HI, + HE = TeamCherry.Localization.LanguageCode.HE, + HR = TeamCherry.Localization.LanguageCode.HR, + HU = TeamCherry.Localization.LanguageCode.HU, + HY = TeamCherry.Localization.LanguageCode.HY, + IA = TeamCherry.Localization.LanguageCode.IA, + ID = TeamCherry.Localization.LanguageCode.ID, + IE = TeamCherry.Localization.LanguageCode.IE, + IK = TeamCherry.Localization.LanguageCode.IK, + IN = TeamCherry.Localization.LanguageCode.IN, + IS = TeamCherry.Localization.LanguageCode.IS, + IT = TeamCherry.Localization.LanguageCode.IT, + IT_CH = TeamCherry.Localization.LanguageCode.IT_CH, + IU = TeamCherry.Localization.LanguageCode.IU, + IW = TeamCherry.Localization.LanguageCode.IW, + JA = TeamCherry.Localization.LanguageCode.JA, + JI = TeamCherry.Localization.LanguageCode.JI, + JW = TeamCherry.Localization.LanguageCode.JW, + KA = TeamCherry.Localization.LanguageCode.KA, + KK = TeamCherry.Localization.LanguageCode.KK, + KL = TeamCherry.Localization.LanguageCode.KL, + KM = TeamCherry.Localization.LanguageCode.KM, + KN = TeamCherry.Localization.LanguageCode.KN, + KO = TeamCherry.Localization.LanguageCode.KO, + KS = TeamCherry.Localization.LanguageCode.KS, + KU = TeamCherry.Localization.LanguageCode.KU, + KY = TeamCherry.Localization.LanguageCode.KY, + LA = TeamCherry.Localization.LanguageCode.LA, + LN = TeamCherry.Localization.LanguageCode.LN, + LO = TeamCherry.Localization.LanguageCode.LO, + LT = TeamCherry.Localization.LanguageCode.LT, + LV = TeamCherry.Localization.LanguageCode.LV, + MG = TeamCherry.Localization.LanguageCode.MG, + MI = TeamCherry.Localization.LanguageCode.MI, + MK = TeamCherry.Localization.LanguageCode.MK, + ML = TeamCherry.Localization.LanguageCode.ML, + MN = TeamCherry.Localization.LanguageCode.MN, + MO = TeamCherry.Localization.LanguageCode.MO, + MR = TeamCherry.Localization.LanguageCode.MR, + MS = TeamCherry.Localization.LanguageCode.MS, + MT = TeamCherry.Localization.LanguageCode.MT, + MY = TeamCherry.Localization.LanguageCode.MY, + NA = TeamCherry.Localization.LanguageCode.NA, + NE = TeamCherry.Localization.LanguageCode.NE, + NL = TeamCherry.Localization.LanguageCode.NL, + NL_BE = TeamCherry.Localization.LanguageCode.NL_BE, + NO = TeamCherry.Localization.LanguageCode.NO, + OC = TeamCherry.Localization.LanguageCode.OC, + OM = TeamCherry.Localization.LanguageCode.OM, + OR = TeamCherry.Localization.LanguageCode.OR, + PA = TeamCherry.Localization.LanguageCode.PA, + PL = TeamCherry.Localization.LanguageCode.PL, + PS = TeamCherry.Localization.LanguageCode.PS, + PT = TeamCherry.Localization.LanguageCode.PT, + PT_BR = TeamCherry.Localization.LanguageCode.PT_BR, + QU = TeamCherry.Localization.LanguageCode.QU, + RM = TeamCherry.Localization.LanguageCode.RM, + RN = TeamCherry.Localization.LanguageCode.RN, + RO = TeamCherry.Localization.LanguageCode.RO, + RO_MO = TeamCherry.Localization.LanguageCode.RO_MO, + RU = TeamCherry.Localization.LanguageCode.RU, + RU_MO = TeamCherry.Localization.LanguageCode.RU_MO, + RW = TeamCherry.Localization.LanguageCode.RW, + SA = TeamCherry.Localization.LanguageCode.SA, + SD = TeamCherry.Localization.LanguageCode.SD, + SG = TeamCherry.Localization.LanguageCode.SG, + SH = TeamCherry.Localization.LanguageCode.SH, + SI = TeamCherry.Localization.LanguageCode.SI, + SK = TeamCherry.Localization.LanguageCode.SK, + SL = TeamCherry.Localization.LanguageCode.SL, + SM = TeamCherry.Localization.LanguageCode.SM, + SN = TeamCherry.Localization.LanguageCode.SN, + SO = TeamCherry.Localization.LanguageCode.SO, + SQ = TeamCherry.Localization.LanguageCode.SQ, + SR = TeamCherry.Localization.LanguageCode.SR, + SS = TeamCherry.Localization.LanguageCode.SS, + ST = TeamCherry.Localization.LanguageCode.ST, + SU = TeamCherry.Localization.LanguageCode.SU, + SV = TeamCherry.Localization.LanguageCode.SV, + SV_FI = TeamCherry.Localization.LanguageCode.SV_FI, + SW = TeamCherry.Localization.LanguageCode.SW, + TA = TeamCherry.Localization.LanguageCode.TA, + TE = TeamCherry.Localization.LanguageCode.TE, + TG = TeamCherry.Localization.LanguageCode.TG, + TH = TeamCherry.Localization.LanguageCode.TH, + TI = TeamCherry.Localization.LanguageCode.TI, + TK = TeamCherry.Localization.LanguageCode.TK, + TL = TeamCherry.Localization.LanguageCode.TL, + TN = TeamCherry.Localization.LanguageCode.TN, + TO = TeamCherry.Localization.LanguageCode.TO, + TR = TeamCherry.Localization.LanguageCode.TR, + TS = TeamCherry.Localization.LanguageCode.TS, + TT = TeamCherry.Localization.LanguageCode.TT, + TW = TeamCherry.Localization.LanguageCode.TW, + UG = TeamCherry.Localization.LanguageCode.UG, + UK = TeamCherry.Localization.LanguageCode.UK, + UR = TeamCherry.Localization.LanguageCode.UR, + UZ = TeamCherry.Localization.LanguageCode.UZ, + VI = TeamCherry.Localization.LanguageCode.VI, + VO = TeamCherry.Localization.LanguageCode.VO, + WO = TeamCherry.Localization.LanguageCode.WO, + XH = TeamCherry.Localization.LanguageCode.XH, + YI = TeamCherry.Localization.LanguageCode.YI, + YO = TeamCherry.Localization.LanguageCode.YO, + ZA = TeamCherry.Localization.LanguageCode.ZA, + ZH = TeamCherry.Localization.LanguageCode.ZH, + ZH_TW = TeamCherry.Localization.LanguageCode.ZH_TW, + ZH_HK = TeamCherry.Localization.LanguageCode.ZH_HK, + ZH_CN = TeamCherry.Localization.LanguageCode.ZH_CN, + ZH_SG = TeamCherry.Localization.LanguageCode.ZH_SG, + ZU = TeamCherry.Localization.LanguageCode.ZU, +} \ No newline at end of file diff --git a/Assembly-CSharp/ModHooks.cs b/Assembly-CSharp/ModHooks.cs index 1ba7815f..0ea986d3 100644 --- a/Assembly-CSharp/ModHooks.cs +++ b/Assembly-CSharp/ModHooks.cs @@ -61,10 +61,10 @@ static ModHooks() { string[] versionNums = Constants.GAME_VERSION.Split('.'); - gameVersion.major = Convert.ToInt32(versionNums[0]); - gameVersion.minor = Convert.ToInt32(versionNums[1]); - gameVersion.revision = Convert.ToInt32(versionNums[2]); - gameVersion.package = Convert.ToInt32(versionNums[3]); + gameVersion.major = versionNums.Length > 0 ? Convert.ToInt32(versionNums[0]) : 0; + gameVersion.minor = versionNums.Length > 1 ? Convert.ToInt32(versionNums[1]) : 0; + gameVersion.revision = versionNums.Length > 2 ? Convert.ToInt32(versionNums[2]) : 0; + gameVersion.package = versionNums.Length > 3 ? Convert.ToInt32(versionNums[3]) : 0; } catch (Exception e) { @@ -225,7 +225,7 @@ internal static void LogConsole(string message, LogLevel level) /// N/A internal static string LanguageGet(string key, string sheet) { - string res = Patches.Language.GetInternal(key, sheet); + string res = Language.Language.GetInternal(key, sheet); if (LanguageGetHook == null) return res; diff --git a/Assembly-CSharp/Patches/GameManager.cs b/Assembly-CSharp/Patches/GameManager.cs index 9510c2d5..99526b73 100644 --- a/Assembly-CSharp/Patches/GameManager.cs +++ b/Assembly-CSharp/Patches/GameManager.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json; using UnityEngine; using UnityEngine.SceneManagement; +using Encryption = TeamCherry.SharedUtils.Encryption; // ReSharper disable all #pragma warning disable 1591, 649, 414, 169, CS0108, CS0626 @@ -196,9 +197,7 @@ public void SaveGame(int saveSlot, Action callback) text = JsonUtility.ToJson(obj); } - bool flag = this.gameConfig.useSaveEncryption && !Platform.Current.IsFileSystemProtected; - - if (flag) + if (this.gameConfig.useSaveEncryption && !Platform.Current.IsFileSystemProtected) { string graph = Encryption.Encrypt(text); BinaryFormatter binaryFormatter = new BinaryFormatter(); @@ -578,12 +577,12 @@ public IEnumerator LoadSceneAdditive(string destScene) AsyncOperation loadop = UnityEngine.SceneManagement.SceneManager.LoadSceneAsync(destScene, LoadSceneMode.Additive); loadop.allowSceneActivation = true; yield return loadop; - yield return UnityEngine.SceneManagement.SceneManager.UnloadSceneAsync(exitingScene); + UnityEngine.SceneManagement.SceneManager.UnloadScene(exitingScene); ModHooks.OnSceneChanged(destScene); this.RefreshTilemapInfo(destScene); if (this.IsUnloadAssetsRequired(exitingScene, destScene)) { - Debug.LogFormat(this, "Unloading assets due to zone transition", new object[0]); + Debug.LogFormat(this, "Unloading assets due to zone transition", Array.Empty()); yield return Resources.UnloadUnusedAssets(); } @@ -628,48 +627,46 @@ public void OnWillActivateFirstLevel() [MonoModIgnore] public extern void SetTimeScale(float timescale); + [MonoModIgnore] + private extern void SetPausedState(bool value); + // code has been copied from PauseGameToggle public IEnumerator PauseToggleDynamicMenu(MenuScreen screen, bool allowUnpause = false) { - if (!this.TimeSlowed) + if (this.TimeSlowed) + { + yield break; + } + if (!this.playerData.GetBool(nameof(PlayerData.disablePause)) && this.gameState == GlobalEnums.GameState.PLAYING) { - if (!this.playerData.GetBool(nameof(PlayerData.disablePause)) && this.gameState == GlobalEnums.GameState.PLAYING) + this.isPaused = true; + this.ui.SetState(GlobalEnums.UIState.PAUSED); + this.SetPausedState(true); + this.SetState(GlobalEnums.GameState.PAUSED); + if (HeroController.instance != null) { - this.gameCams.StopCameraShake(); - this.inputHandler.PreventPause(); - this.inputHandler.StopUIInput(); - this.actorSnapshotPaused.TransitionTo(0f); - this.isPaused = true; - this.SetState(GlobalEnums.GameState.PAUSED); - this.ui.AudioGoToPauseMenu(0.2f); - this.ui.UIPauseToDynamicMenu(screen); - if (HeroController.instance != null) - { - HeroController.instance.Pause(); - } - this.gameCams.MoveMenuToHUDCamera(); - this.SetTimeScale(0f); - yield return new WaitForSecondsRealtime(0.8f); - this.inputHandler.AllowPause(); + HeroController.instance.Pause(); } - else if (allowUnpause && this.gameState == GlobalEnums.GameState.PAUSED) + this.gameCams.MoveMenuToHUDCamera(); + this.inputHandler.PreventPause(); + this.inputHandler.StopUIInput(); + yield return new WaitForSecondsRealtime(0.3f); + this.inputHandler.AllowPause(); + } + else if (allowUnpause && this.gameState == GlobalEnums.GameState.PAUSED) + { + this.isPaused = false; + this.inputHandler.PreventPause(); + this.ui.SetState(GlobalEnums.UIState.PLAYING); + this.SetPausedState(false); + this.SetState(GlobalEnums.GameState.PLAYING); + if (HeroController.instance != null) { - this.gameCams.ResumeCameraShake(); - this.inputHandler.PreventPause(); - this.actorSnapshotUnpaused.TransitionTo(0f); - this.isPaused = false; - this.ui.AudioGoToGameplay(0.2f); - this.ui.SetState( GlobalEnums.UIState.PLAYING); - this.SetState( GlobalEnums.GameState.PLAYING); - if (HeroController.instance != null) - { - HeroController.instance.UnPause(); - } - MenuButtonList.ClearAllLastSelected(); - this.SetTimeScale(1f); - yield return new WaitForSecondsRealtime(0.8f); - this.inputHandler.AllowPause(); + HeroController.instance.UnPause(); } + MenuButtonList.ClearAllLastSelected(); + yield return new WaitForSecondsRealtime(0.3f); + this.inputHandler.AllowPause(); } yield break; } diff --git a/Assembly-CSharp/Patches/HeroController.cs b/Assembly-CSharp/Patches/HeroController.cs index f0430b60..28454dc5 100644 --- a/Assembly-CSharp/Patches/HeroController.cs +++ b/Assembly-CSharp/Patches/HeroController.cs @@ -67,27 +67,43 @@ public void Attack(AttackDirection attackDir) this.slashFsm = this.wallSlashFsm; if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_35))) { - if ((this.playerData.GetInt(nameof(PlayerData.health)) == this.playerData.CurrentMaxHealth && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) + if ((this.playerData.GetInt(nameof(PlayerData.health)) == this.playerData.GetInt(nameof(PlayerData.CurrentMaxHealth)) && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) { if (this.transform.localScale.x > 0f) + { this.grubberFlyBeam = this.grubberFlyBeamPrefabR.Spawn(this.transform.position); + } else + { this.grubberFlyBeam = this.grubberFlyBeamPrefabL.Spawn(this.transform.position); + } if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_13))) + { this.grubberFlyBeam.transform.SetScaleY(this.MANTIS_CHARM_SCALE); + } else + { this.grubberFlyBeam.transform.SetScaleY(1f); + } } if (this.playerData.GetInt(nameof(PlayerData.health)) == 1 && this.playerData.GetBool(nameof(PlayerData.equippedCharm_6)) && this.playerData.GetInt(nameof(PlayerData.healthBlue)) < 1) { if (this.transform.localScale.x > 0f) + { this.grubberFlyBeam = this.grubberFlyBeamPrefabR_fury.Spawn(this.transform.position); + } else + { this.grubberFlyBeam = this.grubberFlyBeamPrefabL_fury.Spawn(this.transform.position); + } if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_13))) + { this.grubberFlyBeam.transform.SetScaleY(this.MANTIS_CHARM_SCALE); + } else + { this.grubberFlyBeam.transform.SetScaleY(1f); + } } } } @@ -110,7 +126,7 @@ public void Attack(AttackDirection attackDir) } if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_35))) { - if ((this.playerData.GetInt(nameof(PlayerData.health)) >= this.playerData.CurrentMaxHealth && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) + if ((this.playerData.GetInt(nameof(PlayerData.health)) >= this.playerData.GetInt(nameof(PlayerData.maxHealth)) && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) { if (this.transform.localScale.x < 0f) this.grubberFlyBeam = this.grubberFlyBeamPrefabR.Spawn(this.transform.position); @@ -141,7 +157,7 @@ public void Attack(AttackDirection attackDir) this.cState.upAttacking = true; if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_35))) { - if ((this.playerData.GetInt(nameof(PlayerData.health)) >= this.playerData.CurrentMaxHealth && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) + if ((this.playerData.GetInt(nameof(PlayerData.health)) >= this.playerData.GetInt(nameof(PlayerData.maxHealth)) && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) { this.grubberFlyBeam = this.grubberFlyBeamPrefabU.Spawn(this.transform.position); this.grubberFlyBeam.transform.SetScaleY(this.transform.localScale.x); @@ -166,7 +182,7 @@ public void Attack(AttackDirection attackDir) this.cState.downAttacking = true; if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_35))) { - if ((this.playerData.GetInt(nameof(PlayerData.health)) >= this.playerData.CurrentMaxHealth && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) + if ((this.playerData.GetInt(nameof(PlayerData.health)) >= this.playerData.GetInt(nameof(PlayerData.maxHealth)) && !this.playerData.GetBool(nameof(PlayerData.equippedCharm_27))) || (this.joniBeam && this.playerData.GetBool(nameof(PlayerData.equippedCharm_27)))) { this.grubberFlyBeam = this.grubberFlyBeamPrefabD.Spawn(this.transform.position); this.grubberFlyBeam.transform.SetScaleY(this.transform.localScale.x); @@ -218,17 +234,16 @@ public void Attack(AttackDirection attackDir) [MonoModReplace] public void SoulGain() { - int mpcharge = this.playerData.GetInt("MPCharge"); int num; - if (mpcharge < this.playerData.GetInt("maxMP")) + if (this.playerData.GetInt(nameof(PlayerData.MPCharge)) < this.playerData.GetInt(nameof(PlayerData.maxMP))) { num = 11; - if (this.playerData.GetBool("equippedCharm_20")) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_20))) { num += 3; } - if (this.playerData.GetBool("equippedCharm_21")) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_21))) { num += 8; } @@ -236,22 +251,22 @@ public void SoulGain() else { num = 6; - if (this.playerData.GetBool("equippedCharm_20")) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_20))) { num += 2; } - if (this.playerData.GetBool("equippedCharm_21")) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_21))) { num += 6; } } - int mpreserve = this.playerData.GetInt("MPReserve"); + int mpreserve = this.playerData.GetInt(nameof(PlayerData.MPReserve)); num = Modding.ModHooks.OnSoulGain(num); this.playerData.AddMPCharge(num); GameCameras.instance.soulOrbFSM.SendEvent("MP GAIN"); - if (this.playerData.GetInt("MPReserve") != mpreserve) + if (this.playerData.GetInt(nameof(PlayerData.MPReserve)) != mpreserve) { this.gm.soulVessel_fsm.SendEvent("MP RESERVE UP"); } @@ -446,8 +461,7 @@ private void LookForQueueInput() && this.dashQueueSteps <= this.DASH_QUEUE_STEPS && this.CanDash() && this.dashQueuing - && !ModHooks.OnDashPressed() - && this.CanDash()) + && !ModHooks.OnDashPressed()) { this.HeroDash(); } @@ -499,6 +513,9 @@ private void LookForQueueInput() [MonoModIgnore] public event HeroController.TakeDamageEvent OnTakenDamage; + [MonoModIgnore] + private HeroVibrationController vibrationCtrl; + [MonoModReplace] public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount, int hazardType) { @@ -545,7 +562,7 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount mixer.StopAllEmissionsWithTag("heroAction"); } - bool flag = false; + bool carefreeShouldStopDamage = false; if (this.carefreeShieldEquipped && hazardType == 1) { if (this.hitsSinceShielded > 7) @@ -558,58 +575,58 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount case 1: if ((float) UnityEngine.Random.Range(1, 100) <= 10f) { - flag = true; + carefreeShouldStopDamage = true; } break; case 2: if ((float) UnityEngine.Random.Range(1, 100) <= 20f) { - flag = true; + carefreeShouldStopDamage = true; } break; case 3: if ((float) UnityEngine.Random.Range(1, 100) <= 30f) { - flag = true; + carefreeShouldStopDamage = true; } break; case 4: if ((float) UnityEngine.Random.Range(1, 100) <= 50f) { - flag = true; + carefreeShouldStopDamage = true; } break; case 5: if ((float) UnityEngine.Random.Range(1, 100) <= 70f) { - flag = true; + carefreeShouldStopDamage = true; } break; case 6: if ((float) UnityEngine.Random.Range(1, 100) <= 80f) { - flag = true; + carefreeShouldStopDamage = true; } break; case 7: if ((float) UnityEngine.Random.Range(1, 100) <= 90f) { - flag = true; + carefreeShouldStopDamage = true; } break; default: - flag = false; + carefreeShouldStopDamage = false; break; } - if (flag) + if (carefreeShouldStopDamage) { this.hitsSinceShielded = 0; this.carefreeShield.SetActive(true); @@ -622,7 +639,7 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount } } - if (this.playerData.GetBool("equippedCharm_5") && this.playerData.GetInt("blockerHits") > 0 && hazardType == 1 && this.cState.focusing && !flag) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_5)) && this.playerData.GetInt(nameof(PlayerData.blockerHits)) > 0 && hazardType == 1 && this.cState.focusing && !carefreeShouldStopDamage) { this.proxyFSM.SendEvent("HeroCtrl-TookBlockerHit"); this.audioSource.PlayOneShot(this.blockerImpact, 1f); @@ -638,7 +655,7 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount if (this.cState.wallSliding) { this.cState.wallSliding = false; - this.wallSlideVibrationPlayer.Stop(); + this.vibrationCtrl.StopWallSlide(); } if (this.cState.touchingWall) @@ -654,24 +671,24 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount if (this.cState.bouncing) { this.CancelBounce(); - this.rb2d.velocity = new Vector2(this.rb2d.velocity.x, 0f); + this.rb2d.linearVelocity = new Vector2(this.rb2d.linearVelocity.x, 0f); } if (this.cState.shroomBouncing) { this.CancelBounce(); - this.rb2d.velocity = new Vector2(this.rb2d.velocity.x, 0f); + this.rb2d.linearVelocity = new Vector2(this.rb2d.linearVelocity.x, 0f); } - if (!flag) + if (!carefreeShouldStopDamage) { this.audioCtrl.PlaySound(HeroSounds.TAKE_HIT); } damageAmount = ModHooks.AfterTakeDamage(hazardType, damageAmount); - if (!this.takeNoDamage && !this.playerData.GetBool("invinciTest")) + if (!this.takeNoDamage && !this.playerData.GetBool(nameof(PlayerData.invinciTest))) { - if (this.playerData.GetBool("overcharmed")) + if (this.playerData.GetBool(nameof(PlayerData.overcharmed))) { this.playerData.TakeHealth(damageAmount * 2); } @@ -681,9 +698,9 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount } } - if (this.playerData.GetBool("equippedCharm_3") && damageAmount > 0) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_3)) && damageAmount > 0) { - if (this.playerData.GetBool("equippedCharm_35")) + if (this.playerData.GetBool(nameof(PlayerData.equippedCharm_35))) { this.AddMPCharge(this.GRUB_SOUL_MP_COMBO); } @@ -709,32 +726,35 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount this.OnTakenDamage(); } - if (this.playerData.GetInt("health") == 0) + if (this.playerData.GetInt(nameof(PlayerData.health)) == 0) { base.StartCoroutine(this.Die()); + return; } else if (hazardType == 2) { base.StartCoroutine(this.DieFromHazard(HazardType.SPIKES, (!(go != null)) ? 0f : go.transform.rotation.z)); + return; } else if (hazardType == 3) { base.StartCoroutine(this.DieFromHazard(HazardType.ACID, 0f)); + return; } else if (hazardType == 4) { Debug.Log("Lava death"); + return; } else if (hazardType == 5) { base.StartCoroutine(this.DieFromHazard(HazardType.PIT, 0f)); + return; } - else - { - base.StartCoroutine(this.StartRecoil(damageSide, spawnDamageEffect, damageAmount)); - } + base.StartCoroutine(this.StartRecoil(damageSide, spawnDamageEffect, damageAmount)); + return; } - else if (this.cState.invulnerable && !this.cState.hazardDeath && !this.playerData.GetBool("isInvincible")) + else if (this.cState.invulnerable && !this.cState.hazardDeath && !this.playerData.GetBool(nameof(PlayerData.isInvincible))) { if (hazardType == 2) { @@ -751,8 +771,8 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount } else { - this.audioCtrl.PlaySound(HeroSounds.TAKE_HIT); - base.StartCoroutine(this.DieFromHazard(HazardType.SPIKES, (!(go != null)) ? 0f : go.transform.rotation.z)); + this.audioCtrl.PlaySound(HeroSounds.TAKE_HIT, false); + base.StartCoroutine(this.DieFromHazard(HazardType.SPIKES, (go != null) ? go.transform.rotation.z : 0f)); } } else if (hazardType == 3) @@ -760,14 +780,13 @@ public void TakeDamage(GameObject go, CollisionSide damageSide, int damageAmount damageAmount = ModHooks.AfterTakeDamage(hazardType, damageAmount); this.playerData.TakeHealth(damageAmount); this.proxyFSM.SendEvent("HeroCtrl-HeroDamaged"); - if (this.playerData.GetInt("health") == 0) + if (this.playerData.GetInt(nameof(PlayerData.health)) == 0) { base.StartCoroutine(this.Die()); + return; } - else - { - base.StartCoroutine(this.DieFromHazard(HazardType.ACID, 0f)); - } + base.StartCoroutine(this.DieFromHazard(HazardType.ACID, 0f)); + return; } else if (hazardType == 4) { @@ -842,7 +861,7 @@ private Vector2 OrigDashVector() origVector = new Vector2 ( velocity, - (!this.cState.onGround) ? BUMP_VELOCITY_DASH : BUMP_VELOCITY + this.cState.onGround ? BUMP_VELOCITY : BUMP_VELOCITY_DASH ); } else @@ -855,7 +874,7 @@ private Vector2 OrigDashVector() origVector = new Vector2 ( -velocity, - (!this.cState.onGround) ? BUMP_VELOCITY_DASH : BUMP_VELOCITY + this.cState.onGround ? BUMP_VELOCITY : BUMP_VELOCITY_DASH ); } else @@ -879,7 +898,7 @@ private void Dash() Vector2 vector = OrigDashVector(); vector = ModHooks.DashVelocityChange(vector); - rb2d.velocity = vector; + rb2d.linearVelocity = vector; dash_timer += Time.deltaTime; } diff --git a/Assembly-CSharp/Patches/InputHandler.cs b/Assembly-CSharp/Patches/InputHandler.cs index 3e5a18b4..2dd48dcf 100644 --- a/Assembly-CSharp/Patches/InputHandler.cs +++ b/Assembly-CSharp/Patches/InputHandler.cs @@ -26,25 +26,22 @@ public class InputHandler : global::InputHandler private void OnGUI() { Cursor.lockState = CursorLockMode.None; - if (isTitleScreenScene) + if (this.isTitleScreenScene) { Cursor.visible = false; return; } - - if (!isMenuScene) + if (this.isMenuScene) { - ModHooks.OnCursor(gm); + Cursor.visible = !this.controllerPressed; return; } - - if (controllerPressed) + if (!this.gm.isPaused) { Cursor.visible = false; return; } - - Cursor.visible = true; + Cursor.visible = !this.controllerPressed; } } } \ No newline at end of file diff --git a/Assembly-CSharp/Patches/Language.cs b/Assembly-CSharp/Patches/Language.cs deleted file mode 100644 index 5fbd34c2..00000000 --- a/Assembly-CSharp/Patches/Language.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections.Generic; -using MonoMod; -using UnityEngine; - -// ReSharper disable All -#pragma warning disable 1591, CS0649 - -namespace Modding.Patches -{ - [MonoModPatch("global::Language.Language")] - public static class Language - { - [MonoModIgnore] - private static Dictionary> currentEntrySheets; - - public static string GetInternal(string key, string sheetTitle) - { - if (currentEntrySheets == null || !currentEntrySheets.ContainsKey(sheetTitle)) - { - Debug.LogError($"The sheet with title \"{sheetTitle}\" does not exist!"); - return string.Empty; - } - - if (currentEntrySheets[sheetTitle].ContainsKey(key)) - { - return currentEntrySheets[sheetTitle][key]; - } - - return "#!#" + key + "#!#"; - } - - public static string Get(string key, string sheetTitle) - { - return ModHooks.LanguageGet(key, sheetTitle); - } - } -} \ No newline at end of file diff --git a/Assembly-CSharp/Patches/MenuSetting.cs b/Assembly-CSharp/Patches/MenuSetting.cs index 51f1b298..6f989f5b 100644 --- a/Assembly-CSharp/Patches/MenuSetting.cs +++ b/Assembly-CSharp/Patches/MenuSetting.cs @@ -55,15 +55,21 @@ public enum MenuSettingType VSync, // where did 13 go MonitorSelect = 14, - FrameCap, + SwitchFrameCap, ParticleLevel, ShaderQuality, + Dithering, + Noise, // HUH???? GameLanguage = 33, GameBackerCredits, NativeAchievements, + ControllerRumble = 37, + HudVisibility = 39, + CameraShake, NativeInput, - ControllerRumble, + XInput, + MFi, // peepoHappy CustomSetting } diff --git a/Assembly-CSharp/Patches/OnScreenDebugInfo.cs b/Assembly-CSharp/Patches/OnScreenDebugInfo.cs deleted file mode 100644 index a04d41a0..00000000 --- a/Assembly-CSharp/Patches/OnScreenDebugInfo.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Threading; -using MonoMod; -using UnityEngine; - -// ReSharper disable All -#pragma warning disable 1591, CS0626 - -namespace Modding.Patches -{ - [MonoModPatch("global::OnScreenDebugInfo")] - public class OnScreenDebugInfo : global::OnScreenDebugInfo - { - private extern void orig_Awake(); - - private void Awake() - { - if (ModLoader.LoadState == ModLoader.ModLoadState.NotStarted) - { - Logger.APILogger.Log("Main menu loading"); - ModLoader.LoadState = ModLoader.ModLoadState.Started; - - GameObject obj = new GameObject(); - DontDestroyOnLoad(obj); - - // Preload reflection - new Thread(ReflectionHelper.PreloadCommonTypes).Start(); - - // NonBouncer does absolutely nothing, which makes it a good dummy to run the loader - obj.AddComponent().StartCoroutine(ModLoader.LoadModsInit(obj)); - } - else - { - // Debug log because this is the expected code path - Logger.APILogger.LogDebug($"OnScreenDebugInfo: Already begun mod loading (state {ModLoader.LoadState})"); - } - - orig_Awake(); - } - } -} \ No newline at end of file diff --git a/Assembly-CSharp/Patches/Platform.cs b/Assembly-CSharp/Patches/Platform.cs index 28b67b31..f7f811f0 100644 --- a/Assembly-CSharp/Patches/Platform.cs +++ b/Assembly-CSharp/Patches/Platform.cs @@ -1,4 +1,5 @@ -using MonoMod; +using System; +using MonoMod; // ReSharper disable all #pragma warning disable 1591, 108, 114 @@ -8,6 +9,12 @@ namespace Modding.Patches [MonoModPatch("global::Platform")] public abstract class Platform : global::Platform { + [Obsolete("Please update your mod to the new HK version and use `RoamingSharedData` instead")] + public ISharedData EncryptedSharedData + { + get { return RoamingSharedData; } + } + public static bool IsSaveSlotIndexValid(int slotIndex) => true; // ReSharper disable once UnusedMember.Global diff --git a/Assembly-CSharp/Patches/PlayMakerUnity2DProxy.cs b/Assembly-CSharp/Patches/PlayMakerUnity2DProxy.cs index 9cd2d27b..5209f962 100644 --- a/Assembly-CSharp/Patches/PlayMakerUnity2DProxy.cs +++ b/Assembly-CSharp/Patches/PlayMakerUnity2DProxy.cs @@ -23,7 +23,7 @@ public void Start() } ModHooks.OnColliderCreate(gameObject); - RefreshImplementation(); + this.RefreshImplementation(); } } } \ No newline at end of file diff --git a/Assembly-CSharp/Patches/SceneManager.cs b/Assembly-CSharp/Patches/SceneManager.cs index 677dfbbd..efc9876d 100644 --- a/Assembly-CSharp/Patches/SceneManager.cs +++ b/Assembly-CSharp/Patches/SceneManager.cs @@ -20,12 +20,14 @@ public class SceneManager : global::SceneManager [MonoModIgnore] private bool heroInfoSent; + // [MonoModIgnore] private extern void orig_Update(); [MonoModIgnore] private GameManager gm; //Added checks for null and an attempt to fix any missing references + // [MonoModReplace] private void Update() { if (this.gameplayScene) @@ -40,40 +42,51 @@ private void Update() orig_Update(); } + [MonoModIgnore] + private Transform borderLeft; + + [MonoModIgnore] + private Transform borderRight; + + [MonoModIgnore] + private Transform borderUp; + + [MonoModIgnore] + private Transform borderDown; + + // [MonoModIgnore] + private extern void orig_OnCameraAspectChanged(float aspect); + //add modhook to send the newly created borders to any mods that want them - [MonoModReplace] - private void DrawBlackBorders() + // [MonoModReplace] + private void OnCameraAspectChanged(float aspect) { - List borders = new List(); - GameObject gameObject = UnityEngine.Object.Instantiate(this.borderPrefab); - gameObject.transform.SetPosition2D(this.gm.sceneWidth + 10f, this.gm.sceneHeight / 2f); - gameObject.transform.localScale = new Vector2(20f, this.gm.sceneHeight + 40f); - borders.Add(gameObject); - - gameObject = UnityEngine.Object.Instantiate(this.borderPrefab); - gameObject.transform.SetPosition2D(-10f, this.gm.sceneHeight / 2f); - gameObject.transform.localScale = new Vector2(20f, this.gm.sceneHeight + 40f); - borders.Add(gameObject); - - gameObject = UnityEngine.Object.Instantiate(this.borderPrefab); - gameObject.transform.SetPosition2D(this.gm.sceneWidth / 2f, this.gm.sceneHeight + 10f); - gameObject.transform.localScale = new Vector2(40f + this.gm.sceneWidth, 20f); - borders.Add(gameObject); - - gameObject = UnityEngine.Object.Instantiate(this.borderPrefab); - gameObject.transform.SetPosition2D(this.gm.sceneWidth / 2f, -10f); - gameObject.transform.localScale = new Vector2(40f + this.gm.sceneWidth, 20f); - borders.Add(gameObject); + orig_OnCameraAspectChanged(aspect); - ModHooks.OnDrawBlackBorders(borders); - - foreach (var border in borders) + List borders = new List(); + if (this.borderLeft != null) + { + borders.Add(this.borderLeft.gameObject); + } + if (this.borderRight != null) + { + borders.Add(this.borderRight.gameObject); + } + if (this.borderUp != null) + { + borders.Add(this.borderUp.gameObject); + } + if (this.borderDown != null) { - UnityEngine.SceneManagement.SceneManager.MoveGameObjectToScene(border, base.gameObject.scene); + borders.Add(this.borderDown.gameObject); } + ModHooks.OnDrawBlackBorders(borders); } + // [MonoModIgnore] private extern void orig_Start(); + + // [MonoModReplace] private void Start() { try diff --git a/Assembly-CSharp/Patches/StartManager.cs b/Assembly-CSharp/Patches/StartManager.cs index 01b8dbb1..43a6f3fc 100644 --- a/Assembly-CSharp/Patches/StartManager.cs +++ b/Assembly-CSharp/Patches/StartManager.cs @@ -1,6 +1,9 @@ -using System.Collections; +using System; +using System.Collections; +using System.Threading; using MonoMod; using UnityEngine; +using UObject = UnityEngine.Object; // ReSharper disable All #pragma warning disable 1591, CS0649 @@ -12,6 +15,37 @@ namespace Modding.Patches [MonoModPatch("global::StartManager")] public class StartManager : global::StartManager { + private bool startedPreloading = false; + private MonoBehaviour modLoaderObj = null; + + private extern void orig_Awake(); + + private void Awake() + { + if (ModLoader.LoadState == ModLoader.ModLoadState.NotStarted) + { + Logger.APILogger.Log("Main menu loading"); + startedPreloading = true; + ModLoader.LoadState = ModLoader.ModLoadState.Started; + + GameObject obj = new GameObject(); + DontDestroyOnLoad(obj); + + // Preload reflection + new Thread(ReflectionHelper.PreloadCommonTypes).Start(); + + // NonBouncer does absolutely nothing, which makes it a good dummy to run the loader + modLoaderObj = obj.AddComponent(); + } + else + { + // Debug log because this is the expected code path + Logger.APILogger.LogDebug($"StartManager: Already begun mod loading (state {ModLoader.LoadState})"); + } + + orig_Awake(); + } + [MonoModIgnore] private bool confirmedLanguage; @@ -30,11 +64,18 @@ public class StartManager : global::StartManager [MonoModIgnore] private extern IEnumerator LanguageSettingDone(); + [MonoModReplace] private IEnumerator Start() { this.controllerImage.sprite = this.GetControllerSpriteForPlatform(this.platform); - AsyncOperation loadOperation = UnityEngine.SceneManagement.SceneManager.LoadSceneAsync("Menu_Title"); - loadOperation.allowSceneActivation = false; + + AsyncOperation loadOperation = null; + if (!startedPreloading) + { + loadOperation = UnityEngine.SceneManagement.SceneManager.LoadSceneAsync("Menu_Title"); + loadOperation.allowSceneActivation = false; + } + Platform.Current.SetSceneLoadState(true, false); bool showLanguageSelect = !this.CheckIsLanguageSet(); if (showLanguageSelect && Platform.Current.ShowLanguageSelect) { @@ -46,14 +87,73 @@ private IEnumerator Start() yield return base.StartCoroutine(this.LanguageSettingDone()); } - + TeamCherry.Localization.LanguageCode currentLanguage = (TeamCherry.Localization.LanguageCode) Language.Language.CurrentLanguage(); + while (!Platform.Current.IsSharedDataMounted) + { + yield return null; + } + bool flag = false; + string text; + if (TeamCherry.Localization.LocalizationProjectSettings.TryGetSavedLanguageCode(out text)) + { + TeamCherry.Localization.LanguageCode languageEnum = TeamCherry.Localization.LocalizationSettings.GetLanguageEnum(text); + if (currentLanguage != languageEnum) + { + flag = true; + } + } + if (flag) + { + Language.Language.LoadLanguage(); + ChangeFontByLanguage[] array = UObject.FindObjectsByType(FindObjectsSortMode.None); + for (int i = 0; i < array.Length; i++) + { + array[i].SetFont(); + } + SetTextMeshProGameText[] componentsInChildren = base.GetComponentsInChildren(true); + for (int i = 0; i < componentsInChildren.Length; i++) + { + componentsInChildren[i].UpdateText(); + } + LogoLanguage[] componentsInChildren2 = base.GetComponentsInChildren(true); + for (int i = 0; i < componentsInChildren2.Length; i++) + { + componentsInChildren2[i].SetSprite(); + } + } this.startManagerAnimator.SetBool("WillShowControllerNotice", false); this.startManagerAnimator.SetBool("WillShowQuote", true); StandaloneLoadingSpinner loadSpinner = UnityEngine.Object.Instantiate(this.loadSpinnerPrefab); loadSpinner.Setup(null); - loadOperation.allowSceneActivation = true; - yield return loadOperation; + bool didWaitForPlayerPrefs = false; + while (!Platform.Current.IsPlayerPrefsLoaded) + { + if (!didWaitForPlayerPrefs) + { + didWaitForPlayerPrefs = true; + Debug.LogFormat("Waiting for PlayerPrefs load...", Array.Empty()); + } + yield return null; + } + if (!didWaitForPlayerPrefs) + { + Debug.LogFormat("Didn't need to wait for PlayerPrefs load.", Array.Empty()); + } + else + { + Debug.LogFormat("Finished waiting for PlayerPrefs load.", Array.Empty()); + } + Platform.Current.SetSceneLoadState(true, true); + if (!startedPreloading) + { + loadOperation.allowSceneActivation = true; + yield return loadOperation; + } + else + { + modLoaderObj.StartCoroutine(ModLoader.LoadModsInit(modLoaderObj.gameObject)); + } yield break; } } diff --git a/Assembly-CSharp/Patches/TakeDamage.cs b/Assembly-CSharp/Patches/TakeDamage.cs index fdd497ae..5a55ff7e 100644 --- a/Assembly-CSharp/Patches/TakeDamage.cs +++ b/Assembly-CSharp/Patches/TakeDamage.cs @@ -22,7 +22,7 @@ public override void OnEnter() MagnitudeMultiplier = this.MagnitudeMultiplier.Value, MoveAngle = this.MoveAngle.Value, MoveDirection = this.MoveDirection.Value, - Multiplier = ((!this.Multiplier.IsNone) ? this.Multiplier.Value : 1f), + Multiplier = (this.Multiplier.IsNone ? 1f : this.Multiplier.Value), SpecialType = (SpecialTypes) this.SpecialType.Value, IsExtraDamage = false }; diff --git a/Assembly-CSharp/Patches/UIManager.cs b/Assembly-CSharp/Patches/UIManager.cs index 0de510dd..b79be999 100644 --- a/Assembly-CSharp/Patches/UIManager.cs +++ b/Assembly-CSharp/Patches/UIManager.cs @@ -194,10 +194,12 @@ public enum MainMenuState MAIN_MENU, OPTIONS_MENU, GAMEPAD_MENU, + ADVANCED_GAMEPAD_MENU, KEYBOARD_MENU, SAVE_PROFILES, AUDIO_MENU, VIDEO_MENU, + ADVANCED_VIDEO_MENU, EXIT_PROMPT, OVERSCAN_MENU, GAME_OPTIONS_MENU, diff --git a/Assembly-CSharp/tk2dForwarding.cs b/Assembly-CSharp/tk2dForwarding.cs new file mode 100644 index 00000000..c61eb2e7 --- /dev/null +++ b/Assembly-CSharp/tk2dForwarding.cs @@ -0,0 +1,56 @@ +using System.Runtime.CompilerServices; + +// for backwards compatibility, done by hand in PostPatcher +[assembly:TypeForwardedTo(typeof(tk2dAnimatedSprite))] +[assembly:TypeForwardedTo(typeof(tk2dAssetPlatform))] +[assembly:TypeForwardedTo(typeof(tk2dBaseSprite))] +[assembly:TypeForwardedTo(typeof(tk2dBatchedSprite))] +[assembly:TypeForwardedTo(typeof(tk2dButton))] +[assembly:TypeForwardedTo(typeof(tk2dCamera))] +[assembly:TypeForwardedTo(typeof(tk2dCameraAnchor))] +[assembly:TypeForwardedTo(typeof(tk2dCameraResolutionOverride))] +[assembly:TypeForwardedTo(typeof(tk2dCameraSettings))] +[assembly:TypeForwardedTo(typeof(tk2dClippedSprite))] +[assembly:TypeForwardedTo(typeof(tk2dCollider2DData))] +[assembly:TypeForwardedTo(typeof(tk2dEditorSpriteDataUnloader))] +[assembly:TypeForwardedTo(typeof(tk2dFont))] +[assembly:TypeForwardedTo(typeof(tk2dFontChar))] +[assembly:TypeForwardedTo(typeof(tk2dFontData))] +[assembly:TypeForwardedTo(typeof(tk2dFontKerning))] +[assembly:TypeForwardedTo(typeof(Tk2dGlobalEvents))] +[assembly:TypeForwardedTo(typeof(tk2dLinkedSpriteCollection))] +[assembly:TypeForwardedTo(typeof(tk2dPixelPerfectHelper))] +[assembly:TypeForwardedTo(typeof(tk2dResource))] +[assembly:TypeForwardedTo(typeof(tk2dResourceTocEntry))] +[assembly:TypeForwardedTo(typeof(tk2dSlicedSprite))] +[assembly:TypeForwardedTo(typeof(tk2dSprite))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteAnimation))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteAnimationClip))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteAnimationFrame))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteAnimator))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteAttachPoint))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollection))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollectionData))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollectionDefault))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollectionDefinition))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollectionFont))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollectionPlatform))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteCollectionSize))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteColliderDefinition))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteColliderIsland))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteDefinition))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteFromTexture))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteGeomGen))] +[assembly:TypeForwardedTo(typeof(Tk2dSpriteSetKeywords))] +[assembly:TypeForwardedTo(typeof(tk2dSpriteSheetSource))] +[assembly:TypeForwardedTo(typeof(tk2dStaticSpriteBatcher))] +[assembly:TypeForwardedTo(typeof(tk2dSystem))] +[assembly:TypeForwardedTo(typeof(tk2dTextGeomGen))] +[assembly:TypeForwardedTo(typeof(tk2dTextMesh))] +[assembly:TypeForwardedTo(typeof(tk2dTextMeshData))] +[assembly:TypeForwardedTo(typeof(tk2dTiledSprite))] +[assembly:TypeForwardedTo(typeof(tk2dTileFlags))] +[assembly:TypeForwardedTo(typeof(tk2dTileMap))] +[assembly:TypeForwardedTo(typeof(tk2dTileMapData))] +[assembly:TypeForwardedTo(typeof(tk2dUpdateManager))] +[assembly:TypeForwardedTo(typeof(tk2dUtil))] diff --git a/HollowKnight.Modding.API.sln b/HollowKnight.Modding.API.sln index a0c12c01..085230af 100644 --- a/HollowKnight.Modding.API.sln +++ b/HollowKnight.Modding.API.sln @@ -10,6 +10,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrePatcher", "PrePatcher\PrePatcher.csproj", "{E06FBDDA-0A27-45EC-AC28-259C23715C50}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostPatcher", "PostPatcher\PostPatcher.csproj", "{CE61CBC8-9373-4C5B-BA15-DED48888DB73}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -24,6 +26,10 @@ Global {E06FBDDA-0A27-45EC-AC28-259C23715C50}.Debug|Any CPU.Build.0 = Debug|Any CPU {E06FBDDA-0A27-45EC-AC28-259C23715C50}.Release|Any CPU.ActiveCfg = Release|Any CPU {E06FBDDA-0A27-45EC-AC28-259C23715C50}.Release|Any CPU.Build.0 = Release|Any CPU + {CE61CBC8-9373-4C5B-BA15-DED48888DB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE61CBC8-9373-4C5B-BA15-DED48888DB73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE61CBC8-9373-4C5B-BA15-DED48888DB73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE61CBC8-9373-4C5B-BA15-DED48888DB73}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PostPatcher/App.config b/PostPatcher/App.config new file mode 100644 index 00000000..56efbc7b --- /dev/null +++ b/PostPatcher/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/PostPatcher/PostPatcher.csproj b/PostPatcher/PostPatcher.csproj new file mode 100644 index 00000000..477e2a48 --- /dev/null +++ b/PostPatcher/PostPatcher.csproj @@ -0,0 +1,41 @@ + + + Exe + net472 + true + PostPatcher + PostPatcher + Copyright © 2019 + bin\$(Configuration)\ + 9 + + + + full + + + + pdbonly + + + + + + + + + + + + + + + + + + + + all + + + diff --git a/PostPatcher/Program.cs b/PostPatcher/Program.cs new file mode 100644 index 00000000..fde8a782 --- /dev/null +++ b/PostPatcher/Program.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using Mono.Cecil; +using Mono.Cecil.Cil; +using Mono.Cecil.Rocks; +using MethodAttributes = Mono.Cecil.MethodAttributes; + +namespace Postpatcher +{ + // ReSharper disable once ClassNeverInstantiated.Global + internal class Program + { + private static void Main(string[] args) + { + if (args.Length < 2) + { + Console.WriteLine("Usage: PostPatcher.exe "); + return; + } + + int changes = 0; + + using AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(args[0]); + + ForwardTk2dTypes(assembly); + + assembly.Write(args[1]); + + Console.WriteLine("Changed " + changes + " get/set calls"); + } + + private static void ForwardTk2dTypes(AssemblyDefinition assembly) + { + AssemblyNameReference assemblyNameReference = new AssemblyNameReference("TeamCherry.TK2D", null); + foreach (var typeName in new string[] + { + "tk2dAnimatedSprite", "tk2dAssetPlatform", "tk2dBaseSprite", "tk2dBatchedSprite", "tk2dButton", "tk2dCamera", "tk2dCameraAnchor", + "tk2dCameraResolutionOverride", "tk2dCameraSettings", "tk2dClippedSprite", "tk2dCollider2DData", "tk2dEditorSpriteDataUnloader", + "tk2dFont", "tk2dFontChar", "tk2dFontData", "tk2dFontKerning", "Tk2dGlobalEvents", "tk2dLinkedSpriteCollection", + "tk2dPixelPerfectHelper", "tk2dResource", "tk2dResourceTocEntry", "tk2dSlicedSprite", "tk2dSprite", "tk2dSpriteAnimation", + "tk2dSpriteAnimationClip", "tk2dSpriteAnimationFrame", "tk2dSpriteAnimator", "tk2dSpriteAttachPoint", "tk2dSpriteCollection", + "tk2dSpriteCollectionData", "tk2dSpriteCollectionDefault", "tk2dSpriteCollectionDefinition", "tk2dSpriteCollectionFont", + "tk2dSpriteCollectionPlatform", "tk2dSpriteCollectionSize", "tk2dSpriteColliderDefinition", "tk2dSpriteColliderIsland", + "tk2dSpriteDefinition", "tk2dSpriteFromTexture", "tk2dSpriteGeomGen", "Tk2dSpriteSetKeywords", "tk2dSpriteSheetSource", + "tk2dStaticSpriteBatcher", "tk2dSystem", "tk2dTextGeomGen", "tk2dTextMesh", "tk2dTextMeshData", "tk2dTiledSprite", "tk2dTileFlags", + "tk2dTileMap", "tk2dTileMapData", "tk2dUpdateManager", "tk2dUtil" + }) + { + var forwardedType = assembly.MainModule.ImportReference + ( + assembly.MainModule.AssemblyResolver + .Resolve(assemblyNameReference) + .MainModule.GetType(typeName) + ); + assembly.MainModule.ExportedTypes.Add + ( + new ExportedType + ( + "", + typeName, + assembly.MainModule, + assembly.Name + ) + { + Attributes = TypeAttributes.Public | TypeAttributes.Forwarder, + Scope = forwardedType.Scope + } + ); + } + } + } +} \ No newline at end of file diff --git a/PostPatcher/Properties/AssemblyInfo.cs b/PostPatcher/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..5010e0c8 --- /dev/null +++ b/PostPatcher/Properties/AssemblyInfo.cs @@ -0,0 +1,9 @@ +using System.Runtime.InteropServices; + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("e06fbdda-0a27-45ec-ac28-259c23715c51")] diff --git a/hollowknight.version b/hollowknight.version index 8a7a4d76..68c21b76 100644 --- a/hollowknight.version +++ b/hollowknight.version @@ -1 +1 @@ -1.5.78.11833 \ No newline at end of file +1.5.12459 \ No newline at end of file