aly/qstbak
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

muffin v7.5.4

Browse source
This commit is contained in:
alydev 2026-06-06 23:47:07 +10:00
parent 40d48d62b0
commit a8f2c1df37
14 changed files with 1093 additions and 957 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Questionable/Questionable.Controller.GameUi/ChocoboNameHandler.cs
View file

@ -97,18 +97,7 @@ internal sealed class ChocoboNameHandler : IDisposable
{
return "Kweh";
}
string text2 = text.Substring(0, 1).ToUpperInvariant();
string text3;
if (text.Length <= 1)
{
text3 = string.Empty;
}
else
{
string text4 = text;
text3 = text4.Substring(1, text4.Length - 1).ToLowerInvariant();
}
return text2 + text3;
return text.Substring(0, 1).ToUpperInvariant() + ((text.Length > 1) ? text.Substring(1).ToLowerInvariant() : string.Empty);
}
private unsafe void FireInputStringCallback(AtkUnitBase* addon, string text)

4
Questionable/Questionable.Controller.Steps/TaskCreator.cs
View file

@ -65,9 +65,7 @@ internal sealed class TaskCreator
string text = x.GetType().FullName ?? x.GetType().Name;
if (text.Contains('.', StringComparison.Ordinal))
{
string text2 = text;
int num3 = text.LastIndexOf('.') + 1;
text = text2.Substring(num3, text2.Length - num3);
text = text.Substring(text.LastIndexOf('.') + 1);
}
_logger.LogTrace("Factory {FactoryName} created Task {TaskNames}", text, string.Join(", ", list4.Select((ITask y) => y.ToString())));
}

13
Questionable/Questionable.Controller/QuestRegistry.cs
View file

@ -325,18 +325,7 @@ internal sealed class QuestRegistry
{
string text = fileName.Substring(0, fileName.Length - ".json".Length);
int num = text.IndexOf('_', StringComparison.Ordinal);
string text2;
if (num < 0 || num + 1 >= text.Length)
{
text2 = text;
}
else
{
string text3 = text;
int num2 = num + 1;
text2 = text3.Substring(num2, text3.Length - num2);
}
name = text2;
name = ((num >= 0 && num + 1 < text.Length) ? text.Substring(num + 1) : text);
}
catch
{

1432
Questionable/Questionable.Data/ChangelogData.cs
View file

File diff suppressed because it is too large Load diff

13
Questionable/Questionable.Windows.ConfigComponents/DebugConfigComponent.cs
View file

@ -160,17 +160,6 @@ internal sealed class DebugConfigComponent : ConfigComponent
{
return string.Empty;
}
string text = name.Substring(0, 1).ToUpperInvariant();
string text2;
if (name.Length <= 1)
{
text2 = string.Empty;
}
else
{
string text3 = name;
text2 = text3.Substring(1, text3.Length - 1).ToLowerInvariant();
}
return text + text2;
return name.Substring(0, 1).ToUpperInvariant() + ((name.Length > 1) ? name.Substring(1).ToLowerInvariant() : string.Empty);
}
}

13
Questionable/Questionable.Windows.ConfigComponents/DutyConfigComponent.cs
View file

@ -475,16 +475,11 @@ internal sealed class DutyConfigComponent : ConfigComponent
{
base.Configuration.Duties.BlacklistedDutyCfcIds.Add(result2);
}
if (!text3.StartsWith("M:", StringComparison.InvariantCulture))
if (text3.StartsWith("M:", StringComparison.InvariantCulture))
{
continue;
}
ReadOnlySpan<char> span = text3.AsSpan("M:".Length);
int num2 = span.IndexOf(':');
if (num2 > 0 && uint.TryParse(span.Slice(0, num2), CultureInfo.InvariantCulture, out var result3))
{
int num3 = num2 + 1;
if (int.TryParse(span.Slice(num3, span.Length - num3), CultureInfo.InvariantCulture, out var result4) && Enum.IsDefined(typeof(EDutyMode), result4))
ReadOnlySpan<char> span = text3.AsSpan("M:".Length);
int num2 = span.IndexOf(':');
if (num2 > 0 && uint.TryParse(span.Slice(0, num2), CultureInfo.InvariantCulture, out var result3) && int.TryParse(span.Slice(num2 + 1), CultureInfo.InvariantCulture, out var result4) && Enum.IsDefined(typeof(EDutyMode), result4))
{
base.Configuration.Duties.DutyModeOverrides[result3] = (EDutyMode)result4;
}

2
Questionable/Questionable.Windows.QuestComponents/ActiveQuestComponent.cs
View file

@ -61,7 +61,7 @@ internal sealed class ActiveQuestComponent
public event EventHandler? Reload;
[GeneratedRegex("\\s\\s+", RegexOptions.IgnoreCase, "en-US")]
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.21808")]
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.23019")]
private static Regex MultipleWhitespaceRegex()
{
return _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0.Instance;

8
Questionable/Questionable.Windows.QuestComponents/SavedPresetsComponent.cs
View file

@ -519,9 +519,7 @@ internal sealed class SavedPresetsComponent
string text = ImGui.GetClipboardText().Trim();
if (text.StartsWith("qst:preset:", StringComparison.InvariantCulture))
{
string text2 = text;
int length = "qst:preset:".Length;
string s = text2.Substring(length, text2.Length - length);
string s = text.Substring("qst:preset:".Length);
return JsonConvert.DeserializeObject<PresetExportData>(Encoding.UTF8.GetString(Convert.FromBase64String(s)));
}
}
@ -538,9 +536,7 @@ internal sealed class SavedPresetsComponent
string text = ImGui.GetClipboardText().Trim();
if (text.StartsWith("qst:presets:", StringComparison.InvariantCulture))
{
string text2 = text;
int length = "qst:presets:".Length;
string s = text2.Substring(length, text2.Length - length);
string s = text.Substring("qst:presets:".Length);
return JsonConvert.DeserializeObject<List<PresetExportData>>(Encoding.UTF8.GetString(Convert.FromBase64String(s)));
}
}

16
Questionable/Questionable.csproj
View file

@ -21,25 +21,25 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Dalamud">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Dalamud.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
</Reference>
<Reference Include="LLib">
<HintPath>..\..\LLib.dll</HintPath>
</Reference>
<Reference Include="FFXIVClientStructs">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
</Reference>
<Reference Include="Questionable.Model">
<HintPath>..\..\Questionable.Model.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
<HintPath>..\..\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Serilog">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Serilog.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Serilog.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection">
<HintPath>..\..\Microsoft.Extensions.DependencyInjection.dll</HintPath>
@ -48,19 +48,19 @@
<HintPath>..\..\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Dalamud.Bindings.ImGui">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Dalamud.Bindings.ImGui.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.Bindings.ImGui.dll</HintPath>
</Reference>
<Reference Include="Lumina.Excel">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
</Reference>
<Reference Include="Lumina">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Lumina.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
</Reference>
<Reference Include="JsonSchema.Net">
<HintPath>..\..\JsonSchema.Net.dll</HintPath>
</Reference>
<Reference Include="InteropGenerator.Runtime">
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\InteropGenerator.Runtime.dll</HintPath>
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\InteropGenerator.Runtime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging">
<HintPath>..\..\Microsoft.Extensions.Logging.dll</HintPath>

10
Questionable/Questionable/QuestionablePlugin.cs
View file

@ -46,15 +46,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin, IDisposable
ServiceCollection serviceCollection = new ServiceCollection();
serviceCollection.AddLogging(delegate(ILoggingBuilder builder)
{
builder.SetMinimumLevel(LogLevel.Trace).ClearProviders().AddProvider(new DalamudLoggerProvider(pluginLog, delegate(string t)
{
if (t == null)
{
return (string?)null;
}
int num = t.LastIndexOf('.') + 1;
return t.Substring(num, t.Length - num);
}));
builder.SetMinimumLevel(LogLevel.Trace).ClearProviders().AddProvider(new DalamudLoggerProvider(pluginLog, (string t) => t?.Substring(t.LastIndexOf('.') + 1)));
});
((IServiceCollection)serviceCollection).AddSingleton((IDalamudPlugin)this);
serviceCollection.AddSingleton(pluginInterface);

2
Questionable/System.Text.RegularExpressions.Generated/-RegexGenerator_g-FBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0.cs
View file

@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
namespace System.Text.RegularExpressions.Generated;
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.21808")]
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.23019")]
[SkipLocalsInit]
internal sealed class _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0 : Regex
{

2
Questionable/System.Text.RegularExpressions.Generated/-RegexGenerator_g-FBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__Utilities.cs
View file

@ -3,7 +3,7 @@ using System.CodeDom.Compiler;
namespace System.Text.RegularExpressions.Generated;
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.21808")]
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.23019")]
internal static class _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__Utilities
{
internal static readonly TimeSpan s_defaultTimeout = ((AppContext.GetData("REGEX_DEFAULT_MATCH_TIMEOUT") is TimeSpan timeSpan) ? timeSpan : Regex.InfiniteMatchTimeout);