Skip to content

Commit

Permalink
use explicit private modifiers everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@foglio1024
foglio1024 committed Apr 10, 2024
1 parent ec7fcc5 commit 3d750f0
Show file tree
Hide file tree
Showing 280 changed files with 2,062 additions and 2,020 deletions.
24 changes: 12 additions & 12 deletions TCC.Core/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public partial class App
{
public static event Action? ReadyEvent;

static bool _restarted;
static bool _running;
static Mutex? _mutex;
private static bool _restarted;
private static bool _running;
private static Mutex? _mutex;

public static bool Beta => GlobalFlags.IsBeta;

Expand All @@ -63,7 +63,7 @@ public partial class App

public static bool Loading { get; private set; }
public static bool ToolboxMode { get; private set; }
static bool FirstStart { get; set; }
private static bool FirstStart { get; set; }

public static Random Random { get; } = new(DateTime.Now.DayOfYear + DateTime.Now.Year +
DateTime.Now.Minute + DateTime.Now.Second +
Expand All @@ -73,8 +73,7 @@ public partial class App
public static SettingsContainer Settings { get; private set; } = null!;



async void OnStartup(object sender, StartupEventArgs e)
private async void OnStartup(object sender, StartupEventArgs e)
{
_running = true;
AppVersion = TccUtils.GetTccVersion();
Expand Down Expand Up @@ -128,7 +127,8 @@ async void OnStartup(object sender, StartupEventArgs e)
//TCC.Debug.Tester.AddAbnormalityToGroupMember(memberId: 1, abnormalId: 101301);
//Tester.StartItemCooldown(444);
}
static async Task Setup()

private static async Task Setup()
{
TccUtils.SetAlignment();

Expand Down Expand Up @@ -208,7 +208,7 @@ static async Task Setup()
}
}

static void ParseStartupArgs(IList<string> args)
private static void ParseStartupArgs(IList<string> args)
{
// --toolbox
ToolboxMode = args.IndexOf("--toolbox") != -1;
Expand Down Expand Up @@ -253,7 +253,7 @@ public static void Close(bool releaseMutex = true, int code = 0)
Environment.Exit(code);
}

static bool IsAlreadyRunning()
private static bool IsAlreadyRunning()
{
_mutex = new Mutex(true, nameof(TCC), out var createdNew);
if (createdNew || !_restarted) return !createdNew;
Expand All @@ -277,7 +277,7 @@ public static void ReleaseMutex()
});
}

static void LoadModules()
private static void LoadModules()
{
BaseDispatcher.Invoke(() =>
{
Expand Down Expand Up @@ -328,7 +328,7 @@ public static void WaitDispatchersShutdown()
//Log.CW("All dispatchers shut down.");
}

static void StartDispatcherWatcher()
private static void StartDispatcherWatcher()
{
const int limit = 60000;

Expand Down Expand Up @@ -371,7 +371,7 @@ static void StartDispatcherWatcher()

#region Misc

static FUBH? _fubh;
private static FUBH? _fubh;

public static bool FI { get; } = DateTime.Now >= TimeUtils.FromUnixTime(1567123200) &&
DateTime.Now < TimeUtils.FromUnixTime(1567209600);
Expand Down
20 changes: 10 additions & 10 deletions TCC.Core/Data/Abnormalities/AbnormalityDuration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ namespace TCC.Data.Abnormalities;

public class AbnormalityDuration : ThreadSafeObservableObject, IDisposable
{
readonly Timer _timer;
uint _duration;
int _stacks;
double _durationLeft;
bool _isTimerDisposed;
DateTime _startTime;
DateTime _endTime;
bool _isHidden;
private readonly Timer _timer;
private uint _duration;
private int _stacks;
private double _durationLeft;
private bool _isTimerDisposed;
private DateTime _startTime;
private DateTime _endTime;
private bool _isHidden;

public event Action? Refreshed;

Expand Down Expand Up @@ -45,7 +45,7 @@ public bool IsHidden
public bool CanBeHidden { get; set; }
public DateTime TimeOfArrival { get; } = DateTime.Now;

AbnormalityDuration(Abnormality b)
private AbnormalityDuration(Abnormality b)
{
Abnormality = b;
_timer = new Timer { Interval = 900 };
Expand Down Expand Up @@ -77,7 +77,7 @@ public AbnormalityDuration(Abnormality b, uint d, int s, ulong t, Dispatcher dis
ObjectTracker.Unregister(GetType());
}

void DecreaseDuration(object? sender, EventArgs e)
private void DecreaseDuration(object? sender, EventArgs e)
{
DurationLeft = (_endTime - DateTime.Now).TotalMilliseconds;
if (DurationLeft < 0) DurationLeft = 0;
Expand Down
33 changes: 17 additions & 16 deletions TCC.Core/Data/Abnormalities/ArcherAbnormalityTracker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ namespace TCC.Data.Abnormalities;

public class ArcherAbnormalityTracker : AbnormalityTracker
{
const uint FocusId = 601400;
const uint FocusXId = 601450;
static readonly uint[] WindsongIds = [602101, 602221 /*, 602107, 602108, 602227*/];
static readonly uint[] WindWalkIds = [602102, 602103];
private const uint FocusId = 601400;
private const uint FocusXId = 601450;
private static readonly uint[] WindsongIds = [602101, 602221 /*, 602107, 602108, 602227*/];

private static readonly uint[] WindWalkIds = [602102, 602103];
//private const string WindsongIconName = "icon_skills.breeze_tex";

public override void OnAbnormalityBegin(S_ABNORMALITY_BEGIN p)
Expand Down Expand Up @@ -42,23 +43,23 @@ public override void OnAbnormalityEnd(S_ABNORMALITY_END p)
CheckGaleStepsEnd(p);
}

static void CheckWindsongBegin(S_ABNORMALITY_BEGIN p)
private static void CheckWindsongBegin(S_ABNORMALITY_BEGIN p)
{
if (!WindsongIds.Contains(p.AbnormalityId)) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Windsong.StartEffect(p.Duration);
}

static void CheckWindsongRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckWindsongRefresh(S_ABNORMALITY_REFRESH p)
{
if (!WindsongIds.Contains(p.AbnormalityId)) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Windsong.RefreshEffect(p.Duration);
}

static void CheckWindsongEnd(S_ABNORMALITY_END p)
private static void CheckWindsongEnd(S_ABNORMALITY_END p)
{
if (!WindsongIds.Contains(p.AbnormalityId)) return;
//if (!CheckByIconName(p.AbnormalityId, WindsongIconName)) return; //TODO: temporary
Expand All @@ -67,7 +68,7 @@ static void CheckWindsongEnd(S_ABNORMALITY_END p)
vm.Windsong.StopEffect();
}

static void CheckGaleStepsBegin(S_ABNORMALITY_BEGIN p)
private static void CheckGaleStepsBegin(S_ABNORMALITY_BEGIN p)
{
if (!WindWalkIds.Contains(p.AbnormalityId)) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;
Expand All @@ -76,7 +77,7 @@ static void CheckGaleStepsBegin(S_ABNORMALITY_BEGIN p)
vm.WindWalkProc = true;
}

static void CheckWindWalkRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckWindWalkRefresh(S_ABNORMALITY_REFRESH p)
{
if (!WindWalkIds.Contains(p.AbnormalityId)) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;
Expand All @@ -85,7 +86,7 @@ static void CheckWindWalkRefresh(S_ABNORMALITY_REFRESH p)
vm.WindWalkProc = true;
}

static void CheckGaleStepsEnd(S_ABNORMALITY_END p)
private static void CheckGaleStepsEnd(S_ABNORMALITY_END p)
{
if (!WindWalkIds.Contains(p.AbnormalityId)) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;
Expand All @@ -94,47 +95,47 @@ static void CheckGaleStepsEnd(S_ABNORMALITY_END p)
vm.WindWalkProc = false;
}

static void CheckFocusBegin(S_ABNORMALITY_BEGIN p)
private static void CheckFocusBegin(S_ABNORMALITY_BEGIN p)
{
if (p.AbnormalityId != FocusId) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Focus.StartFocus(p.Duration);
}

static void CheckFocusRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckFocusRefresh(S_ABNORMALITY_REFRESH p)
{
if (p.AbnormalityId != FocusId) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Focus.SetFocusStacks(p.Stacks, p.Duration);
}

static void CheckFocusRefresh(S_ABNORMALITY_END p)
private static void CheckFocusRefresh(S_ABNORMALITY_END p)
{
if (p.AbnormalityId != FocusId) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Focus.StopFocus();
}

static void CheckFocusXBegin(S_ABNORMALITY_BEGIN p)
private static void CheckFocusXBegin(S_ABNORMALITY_BEGIN p)
{
if (p.AbnormalityId != FocusXId) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Focus.StartFocusX(p.Duration);
}

static void CheckFocusXRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckFocusXRefresh(S_ABNORMALITY_REFRESH p)
{
if (p.AbnormalityId != FocusXId) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;

vm.Focus.StartFocusX(p.Duration);
}

static void CheckFocusXRefresh(S_ABNORMALITY_END p)
private static void CheckFocusXRefresh(S_ABNORMALITY_END p)
{
if (p.AbnormalityId != FocusXId) return;
if (!TryGetClassViewModel<ArcherLayoutViewModel>(out var vm)) return;
Expand Down
16 changes: 8 additions & 8 deletions TCC.Core/Data/Abnormalities/BerserkerAbnormalityTracker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ namespace TCC.Data.Abnormalities;

public class BerserkerAbnormalityTracker : AbnormalityTracker
{
const int BloodlustId = 400701;
const int FieryRageId = 400105;
const int UnleashId = 401705;
const int SinisterDexter = 401706;
const int Rampage = 401710;
private const int BloodlustId = 400701;
private const int FieryRageId = 400105;
private const int UnleashId = 401705;
private const int SinisterDexter = 401706;
private const int Rampage = 401710;

public override void OnAbnormalityBegin(S_ABNORMALITY_BEGIN p)
{
Expand Down Expand Up @@ -83,7 +83,7 @@ public override void OnAbnormalityEnd(S_ABNORMALITY_END p)
}
}

static void CheckUnleashAbnormalsBegin(S_ABNORMALITY_BEGIN p)
private static void CheckUnleashAbnormalsBegin(S_ABNORMALITY_BEGIN p)
{
if (!TryGetClassViewModel<BerserkerLayoutViewModel>(out var vm)) return;

Expand All @@ -101,7 +101,7 @@ static void CheckUnleashAbnormalsBegin(S_ABNORMALITY_BEGIN p)
}
}

static void CheckUnleashAbnormalsRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckUnleashAbnormalsRefresh(S_ABNORMALITY_REFRESH p)
{
if (!TryGetClassViewModel<BerserkerLayoutViewModel>(out var vm)) return;

Expand All @@ -119,7 +119,7 @@ static void CheckUnleashAbnormalsRefresh(S_ABNORMALITY_REFRESH p)
}
}

static void CheckUnleashAbnormalsEnd(S_ABNORMALITY_END p)
private static void CheckUnleashAbnormalsEnd(S_ABNORMALITY_END p)
{
if (!TryGetClassViewModel<BerserkerLayoutViewModel>(out var vm)) return;

Expand Down
16 changes: 8 additions & 8 deletions TCC.Core/Data/Abnormalities/BrawlerAbnormalityTracker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ namespace TCC.Data.Abnormalities;

public class BrawlerAbnormalityTracker : AbnormalityTracker
{
const int GrowingFuryId = 10153040;
const int CounterGlyphId = 31020;
private const int GrowingFuryId = 10153040;
private const int CounterGlyphId = 31020;

public override void OnAbnormalityBegin(S_ABNORMALITY_BEGIN p)
{
Expand All @@ -32,31 +32,31 @@ public override void OnAbnormalityEnd(S_ABNORMALITY_END p)
CheckCounterProcEnd(p);
}

static void CheckGrowingFuryBegin(S_ABNORMALITY_BEGIN p)
private static void CheckGrowingFuryBegin(S_ABNORMALITY_BEGIN p)
{
if (p.AbnormalityId != GrowingFuryId) return;
if (!TryGetClassViewModel<BrawlerLayoutViewModel>(out var vm)) return;

vm.IsGfOn = true;
}

static void CheckGrowingFuryRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckGrowingFuryRefresh(S_ABNORMALITY_REFRESH p)
{
if (p.AbnormalityId != GrowingFuryId) return;
if (!TryGetClassViewModel<BrawlerLayoutViewModel>(out var vm)) return;

vm.IsGfOn = true;
}

static void CheckGrowingFuryEnd(S_ABNORMALITY_END p)
private static void CheckGrowingFuryEnd(S_ABNORMALITY_END p)
{
if (p.AbnormalityId != GrowingFuryId) return;
if (!TryGetClassViewModel<BrawlerLayoutViewModel>(out var vm)) return;

vm.IsGfOn = false;
}

static void CheckCounterProcBegin(S_ABNORMALITY_BEGIN p)
private static void CheckCounterProcBegin(S_ABNORMALITY_BEGIN p)
{
if (p.AbnormalityId != CounterGlyphId) return;
if (!TryGetClassViewModel<BrawlerLayoutViewModel>(out var vm)) return;
Expand All @@ -65,7 +65,7 @@ static void CheckCounterProcBegin(S_ABNORMALITY_BEGIN p)
vm.CounterProc = true;
}

static void CheckCounterProcRefresh(S_ABNORMALITY_REFRESH p)
private static void CheckCounterProcRefresh(S_ABNORMALITY_REFRESH p)
{
if (p.AbnormalityId != CounterGlyphId) return;
if (!TryGetClassViewModel<BrawlerLayoutViewModel>(out var vm)) return;
Expand All @@ -74,7 +74,7 @@ static void CheckCounterProcRefresh(S_ABNORMALITY_REFRESH p)
vm.CounterProc = true;
}

static void CheckCounterProcEnd(S_ABNORMALITY_END p)
private static void CheckCounterProcEnd(S_ABNORMALITY_END p)
{
if (p.AbnormalityId != CounterGlyphId) return;
if (!TryGetClassViewModel<BrawlerLayoutViewModel>(out var vm)) return;
Expand Down
Loading

0 comments on commit 3d750f0

Please sign in to comment.