Remove hard coded string LuaCsForBarotrauma everywhere possible
This commit is contained in:
+6
-6
@@ -75,11 +75,11 @@ internal sealed class ModsGameplaySettingsMenu : ModsSettingsMenuBase
|
|||||||
|
|
||||||
|
|
||||||
// ReSharper restore FieldCanBeMadeReadOnly.Local
|
// ReSharper restore FieldCanBeMadeReadOnly.Local
|
||||||
private const string SettingsResetButtonText = "LuaCsForBarotrauma.SettingsMenu.ResetVisibleSettings";
|
private const string SettingsResetButtonText = $"{LuaCsSetup.PackageName}.SettingsMenu.ResetVisibleSettings";
|
||||||
private const string SettingsResetPromptTitle = "LuaCsForBarotrauma.SettingsMenu.ResetPrompt.Title";
|
private const string SettingsResetPromptTitle = $"{LuaCsSetup.PackageName}.SettingsMenu.ResetPrompt.Title";
|
||||||
private const string SettingsResetPromptContents = "LuaCsForBarotrauma.SettingsMenu.ResetPrompt.Message";
|
private const string SettingsResetPromptContents = $"{LuaCsSetup.PackageName}.SettingsMenu.ResetPrompt.Message";
|
||||||
private const string SettingsResetPromptYesText = "LuaCsForBarotrauma.SettingsMenu.ResetPrompt.Yes";
|
private const string SettingsResetPromptYesText = $"{LuaCsSetup.PackageName}.SettingsMenu.ResetPrompt.Yes";
|
||||||
private const string SettingsResetPromptNoText = "LuaCsForBarotrauma.SettingsMenu.ResetPrompt.No";
|
private const string SettingsResetPromptNoText = $"{LuaCsSetup.PackageName}.SettingsMenu.ResetPrompt.No";
|
||||||
|
|
||||||
|
|
||||||
private event Action OnApplyInstalledModsChanges;
|
private event Action OnApplyInstalledModsChanges;
|
||||||
@@ -100,7 +100,7 @@ internal sealed class ModsGameplaySettingsMenu : ModsSettingsMenuBase
|
|||||||
var menuTitleLayoutGroup = new GUILayoutGroup(
|
var menuTitleLayoutGroup = new GUILayoutGroup(
|
||||||
new RectTransform(new Vector2(1f, MenuTitleHeight), mainLayoutGroup.RectTransform, Anchor.TopLeft), true, Anchor.TopLeft);
|
new RectTransform(new Vector2(1f, MenuTitleHeight), mainLayoutGroup.RectTransform, Anchor.TopLeft), true, Anchor.TopLeft);
|
||||||
GUIUtil.Label(menuTitleLayoutGroup,
|
GUIUtil.Label(menuTitleLayoutGroup,
|
||||||
GetLocalizedString("LuaCsForBarotrauma.SettingsMenu.ModGameplayButton", "Mod Gameplay Settings"),
|
GetLocalizedString($"{LuaCsSetup.PackageName}.SettingsMenu.ModGameplayButton", "Mod Gameplay Settings"),
|
||||||
GUIStyle.LargeFont, new Vector2(1f, 1f));
|
GUIStyle.LargeFont, new Vector2(1f, 1f));
|
||||||
|
|
||||||
// page contents
|
// page contents
|
||||||
|
|||||||
+3
-3
@@ -46,10 +46,10 @@ public class SettingsMenuSystem : ISettingsMenuSystem
|
|||||||
var tabControlsIndex = (SettingsMenu.Tab)tabCount+1;
|
var tabControlsIndex = (SettingsMenu.Tab)tabCount+1;
|
||||||
|
|
||||||
_gameplayContentFrame = CreateNewContentTab(tabGameplayIndex, __instance,
|
_gameplayContentFrame = CreateNewContentTab(tabGameplayIndex, __instance,
|
||||||
GUIStyle.ComponentStyles.ContainsKey("SettingsMenuTab.LuaCsSettings") ? "SettingsMenuTab.LuaCsSettings" : "SettingsMenuTab.Mods",
|
GUIStyle.ComponentStyles.ContainsKey("SettingsMenuTab.LuaCsSettings") ? "SettingsMenuTab.LuaCsSettings" : "SettingsMenuTab.Mods",
|
||||||
"LuaCsForBarotrauma.SettingsMenu.ModGameplayButton");
|
$"{LuaCsSetup.PackageName}.SettingsMenu.ModGameplayButton");
|
||||||
/*_controlsContentFrame = CreateNewContentTab(tabControlsIndex, __instance,
|
/*_controlsContentFrame = CreateNewContentTab(tabControlsIndex, __instance,
|
||||||
"SettingsMenuTab.Controls", "LuaCsForBarotrauma.SettingsMenu.ModControlsButton");
|
"SettingsMenuTab.Controls", $"{LuaCsSetup.PackageName}.SettingsMenu.ModControlsButton");
|
||||||
*/
|
*/
|
||||||
|
|
||||||
_gameplayMenuInstance = new ModsGameplaySettingsMenu(_gameplayContentFrame, _packageManagementService, _configService, _loggerService, __instance);
|
_gameplayMenuInstance = new ModsGameplaySettingsMenu(_gameplayContentFrame, _packageManagementService, _configService, _loggerService, __instance);
|
||||||
|
|||||||
+2
-2
@@ -194,7 +194,7 @@ public sealed class PackageManagementService : IPackageManagementService
|
|||||||
|
|
||||||
IService.CheckDisposed(this);
|
IService.CheckDisposed(this);
|
||||||
var result = new FluentResults.Result();
|
var result = new FluentResults.Result();
|
||||||
var packages2 = packages.OrderBy(pkg => pkg.Name == "LuaCsForBarotrauma" ? 0 : 1) // always run lua cs first.
|
var packages2 = packages.OrderBy(pkg => pkg.Name == LuaCsSetup.PackageName ? 0 : 1) // always run lua cs first.
|
||||||
.ThenBy(packages.IndexOf)
|
.ThenBy(packages.IndexOf)
|
||||||
.ToImmutableArray();
|
.ToImmutableArray();
|
||||||
|
|
||||||
@@ -318,7 +318,7 @@ public sealed class PackageManagementService : IPackageManagementService
|
|||||||
|
|
||||||
// get loading order. Note: packages not in the execution order list will load first.
|
// get loading order. Note: packages not in the execution order list will load first.
|
||||||
var loadingOrderedPackages = _loadedPackages
|
var loadingOrderedPackages = _loadedPackages
|
||||||
.OrderBy(pkg => pkg.Key.Name == "LuaCsForBarotrauma" ? 0 : 1) // always run lua cs first.
|
.OrderBy(pkg => pkg.Key.Name == LuaCsSetup.PackageName ? 0 : 1) // always run lua cs first.
|
||||||
.ThenBy(pkg => executionOrder.IndexOf(pkg.Key))
|
.ThenBy(pkg => executionOrder.IndexOf(pkg.Key))
|
||||||
.ToImmutableArray();
|
.ToImmutableArray();
|
||||||
var loadOrderByPackage = loadingOrderedPackages.Select(p => p.Key).ToImmutableArray();
|
var loadOrderByPackage = loadingOrderedPackages.Select(p => p.Key).ToImmutableArray();
|
||||||
|
|||||||
@@ -705,7 +705,7 @@ public class PluginManagementService : IAssemblyManagementService
|
|||||||
{
|
{
|
||||||
builder.AddRange(BaseMetadataReferencesWithBarotrauma);
|
builder.AddRange(BaseMetadataReferencesWithBarotrauma);
|
||||||
foreach (var loaderService in _assemblyLoaders
|
foreach (var loaderService in _assemblyLoaders
|
||||||
.Where(asl => !asl.Key.Name.Equals("LuaCsForBarotrauma", StringComparison.InvariantCultureIgnoreCase))
|
.Where(asl => !asl.Key.Name.Equals(LuaCsSetup.PackageName, StringComparison.InvariantCultureIgnoreCase))
|
||||||
.ToImmutableArray())
|
.ToImmutableArray())
|
||||||
{
|
{
|
||||||
builder.AddRange(loaderService.Value.AssemblyReferences.Where(ar => ar is not null));
|
builder.AddRange(loaderService.Value.AssemblyReferences.Where(ar => ar is not null));
|
||||||
|
|||||||
Reference in New Issue
Block a user