Skip to content

Commit

Permalink
Fixed settings bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@taz030485
taz030485 committed Aug 30, 2018
1 parent 3cb5514 commit d48f2f1
Show file tree
Hide file tree
Showing 13 changed files with 154 additions and 85 deletions.
2 changes: 1 addition & 1 deletion BeatSaberTweaks/Plugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class Plugin : IPlugin
#if NewUI
public string Version => "3.4";
#else
public string Version => "3.3.1";
public string Version => "3.3.2";
#endif

private bool _init = false;
Expand Down
16 changes: 2 additions & 14 deletions BeatSaberTweaks/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,13 @@ public static string SettingsPath()

public static void Load()
{
// I'm a dumbass and spelled the filename wrong
string oldPath = Path.Combine(Environment.CurrentDirectory, "Tweask.cfg");
if (File.Exists(oldPath))
{
string dataAsJson = File.ReadAllText(oldPath);
instance = JsonUtility.FromJson<Settings>(dataAsJson);
File.Delete(oldPath);
return;
}
instance = new Settings();

string filePath = SettingsPath();
if (File.Exists(filePath))
{
string dataAsJson = File.ReadAllText(filePath);
instance = JsonUtility.FromJson<Settings>(dataAsJson);
}
else
{
instance = new Settings();
JsonUtility.FromJsonOverwrite(dataAsJson, instance);
}
}

Expand Down
26 changes: 13 additions & 13 deletions BeatSaberTweaks/TweakManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ public class TweakManager : MonoBehaviour
MainMenuViewController _mainMenuViewController = null;
SimpleDialogPromptViewController prompt = null;

List<string> warningPlugins = new List<string>();

static MainGameSceneSetupData _mainGameSceneSetupData = null;

float carTime = 0;
Expand Down Expand Up @@ -117,19 +115,20 @@ public static bool IsPartyMode()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
//Console.WriteLine("Active: " + scene.name);
if (SettingsUI.isMenuScene(scene))
try
{
_mainMenuViewController = Resources.FindObjectsOfTypeAll<MainMenuViewController>().First();
var _menuMasterViewController = Resources.FindObjectsOfTypeAll<StandardLevelSelectionFlowCoordinator>().First();
prompt = ReflectionUtil.GetPrivateField<SimpleDialogPromptViewController>(_menuMasterViewController, "_simpleDialogPromptViewController");

if (warningPlugins.Count > 0)
//Console.WriteLine("Active: " + scene.name);
if (SettingsUI.isMenuScene(scene))
{
StartCoroutine(LoadWarning());
}
_mainMenuViewController = Resources.FindObjectsOfTypeAll<MainMenuViewController>().First();
var _menuMasterViewController = Resources.FindObjectsOfTypeAll<StandardLevelSelectionFlowCoordinator>().First();
prompt = ReflectionUtil.GetPrivateField<SimpleDialogPromptViewController>(_menuMasterViewController, "_simpleDialogPromptViewController");

CreateUI();
CreateUI();
}
}catch (Exception e)
{
Console.WriteLine("Tweaks (Manager) done fucked up: " + e);
}
}

Expand Down Expand Up @@ -247,7 +246,7 @@ public static void LogComponents(Transform t, bool includeScipts = false, string
LogComponents(child, includeScipts, prefix + "|");
}
}

/*
IEnumerator LoadWarning()
{
string warningText = "The folling plugins are obsolete:\n";
Expand Down Expand Up @@ -289,6 +288,7 @@ private void Warning_didFinishEvent(SimpleDialogPromptViewController viewControl
Application.Quit();
}
}
*/

private void Prompt_didFinishEvent(SimpleDialogPromptViewController viewController, bool ok)
{
Expand Down
47 changes: 27 additions & 20 deletions BeatSaberTweaks/Tweaks/InGameClock.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,39 @@ public void Awake()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (SettingsUI.isMenuScene(scene) && ClockCanvas == null)
try
{
ClockCanvas = new GameObject();
DontDestroyOnLoad(ClockCanvas);
ClockCanvas.AddComponent<Canvas>();
if (SettingsUI.isMenuScene(scene) && ClockCanvas == null)
{
ClockCanvas = new GameObject();
DontDestroyOnLoad(ClockCanvas);
ClockCanvas.AddComponent<Canvas>();

ClockCanvas.name = "Clock Canvas";
ClockCanvas.transform.position = timePos;
ClockCanvas.transform.rotation = timeRot;
ClockCanvas.transform.localScale = new Vector3(0.02f, 0.02f, 1.0f);
ClockCanvas.name = "Clock Canvas";
ClockCanvas.transform.position = timePos;
ClockCanvas.transform.rotation = timeRot;
ClockCanvas.transform.localScale = new Vector3(0.02f, 0.02f, 1.0f);

var textGO = new GameObject();
textGO.transform.SetParent(ClockCanvas.transform);
textGO.transform.localPosition = Vector3.zero;
textGO.transform.localRotation = Quaternion.identity;
textGO.transform.localScale = Vector3.one;
var textGO = new GameObject();
textGO.transform.SetParent(ClockCanvas.transform);
textGO.transform.localPosition = Vector3.zero;
textGO.transform.localRotation = Quaternion.identity;
textGO.transform.localScale = Vector3.one;

text = textGO.AddComponent<TextMeshProUGUI>();
text.name = "Clock Text";
text.alignment = TextAlignmentOptions.Center;
text.fontSize = timeSize;
text.text = "";
text = textGO.AddComponent<TextMeshProUGUI>();
text.name = "Clock Text";
text.alignment = TextAlignmentOptions.Center;
text.fontSize = timeSize;
text.text = "";

UpdateClock();
UpdateClock();

ClockCanvas.SetActive(Settings.ShowClock);
ClockCanvas.SetActive(Settings.ShowClock);
}
}
catch (Exception e)
{
Console.WriteLine("Tweaks (Clock) done fucked up: " + e);
}
}

Expand Down
21 changes: 14 additions & 7 deletions BeatSaberTweaks/Tweaks/MenuBGVolume.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,25 @@ public static void UpdateBGVolume()

private void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (SettingsUI.isMenuScene(scene))
try
{
player = Resources.FindObjectsOfTypeAll<SongPreviewPlayer>().FirstOrDefault();
if (normalVolume == 0)
if (SettingsUI.isMenuScene(scene))
{
normalVolume = ReflectionUtil.GetPrivateField<float>(player, "_ambientVolumeScale");
player = Resources.FindObjectsOfTypeAll<SongPreviewPlayer>().FirstOrDefault();
if (normalVolume == 0)
{
normalVolume = ReflectionUtil.GetPrivateField<float>(player, "_ambientVolumeScale");
}
UpdateBGVolume();
}
else
{
player = null;
}
UpdateBGVolume();
}
else
catch (Exception e)
{
player = null;
Console.WriteLine("Tweaks (MenuMusic) done fucked up: " + e);
}
}
}
Expand Down
15 changes: 13 additions & 2 deletions BeatSaberTweaks/Tweaks/MoveEnergyBar.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,20 @@ public void Awake()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (Settings.MoveEnergyBar && SettingsUI.isGameScene(scene))
try
{
SceneEvents.GetSceneLoader().loadingDidFinishEvent += LoadingDidFinishEvent;
if (Settings.MoveEnergyBar && SettingsUI.isGameScene(scene))
{
var loader = SceneEvents.GetSceneLoader();
if (loader != null)
{
loader.loadingDidFinishEvent += LoadingDidFinishEvent;
}
}
}
catch (Exception e)
{
Console.WriteLine("Tweaks (EnergyBar) done fucked up: " + e);
}
}

Expand Down
15 changes: 13 additions & 2 deletions BeatSaberTweaks/Tweaks/NoteHitVolume.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,20 @@ public void Awake()

private void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (SettingsUI.isGameScene(scene))
try
{
if (SettingsUI.isGameScene(scene))
{
var loader = SceneEvents.GetSceneLoader();
if (loader != null)
{
loader.loadingDidFinishEvent += LoadingDidFinishEvent;
}
}
}
catch (Exception e)
{
SceneEvents.GetSceneLoader().loadingDidFinishEvent += LoadingDidFinishEvent;
Console.WriteLine("Tweaks (NoteVolume) done fucked up: " + e);
}
}

Expand Down
33 changes: 22 additions & 11 deletions BeatSaberTweaks/Tweaks/OneColour.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,29 @@ public void Awake()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
//if (SettingsUI.isMenuScene(scene))
// {
// if (model == null)
// {
// model = Resources.FindObjectsOfTypeAll<MainSettingsModel>().FirstOrDefault();
// rumble = model.controllersRumbleEnabled;
// }
// model.controllersRumbleEnabled = rumble;
// }
if (SettingsUI.isGameScene(scene) && Settings.OneColour && TweakManager.IsPartyMode())
try
{
//if (SettingsUI.isMenuScene(scene))
// {
// if (model == null)
// {
// model = Resources.FindObjectsOfTypeAll<MainSettingsModel>().FirstOrDefault();
// rumble = model.controllersRumbleEnabled;
// }
// model.controllersRumbleEnabled = rumble;
// }
if (SettingsUI.isGameScene(scene) && Settings.OneColour && TweakManager.IsPartyMode())
{
var loader = SceneEvents.GetSceneLoader();
if (loader != null)
{
loader.loadingDidFinishEvent += LoadingDidFinishEvent;
}
}
}
catch (Exception e)
{
SceneEvents.GetSceneLoader().loadingDidFinishEvent += LoadingDidFinishEvent;
Console.WriteLine("Tweaks (OneColour) done fucked up: " + e);
}
}

Expand Down
15 changes: 13 additions & 2 deletions BeatSaberTweaks/Tweaks/ScoreMover.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,20 @@ public void Awake()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (Settings.MoveScore && SettingsUI.isGameScene(scene))
try
{
SceneEvents.GetSceneLoader().loadingDidFinishEvent += LoadingDidFinishEvent;
if (Settings.MoveScore && SettingsUI.isGameScene(scene))
{
var loader = SceneEvents.GetSceneLoader();
if (loader != null)
{
loader.loadingDidFinishEvent += LoadingDidFinishEvent;
}
}
}
catch (Exception e)
{
Console.WriteLine("Tweaks (MoveScore) done fucked up: " + e);
}
}

Expand Down
17 changes: 14 additions & 3 deletions BeatSaberTweaks/Tweaks/SongDataModifer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,24 @@ public void Awake()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (SettingsUI.isGameScene(scene))
try
{
if (TweakManager.IsPartyMode() && Settings.OverrideJumpSpeed)
if (SettingsUI.isGameScene(scene))
{
SceneEvents.GetSceneLoader().loadingDidFinishEvent += LoadingDidFinishEvent;
if (TweakManager.IsPartyMode() && Settings.OverrideJumpSpeed)
{
var loader = SceneEvents.GetSceneLoader();
if (loader != null)
{
loader.loadingDidFinishEvent += LoadingDidFinishEvent;
}
}
}
}
catch (Exception e)
{
Console.WriteLine("Tweaks (SongDataModifer) done fucked up: " + e);
}
}

private void LoadingDidFinishEvent()
Expand Down
25 changes: 16 additions & 9 deletions BeatSaberTweaks/Utilites/SettingsUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,16 +215,23 @@ public void Awake()

public void SceneManagerOnActiveSceneChanged(Scene arg0, Scene scene)
{
if (isMenuScene(scene))
try
{
SetupUI();

//var testSub = CreateSubMenu("Test 1");
//var testSub2 = CreateSubMenu("Test 2");
//var testSub3 = CreateSubMenu("Test 3");
//var testSub4 = CreateSubMenu("Test 4");
//var testSub5 = CreateSubMenu("Test 5");
//var testSub6 = CreateSubMenu("Test 6");
if (isMenuScene(scene))
{
SetupUI();

//var testSub = CreateSubMenu("Test 1");
//var testSub2 = CreateSubMenu("Test 2");
//var testSub3 = CreateSubMenu("Test 3");
//var testSub4 = CreateSubMenu("Test 4");
//var testSub5 = CreateSubMenu("Test 5");
//var testSub6 = CreateSubMenu("Test 6");
}
}
catch (Exception e)
{
Console.WriteLine("SettingsUI done fucked up: " + e);
}
}

Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ The following options are changed by editing Tweaks.cfg
- Score Position

# Changes
3.3.2
- Fixed settings loading bug

3.3.1
- Fixed a major bug

Expand Down
4 changes: 3 additions & 1 deletion TODO.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Add one saber option to one colour in tweaks
Add healterh warning screen skip
Controller virbation is being weird
Controller virbation is being weird
Option to hide UI elements (Combo, score, etc)
Hide UI elements (combo, score, etc)

0 comments on commit d48f2f1

Please sign in to comment.