Skip to content

Update dependencies with fixes for SDK changes #235

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

Open
lanaklein14 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update dependencies with fixes for SDK changes #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888d360
Update FrameworkVersion for AddonExample
gozolana Dec 13, 2021
1da7292
Update dependencies
gozolana Dec 13, 2021
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
2 changes: 1 addition & 1 deletion AddonExample/AddonExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AddonExample</RootNamespace>
<AssemblyName>AddonExample</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions DEPS.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

deps = {
'ACT': {
'url': 'https://github.com/EQAditu/AdvancedCombatTracker/releases/download/3.4.7.268/ACTv3.zip',
'url': 'https://github.com/EQAditu/AdvancedCombatTracker/releases/download/3.5.0.273/ACTv3.zip',
'dest': 'Thirdparty/ACT',
'strip': 0,
'hash': ['sha256', 'adf13a38d0938ce90f8e674f8365b227d933b91636ddf72b26c85702f6e3b808'],
},
'FFXIV_ACT_Plugin': {
'url': 'https://github.com/ravahn/FFXIV_ACT_Plugin/raw/master/Releases/FFXIV_ACT_Plugin_SDK_2.0.6.1.zip',
'url': 'https://github.com/ravahn/FFXIV_ACT_Plugin/raw/master/Releases/FFXIV_ACT_Plugin_SDK_2.6.2.8.zip',
'dest': 'Thirdparty/FFXIV_ACT_Plugin',
'strip': 0,
'hash': ['sha256', '55eed8660848273b285e2f128a65e6822f086c885942be69691baf5c530a7cd6'],
'hash': ['sha256', '437579fba7e9d848ffb7bae9cedc59a61749429de488e6df0dcd3885f5b6e93d'],
},
'curl': {
'url': 'https://curl.haxx.se/download/curl-7.70.0.tar.xz',
Expand Down
5 changes: 4 additions & 1 deletion OverlayPlugin.Core/Integration/FFXIVRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,10 @@ public Language GetLanguage()
{
var repo = GetRepository();
if (repo == null)
return Language.Unknown;
{
// Defaults to English
return Language.English;
}
return repo.GetSelectedLanguageID();
}

Expand Down
7 changes: 7 additions & 0 deletions OverlayPlugin.Core/MemoryProcessors/FFXIVProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ static internal bool IsCrafter(EntityJob job)
job == EntityJob.ALC ||
job == EntityJob.CUL;
}

static internal string ToProperCase(string name)
{
System.Globalization.CultureInfo cultureInfo = System.Threading.Thread.CurrentThread.CurrentCulture;
System.Globalization.TextInfo textInfo = cultureInfo.TextInfo;
return textInfo.ToTitleCase(name);
}

[Serializable]
public class EntityData
Expand Down
2 changes: 1 addition & 1 deletion OverlayPlugin.Core/MemoryProcessors/FFXIVProcessCn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public unsafe override EntityData GetEntityDataFromByteArray(byte[] source) {

// dump '\0' string terminators
var memoryName = System.Text.Encoding.UTF8.GetString(mem.Name, EntityMemory.nameBytes).Split(new[] { '\0' }, 2)[0];
var capitalizedName = FFXIV_ACT_Plugin.Common.StringHelper.ToProperCase(memoryName);
var capitalizedName = ToProperCase(memoryName);

EntityData entity = new EntityData() {
name = capitalizedName,
Expand Down
2 changes: 1 addition & 1 deletion OverlayPlugin.Core/MemoryProcessors/FFXIVProcessIntl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public unsafe override EntityData GetEntityDataFromByteArray(byte[] source) {

// dump '\0' string terminators
var memoryName = System.Text.Encoding.UTF8.GetString(mem.Name, EntityMemory.nameBytes).Split(new[] { '\0' }, 2)[0];
var capitalizedName = FFXIV_ACT_Plugin.Common.StringHelper.ToProperCase(memoryName);
var capitalizedName = ToProperCase(memoryName);

EntityData entity = new EntityData() {
name = capitalizedName,
Expand Down
2 changes: 1 addition & 1 deletion OverlayPlugin.Core/MemoryProcessors/FFXIVProcessKo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public unsafe override EntityData GetEntityDataFromByteArray(byte[] source) {

// dump '\0' string terminators
var memoryName = System.Text.Encoding.UTF8.GetString(mem.Name, EntityMemory.nameBytes).Split(new[] { '\0' }, 2)[0];
var capitalizedName = FFXIV_ACT_Plugin.Common.StringHelper.ToProperCase(memoryName);
var capitalizedName = ToProperCase(memoryName);

EntityData entity = new EntityData() {
name = capitalizedName,
Expand Down