Skip to content

Updated some namespaces and dependencies #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GyVn87 wants to merge 1 commit into from
Closed

Updated some namespaces and dependencies #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Assembly-CSharp/Assembly-CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<Reference Include="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<HintPath>..\override\mscorlib.dll</HintPath>
</Reference>
<Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<Reference Include="netstandard">
<HintPath>../Vanilla/netstandard.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null">
Expand All @@ -158,6 +158,15 @@
<HintPath>../Vanilla/PlayMaker.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="TeamCherry.Localization">
<HintPath>../Vanilla/TeamCherry.Localization.dll</HintPath>
</Reference>
<Reference Include="TeamCherry.SharedUtils">
<HintPath>..\Vanilla\TeamCherry.SharedUtils.dll</HintPath>
</Reference>
<Reference Include="TeamCherry.TK2D">
<HintPath>..\Vanilla\TeamCherry.TK2D.dll</HintPath>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../Vanilla/UnityEngine.dll</HintPath>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion Assembly-CSharp/Menu/MenuUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using UnityEngine;
using UnityEngine.UI;
using Patch = Modding.Patches;
using Lang = Language.Language;
using Lang = TeamCherry.Localization.Language;

Check failure on line 11 in Assembly-CSharp/Menu/MenuUtils.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'Localization' does not exist in the namespace 'TeamCherry' (are you missing an assembly reference?)

Check failure on line 11 in Assembly-CSharp/Menu/MenuUtils.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'Localization' does not exist in the namespace 'TeamCherry' (are you missing an assembly reference?)


namespace Modding.Menu
Expand Down
2 changes: 1 addition & 1 deletion Assembly-CSharp/Mod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public virtual void Initialize() { }
/// change the text of the button to jump to this mod's menu.
/// </summary>
/// <returns></returns>
public virtual string GetMenuButtonText() => $"{GetName()} {Language.Language.Get("MAIN_OPTIONS", "MainMenu")}";
public virtual string GetMenuButtonText() => $"{GetName()} {TeamCherry.Localization.Language.Get("MAIN_OPTIONS", "MainMenu")}";

private void HookSaveMethods()
{
Expand Down
2 changes: 1 addition & 1 deletion Assembly-CSharp/ModListMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using UnityEngine.UI;
using static Modding.ModLoader;
using Patch = Modding.Patches;
using Lang = Language.Language;
using Lang = TeamCherry.Localization.Language;

Check failure on line 9 in Assembly-CSharp/ModListMenu.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'Localization' does not exist in the namespace 'TeamCherry' (are you missing an assembly reference?)

Check failure on line 9 in Assembly-CSharp/ModListMenu.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'Localization' does not exist in the namespace 'TeamCherry' (are you missing an assembly reference?)

namespace Modding
{
Expand Down
1 change: 1 addition & 0 deletions Assembly-CSharp/Patches/GameManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Newtonsoft.Json;
using UnityEngine;
using UnityEngine.SceneManagement;
using TeamCherry.SharedUtils;

Check failure on line 11 in Assembly-CSharp/Patches/GameManager.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'SharedUtils' does not exist in the namespace 'TeamCherry' (are you missing an assembly reference?)

Check failure on line 11 in Assembly-CSharp/Patches/GameManager.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'SharedUtils' does not exist in the namespace 'TeamCherry' (are you missing an assembly reference?)

// ReSharper disable all
#pragma warning disable 1591, 649, 414, 169, CS0108, CS0626
Expand Down
5 changes: 4 additions & 1 deletion Assembly-CSharp/Patches/HeroController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,9 @@
[MonoModIgnore]
private float nailChargeTimer;

[MonoModIgnore]
private HeroVibrationController vibrationCtrl;

Check failure on line 491 in Assembly-CSharp/Patches/HeroController.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'HeroVibrationController' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 491 in Assembly-CSharp/Patches/HeroController.cs

View workflow job for this annotation

GitHub Actions / pr-build / build (windows, main) 

The type or namespace name 'HeroVibrationController' could not be found (are you missing a using directive or an assembly reference?)

[MonoModIgnore]
private extern IEnumerator Die();

Expand Down Expand Up @@ -638,7 +641,7 @@
if (this.cState.wallSliding)
{
this.cState.wallSliding = false;
this.wallSlideVibrationPlayer.Stop();
this.vibrationCtrl.StopWallSlide();
}

if (this.cState.touchingWall)
Expand Down
Loading