chore: housekeeping — linter & formatter setup

Add .prettierrc.json, .markdownlint.json, .yamllint.yaml, .gitattributes
Run CSharpier, Prettier and markdownlint across the entire codebase.
No logic changes — formatting, using order and line endings only.
This commit is contained in:
2026-05-10 13:01:00 +02:00
parent cd01fa63a1
commit 699d4ede1d
141 changed files with 8833 additions and 5733 deletions
+6
View File
@@ -1,2 +1,8 @@
# Generated files # Generated files
HellionChat/Resources/Language.*.resx linguist-generated=true HellionChat/Resources/Language.*.resx linguist-generated=true
* text=auto eol=lf
*.cs text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
*.md text eol=lf
*.json text eol=lf
+16 -17
View File
@@ -1,21 +1,20 @@
name: Security name: Security
on: on:
push: push:
branches: [main, master] branches: [main, master]
pull_request: pull_request:
schedule: schedule:
- cron: '0 6 * * 1' - cron: "0 6 * * 1"
workflow_dispatch: workflow_dispatch:
jobs: jobs:
scan: scan:
uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
with: with:
# MessageStore.cs uses string-interpolation in CommandText for table # MessageStore.cs uses string-interpolation in CommandText for table
# names and clause-joins that come from internal code constants, not # names and clause-joins that come from internal code constants, not
# user input. Values are bound via SqlParameter, the SQL surface is # user input. Values are bound via SqlParameter, the SQL surface is
# local-only inside a Dalamud plugin. Semgrep matches the pattern # local-only inside a Dalamud plugin. Semgrep matches the pattern
# without dataflow, so it flags those eight call sites; CodeQL # without dataflow, so it flags those eight call sites; CodeQL
# would not. Suppressed for this repo only. # would not. Suppressed for this repo only.
semgrep-exclude-rules: 'csharp.lang.security.sqli.csharp-sqli.csharp-sqli' semgrep-exclude-rules: "csharp.lang.security.sqli.csharp-sqli.csharp-sqli"
+66 -66
View File
@@ -1,73 +1,73 @@
name: Bug report name: Bug report
description: Something in HellionChat is broken or behaves wrong description: Something in HellionChat is broken or behaves wrong
labels: labels:
- bug - bug
body: body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
Thanks for reporting. Please fill in the fields below so I can Thanks for reporting. Please fill in the fields below so I can
reproduce the issue. If this is a security issue, stop here and reproduce the issue. If this is a security issue, stop here and
report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D) report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
instead. instead.
- type: input - type: input
id: version id: version
attributes: attributes:
label: HellionChat version label: HellionChat version
description: From Settings → Information → Version description: From Settings → Information → Version
placeholder: "0.5.4" placeholder: "0.5.4"
validations: validations:
required: true
- type: dropdown
id: platform
attributes:
label: Platform
options:
- Windows (XIVLauncher)
- Linux (XIVLauncher Core)
- macOS (XIVLauncher Core / wine)
- Other
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: What happened
description: Plain description, no log dumps yet
validations:
required: true
- type: textarea
id: expected
attributes:
label: What you expected
validations:
required: true
- type: textarea
id: steps
attributes:
label: How to reproduce
description: Step-by-step from "open settings" or "log in" through to the broken behaviour
validations:
required: true
- type: textarea
id: log
attributes:
label: Relevant /xllog excerpt
description: Filter for "HellionChat" if the log is huge
render: text
- type: checkboxes
id: confirm
attributes:
label: Pre-flight
options:
- label: I am running the latest version of HellionChat
required: true required: true
- label: I have searched existing issues for duplicates
- type: dropdown
id: platform
attributes:
label: Platform
options:
- Windows (XIVLauncher)
- Linux (XIVLauncher Core)
- macOS (XIVLauncher Core / wine)
- Other
validations:
required: true required: true
- type: textarea
id: what-happened
attributes:
label: What happened
description: Plain description, no log dumps yet
validations:
required: true
- type: textarea
id: expected
attributes:
label: What you expected
validations:
required: true
- type: textarea
id: steps
attributes:
label: How to reproduce
description: Step-by-step from "open settings" or "log in" through to the broken behaviour
validations:
required: true
- type: textarea
id: log
attributes:
label: Relevant /xllog excerpt
description: Filter for "HellionChat" if the log is huge
render: text
- type: checkboxes
id: confirm
attributes:
label: Pre-flight
options:
- label: I am running the latest version of HellionChat
required: true
- label: I have searched existing issues for duplicates
required: true
+10 -9
View File
@@ -1,14 +1,15 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Security vulnerability - name: Security vulnerability
url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
about: Do not open a public issue for security problems. Report by e-mail instead. about: Do not open a public issue for security problems. Report by e-mail instead.
- name: Upstream Chat 2 issue - name: Upstream Chat 2 issue
url: https://github.com/Infiziert90/ChatTwo/issues url: https://github.com/Infiziert90/ChatTwo/issues
about: If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well. about:
If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well.
- name: Discord - name: Discord
url: https://discord.com/users/j.j_kazama url: https://discord.com/users/j.j_kazama
about: Quick questions, casual feedback. Bug reports still go through the issue tracker for tracking. about: Quick questions, casual feedback. Bug reports still go through the issue tracker for tracking.
+50 -48
View File
@@ -1,55 +1,57 @@
name: Feature request name: Feature request
description: Suggest a feature or enhancement for HellionChat description: Suggest a feature or enhancement for HellionChat
labels: labels:
- enhancement - enhancement
body: body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
Thanks for the suggestion. HellionChat focuses on privacy by Thanks for the suggestion. HellionChat focuses on privacy by
default and a small, well-scoped feature set. Suggestions that default and a small, well-scoped feature set. Suggestions that
align with that scope are easier to accept than ones that pull align with that scope are easier to accept than ones that pull
the plugin toward "do everything". the plugin toward "do everything".
- type: textarea - type: textarea
id: problem id: problem
attributes: attributes:
label: What problem are you trying to solve label: What problem are you trying to solve
description: The user-side problem, not the proposed solution yet description: The user-side problem, not the proposed solution yet
validations: validations:
required: true
- type: textarea
id: solution
attributes:
label: What you would like HellionChat to do
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: Alternatives you have considered
description: Other plugins, manual workarounds, settings combinations
- type: dropdown
id: scope
attributes:
label: Scope estimate from your side
options:
- "Small (one tab, one toggle, one filter)"
- "Medium (a settings section, persistent state, one new file)"
- "Large (architectural, touches the message pipeline or the database)"
- "I don't know"
validations:
required: true
- type: checkboxes
id: confirm
attributes:
label: Pre-flight
options:
- label: I have searched existing issues for similar requests
required: true required: true
- label: I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat 2
- type: textarea
id: solution
attributes:
label: What you would like HellionChat to do
validations:
required: true required: true
- type: textarea
id: alternatives
attributes:
label: Alternatives you have considered
description: Other plugins, manual workarounds, settings combinations
- type: dropdown
id: scope
attributes:
label: Scope estimate from your side
options:
- "Small (one tab, one toggle, one filter)"
- "Medium (a settings section, persistent state, one new file)"
- "Large (architectural, touches the message pipeline or the database)"
- "I don't know"
validations:
required: true
- type: checkboxes
id: confirm
attributes:
label: Pre-flight
options:
- label: I have searched existing issues for similar requests
required: true
- label:
I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat
2
required: true
+8 -13
View File
@@ -18,8 +18,7 @@ mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
- [ ] Bug fix (non-breaking change that fixes an issue) - [ ] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds behaviour) - [ ] New feature (non-breaking change that adds behaviour)
- [ ] Breaking change (config migration, removed feature, or behaviour - [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible defaults rely on)
change that user-visible defaults rely on)
- [ ] Documentation only - [ ] Documentation only
- [ ] Translation update - [ ] Translation update
- [ ] Build, CI or tooling change - [ ] Build, CI or tooling change
@@ -56,15 +55,11 @@ new commands, new translations, removed behaviour. If none, write
## Checklist ## Checklist
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and - [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
[CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
- [ ] My change matches the existing code style (`.editorconfig`). - [ ] My change matches the existing code style (`.editorconfig`).
- [ ] I added or updated tests where the existing test infrastructure - [ ] I added or updated tests where the existing test infrastructure made that practical, or I have explained why tests
made that practical, or I have explained why tests are not are not applicable.
applicable. - [ ] I updated the README, in-plugin strings or documentation if my change is user-visible.
- [ ] I updated the README, in-plugin strings or documentation if my - [ ] I did not include any AI-generated code without disclosing it in the PR description (see
change is user-visible. [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I did not include any AI-generated code without disclosing it - [ ] I confirm my contribution is released under the [EUPL-1.2](../LICENSE).
in the PR description (see [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I confirm my contribution is released under the
[EUPL-1.2](../LICENSE).
+38 -38
View File
@@ -1,42 +1,42 @@
version: 2 version: 2
updates: updates:
# NuGet package updates for the plugin project. Weekly cadence keeps the # NuGet package updates for the plugin project. Weekly cadence keeps the
# noise down while still catching transitive security advisories within # noise down while still catching transitive security advisories within
# a few days of disclosure. # a few days of disclosure.
- package-ecosystem: nuget - package-ecosystem: nuget
directory: /HellionChat directory: /HellionChat
schedule: schedule:
interval: weekly interval: weekly
day: monday day: monday
time: "07:00" time: "07:00"
timezone: Europe/Berlin timezone: Europe/Berlin
open-pull-requests-limit: 5 open-pull-requests-limit: 5
labels: labels:
- dependencies - dependencies
- nuget - nuget
commit-message: commit-message:
prefix: "chore(deps)" prefix: "chore(deps)"
groups: groups:
patches: patches:
update-types: update-types:
- patch - patch
minor: minor:
update-types: update-types:
- minor - minor
# GitHub Actions versions in .github/workflows. Lower cadence because # GitHub Actions versions in .github/workflows. Lower cadence because
# Action releases ship less frequently and are usually safe to defer # Action releases ship less frequently and are usually safe to defer
# for a month. # for a month.
- package-ecosystem: github-actions - package-ecosystem: github-actions
directory: / directory: /
schedule: schedule:
interval: monthly interval: monthly
time: "07:00" time: "07:00"
timezone: Europe/Berlin timezone: Europe/Berlin
open-pull-requests-limit: 3 open-pull-requests-limit: 3
labels: labels:
- dependencies - dependencies
- github-actions - github-actions
commit-message: commit-message:
prefix: "chore(actions)" prefix: "chore(actions)"
+9 -4
View File
@@ -2,11 +2,16 @@
subtitle: "Theme Foundation" subtitle: "Theme Foundation"
versionsnatur: "Major-UI-Cycle" versionsnatur: "Major-UI-Cycle"
--- ---
- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC zurück zur Übersicht - Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint
Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC
zurück zur Übersicht
- Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick - Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick
- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch abgelegt - Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch
abgelegt
- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben - Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
- Plugin-Icon zum Hellion-Forge-Hammer gewechselt - Plugin-Icon zum Hellion-Forge-Hammer gewechselt
- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings → Themes - Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings
→ Themes
- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md` - Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
+15 -6
View File
@@ -2,14 +2,23 @@
subtitle: "Layout Refresh" subtitle: "Layout Refresh"
versionsnatur: "Major-UI-Cycle" versionsnatur: "Major-UI-Cycle"
--- ---
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den aktiven Tab
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den
aktiven Tab
- Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab - Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab
- Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool) - Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool)
- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher Partner ergibt konsistent dieselbe - Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0) (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek Partner ergibt konsistent dieselbe
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler - Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle,
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben beide deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter,
Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner.
`Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante
Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben
beide
- Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren - Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren
- Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben - Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben
+21 -8
View File
@@ -2,15 +2,28 @@
subtitle: "Settings Cleanup" subtitle: "Settings Cleanup"
versionsnatur: "UX-Polish-Cycle" versionsnatur: "UX-Polish-Cycle"
--- ---
- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt) - Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen
Untertitel — kein Raten mehr wo eine Setting steckt
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben**
(Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer,
Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
- Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter - Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter
- Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen - Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen
- KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache - KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache
- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker` - Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle,
- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500 - Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine Preset-Wahl) `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über unseren Slider für das jeweilige Fenster gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User
die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig
hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine
Preset-Wahl)
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der
Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über
unseren Slider für das jeweilige Fenster
Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) wie ursprünglich geplant. Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker)
wie ursprünglich geplant.
+17 -7
View File
@@ -2,12 +2,22 @@
subtitle: "Theme Expansion" subtitle: "Theme Expansion"
versionsnatur: "Theme-Pack-Patch" versionsnatur: "Theme-Pack-Patch"
--- ---
- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach mehr Farboptionen
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich nicht mit den Brand-Themes beißt - Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander mehr Farboptionen
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan - **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich
- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab nicht mit den Brand-Themes beißt
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen unverändert weiter - **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von
Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein
eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der
Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün);
die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller
CVD-Fälle ab
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen
unverändert weiter
- Theme-Katalog wächst damit von fünf auf neun Built-ins - Theme-Katalog wächst damit von fünf auf neun Built-ins
Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt. Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche)
kann später nachgeliefert werden, falls Bedarf kommt.
+12 -4
View File
@@ -2,9 +2,17 @@
subtitle: "Plugin Integrations: Honorific" subtitle: "Plugin Integrations: Honorific"
versionsnatur: "Plugin-Integration-Cycle 1" versionsnatur: "Plugin-Integration-Cycle 1"
--- ---
- Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap - Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap
- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel aktiv ist - **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem
Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel
aktiv ist
- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss - **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger) - **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald HellionChat aktualisiert (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button
(XIVInstantMessenger)
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus
Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald
HellionChat aktualisiert
+12 -21
View File
@@ -5,28 +5,19 @@ versionsnatur: Stability-Hotfix
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes** **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
abgearbeitet, bevor Performance- und Architektur-Refactors
draufkommen.
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur - **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
Datei-Freigabe an, Pooling=false auf der Connection macht manuellen GC.Collect überflüssig
den manuellen GC.Collect überflüssig - **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das Plugin-Domain kann
- **Worker-Threads** (PendingMessage, RetentionSweep) sind
jetzt explizit IsBackground=true, das Plugin-Domain kann
sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
- **EmoteCache-Loader** von async-void auf async-Task mit - **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
mehr auf disposed EmoteImages-Einträge nach Plugin-Reload mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent - **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
zu failen - **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
- **Plugin-Dispose** flushed pending DeferredSave bevor Services Frames vor Disable überleben jetzt zuverlässig
abgebaut werden, Settings-Änderungen aus den letzten Frames - **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das neue
vor Disable überleben jetzt zuverlässig WindowOpacity-Feld statt auf 0.85 zurückzufallen
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt
HellionThemeWindowOpacity in das neue WindowOpacity-Feld statt
auf 0.85 zurückzufallen
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown spürbar sauberer laufen.
außer dass Reload und Shutdown spürbar sauberer laufen.
+14 -26
View File
@@ -5,35 +5,23 @@ versionsnatur: Performance-Patch
**Hellion Chat 1.4.1 — Theme Engine Performance** **Hellion Chat 1.4.1 — Theme Engine Performance**
Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad eliminiert,
aus dem Theme-Engine-Render-Pfad eliminiert, Custom-Theme- Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter Built-In und überarbeitete
Hot-Reload überlebt transiente File-Locks beim Editor-Save. Author-Credits.
Plus zehnter Built-In und überarbeitete Author-Credits.
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register - **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle Color-Slots einmalig in
(Built-In oder Custom) werden alle Color-Slots einmalig in ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem Cache statt pro Slot pro Frame durch
ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal ColourUtil.RgbaToAbgr zu jagen. Real gemessene Frame-Time-Recovery: **~13 %** in typischer Render-Szene
liest aus dem Cache statt pro Slot pro Frame durch
ColourUtil.RgbaToAbgr zu jagen. Real gemessene
Frame-Time-Recovery: **~13 %** in typischer Render-Szene
(Plan-Erwartung war 2-6 % konservativ, real ~10-15 %) (Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein - **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während HellionChat reloaden will,
Theme-JSON gerade speichert während HellionChat reloaden fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im Picker,
will, fängt der Loader jetzt explizit Sharing-Violation beim nächsten Tick wird automatisch retry'd — vorher fiel das Theme aus der Liste bis zum Plugin-Reload
und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im - **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
Picker, beim nächsten Tick wird automatisch retry'd —
vorher fiel das Theme aus der Liste bis zum Plugin-Reload
- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein
Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
gekommen ist, holt Switch() das beim Anwenden nach gekommen ist, holt Switch() das beim Anwenden nach
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + - **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
Late-Night-Raids Late-Night-Raids
- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt - **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und Forge Merchantman
unter „Hellion Forge". Mint Grove und Forge Merchantman
werden Carla Beleandis als Community-Geste zugeschrieben. werden Carla Beleandis als Community-Geste zugeschrieben.
Keine Schema-Bumps, keine User-sichtbaren Funktions- Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in Theme-getrieben rendernden
Änderungen außer dass die Frames in Theme-getrieben Szenen merklich glatter laufen und ein neues Theme im Picker steht.
rendernden Szenen merklich glatter laufen und ein neues
Theme im Picker steht.
+16 -30
View File
@@ -5,39 +5,25 @@ versionsnatur: Performance-Patch
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path** **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- Pfad
Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- und der Settings-StatusBar eliminiert.
Pfad und der Settings-StatusBar eliminiert.
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt - **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right und die ABGR-
Theme, DrawList, Window-Left, Window-Right und die ABGR- Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das gut 500 redundante P/Invokes und
Border-Color einmalig vor den Per-Message-Loop. Bei 100 Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups (mehrere parallele Chat-Windows) profitieren
sichtbaren Messages sind das gut 500 redundante P/Invokes proportional, weil der Hoist pro DrawMessages-Call greift, also pro Window
und Property-Reads, die der Hoist eliminiert. Pop-Out- - **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
Heavy-Setups (mehrere parallele Chat-Windows) profitieren zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der neue TabTintCache liest pre-computed
proportional, weil der Hoist pro DrawMessages-Call greift, Werte aus dem Tab und rechnet nur neu wenn das Tell-Target drifted. Beide Caches haben separate Validation-Keys, also
also pro Window keine Cross-Invalidation zwischen Tint- und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Tab-Awareness
Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit - **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert die Tab-Message-
zwei String-Allokationen pro Tab (eine für Tint-Hash, eine Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
für Icon-Hash). Der neue TabTintCache liest pre-computed liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
Werte aus dem Tab und rechnet nur neu wenn das Tell-Target
drifted. Beide Caches haben separate Validation-Keys, also
keine Cross-Invalidation zwischen Tint- und Icon-Pfad.
AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin
ohne Tab-Awareness
- **StatusBar-Aggregation hinter Cache-Gate.** Die Status-
Leiste am unteren Window-Rand summiert die Tab-Message-
Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache-
Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
liefen Sum und Count trotzdem pro Frame. Jetzt vor dem
Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
ersetzt. Die Aggregation läuft auf etwa 1 % der Frames ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
Multiplikation pro Window. Multiplikation pro Window.
Keine Schema-Bumps, keine User-sichtbaren Funktions- Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log und in der
Änderungen außer dass die Frames im Chat-Log und in der
Settings-Statusleiste merklich glatter laufen. Settings-Statusleiste merklich glatter laufen.
+19 -35
View File
@@ -5,41 +5,25 @@ versionsnatur: Architecture-Refactor
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover** **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert und
Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert das Custom-Repo zieht von GitHub auf Gitea um.
und das Custom-Repo zieht von GitHub auf Gitea um.
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur - **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials (Config-Load, Language-Init,
noch die Bootstrap-Essentials (Config-Load, Language-Init, Conflict-Detection). Migrationen, Service-Allokationen, Window-Konstruktion und Hook-Subscription wandern in
Conflict-Detection). Migrationen, Service-Allokationen, LoadAsync, sodass Dalamud die UI während der schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in
Window-Konstruktion und Hook-Subscription wandern in DisposeAsync mirrort LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
LoadAsync, sodass Dalamud die UI während der schweren - **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die Custom-Repo-URL auf
Arbeit responsive halten kann. Per-Line-CaptureFailure in `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` umstellen, dann
DisposeAsync mirrort LightlessSync's Pattern, plus XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen und wird nicht mehr
Idempotency-Guard gegen Reload-Races aktualisiert
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester - **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen harten Schema-Check in
müssen einmalig in XIVLauncher die Custom-Repo-URL auf Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine klare „install v1.4.2
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` first"-Fehlermeldung statt eines impliziten Migrations-Pfads
umstellen, dann XIVLauncher neu starten. Das alte - **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt blockierend im
GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen kurzen Hitch haben, dafür kein
stehen und wird nicht mehr aktualisiert
- **Schema-Gate statt Migrations-Kette.** Die v9 → v16
Migrationen sind raus, ersetzt durch einen harten
Schema-Check in Phase 1. Configs auf Schema v16+ laden
direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine
klare „install v1.4.2 first"-Fehlermeldung statt eines
impliziten Migrations-Pfads
- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache
füllt sich jetzt fire-and-forget statt blockierend im
Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung
einer Session kann einen kurzen Hitch haben, dafür kein
300-ms-Block beim Plugin-Start 300-ms-Block beim Plugin-Start
- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf - **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und Code-Architektur-Hygiene, kein direkter User-spürbarer
Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) Speed-Win in dieser Release
und Code-Architektur-Hygiene, kein direkter
User-spürbarer Speed-Win in dieser Release
Keine User-sichtbaren Funktions-Änderungen außer dem Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs bleiben unangetastet.
Repo-URL-Update. Settings, Themes und Tabs bleiben
unangetastet.
+14 -13
View File
@@ -1,26 +1,27 @@
--- ---
## How to install ## How to install
This release is distributed via the HellionChat custom repository, not the This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo. To install:
Dalamud main plugin repo. To install:
1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories** 1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
2. Add the URL: 2. Add the URL: `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install 3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install
## Project documents ## Project documents
- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features, architecture, build - [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features,
- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what the plugin stores and sends architecture, build
- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences - [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what
- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) — vulnerability reporting the plugin stores and sends
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports, questions, contact paths - [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md)
— dependencies and licences
- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) —
vulnerability reporting
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports,
questions, contact paths
## Licence ## Licence
[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). [EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). Based on
Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
also EUPL-1.2.
+27 -27
View File
@@ -11,43 +11,43 @@ name: Build
# Dalamud SDK 15 uses on Linux). # Dalamud SDK 15 uses on Linux).
on: on:
push: push:
branches: [main] branches: [main]
pull_request: pull_request:
branches: [main] branches: [main]
workflow_dispatch: workflow_dispatch:
# Minimum permissions for a build-only workflow: read the repo, nothing # Minimum permissions for a build-only workflow: read the repo, nothing
# else. Closes the CodeQL "Workflow does not contain permissions" alert # else. Closes the CodeQL "Workflow does not contain permissions" alert
# and matches the principle-of-least-privilege the security guide # and matches the principle-of-least-privilege the security guide
# recommends for workflows that don't push or create releases. # recommends for workflows that don't push or create releases.
permissions: permissions:
contents: read contents: read
jobs: jobs:
build: build:
name: Build (Release) name: Build (Release)
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v6
- name: Setup .NET 10 - name: Setup .NET 10
uses: actions/setup-dotnet@v5 uses: actions/setup-dotnet@v5
with: with:
dotnet-version: 10.0.x dotnet-version: 10.0.x
- name: Download Dalamud staging - name: Download Dalamud staging
run: | run: |
hooks="$HOME/.xlcore/dalamud/Hooks/dev" hooks="$HOME/.xlcore/dalamud/Hooks/dev"
mkdir -p "$hooks" mkdir -p "$hooks"
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
unzip -oq dalamud.zip -d "$hooks" unzip -oq dalamud.zip -d "$hooks"
- name: Restore - name: Restore
run: dotnet restore HellionChat/HellionChat.csproj run: dotnet restore HellionChat/HellionChat.csproj
- name: Build (Release) - name: Build (Release)
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
+190 -190
View File
@@ -17,209 +17,209 @@ name: Forge Announce
# (issue titles, PR bodies, commit messages, etc.) flows into run-steps. # (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
on: on:
push: push:
tags: tags:
- 'v*' - "v*"
workflow_dispatch: workflow_dispatch:
inputs: inputs:
tag: tag:
description: 'Existing tag to (re)post, e.g. v1.1.0' description: "Existing tag to (re)post, e.g. v1.1.0"
required: true required: true
type: string type: string
permissions: permissions:
contents: read contents: read
jobs: jobs:
announce: announce:
name: Post changelog to Hellion Forge name: Post changelog to Hellion Forge
runs-on: ubuntu-latest runs-on: ubuntu-latest
# The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret # The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
# on Gitea (Settings → Actions → Secrets). Repo-level secrets are in # on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
# scope for every job by default, no environment: declaration needed. # scope for every job by default, no environment: declaration needed.
timeout-minutes: 5 timeout-minutes: 5
steps: steps:
# On push:tags github.ref points at the tag commit; on workflow_dispatch # On push:tags github.ref points at the tag commit; on workflow_dispatch
# the user supplies the tag explicitly. Always check out that tag so # the user supplies the tag explicitly. Always check out that tag so
# the yaml + forge-posts file are read from the tagged tree, not main. # the yaml + forge-posts file are read from the tagged tree, not main.
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with: with:
ref: ${{ github.event.inputs.tag || github.ref }} ref: ${{ github.event.inputs.tag || github.ref }}
# Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh) # Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
# ships pre-installed on ubuntu-latest so we get the same scripting # ships pre-installed on ubuntu-latest so we get the same scripting
# patterns release.yml uses on windows-latest. Tag is read via env: to # patterns release.yml uses on windows-latest. Tag is read via env: to
# treat it as a string variable rather than inline shell text, and # treat it as a string variable rather than inline shell text, and
# validated against the semver regex before any interpolation. # validated against the semver regex before any interpolation.
- name: Build embed payload - name: Build embed payload
id: build id: build
shell: pwsh shell: pwsh
env: env:
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }} TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
run: | run: |
$tag = $env:TAG_NAME $tag = $env:TAG_NAME
if ($tag -notmatch '^v\d+\.\d+\.\d+$') { if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
throw "V1: Refusing to announce non-semver tag: $tag" throw "V1: Refusing to announce non-semver tag: $tag"
}
$version = $tag.Substring(1)
# ---------- Forge-Post-Datei lesen ----------
$forgePath = ".github/forge-posts/$tag.md"
if (-not (Test-Path $forgePath)) {
throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
}
$forgeRaw = Get-Content -Path $forgePath -Raw
# Frontmatter (--- … ---) am Datei-Anfang
if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
}
$fmText = $matches[1]
$deBody = $matches[2].Trim()
$subtitle = $null
$versionsnatur = $null
foreach ($line in ($fmText -split "`r?`n")) {
if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$') { $subtitle = $matches[1] }
if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
}
if ([string]::IsNullOrWhiteSpace($subtitle)) { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
if ($subtitle.Length -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
# ---------- EN-Block aus HellionChat.yaml ziehen ----------
# 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
# Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
$yamlPath = "HellionChat/HellionChat.yaml"
$raw = Get-Content -Path $yamlPath -Raw
$marker = "changelog: |-"
$idx = $raw.IndexOf($marker)
if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
$afterMarker = $raw.Substring($idx + $marker.Length)
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
if ($_ -match '^ ') { $_.Substring(2) } else { $_ }
}) -join "`n"
$header = "**Hellion Chat $version"
$start = $changelogBody.IndexOf($header)
if ($start -lt 0) {
throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
}
$rest = $changelogBody.Substring($start)
$nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
$trailer = $rest.IndexOf("`n`n---")
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
$enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
} elseif ($trailer -ge 0) {
$enBlock = $rest.Substring(0, $trailer).TrimEnd()
} else {
$enBlock = $rest.TrimEnd()
}
# ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
$title = "Hellion Chat $version — $subtitle"
$description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
$footerText = "Hellion Forge · $versionsnatur"
$totalChars = $title.Length + $description.Length + $footerText.Length
if ($totalChars -gt 5500) {
throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
}
Write-Host "Char-Cap OK: $totalChars / 5500"
# ---------- Embed-Payload bauen ----------
$payload = [ordered]@{
username = "Forge Herald"
avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
content = "<@&1500489631555260446>"
allowed_mentions = [ordered]@{
parse = @()
roles = @("1500489631555260446")
}
embeds = @(
[ordered]@{
title = $title
url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
color = 12730636
description = $description
footer = [ordered]@{ text = $footerText }
timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
} }
) $version = $tag.Substring(1)
}
$payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress # ---------- Forge-Post-Datei lesen ----------
# Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @- $forgePath = ".github/forge-posts/$tag.md"
[System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false)) if (-not (Test-Path $forgePath)) {
throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
}
$forgeRaw = Get-Content -Path $forgePath -Raw
Write-Host "Payload size: $($payloadJson.Length) chars" # Frontmatter (--- … ---) am Datei-Anfang
Write-Host "Embed title: $title" if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
Write-Host "Embed footer: $footerText" throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
}
$fmText = $matches[1]
$deBody = $matches[2].Trim()
# POST to the Hellion Forge changelog webhook. curl from PowerShell-Core $subtitle = $null
# so we can pipe the payload via stdin (--data-binary @-) and keep $versionsnatur = $null
# secrets out of process arg lists. One retry on 5xx, hard fail on 4xx. foreach ($line in ($fmText -split "`r?`n")) {
- name: POST to Hellion Forge webhook if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$') { $subtitle = $matches[1] }
shell: pwsh if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
env: }
DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }} if ([string]::IsNullOrWhiteSpace($subtitle)) { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
run: | if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) { if ($subtitle.Length -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook." if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
} if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
$payloadFile = "$PWD/embed-payload.json" # ---------- EN-Block aus HellionChat.yaml ziehen ----------
if (-not (Test-Path $payloadFile)) { # 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
throw "Embed payload file missing — previous step did not produce embed-payload.json" # Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
} $yamlPath = "HellionChat/HellionChat.yaml"
$raw = Get-Content -Path $yamlPath -Raw
$marker = "changelog: |-"
$idx = $raw.IndexOf($marker)
if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
$afterMarker = $raw.Substring($idx + $marker.Length)
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
if ($_ -match '^ ') { $_.Substring(2) } else { $_ }
}) -join "`n"
$maxAttempts = 2 $header = "**Hellion Chat $version"
$attempt = 0 $start = $changelogBody.IndexOf($header)
while ($attempt -lt $maxAttempts) { if ($start -lt 0) {
$attempt++ throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
Write-Host "POST attempt $attempt of $maxAttempts" }
$tmpResp = "$PWD/.webhook-response" $rest = $changelogBody.Substring($start)
$tmpHeaders = "$PWD/.webhook-headers" $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
# --silent suppresses progress; --show-error prints errors so $trailer = $rest.IndexOf("`n`n---")
# the workflow log shows what happened. -w prints HTTP status if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
# to stdout for inspection. -o captures body for diagnosis, $enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
# -D captures headers. } elseif ($trailer -ge 0) {
$rawStatus = Get-Content $payloadFile -Raw | $enBlock = $rest.Substring(0, $trailer).TrimEnd()
curl --silent --show-error ` } else {
--header 'Content-Type: application/json' ` $enBlock = $rest.TrimEnd()
--data-binary '@-' ` }
-D $tmpHeaders `
-o $tmpResp `
-w '%{http_code}' `
"$env:DISCORD_FORGE_WEBHOOK"
$status = [int]$rawStatus
Write-Host "HTTP status: $status"
if ($status -ge 200 -and $status -lt 300) { # ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
Write-Host "Forge announce POST succeeded." $title = "Hellion Chat $version — $subtitle"
exit 0 $description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
} $footerText = "Hellion Forge · $versionsnatur"
$totalChars = $title.Length + $description.Length + $footerText.Length
if ($totalChars -gt 5500) {
throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
}
Write-Host "Char-Cap OK: $totalChars / 5500"
$bodySnippet = "" # ---------- Embed-Payload bauen ----------
if (Test-Path $tmpResp) { $payload = [ordered]@{
$bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue) username = "Forge Herald"
if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" } avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
} content = "<@&1500489631555260446>"
allowed_mentions = [ordered]@{
parse = @()
roles = @("1500489631555260446")
}
embeds = @(
[ordered]@{
title = $title
url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
color = 12730636
description = $description
footer = [ordered]@{ text = $footerText }
timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
}
)
}
if ($status -ge 400 -and $status -lt 500) { $payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
# E2: 4xx is permanent — webhook revoked, channel deleted, # Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
# payload malformed. No retry. [System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
}
# E1: 5xx (or transport-level fail with status 0) — wait + retry once Write-Host "Payload size: $($payloadJson.Length) chars"
if ($attempt -lt $maxAttempts) { Write-Host "Embed title: $title"
Write-Host "Transient $status — sleeping 30s before retry." Write-Host "Embed footer: $footerText"
Start-Sleep -Seconds 30
} else { # POST to the Hellion Forge changelog webhook. curl from PowerShell-Core
throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet" # so we can pipe the payload via stdin (--data-binary @-) and keep
} # secrets out of process arg lists. One retry on 5xx, hard fail on 4xx.
} - name: POST to Hellion Forge webhook
shell: pwsh
env:
DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }}
run: |
if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) {
throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook."
}
$payloadFile = "$PWD/embed-payload.json"
if (-not (Test-Path $payloadFile)) {
throw "Embed payload file missing — previous step did not produce embed-payload.json"
}
$maxAttempts = 2
$attempt = 0
while ($attempt -lt $maxAttempts) {
$attempt++
Write-Host "POST attempt $attempt of $maxAttempts"
$tmpResp = "$PWD/.webhook-response"
$tmpHeaders = "$PWD/.webhook-headers"
# --silent suppresses progress; --show-error prints errors so
# the workflow log shows what happened. -w prints HTTP status
# to stdout for inspection. -o captures body for diagnosis,
# -D captures headers.
$rawStatus = Get-Content $payloadFile -Raw |
curl --silent --show-error `
--header 'Content-Type: application/json' `
--data-binary '@-' `
-D $tmpHeaders `
-o $tmpResp `
-w '%{http_code}' `
"$env:DISCORD_FORGE_WEBHOOK"
$status = [int]$rawStatus
Write-Host "HTTP status: $status"
if ($status -ge 200 -and $status -lt 300) {
Write-Host "Forge announce POST succeeded."
exit 0
}
$bodySnippet = ""
if (Test-Path $tmpResp) {
$bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue)
if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" }
}
if ($status -ge 400 -and $status -lt 500) {
# E2: 4xx is permanent — webhook revoked, channel deleted,
# payload malformed. No retry.
throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
}
# E1: 5xx (or transport-level fail with status 0) — wait + retry once
if ($attempt -lt $maxAttempts) {
Write-Host "Transient $status — sleeping 30s before retry."
Start-Sleep -Seconds 30
} else {
throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet"
}
}
+131 -131
View File
@@ -17,154 +17,154 @@ name: Release
# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/... # Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
on: on:
push: push:
tags: tags:
- 'v*' - "v*"
# Manual recovery trigger. Use when a tag was pushed but the auto-run # Manual recovery trigger. Use when a tag was pushed but the auto-run
# was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`. # was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`.
# The tag input is validated against the same semver regex as the # The tag input is validated against the same semver regex as the
# auto-trigger before any string interpolation happens. # auto-trigger before any string interpolation happens.
workflow_dispatch: workflow_dispatch:
inputs: inputs:
tag: tag:
description: 'Existing tag to (re)release, e.g. v0.6.1' description: "Existing tag to (re)release, e.g. v0.6.1"
required: true required: true
type: string type: string
permissions: permissions:
contents: write contents: write
jobs: jobs:
release: release:
name: Build and attach release ZIP name: Build and attach release ZIP
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 20 timeout-minutes: 20
steps: steps:
# On push:tags, github.ref_name is the tag — checkout default works. # On push:tags, github.ref_name is the tag — checkout default works.
# On workflow_dispatch, ref defaults to the branch the action was # On workflow_dispatch, ref defaults to the branch the action was
# invoked from; we need to explicitly check out the tag the user # invoked from; we need to explicitly check out the tag the user
# supplied so the build comes from the tagged commit, not main. # supplied so the build comes from the tagged commit, not main.
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v6
with: with:
ref: ${{ github.event.inputs.tag || github.ref }} ref: ${{ github.event.inputs.tag || github.ref }}
- name: Setup .NET 10 - name: Setup .NET 10
uses: actions/setup-dotnet@v5 uses: actions/setup-dotnet@v5
with: with:
dotnet-version: 10.0.x dotnet-version: 10.0.x
- name: Download Dalamud staging - name: Download Dalamud staging
run: | run: |
hooks="$HOME/.xlcore/dalamud/Hooks/dev" hooks="$HOME/.xlcore/dalamud/Hooks/dev"
mkdir -p "$hooks" mkdir -p "$hooks"
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
unzip -oq dalamud.zip -d "$hooks" unzip -oq dalamud.zip -d "$hooks"
- name: Build (Release) - name: Build (Release)
run: dotnet build HellionChat/HellionChat.csproj --configuration Release run: dotnet build HellionChat/HellionChat.csproj --configuration Release
- name: Locate latest.zip - name: Locate latest.zip
id: locate id: locate
run: | run: |
zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)" zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
if [ -z "$zip" ]; then if [ -z "$zip" ]; then
echo "latest.zip not found under HellionChat/bin/Release" >&2 echo "latest.zip not found under HellionChat/bin/Release" >&2
exit 1 exit 1
fi fi
echo "Found: $zip" echo "Found: $zip"
echo "path=$zip" >> "$GITHUB_OUTPUT" echo "path=$zip" >> "$GITHUB_OUTPUT"
# Build a release body from the matching changelog block in # Build a release body from the matching changelog block in
# HellionChat.yaml plus a static install / docs footer. Fails the # HellionChat.yaml plus a static install / docs footer. Fails the
# workflow if no block exists for the tagged version, which is the # workflow if no block exists for the tagged version, which is the
# automated counterpart to the "yaml + repo.json + release body # automated counterpart to the "yaml + repo.json + release body
# kept in sync" rule. # kept in sync" rule.
# #
# GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the # GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
# tag value is treated as a PowerShell variable, not as inline shell # tag value is treated as a PowerShell variable, not as inline shell
# text. The strict regex below rejects anything that is not a clean # text. The strict regex below rejects anything that is not a clean
# semver tag before it is used to build a string. # semver tag before it is used to build a string.
- name: Generate release body - name: Generate release body
shell: pwsh shell: pwsh
env: env:
# workflow_dispatch carries the user-supplied tag in inputs.tag; # workflow_dispatch carries the user-supplied tag in inputs.tag;
# push:tags carries it in github.ref_name. Either way the value # push:tags carries it in github.ref_name. Either way the value
# is treated as a PowerShell variable (env-var pass), not as # is treated as a PowerShell variable (env-var pass), not as
# inline shell text, and validated against the semver regex # inline shell text, and validated against the semver regex
# below before any string interpolation. # below before any string interpolation.
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }} TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
run: | run: |
$tag = $env:TAG_NAME $tag = $env:TAG_NAME
if ($tag -notmatch '^v\d+\.\d+\.\d+$') { if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
throw "Refusing to generate release body for non-semver tag: $tag" throw "Refusing to generate release body for non-semver tag: $tag"
} }
$version = $tag.Substring(1) $version = $tag.Substring(1)
$yamlPath = "HellionChat/HellionChat.yaml" $yamlPath = "HellionChat/HellionChat.yaml"
$raw = Get-Content -Path $yamlPath -Raw $raw = Get-Content -Path $yamlPath -Raw
$marker = "changelog: |-" $marker = "changelog: |-"
$idx = $raw.IndexOf($marker) $idx = $raw.IndexOf($marker)
if ($idx -lt 0) { throw "changelog block not found in $yamlPath" } if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
# changelog: is the last top-level key in the manifest, so # changelog: is the last top-level key in the manifest, so
# everything after the marker is the literal block. Strip the # everything after the marker is the literal block. Strip the
# 2-space yaml indent from each line. # 2-space yaml indent from each line.
$afterMarker = $raw.Substring($idx + $marker.Length) $afterMarker = $raw.Substring($idx + $marker.Length)
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object { $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
if ($_ -match '^ ') { $_.Substring(2) } else { $_ } if ($_ -match '^ ') { $_.Substring(2) } else { $_ }
}) -join "`n" }) -join "`n"
$header = "**Hellion Chat $version" $header = "**Hellion Chat $version"
$start = $changelogBody.IndexOf($header) $start = $changelogBody.IndexOf($header)
if ($start -lt 0) { if ($start -lt 0) {
throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release." throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
} }
$rest = $changelogBody.Substring($start) $rest = $changelogBody.Substring($start)
$nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1) $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
$trailer = $rest.IndexOf("`n`n---") $trailer = $rest.IndexOf("`n`n---")
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) { if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
$currentBlock = $rest.Substring(0, $nextHdr).TrimEnd() $currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
} elseif ($trailer -ge 0) { } elseif ($trailer -ge 0) {
$currentBlock = $rest.Substring(0, $trailer).TrimEnd() $currentBlock = $rest.Substring(0, $trailer).TrimEnd()
} else { } else {
$currentBlock = $rest.TrimEnd() $currentBlock = $rest.TrimEnd()
} }
# Static install / docs / licence footer is maintained as a # Static install / docs / licence footer is maintained as a
# separate file so the workflow YAML stays clean (no embedded # separate file so the workflow YAML stays clean (no embedded
# heredoc that would have to be indented under the run-block). # heredoc that would have to be indented under the run-block).
$footerPath = ".github/release-footer.md" $footerPath = ".github/release-footer.md"
if (-not (Test-Path $footerPath)) { if (-not (Test-Path $footerPath)) {
throw "Release footer template not found: $footerPath" throw "Release footer template not found: $footerPath"
} }
$footer = Get-Content -Path $footerPath -Raw $footer = Get-Content -Path $footerPath -Raw
$body = $currentBlock + "`n" + $footer $body = $currentBlock + "`n" + $footer
$body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline $body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
Write-Host "Generated release body for $tag :" Write-Host "Generated release body for $tag :"
Write-Host "----------------------------------------" Write-Host "----------------------------------------"
Write-Host $body Write-Host $body
Write-Host "----------------------------------------" Write-Host "----------------------------------------"
# Gitea-native release action. Creates the release if the tag has no # Gitea-native release action. Creates the release if the tag has no
# release yet, or updates the existing one. body_path provides the # release yet, or updates the existing one. body_path provides the
# generated release body, files attaches latest.zip. The auto-injected # generated release body, files attaches latest.zip. The auto-injected
# GITHUB_TOKEN on Gitea Actions has Gitea-API scope and is sufficient # GITHUB_TOKEN on Gitea Actions has Gitea-API scope and is sufficient
# for release write. # for release write.
- name: Attach to Gitea release - name: Attach to Gitea release
uses: https://gitea.com/actions/release-action@main uses: https://gitea.com/actions/release-action@main
with: with:
# Explicit tag_name so the action targets the correct release in # Explicit tag_name so the action targets the correct release in
# both push:tags (auto) and workflow_dispatch (manual recovery) # both push:tags (auto) and workflow_dispatch (manual recovery)
# modes. Without this, dispatch runs would default to the branch # modes. Without this, dispatch runs would default to the branch
# ref (main) and fail to find the release. # ref (main) and fail to find the release.
tag_name: ${{ github.event.inputs.tag || github.ref_name }} tag_name: ${{ github.event.inputs.tag || github.ref_name }}
files: ${{ steps.locate.outputs.path }} files: ${{ steps.locate.outputs.path }}
body_path: release-body.md body_path: release-body.md
api_key: ${{ secrets.GITHUB_TOKEN }} api_key: ${{ secrets.GITHUB_TOKEN }}
+7
View File
@@ -0,0 +1,7 @@
{
"MD007": { "indent": 4 },
"MD013": false,
"MD029": false,
"MD033": false,
"MD041": false
}
+4
View File
@@ -0,0 +1,4 @@
bin/
obj/
node_modules/
*.Designer.cs
+7
View File
@@ -0,0 +1,7 @@
{
"printWidth": 120,
"tabWidth": 4,
"proseWrap": "always",
"singleQuote": false,
"endOfLine": "lf"
}
+8
View File
@@ -0,0 +1,8 @@
extends: default
rules:
line-length: disable
document-start: disable
truthy:
allowed-values: ["true", "false", "on"]
empty-lines:
max: 1
+54 -77
View File
@@ -2,16 +2,14 @@
## A Note on This Project ## A Note on This Project
HellionChat is a one-person side project developed under Hellion Forge. HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare time, which means
I maintain this in my spare time, which means replies can take a few replies can take a few days. Please do not escalate just because a thread is quiet.
days. Please do not escalate just because a thread is quiet.
When in doubt, assume good intent. Contributors come from different When in doubt, assume good intent. Contributors come from different backgrounds, time zones and skill levels. A
backgrounds, time zones and skill levels. A clarifying question is clarifying question is almost always a better first move than an accusation.
almost always a better first move than an accusation.
Please also keep discussions on topic. This project is about a Dalamud Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic arguments belong
chat plugin. Off-topic arguments belong elsewhere. elsewhere.
--- ---
@@ -19,88 +17,72 @@ chat plugin. Off-topic arguments belong elsewhere.
We pledge to make our community welcoming, safe, and equitable for all. We pledge to make our community welcoming, safe, and equitable for all.
We are committed to fostering an environment that respects and promotes We are committed to fostering an environment that respects and promotes the dignity, rights, and contributions of all
the dignity, rights, and contributions of all individuals, regardless individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics,
of characteristics including race, ethnicity, caste, color, age, neurodiversity, disability, sex or gender, gender identity or expression, sexual orientation, language, philosophy or
physical characteristics, neurodiversity, disability, sex or gender, religion, national or social origin, socio-economic position, level of education, or other status. The same privileges
gender identity or expression, sexual orientation, language, philosophy of participation are extended to everyone who participates in good faith and in accordance with this Covenant.
or religion, national or social origin, socio-economic position, level
of education, or other status. The same privileges of participation are
extended to everyone who participates in good faith and in accordance
with this Covenant.
## Encouraged Behaviors ## Encouraged Behaviors
While acknowledging differences in social norms, we all strive to meet While acknowledging differences in social norms, we all strive to meet our community's expectations for positive
our community's expectations for positive behavior. We also understand behavior. We also understand that our words and actions may be interpreted differently than we intend based on culture,
that our words and actions may be interpreted differently than we intend background, or native language.
based on culture, background, or native language.
With these considerations in mind, we agree to behave mindfully toward With these considerations in mind, we agree to behave mindfully toward each other and act in ways that center our shared
each other and act in ways that center our shared values, including: values, including:
1. Respecting the **purpose of our community**, our activities, and our 1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
ways of gathering.
2. Engaging **kindly and honestly** with others. 2. Engaging **kindly and honestly** with others.
3. Respecting **different viewpoints** and experiences. 3. Respecting **different viewpoints** and experiences.
4. **Taking responsibility** for our actions and contributions. 4. **Taking responsibility** for our actions and contributions.
5. Gracefully giving and accepting **constructive feedback**. 5. Gracefully giving and accepting **constructive feedback**.
6. Committing to **repairing harm** when it occurs. 6. Committing to **repairing harm** when it occurs.
7. Behaving in other ways that promote and sustain the **well-being of 7. Behaving in other ways that promote and sustain the **well-being of our community**.
our community**.
## Restricted Behaviors ## Restricted Behaviors
We agree to restrict the following behaviors in our community. We agree to restrict the following behaviors in our community. Instances, threats, and promotion of these behaviors are
Instances, threats, and promotion of these behaviors are violations of violations of this Code of Conduct.
this Code of Conduct.
1. **Harassment.** Violating explicitly expressed boundaries or engaging 1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal attention after any
in unnecessary personal attention after any clear request to stop. clear request to stop.
2. **Character attacks.** Making insulting, demeaning, or pejorative 2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a community member or group of
comments directed at a community member or group of people. people.
3. **Stereotyping or discrimination.** Characterizing anyone's 3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis of immutable
personality or behavior on the basis of immutable identities or identities or traits.
traits. 4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate in the context or
4. **Sexualization.** Behaving in a way that would generally be purpose of the community.
considered inappropriately intimate in the context or purpose of the 5. **Violating confidentiality.** Sharing or acting on someone's personal or private information without their
community. permission.
5. **Violating confidentiality.** Sharing or acting on someone's 6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person or group.
personal or private information without their permission. 7. Behaving in other ways that **threaten the well-being** of our community.
6. **Endangerment.** Causing, encouraging, or threatening violence or
other harm toward any person or group.
7. Behaving in other ways that **threaten the well-being** of our
community.
### Other Restrictions ### Other Restrictions
1. **Misleading identity.** Impersonating someone else for any reason, 1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone else to evade
or pretending to be someone else to evade enforcement actions. enforcement actions.
2. **Failing to credit sources.** Not properly crediting the sources of 2. **Failing to credit sources.** Not properly crediting the sources of content you contribute.
content you contribute. 3. **Promotional materials.** Sharing marketing or other commercial content in a way that is outside the norms of the
3. **Promotional materials.** Sharing marketing or other commercial community.
content in a way that is outside the norms of the community. 4. **Irresponsible communication.** Failing to responsibly present content which includes, links to, or describes any
4. **Irresponsible communication.** Failing to responsibly present other restricted behaviors.
content which includes, links to, or describes any other restricted
behaviors.
## Reporting ## Reporting
If something here is being broken, contact me directly. Do not open a If something here is being broken, contact me directly. Do not open a public issue.
public issue.
| Channel | Address | | Channel | Address |
| ---------- | ------------------------ | | ---------- | -------------------------- |
| Email | `kontakt@hellion-media.de` | | Email | `kontakt@hellion-media.de` |
| Discord DM | `@j.j_kazama` | | Discord DM | `@j.j_kazama` |
Reports stay private. I will acknowledge within a few weekdays Reports stay private. I will acknowledge within a few weekdays (European business hours) and tell you what I plan to do.
(European business hours) and tell you what I plan to do.
## Enforcement ## Enforcement
I am the sole maintainer, so enforcement is a single-person process. I am the sole maintainer, so enforcement is a single-person process. I will pick the lightest measure that actually
I will pick the lightest measure that actually resolves the situation: resolves the situation:
1. Private note asking the behaviour to stop. 1. Private note asking the behaviour to stop.
2. Public correction in the affected thread. 2. Public correction in the affected thread.
@@ -109,25 +91,20 @@ I will pick the lightest measure that actually resolves the situation:
5. Temporary block from the repository or related spaces. 5. Temporary block from the repository or related spaces.
6. Permanent block. 6. Permanent block.
Severe cases skip the lower steps. I will not negotiate over harassment Severe cases skip the lower steps. I will not negotiate over harassment or threats.
or threats.
## Scope ## Scope
This Code of Conduct applies to all spaces the project owns or that I This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub repository, GitHub
run on its behalf: the GitHub repository, GitHub Discussions, Discussions, project-related Discord conversations, and the maintainer contact listed in [`SECURITY.md`](SECURITY.md).
project-related Discord conversations, and the maintainer contact It also applies when someone is identifiably representing HellionChat elsewhere, for example when posting as a
listed in [`SECURITY.md`](SECURITY.md). It also applies when someone HellionChat maintainer in the Dalamud Discord.
is identifiably representing HellionChat elsewhere, for example when
posting as a HellionChat maintainer in the Dalamud Discord.
## Attribution ## Attribution
This Code of Conduct is adapted from the Contributor Covenant, version This Code of Conduct is adapted from the Contributor Covenant, version 3.0, available at
3.0, available at
[https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/). [https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).
Contributor Covenant is stewarded by the Organization for Ethical Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA 4.0. To view a copy
Source and licensed under CC BY-SA 4.0. To view a copy of this of this license, visit
license, visit
[https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/). [https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).
+72 -107
View File
@@ -1,91 +1,69 @@
# Contributing to HellionChat # Contributing to HellionChat
Thanks for taking a look. HellionChat is a one-person side project Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It started as a fork
developed under Hellion Forge. It started as a fork of of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a standalone plugin under its own namespace,
[Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become IPC channels and source tree (standalone-cut completed in v1.0.0). Forking HellionChat itself is explicitly permitted
a standalone plugin under its own namespace, IPC channels and under the EUPL-1.2.
source tree (standalone-cut completed in v1.0.0). Forking HellionChat
itself is explicitly permitted under the EUPL-1.2.
This document explains what I am looking for, what I am not, and how This document explains what I am looking for, what I am not, and how to make a contribution land smoothly.
to make a contribution land smoothly.
## Before You Open Anything ## Before You Open Anything
- Read the [README](README.md) so you understand the scope: a - Read the [README](README.md) so you understand the scope: a privacy-focused, EUPL-1.2-licensed Dalamud plugin that
privacy-focused, EUPL-1.2-licensed Dalamud plugin that intentionally intentionally removes the upstream webinterface and ships privacy-first defaults.
removes the upstream webinterface and ships privacy-first defaults. - Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2 has ended in the
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active v1.4.x cycle; HellionChat continues as an independent codebase. Existing upstream-derived code keeps its attribution.
cherry-picking from upstream Chat 2 has ended in the v1.4.x cycle; New contributions stand on their own and do not need to be cherry-pick-compatible.
HellionChat continues as an independent codebase. Existing - Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes through a private advisory, never a public issue
upstream-derived code keeps its attribution. New contributions or PR.
stand on their own and do not need to be cherry-pick-compatible.
- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes
through a private advisory, never a public issue or PR.
- Read the [Code of Conduct](CODE_OF_CONDUCT.md). - Read the [Code of Conduct](CODE_OF_CONDUCT.md).
## What I Will Accept ## What I Will Accept
- Bug fixes for behaviour documented in the README, the in-plugin - Bug fixes for behaviour documented in the README, the in-plugin settings or the changelog.
settings or the changelog. - Translation contributions for Hellion-specific strings via direct pull requests against
- Translation contributions for Hellion-specific strings via direct `HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings (`Language.*.resx`) are not
pull requests against handled here; those go to the upstream Chat 2 project.
`HellionChat/Resources/HellionStrings.*.resx`. Translations for
upstream Chat 2 strings (`Language.*.resx`) are not handled here;
those go to the upstream Chat 2 project.
- Documentation improvements (README, comments, this file). - Documentation improvements (README, comments, this file).
- Performance fixes with a measurable before/after. - Performance fixes with a measurable before/after.
- New features that fit the privacy-first scope and do not duplicate - New features that fit the privacy-first scope and do not duplicate what an existing Dalamud plugin already does well.
what an existing Dalamud plugin already does well.
## What I Will Probably Decline ## What I Will Probably Decline
- Re-introducing the webinterface or any remote-access feature. It was - Re-introducing the webinterface or any remote-access feature. It was removed in v0.2.0 on purpose. See the README
removed in v0.2.0 on purpose. See the README section section "Was gegenüber Chat 2 fehlt".
"Was gegenüber Chat 2 fehlt". - Features that bypass the privacy filter or weaken the default retention behaviour without an explicit, documented
- Features that bypass the privacy filter or weaken the default opt-in.
retention behaviour without an explicit, documented opt-in. - Sweeping refactors that touch large parts of the codebase. The maintenance cost outweighs the benefit for a one-person
- Sweeping refactors that touch large parts of the codebase. The project. (This used to be doubly important because of the upstream cherry-pick path; that path is closed now, but the
maintenance cost outweighs the benefit for a one-person project. rule still holds on its own merits.)
(This used to be doubly important because of the upstream - AI-generated code dropped in without disclosure or human review. See [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md)
cherry-pick path; that path is closed now, but the rule still for how I handle AI assistance on my side; I expect comparable transparency from contributors.
holds on its own merits.)
- AI-generated code dropped in without disclosure or human review. See
[`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle
AI assistance on my side; I expect comparable transparency from
contributors.
If you are unsure whether an idea fits, open a feature-request issue If you are unsure whether an idea fits, open a feature-request issue first and ask before writing code. I would rather
first and ask before writing code. I would rather say "no" to a say "no" to a proposal than to a finished pull request.
proposal than to a finished pull request.
## Workflow ## Workflow
1. Open an issue (bug or feature request) using the templates under 1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip this for trivial
`.github/ISSUE_TEMPLATE/`. Skip this for trivial typos. typos.
2. Fork the repository and branch off `main`. Branch naming is 2. Fork the repository and branch off `main`. Branch naming is informal; something like `fix/auto-tell-history-empty` or
informal; something like `fix/auto-tell-history-empty` or
`feat/theme-export` is fine. `feat/theme-export` is fine.
3. Match the existing code style. The repository ships an 3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider pick up automatically.
`.editorconfig` that VS Code and Rider pick up automatically. 4. Keep commits focused. Several small commits with clear messages are easier to review than one large one.
4. Keep commits focused. Several small commits with clear messages are Squash-on-merge happens at the PR level if needed.
easier to review than one large one. Squash-on-merge happens at 5. If your change touches user-visible behaviour, update the README and/or the changelog block in
the PR level if needed. `HellionChat/HellionChat.yaml` and `repo.json`. I bump the version number myself at release time.
5. If your change touches user-visible behaviour, update the README 6. Open the pull request against `main`. The PR template will ask you to summarise the change, the testing you did and
and/or the changelog block in `HellionChat/HellionChat.yaml` and any compatibility notes.
`repo.json`. I bump the version number myself at release time.
6. Open the pull request against `main`. The PR template will ask
you to summarise the change, the testing you did and any
compatibility notes.
## Build and Test ## Build and Test
The project targets `net10.0-windows` against Dalamud SDK 15. To build The project targets `net10.0-windows` against Dalamud SDK 15. To build locally you need:
locally you need:
- .NET 10 SDK - .NET 10 SDK
- A working Dalamud dev environment with `DALAMUD_HOME` set - A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once is the simplest
(XIVLauncher installed and launched once is the simplest path) path)
- VS Code with the C# Dev Kit, Rider, or Visual Studio - VS Code with the C# Dev Kit, Rider, or Visual Studio
```bash ```bash
@@ -93,68 +71,56 @@ dotnet restore
dotnet build HellionChat.sln -c Release dotnet build HellionChat.sln -c Release
``` ```
There are currently no tests in `HellionChat.sln`. If you add a test There are currently no tests in `HellionChat.sln`. If you add a test project, point it at the relevant subsystems
project, point it at the relevant subsystems (privacy filter, (privacy filter, configuration migration, message store) and mention it in the PR.
configuration migration, message store) and mention it in the PR.
For a smoke test in-game: build, copy the output into your Dalamud For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/` directory and load it via
`devPlugins/HellionChat/` directory and load it via `/xlplugins`. `/xlplugins`.
## Continuous Integration ## Continuous Integration
Every push and every pull request runs: Every push and every pull request runs:
| Workflow | What it checks | | Workflow | What it checks |
| ------------- | ------------------------------------- | | ------------ | -------------------------------- |
| `build.yml` | `dotnet build` and `dotnet test` | | `build.yml` | `dotnet build` and `dotnet test` |
| `codeql.yml` | CodeQL security analysis | | `codeql.yml` | CodeQL security analysis |
A pull request will not be merged while either of these is failing. A pull request will not be merged while either of these is failing. CodeQL findings on changed code need to be
CodeQL findings on changed code need to be addressed; pre-existing addressed; pre-existing findings on untouched code are tracked separately.
findings on untouched code are tracked separately.
## Translations ## Translations
Hellion-specific strings live in Hellion-specific strings live in `HellionChat/Resources/HellionStrings.resx` (English source) and
`HellionChat/Resources/HellionStrings.resx` (English source) and `HellionStrings.<lang>.resx` (per-language). These are accepted as direct pull requests.
`HellionStrings.<lang>.resx` (per-language). These are accepted as
direct pull requests.
The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are **not** translated here. They are kept as-is
are **not** translated here. They are kept as-is from the last from the last upstream sync and remain the work of the Chat 2 Crowdin community. Active cherry-picking from upstream
upstream sync and remain the work of the Chat 2 Crowdin community. ended in the v1.4.x cycle (see [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to
Active cherry-picking from upstream ended in the v1.4.x cycle (see those upstream strings will not flow into HellionChat automatically anymore. If you have improvements for the original
[`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future Chat 2 strings, please contribute them to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.
translation improvements to those upstream strings will not flow
into HellionChat automatically anymore. If you have improvements
for the original Chat 2 strings, please contribute them to
[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo)
directly.
## Licensing ## Licensing
By submitting a pull request you confirm that: By submitting a pull request you confirm that:
- Your contribution is your own work, or you have the right to - Your contribution is your own work, or you have the right to contribute it under the project licence.
contribute it under the project licence. - You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence as the rest of the
- You agree that your contribution will be released under the project.
[EUPL-1.2](LICENSE), the same licence as the rest of the project.
There is no separate CLA. Forking HellionChat is explicitly permitted There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with any EUPL-licensed
under the EUPL-1.2, as with any EUPL-licensed project. project.
## Response Times ## Response Times
| Channel | Address | | Channel | Address |
| ------------- | -------------------------- | | ------------- | --------------------------------------- |
| GitHub Issues | Preferred for bugs and feature requests | | GitHub Issues | Preferred for bugs and feature requests |
| Discord DM | `@j.j_kazama` | | Discord DM | `@j.j_kazama` |
| Email | `kontakt@hellion-media.de` | | Email | `kontakt@hellion-media.de` |
I respond on weekdays during European business hours and take weekends I respond on weekdays during European business hours and take weekends and FFXIV patch days off. A pull request that
and FFXIV patch days off. A pull request that sits for a few days has sits for a few days has not been ignored. Pinging once after a week is fine; please do not ping daily.
not been ignored. Pinging once after a week is fine; please do not
ping daily.
## First-time setup ## First-time setup
@@ -164,10 +130,9 @@ After cloning, run once:
./scripts/setup-hooks.sh ./scripts/setup-hooks.sh
``` ```
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight (versions/manifest/changelog/build).
(versions/manifest/changelog/build).
### Test suite ### Test suite
The plugin's test suite lives in a separate local repository and is not part of The plugin's test suite lives in a separate local repository and is not part of this codebase. If you need access for
this codebase. If you need access for development, contact the maintainer. development, contact the maintainer.
+12 -12
View File
@@ -4,22 +4,22 @@ HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
Source code Source code
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
Copyright (c) 2022-2026 Infiziert90 (Infi) and Anna Clemens (ascclemens) Copyright (c) 2022-2026 **[Infiziert90 (Infi)](https://github.com/Infiziert90)** and **[Anna](https://github.com/anna-is-cute)**
Original ChatTwo authors and copyright holders of the upstream Original ChatTwo authors and copyright holders of the upstream
plugin this fork is built on. Their work covers the message store, plugin this fork is built on. Their work covers the message store,
the channel filtering, the sidebar tab system, the FFXIV chat the channel filtering, the sidebar tab system, the FFXIV chat
hooks, the localisation infrastructure and most of the hooks, the localisation infrastructure and most of the
architecture HellionChat still relies on. architecture HellionChat still relies on.
Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
HellionChat-specific modifications, including the privacy filter, HellionChat-specific modifications, including the privacy filter,
per-channel retention sweep, export pipeline, Auto-Tell-Tabs, per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
German localisation and the EUPL-1.2 fork maintenance. German localisation and the EUPL-1.2 fork maintenance.
Source code is licensed under the European Union Public Licence Source code is licensed under the European Union Public Licence
(EUPL), Version 1.2 only. The full Licence text lives in the LICENSE (EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
file at the root of this repository. The official Licence website is file at the root of this repository. The official Licence website is
at: https://eupl.eu/1.2/en/ at: <https://eupl.eu/1.2/en/>
This Work is provided "AS IS" without warranties of any kind. See This Work is provided "AS IS" without warranties of any kind. See
Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
@@ -42,8 +42,8 @@ Bundled assets
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
Exo 2 font (HellionChat/Resources/HellionFont.ttf) Exo 2 font (HellionChat/Resources/HellionFont.ttf)
SIL Open Font License 1.1, full text in HellionFont-OFL.txt. SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
Bundled with permission per the OFL terms. Bundled with permission per the OFL terms.
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
+42 -28
View File
@@ -1,12 +1,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.GameFunctions.Types; using HellionChat.GameFunctions.Types;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
namespace HellionChat; namespace HellionChat;
@@ -76,7 +76,10 @@ internal sealed class AutoTellTabsService : IDisposable
return; return;
} }
if (message.Code.Type != ChatType.TellIncoming && message.Code.Type != ChatType.TellOutgoing) if (
message.Code.Type != ChatType.TellIncoming
&& message.Code.Type != ChatType.TellOutgoing
)
{ {
return; return;
} }
@@ -89,10 +92,11 @@ internal sealed class AutoTellTabsService : IDisposable
// (FFXIV changing tell payload shape, new edge cases) findable // (FFXIV changing tell payload shape, new edge cases) findable
// without having to crank up debug logging at the source. // without having to crank up debug logging at the source.
Plugin.Log.Warning( Plugin.Log.Warning(
$"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, " + $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
$"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " + + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
$"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " + + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
$"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"); + $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"
);
return; return;
} }
@@ -124,8 +128,9 @@ internal sealed class AutoTellTabsService : IDisposable
// PlayerPayload normally rides on a chunk's Link slot, but for // PlayerPayload normally rides on a chunk's Link slot, but for
// some tell types FFXIV only puts it in the raw SeString — // some tell types FFXIV only puts it in the raw SeString —
// fall back to that before giving up. // fall back to that before giving up.
var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender) var fromSender =
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource); ChunkUtil.TryGetPlayerPayload(message.Sender)
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
if (fromSender != null) if (fromSender != null)
{ {
return (fromSender.PlayerName, fromSender.World.RowId); return (fromSender.PlayerName, fromSender.World.RowId);
@@ -137,17 +142,19 @@ internal sealed class AutoTellTabsService : IDisposable
// up either as a payload in the content (for tells typed via the // up either as a payload in the content (for tells typed via the
// Chat 2 input bar) or as the channel's tracked tell target (set by // Chat 2 input bar) or as the channel's tracked tell target (set by
// the SetContextTellTarget game hook). Same SeString fallback. // the SetContextTellTarget game hook). Same SeString fallback.
var fromContent = ChunkUtil.TryGetPlayerPayload(message.Content) var fromContent =
?? ChunkUtil.TryGetPlayerPayload(message.ContentSource) ChunkUtil.TryGetPlayerPayload(message.Content)
?? ChunkUtil.TryGetPlayerPayload(message.Sender) ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource); ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
if (fromContent != null) if (fromContent != null)
{ {
return (fromContent.PlayerName, fromContent.World.RowId); return (fromContent.PlayerName, fromContent.World.RowId);
} }
var current = _plugin.CurrentTab.CurrentChannel.TellTarget var current =
?? _plugin.CurrentTab.CurrentChannel.TempTellTarget; _plugin.CurrentTab.CurrentChannel.TellTarget
?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
if (current != null && current.IsSet()) if (current != null && current.IsSet())
{ {
return (current.Name, current.World); return (current.Name, current.World);
@@ -162,7 +169,8 @@ internal sealed class AutoTellTabsService : IDisposable
t.IsTempTab t.IsTempTab
&& t.TellTarget != null && t.TellTarget != null
&& string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase) && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
&& t.TellTarget.World == world); && t.TellTarget.World == world
);
} }
private void DropOldestTempTab() private void DropOldestTempTab()
@@ -171,8 +179,8 @@ internal sealed class AutoTellTabsService : IDisposable
// "I'm done with that conversation"), and within each bucket we // "I'm done with that conversation"), and within each bucket we
// pick the oldest LastActivity. This protects active conversations // pick the oldest LastActivity. This protects active conversations
// and unfinished greetings while still freeing up a slot. // and unfinished greetings while still freeing up a slot.
var victim = Plugin.Config.Tabs var victim = Plugin
.Select((tab, idx) => (Tab: tab, Index: idx)) .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
.Where(t => t.Tab.IsTempTab) .Where(t => t.Tab.IsTempTab)
.OrderByDescending(t => t.Tab.IsGreeted) .OrderByDescending(t => t.Tab.IsGreeted)
.ThenBy(t => t.Tab.LastActivity) .ThenBy(t => t.Tab.LastActivity)
@@ -191,8 +199,9 @@ internal sealed class AutoTellTabsService : IDisposable
// popped tab is now a routine code path. // popped tab is now a routine code path.
if (victim.Tab.PopOut) if (victim.Tab.PopOut)
{ {
var popout = _plugin.ChatLogWindow.ActivePopouts var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
.FirstOrDefault(p => p.TabIdentifier == victim.Tab.Identifier); p.TabIdentifier == victim.Tab.Identifier
);
if (popout != null) if (popout != null)
{ {
popout.IsOpen = false; popout.IsOpen = false;
@@ -286,7 +295,8 @@ internal sealed class AutoTellTabsService : IDisposable
_messageManager.CurrentContentId, _messageManager.CurrentContentId,
senderName, senderName,
senderWorld, senderWorld,
preloadCount + 1); preloadCount + 1
);
var historicMessages = history var historicMessages = history
.Where(m => m.Id != currentMessageId) .Where(m => m.Id != currentMessageId)
@@ -314,7 +324,8 @@ internal sealed class AutoTellTabsService : IDisposable
// after the historical messages but before the current one. // after the historical messages but before the current one.
tab.Messages.AddPrune( tab.Messages.AddPrune(
MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator), MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator),
MessageManager.MessageDisplayLimit); MessageManager.MessageDisplayLimit
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -324,7 +335,8 @@ internal sealed class AutoTellTabsService : IDisposable
Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed"); Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
tab.Messages.AddPrune( tab.Messages.AddPrune(
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError), MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
MessageManager.MessageDisplayLimit); MessageManager.MessageDisplayLimit
);
} }
} }
@@ -388,16 +400,18 @@ internal sealed class AutoTellTabsService : IDisposable
// the next plugin reload. Especially relevant once Auto-Pop-Out is // the next plugin reload. Especially relevant once Auto-Pop-Out is
// enabled — every logout would otherwise leak as many ghosts as // enabled — every logout would otherwise leak as many ghosts as
// there were active /tell pop-outs. // there were active /tell pop-outs.
var poppedTempTabIds = Plugin.Config.Tabs var poppedTempTabIds = Plugin
.Where(t => t.IsTempTab && t.PopOut) .Config.Tabs.Where(t => t.IsTempTab && t.PopOut)
.Select(t => t.Identifier) .Select(t => t.Identifier)
.ToList(); .ToList();
if (poppedTempTabIds.Count > 0) if (poppedTempTabIds.Count > 0)
{ {
var poppedSet = poppedTempTabIds.ToHashSet(); var poppedSet = poppedTempTabIds.ToHashSet();
foreach (var popout in _plugin.ChatLogWindow.ActivePopouts foreach (
.Where(p => poppedSet.Contains(p.TabIdentifier)) var popout in _plugin
.ToList()) .ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
.ToList()
)
{ {
popout.IsOpen = false; popout.IsOpen = false;
} }
+10 -8
View File
@@ -1,6 +1,6 @@
using System.Linq; using System.Linq;
using HellionChat.Resources;
using Dalamud.Plugin; using Dalamud.Plugin;
using HellionChat.Resources;
namespace HellionChat; namespace HellionChat;
@@ -10,17 +10,19 @@ internal static class ChatTwoConflictDetector
public static void ThrowIfChatTwoIsLoaded(IDalamudPluginInterface pluginInterface) public static void ThrowIfChatTwoIsLoaded(IDalamudPluginInterface pluginInterface)
{ {
var conflict = pluginInterface.InstalledPlugins var conflict = pluginInterface.InstalledPlugins.FirstOrDefault(p =>
.FirstOrDefault(p => p.InternalName == UpstreamInternalName && p.IsLoaded
p.InternalName == UpstreamInternalName && );
p.IsLoaded);
if (conflict is null) if (conflict is null)
return; return;
var message = HellionStrings.ChatTwoConflictTitle + "\n\n" + var message =
HellionStrings.ChatTwoConflictBody + "\n\n" + HellionStrings.ChatTwoConflictTitle
HellionStrings.ChatTwoConflictAction; + "\n\n"
+ HellionStrings.ChatTwoConflictBody
+ "\n\n"
+ HellionStrings.ChatTwoConflictAction;
throw new System.InvalidOperationException(message); throw new System.InvalidOperationException(message);
} }
+40 -18
View File
@@ -1,5 +1,5 @@
using HellionChat.Code;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using HellionChat.Code;
using MessagePack; using MessagePack;
namespace HellionChat; namespace HellionChat;
@@ -25,13 +25,14 @@ public abstract class Chunk
Link = link; Link = link;
} }
internal SeString? GetSeString() => Source switch internal SeString? GetSeString() =>
{ Source switch
ChunkSource.None => null, {
ChunkSource.Sender => Message?.SenderSource, ChunkSource.None => null,
ChunkSource.Content => Message?.ContentSource, ChunkSource.Sender => Message?.SenderSource,
_ => null, ChunkSource.Content => Message?.ContentSource,
}; _ => null,
};
/// <summary> /// <summary>
/// Get some basic text for use in generating hashes. /// Get some basic text for use in generating hashes.
@@ -42,7 +43,7 @@ public abstract class Chunk
{ {
TextChunk text => text.Content, TextChunk text => text.Content,
IconChunk icon => icon.Icon.ToString(), IconChunk icon => icon.Icon.ToString(),
_ => "" _ => "",
}; };
} }
} }
@@ -57,18 +58,29 @@ public enum ChunkSource
[MessagePackObject(AllowPrivate = true)] [MessagePackObject(AllowPrivate = true)]
public class TextChunk : Chunk public class TextChunk : Chunk
{ {
[Key(2)] public ChatType? FallbackColour; [Key(2)]
[Key(3)] public uint? Foreground; public ChatType? FallbackColour;
[Key(4)] public uint? Glow;
[Key(5)] public bool Italic;
[Key(6)] public string Content;
private TextChunk(Chunk chunk, string content) : base(chunk.Source, chunk.Link) [Key(3)]
public uint? Foreground;
[Key(4)]
public uint? Glow;
[Key(5)]
public bool Italic;
[Key(6)]
public string Content;
private TextChunk(Chunk chunk, string content)
: base(chunk.Source, chunk.Link)
{ {
Content = content; Content = content;
} }
internal TextChunk(ChunkSource source, Payload? link, string content) : base(source, link) internal TextChunk(ChunkSource source, Payload? link, string content)
: base(source, link)
{ {
// This has been null in the past, and it broke rendering code. // This has been null in the past, and it broke rendering code.
// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
@@ -76,7 +88,16 @@ public class TextChunk : Chunk
} }
// ReSharper disable once UnusedMember.Global // Used by MessagePack // ReSharper disable once UnusedMember.Global // Used by MessagePack
public TextChunk(ChunkSource source, Payload? link, ChatType? fallbackColour, uint? foreground, uint? glow, bool italic, string content) : base(source, link) public TextChunk(
ChunkSource source,
Payload? link,
ChatType? fallbackColour,
uint? foreground,
uint? glow,
bool italic,
string content
)
: base(source, link)
{ {
FallbackColour = fallbackColour; FallbackColour = fallbackColour;
Foreground = foreground; Foreground = foreground;
@@ -122,7 +143,8 @@ public class IconChunk : Chunk
[Key(2)] [Key(2)]
public BitmapFontIcon Icon { get; set; } public BitmapFontIcon Icon { get; set; }
public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon) : base(source, link) public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon)
: base(source, link)
{ {
Icon = icon; Icon = icon;
} }
+1 -1
View File
@@ -16,7 +16,7 @@ public class ChatCode
} }
public ChatCode(byte type, byte source, byte target) public ChatCode(byte type, byte source, byte target)
: this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) {} : this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) { }
public bool IsBattle() public bool IsBattle()
{ {
+27 -19
View File
@@ -5,24 +5,32 @@ namespace HellionChat.Code;
internal static class ChatSourceExt internal static class ChatSourceExt
{ {
internal const ChatSource All = internal const ChatSource All =
ChatSource.LocalPlayer | ChatSource.PartyMember | ChatSource.AllianceMember | ChatSource.LocalPlayer
ChatSource.OtherPlayer | ChatSource.EngagedEnemy | ChatSource.UnengagedEnemy | | ChatSource.PartyMember
ChatSource.FriendlyNpc | ChatSource.PetOrCompanion | ChatSource.PetOrCompanionParty | | ChatSource.AllianceMember
ChatSource.PetOrCompanionAlliance | ChatSource.PetOrCompanionOther; | ChatSource.OtherPlayer
| ChatSource.EngagedEnemy
| ChatSource.UnengagedEnemy
| ChatSource.FriendlyNpc
| ChatSource.PetOrCompanion
| ChatSource.PetOrCompanionParty
| ChatSource.PetOrCompanionAlliance
| ChatSource.PetOrCompanionOther;
internal static string Name(this ChatSource source) => source switch internal static string Name(this ChatSource source) =>
{ source switch
ChatSource.LocalPlayer => Language.ChatSource_Self, {
ChatSource.PartyMember => Language.ChatSource_PartyMember, ChatSource.LocalPlayer => Language.ChatSource_Self,
ChatSource.AllianceMember => Language.ChatSource_AllianceMember, ChatSource.PartyMember => Language.ChatSource_PartyMember,
ChatSource.OtherPlayer => Language.ChatSource_Other, ChatSource.AllianceMember => Language.ChatSource_AllianceMember,
ChatSource.EngagedEnemy => Language.ChatSource_EngagedEnemy, ChatSource.OtherPlayer => Language.ChatSource_Other,
ChatSource.UnengagedEnemy => Language.ChatSource_UnengagedEnemy, ChatSource.EngagedEnemy => Language.ChatSource_EngagedEnemy,
ChatSource.FriendlyNpc => Language.ChatSource_FriendlyNpc, ChatSource.UnengagedEnemy => Language.ChatSource_UnengagedEnemy,
ChatSource.PetOrCompanion => Language.ChatSource_SelfPet, ChatSource.FriendlyNpc => Language.ChatSource_FriendlyNpc,
ChatSource.PetOrCompanionParty => Language.ChatSource_PartyPet, ChatSource.PetOrCompanion => Language.ChatSource_SelfPet,
ChatSource.PetOrCompanionAlliance => Language.ChatSource_AlliancePet, ChatSource.PetOrCompanionParty => Language.ChatSource_PartyPet,
ChatSource.PetOrCompanionOther => Language.ChatSource_OtherPet, ChatSource.PetOrCompanionAlliance => Language.ChatSource_AlliancePet,
_ => throw new ArgumentOutOfRangeException(nameof(source), source, null), ChatSource.PetOrCompanionOther => Language.ChatSource_OtherPet,
}; _ => throw new ArgumentOutOfRangeException(nameof(source), source, null),
};
} }
+265 -252
View File
@@ -1,92 +1,98 @@
using Dalamud.Game.Config;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Game.Config;
namespace HellionChat.Code; namespace HellionChat.Code;
internal static class ChatTypeExt internal static class ChatTypeExt
{ {
internal static IEnumerable<(string, ChatType[])> SortOrder => internal static IEnumerable<(string, ChatType[])> SortOrder =>
[
(Language.Options_Tabs_ChannelTypes_Special, [ChatType.Debug, ChatType.Urgent, ChatType.Notice]),
(Language.Options_Tabs_ChannelTypes_Chat,
[ [
ChatType.Say, (
ChatType.Yell, Language.Options_Tabs_ChannelTypes_Special,
ChatType.Shout, [ChatType.Debug, ChatType.Urgent, ChatType.Notice]
ChatType.TellIncoming, ),
ChatType.TellOutgoing, (
ChatType.Party, Language.Options_Tabs_ChannelTypes_Chat,
ChatType.CrossParty, [
ChatType.Alliance, ChatType.Say,
ChatType.FreeCompany, ChatType.Yell,
ChatType.PvpTeam, ChatType.Shout,
ChatType.CrossLinkshell1, ChatType.TellIncoming,
ChatType.CrossLinkshell2, ChatType.TellOutgoing,
ChatType.CrossLinkshell3, ChatType.Party,
ChatType.CrossLinkshell4, ChatType.CrossParty,
ChatType.CrossLinkshell5, ChatType.Alliance,
ChatType.CrossLinkshell6, ChatType.FreeCompany,
ChatType.CrossLinkshell7, ChatType.PvpTeam,
ChatType.CrossLinkshell8, ChatType.CrossLinkshell1,
ChatType.Linkshell1, ChatType.CrossLinkshell2,
ChatType.Linkshell2, ChatType.CrossLinkshell3,
ChatType.Linkshell3, ChatType.CrossLinkshell4,
ChatType.Linkshell4, ChatType.CrossLinkshell5,
ChatType.Linkshell5, ChatType.CrossLinkshell6,
ChatType.Linkshell6, ChatType.CrossLinkshell7,
ChatType.Linkshell7, ChatType.CrossLinkshell8,
ChatType.Linkshell8, ChatType.Linkshell1,
ChatType.NoviceNetwork, ChatType.Linkshell2,
ChatType.StandardEmote, ChatType.Linkshell3,
ChatType.CustomEmote ChatType.Linkshell4,
]), ChatType.Linkshell5,
ChatType.Linkshell6,
(Language.Options_Tabs_ChannelTypes_Battle, ChatType.Linkshell7,
[ ChatType.Linkshell8,
ChatType.Damage, ChatType.NoviceNetwork,
ChatType.Miss, ChatType.StandardEmote,
ChatType.Action, ChatType.CustomEmote,
ChatType.Item, ]
ChatType.Healing, ),
ChatType.GainBuff, (
ChatType.LoseBuff, Language.Options_Tabs_ChannelTypes_Battle,
ChatType.GainDebuff, [
ChatType.LoseDebuff ChatType.Damage,
]), ChatType.Miss,
ChatType.Action,
(Language.Options_Tabs_ChannelTypes_Announcements, ChatType.Item,
[ ChatType.Healing,
ChatType.System, ChatType.GainBuff,
ChatType.BattleSystem, ChatType.LoseBuff,
ChatType.GatheringSystem, ChatType.GainDebuff,
ChatType.Error, ChatType.LoseDebuff,
ChatType.Echo, ]
ChatType.NoviceNetworkSystem, ),
ChatType.FreeCompanyAnnouncement, (
ChatType.PvpTeamAnnouncement, Language.Options_Tabs_ChannelTypes_Announcements,
ChatType.FreeCompanyLoginLogout, [
ChatType.PvpTeamLoginLogout, ChatType.System,
ChatType.RetainerSale, ChatType.BattleSystem,
ChatType.NpcDialogue, ChatType.GatheringSystem,
ChatType.NpcAnnouncement, ChatType.Error,
ChatType.LootNotice, ChatType.Echo,
ChatType.Progress, ChatType.NoviceNetworkSystem,
ChatType.LootRoll, ChatType.FreeCompanyAnnouncement,
ChatType.Crafting, ChatType.PvpTeamAnnouncement,
ChatType.Gathering, ChatType.FreeCompanyLoginLogout,
ChatType.PeriodicRecruitmentNotification, ChatType.PvpTeamLoginLogout,
ChatType.Sign, ChatType.RetainerSale,
ChatType.RandomNumber, ChatType.NpcDialogue,
ChatType.Orchestrion, ChatType.NpcAnnouncement,
ChatType.MessageBook, ChatType.LootNotice,
ChatType.Alarm, ChatType.Progress,
ChatType.GlamourNotifications ChatType.LootRoll,
]) ChatType.Crafting,
// Note: ExtraChat linkshells are handled separately in the tab settings ChatType.Gathering,
// UI. ChatType.PeriodicRecruitmentNotification,
]; ChatType.Sign,
ChatType.RandomNumber,
ChatType.Orchestrion,
ChatType.MessageBook,
ChatType.Alarm,
ChatType.GlamourNotifications,
]
),
// Note: ExtraChat linkshells are handled separately in the tab settings
// UI.
];
internal static string Name(this ChatType type) internal static string Name(this ChatType type)
{ {
@@ -143,7 +149,8 @@ internal static class ChatTypeExt
ChatType.FreeCompanyAnnouncement => Language.ChatType_FreeCompanyAnnouncement, ChatType.FreeCompanyAnnouncement => Language.ChatType_FreeCompanyAnnouncement,
ChatType.FreeCompanyLoginLogout => Language.ChatType_FreeCompanyLoginLogout, ChatType.FreeCompanyLoginLogout => Language.ChatType_FreeCompanyLoginLogout,
ChatType.RetainerSale => Language.ChatType_RetainerSale, ChatType.RetainerSale => Language.ChatType_RetainerSale,
ChatType.PeriodicRecruitmentNotification => Language.ChatType_PeriodicRecruitmentNotification, ChatType.PeriodicRecruitmentNotification =>
Language.ChatType_PeriodicRecruitmentNotification,
ChatType.Sign => Language.ChatType_Sign, ChatType.Sign => Language.ChatType_Sign,
ChatType.RandomNumber => Language.ChatType_RandomNumber, ChatType.RandomNumber => Language.ChatType_RandomNumber,
ChatType.NoviceNetworkSystem => Language.ChatType_NoviceNetworkSystem, ChatType.NoviceNetworkSystem => Language.ChatType_NoviceNetworkSystem,
@@ -306,181 +313,187 @@ internal static class ChatTypeExt
} }
} }
internal static InputChannel? ToInputChannel(this ChatType type) => type switch internal static InputChannel? ToInputChannel(this ChatType type) =>
{ type switch
ChatType.TellOutgoing => InputChannel.Tell, {
ChatType.Say => InputChannel.Say, ChatType.TellOutgoing => InputChannel.Tell,
ChatType.Party => InputChannel.Party, ChatType.Say => InputChannel.Say,
ChatType.Alliance => InputChannel.Alliance, ChatType.Party => InputChannel.Party,
ChatType.Yell => InputChannel.Yell, ChatType.Alliance => InputChannel.Alliance,
ChatType.Shout => InputChannel.Shout, ChatType.Yell => InputChannel.Yell,
ChatType.FreeCompany => InputChannel.FreeCompany, ChatType.Shout => InputChannel.Shout,
ChatType.PvpTeam => InputChannel.PvpTeam, ChatType.FreeCompany => InputChannel.FreeCompany,
ChatType.NoviceNetwork => InputChannel.NoviceNetwork, ChatType.PvpTeam => InputChannel.PvpTeam,
ChatType.CrossLinkshell1 => InputChannel.CrossLinkshell1, ChatType.NoviceNetwork => InputChannel.NoviceNetwork,
ChatType.CrossLinkshell2 => InputChannel.CrossLinkshell2, ChatType.CrossLinkshell1 => InputChannel.CrossLinkshell1,
ChatType.CrossLinkshell3 => InputChannel.CrossLinkshell3, ChatType.CrossLinkshell2 => InputChannel.CrossLinkshell2,
ChatType.CrossLinkshell4 => InputChannel.CrossLinkshell4, ChatType.CrossLinkshell3 => InputChannel.CrossLinkshell3,
ChatType.CrossLinkshell5 => InputChannel.CrossLinkshell5, ChatType.CrossLinkshell4 => InputChannel.CrossLinkshell4,
ChatType.CrossLinkshell6 => InputChannel.CrossLinkshell6, ChatType.CrossLinkshell5 => InputChannel.CrossLinkshell5,
ChatType.CrossLinkshell7 => InputChannel.CrossLinkshell7, ChatType.CrossLinkshell6 => InputChannel.CrossLinkshell6,
ChatType.CrossLinkshell8 => InputChannel.CrossLinkshell8, ChatType.CrossLinkshell7 => InputChannel.CrossLinkshell7,
ChatType.Linkshell1 => InputChannel.Linkshell1, ChatType.CrossLinkshell8 => InputChannel.CrossLinkshell8,
ChatType.Linkshell2 => InputChannel.Linkshell2, ChatType.Linkshell1 => InputChannel.Linkshell1,
ChatType.Linkshell3 => InputChannel.Linkshell3, ChatType.Linkshell2 => InputChannel.Linkshell2,
ChatType.Linkshell4 => InputChannel.Linkshell4, ChatType.Linkshell3 => InputChannel.Linkshell3,
ChatType.Linkshell5 => InputChannel.Linkshell5, ChatType.Linkshell4 => InputChannel.Linkshell4,
ChatType.Linkshell6 => InputChannel.Linkshell6, ChatType.Linkshell5 => InputChannel.Linkshell5,
ChatType.Linkshell7 => InputChannel.Linkshell7, ChatType.Linkshell6 => InputChannel.Linkshell6,
ChatType.Linkshell8 => InputChannel.Linkshell8, ChatType.Linkshell7 => InputChannel.Linkshell7,
_ => null, ChatType.Linkshell8 => InputChannel.Linkshell8,
}; _ => null,
};
internal static bool IsGm(this ChatType type) => type switch internal static bool IsGm(this ChatType type) =>
{ type switch
ChatType.GmTell => true, {
ChatType.GmSay => true, ChatType.GmTell => true,
ChatType.GmShout => true, ChatType.GmSay => true,
ChatType.GmYell => true, ChatType.GmShout => true,
ChatType.GmParty => true, ChatType.GmYell => true,
ChatType.GmFreeCompany => true, ChatType.GmParty => true,
ChatType.GmLinkshell1 => true, ChatType.GmFreeCompany => true,
ChatType.GmLinkshell2 => true, ChatType.GmLinkshell1 => true,
ChatType.GmLinkshell3 => true, ChatType.GmLinkshell2 => true,
ChatType.GmLinkshell4 => true, ChatType.GmLinkshell3 => true,
ChatType.GmLinkshell5 => true, ChatType.GmLinkshell4 => true,
ChatType.GmLinkshell6 => true, ChatType.GmLinkshell5 => true,
ChatType.GmLinkshell7 => true, ChatType.GmLinkshell6 => true,
ChatType.GmLinkshell8 => true, ChatType.GmLinkshell7 => true,
ChatType.GmNoviceNetwork => true, ChatType.GmLinkshell8 => true,
_ => false, ChatType.GmNoviceNetwork => true,
}; _ => false,
};
internal static bool IsExtraChatLinkshell(this ChatType type) => type switch internal static bool IsExtraChatLinkshell(this ChatType type) =>
{ type switch
ChatType.ExtraChatLinkshell1 => true, {
ChatType.ExtraChatLinkshell2 => true, ChatType.ExtraChatLinkshell1 => true,
ChatType.ExtraChatLinkshell3 => true, ChatType.ExtraChatLinkshell2 => true,
ChatType.ExtraChatLinkshell4 => true, ChatType.ExtraChatLinkshell3 => true,
ChatType.ExtraChatLinkshell5 => true, ChatType.ExtraChatLinkshell4 => true,
ChatType.ExtraChatLinkshell6 => true, ChatType.ExtraChatLinkshell5 => true,
ChatType.ExtraChatLinkshell7 => true, ChatType.ExtraChatLinkshell6 => true,
ChatType.ExtraChatLinkshell8 => true, ChatType.ExtraChatLinkshell7 => true,
_ => false, ChatType.ExtraChatLinkshell8 => true,
}; _ => false,
};
public static UiConfigOption ToConfigEntry(this ChatType type) => type switch public static UiConfigOption ToConfigEntry(this ChatType type) =>
{ type switch
ChatType.Say => UiConfigOption.ColorSay, {
ChatType.Shout => UiConfigOption.ColorShout, ChatType.Say => UiConfigOption.ColorSay,
ChatType.TellOutgoing => UiConfigOption.ColorTell, ChatType.Shout => UiConfigOption.ColorShout,
ChatType.Party => UiConfigOption.ColorParty, ChatType.TellOutgoing => UiConfigOption.ColorTell,
ChatType.Linkshell1 => UiConfigOption.ColorLS1, ChatType.Party => UiConfigOption.ColorParty,
ChatType.Linkshell2 => UiConfigOption.ColorLS2, ChatType.Linkshell1 => UiConfigOption.ColorLS1,
ChatType.Linkshell3 => UiConfigOption.ColorLS3, ChatType.Linkshell2 => UiConfigOption.ColorLS2,
ChatType.Linkshell4 => UiConfigOption.ColorLS4, ChatType.Linkshell3 => UiConfigOption.ColorLS3,
ChatType.Linkshell5 => UiConfigOption.ColorLS5, ChatType.Linkshell4 => UiConfigOption.ColorLS4,
ChatType.Linkshell6 => UiConfigOption.ColorLS6, ChatType.Linkshell5 => UiConfigOption.ColorLS5,
ChatType.Linkshell7 => UiConfigOption.ColorLS7, ChatType.Linkshell6 => UiConfigOption.ColorLS6,
ChatType.Linkshell8 => UiConfigOption.ColorLS8, ChatType.Linkshell7 => UiConfigOption.ColorLS7,
ChatType.FreeCompany => UiConfigOption.ColorFCompany, ChatType.Linkshell8 => UiConfigOption.ColorLS8,
ChatType.NoviceNetwork => UiConfigOption.ColorBeginner, ChatType.FreeCompany => UiConfigOption.ColorFCompany,
ChatType.CustomEmote => UiConfigOption.ColorEmoteUser, ChatType.NoviceNetwork => UiConfigOption.ColorBeginner,
ChatType.StandardEmote => UiConfigOption.ColorEmote, ChatType.CustomEmote => UiConfigOption.ColorEmoteUser,
ChatType.Yell => UiConfigOption.ColorYell, ChatType.StandardEmote => UiConfigOption.ColorEmote,
ChatType.GainBuff => UiConfigOption.ColorBuffGive, ChatType.Yell => UiConfigOption.ColorYell,
ChatType.GainDebuff => UiConfigOption.ColorDebuffGive, ChatType.GainBuff => UiConfigOption.ColorBuffGive,
ChatType.System => UiConfigOption.ColorSysMsg, ChatType.GainDebuff => UiConfigOption.ColorDebuffGive,
ChatType.NpcDialogue => UiConfigOption.ColorNpcSay, ChatType.System => UiConfigOption.ColorSysMsg,
ChatType.LootRoll => UiConfigOption.ColorLoot, ChatType.NpcDialogue => UiConfigOption.ColorNpcSay,
ChatType.FreeCompanyAnnouncement => UiConfigOption.ColorFCAnnounce, ChatType.LootRoll => UiConfigOption.ColorLoot,
ChatType.PvpTeamAnnouncement => UiConfigOption.ColorPvPGroupAnnounce, ChatType.FreeCompanyAnnouncement => UiConfigOption.ColorFCAnnounce,
_ => UiConfigOption.ColorSay, ChatType.PvpTeamAnnouncement => UiConfigOption.ColorPvPGroupAnnounce,
}; _ => UiConfigOption.ColorSay,
};
internal static bool HasSource(this ChatType type) => type switch internal static bool HasSource(this ChatType type) =>
{ type switch
// Battle {
ChatType.Damage => true, // Battle
ChatType.Miss => true, ChatType.Damage => true,
ChatType.Action => true, ChatType.Miss => true,
ChatType.Item => true, ChatType.Action => true,
ChatType.Healing => true, ChatType.Item => true,
ChatType.GainBuff => true, ChatType.Healing => true,
ChatType.LoseBuff => true, ChatType.GainBuff => true,
ChatType.GainDebuff => true, ChatType.LoseBuff => true,
ChatType.LoseDebuff => true, ChatType.GainDebuff => true,
ChatType.LoseDebuff => true,
// Announcements // Announcements
ChatType.System => true, ChatType.System => true,
ChatType.BattleSystem => true, ChatType.BattleSystem => true,
ChatType.Error => true, ChatType.Error => true,
ChatType.LootNotice => true, ChatType.LootNotice => true,
ChatType.Progress => true, ChatType.Progress => true,
ChatType.LootRoll => true, ChatType.LootRoll => true,
ChatType.Crafting => true, ChatType.Crafting => true,
ChatType.Gathering => true, ChatType.Gathering => true,
ChatType.FreeCompanyLoginLogout => true, ChatType.FreeCompanyLoginLogout => true,
ChatType.PvpTeamLoginLogout => true, ChatType.PvpTeamLoginLogout => true,
_ => false, _ => false,
}; };
internal static ChatType Parent(this ChatType type) => type switch internal static ChatType Parent(this ChatType type) =>
{ type switch
ChatType.Say => ChatType.Say, {
ChatType.GmSay => ChatType.Say, ChatType.Say => ChatType.Say,
ChatType.Shout => ChatType.Shout, ChatType.GmSay => ChatType.Say,
ChatType.GmShout => ChatType.Shout, ChatType.Shout => ChatType.Shout,
ChatType.TellOutgoing => ChatType.TellOutgoing, ChatType.GmShout => ChatType.Shout,
ChatType.TellIncoming => ChatType.TellOutgoing, ChatType.TellOutgoing => ChatType.TellOutgoing,
ChatType.GmTell => ChatType.TellOutgoing, ChatType.TellIncoming => ChatType.TellOutgoing,
ChatType.Party => ChatType.Party, ChatType.GmTell => ChatType.TellOutgoing,
ChatType.CrossParty => ChatType.Party, ChatType.Party => ChatType.Party,
ChatType.GmParty => ChatType.Party, ChatType.CrossParty => ChatType.Party,
ChatType.Linkshell1 => ChatType.Linkshell1, ChatType.GmParty => ChatType.Party,
ChatType.GmLinkshell1 => ChatType.Linkshell1, ChatType.Linkshell1 => ChatType.Linkshell1,
ChatType.Linkshell2 => ChatType.Linkshell2, ChatType.GmLinkshell1 => ChatType.Linkshell1,
ChatType.GmLinkshell2 => ChatType.Linkshell2, ChatType.Linkshell2 => ChatType.Linkshell2,
ChatType.Linkshell3 => ChatType.Linkshell3, ChatType.GmLinkshell2 => ChatType.Linkshell2,
ChatType.GmLinkshell3 => ChatType.Linkshell3, ChatType.Linkshell3 => ChatType.Linkshell3,
ChatType.Linkshell4 => ChatType.Linkshell4, ChatType.GmLinkshell3 => ChatType.Linkshell3,
ChatType.GmLinkshell4 => ChatType.Linkshell4, ChatType.Linkshell4 => ChatType.Linkshell4,
ChatType.Linkshell5 => ChatType.Linkshell5, ChatType.GmLinkshell4 => ChatType.Linkshell4,
ChatType.GmLinkshell5 => ChatType.Linkshell5, ChatType.Linkshell5 => ChatType.Linkshell5,
ChatType.Linkshell6 => ChatType.Linkshell6, ChatType.GmLinkshell5 => ChatType.Linkshell5,
ChatType.GmLinkshell6 => ChatType.Linkshell6, ChatType.Linkshell6 => ChatType.Linkshell6,
ChatType.Linkshell7 => ChatType.Linkshell7, ChatType.GmLinkshell6 => ChatType.Linkshell6,
ChatType.GmLinkshell7 => ChatType.Linkshell7, ChatType.Linkshell7 => ChatType.Linkshell7,
ChatType.Linkshell8 => ChatType.Linkshell8, ChatType.GmLinkshell7 => ChatType.Linkshell7,
ChatType.GmLinkshell8 => ChatType.Linkshell8, ChatType.Linkshell8 => ChatType.Linkshell8,
ChatType.FreeCompany => ChatType.FreeCompany, ChatType.GmLinkshell8 => ChatType.Linkshell8,
ChatType.GmFreeCompany => ChatType.FreeCompany, ChatType.FreeCompany => ChatType.FreeCompany,
ChatType.NoviceNetwork => ChatType.NoviceNetwork, ChatType.GmFreeCompany => ChatType.FreeCompany,
ChatType.GmNoviceNetwork => ChatType.NoviceNetwork, ChatType.NoviceNetwork => ChatType.NoviceNetwork,
ChatType.CustomEmote => ChatType.CustomEmote, ChatType.GmNoviceNetwork => ChatType.NoviceNetwork,
ChatType.StandardEmote => ChatType.StandardEmote, ChatType.CustomEmote => ChatType.CustomEmote,
ChatType.Yell => ChatType.Yell, ChatType.StandardEmote => ChatType.StandardEmote,
ChatType.GmYell => ChatType.Yell, ChatType.Yell => ChatType.Yell,
ChatType.GainBuff => ChatType.GainBuff, ChatType.GmYell => ChatType.Yell,
ChatType.LoseBuff => ChatType.GainBuff, ChatType.GainBuff => ChatType.GainBuff,
ChatType.GainDebuff => ChatType.GainDebuff, ChatType.LoseBuff => ChatType.GainBuff,
ChatType.LoseDebuff => ChatType.GainDebuff, ChatType.GainDebuff => ChatType.GainDebuff,
ChatType.System => ChatType.System, ChatType.LoseDebuff => ChatType.GainDebuff,
ChatType.Alarm => ChatType.System, ChatType.System => ChatType.System,
ChatType.GlamourNotifications => ChatType.System, ChatType.Alarm => ChatType.System,
ChatType.RetainerSale => ChatType.System, ChatType.GlamourNotifications => ChatType.System,
ChatType.PeriodicRecruitmentNotification => ChatType.System, ChatType.RetainerSale => ChatType.System,
ChatType.Sign => ChatType.System, ChatType.PeriodicRecruitmentNotification => ChatType.System,
ChatType.Orchestrion => ChatType.System, ChatType.Sign => ChatType.System,
ChatType.MessageBook => ChatType.System, ChatType.Orchestrion => ChatType.System,
ChatType.NpcDialogue => ChatType.NpcDialogue, ChatType.MessageBook => ChatType.System,
ChatType.NpcAnnouncement => ChatType.NpcDialogue, ChatType.NpcDialogue => ChatType.NpcDialogue,
ChatType.LootRoll => ChatType.LootRoll, ChatType.NpcAnnouncement => ChatType.NpcDialogue,
ChatType.RandomNumber => ChatType.LootRoll, ChatType.LootRoll => ChatType.LootRoll,
ChatType.FreeCompanyAnnouncement => ChatType.FreeCompanyAnnouncement, ChatType.RandomNumber => ChatType.LootRoll,
ChatType.FreeCompanyLoginLogout => ChatType.FreeCompanyAnnouncement, ChatType.FreeCompanyAnnouncement => ChatType.FreeCompanyAnnouncement,
ChatType.PvpTeamAnnouncement => ChatType.PvpTeamAnnouncement, ChatType.FreeCompanyLoginLogout => ChatType.FreeCompanyAnnouncement,
ChatType.PvpTeamLoginLogout => ChatType.PvpTeamAnnouncement, ChatType.PvpTeamAnnouncement => ChatType.PvpTeamAnnouncement,
_ => type, ChatType.PvpTeamLoginLogout => ChatType.PvpTeamAnnouncement,
}; _ => type,
};
} }
+153 -145
View File
@@ -4,111 +4,114 @@ namespace HellionChat.Code;
internal static class InputChannelExt internal static class InputChannelExt
{ {
internal static ChatType ToChatType(this InputChannel input) => input switch internal static ChatType ToChatType(this InputChannel input) =>
{ input switch
InputChannel.Tell => ChatType.TellOutgoing, {
InputChannel.Say => ChatType.Say, InputChannel.Tell => ChatType.TellOutgoing,
InputChannel.Party => ChatType.Party, InputChannel.Say => ChatType.Say,
InputChannel.Alliance => ChatType.Alliance, InputChannel.Party => ChatType.Party,
InputChannel.Yell => ChatType.Yell, InputChannel.Alliance => ChatType.Alliance,
InputChannel.Shout => ChatType.Shout, InputChannel.Yell => ChatType.Yell,
InputChannel.FreeCompany => ChatType.FreeCompany, InputChannel.Shout => ChatType.Shout,
InputChannel.PvpTeam => ChatType.PvpTeam, InputChannel.FreeCompany => ChatType.FreeCompany,
InputChannel.NoviceNetwork => ChatType.NoviceNetwork, InputChannel.PvpTeam => ChatType.PvpTeam,
InputChannel.CrossLinkshell1 => ChatType.CrossLinkshell1, InputChannel.NoviceNetwork => ChatType.NoviceNetwork,
InputChannel.CrossLinkshell2 => ChatType.CrossLinkshell2, InputChannel.CrossLinkshell1 => ChatType.CrossLinkshell1,
InputChannel.CrossLinkshell3 => ChatType.CrossLinkshell3, InputChannel.CrossLinkshell2 => ChatType.CrossLinkshell2,
InputChannel.CrossLinkshell4 => ChatType.CrossLinkshell4, InputChannel.CrossLinkshell3 => ChatType.CrossLinkshell3,
InputChannel.CrossLinkshell5 => ChatType.CrossLinkshell5, InputChannel.CrossLinkshell4 => ChatType.CrossLinkshell4,
InputChannel.CrossLinkshell6 => ChatType.CrossLinkshell6, InputChannel.CrossLinkshell5 => ChatType.CrossLinkshell5,
InputChannel.CrossLinkshell7 => ChatType.CrossLinkshell7, InputChannel.CrossLinkshell6 => ChatType.CrossLinkshell6,
InputChannel.CrossLinkshell8 => ChatType.CrossLinkshell8, InputChannel.CrossLinkshell7 => ChatType.CrossLinkshell7,
InputChannel.Linkshell1 => ChatType.Linkshell1, InputChannel.CrossLinkshell8 => ChatType.CrossLinkshell8,
InputChannel.Linkshell2 => ChatType.Linkshell2, InputChannel.Linkshell1 => ChatType.Linkshell1,
InputChannel.Linkshell3 => ChatType.Linkshell3, InputChannel.Linkshell2 => ChatType.Linkshell2,
InputChannel.Linkshell4 => ChatType.Linkshell4, InputChannel.Linkshell3 => ChatType.Linkshell3,
InputChannel.Linkshell5 => ChatType.Linkshell5, InputChannel.Linkshell4 => ChatType.Linkshell4,
InputChannel.Linkshell6 => ChatType.Linkshell6, InputChannel.Linkshell5 => ChatType.Linkshell5,
InputChannel.Linkshell7 => ChatType.Linkshell7, InputChannel.Linkshell6 => ChatType.Linkshell6,
InputChannel.Linkshell8 => ChatType.Linkshell8, InputChannel.Linkshell7 => ChatType.Linkshell7,
InputChannel.ExtraChatLinkshell1 => ChatType.ExtraChatLinkshell1, InputChannel.Linkshell8 => ChatType.Linkshell8,
InputChannel.ExtraChatLinkshell2 => ChatType.ExtraChatLinkshell2, InputChannel.ExtraChatLinkshell1 => ChatType.ExtraChatLinkshell1,
InputChannel.ExtraChatLinkshell3 => ChatType.ExtraChatLinkshell3, InputChannel.ExtraChatLinkshell2 => ChatType.ExtraChatLinkshell2,
InputChannel.ExtraChatLinkshell4 => ChatType.ExtraChatLinkshell4, InputChannel.ExtraChatLinkshell3 => ChatType.ExtraChatLinkshell3,
InputChannel.ExtraChatLinkshell5 => ChatType.ExtraChatLinkshell5, InputChannel.ExtraChatLinkshell4 => ChatType.ExtraChatLinkshell4,
InputChannel.ExtraChatLinkshell6 => ChatType.ExtraChatLinkshell6, InputChannel.ExtraChatLinkshell5 => ChatType.ExtraChatLinkshell5,
InputChannel.ExtraChatLinkshell7 => ChatType.ExtraChatLinkshell7, InputChannel.ExtraChatLinkshell6 => ChatType.ExtraChatLinkshell6,
InputChannel.ExtraChatLinkshell8 => ChatType.ExtraChatLinkshell8, InputChannel.ExtraChatLinkshell7 => ChatType.ExtraChatLinkshell7,
InputChannel.Invalid => ChatType.Echo, InputChannel.ExtraChatLinkshell8 => ChatType.ExtraChatLinkshell8,
_ => throw new ArgumentOutOfRangeException(nameof(input), input, null), InputChannel.Invalid => ChatType.Echo,
}; _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
};
public static uint LinkshellIndex(this InputChannel channel) => channel switch public static uint LinkshellIndex(this InputChannel channel) =>
{ channel switch
InputChannel.Linkshell1 => 0, {
InputChannel.Linkshell2 => 1, InputChannel.Linkshell1 => 0,
InputChannel.Linkshell3 => 2, InputChannel.Linkshell2 => 1,
InputChannel.Linkshell4 => 3, InputChannel.Linkshell3 => 2,
InputChannel.Linkshell5 => 4, InputChannel.Linkshell4 => 3,
InputChannel.Linkshell6 => 5, InputChannel.Linkshell5 => 4,
InputChannel.Linkshell7 => 6, InputChannel.Linkshell6 => 5,
InputChannel.Linkshell8 => 7, InputChannel.Linkshell7 => 6,
InputChannel.CrossLinkshell1 => 0, InputChannel.Linkshell8 => 7,
InputChannel.CrossLinkshell2 => 1, InputChannel.CrossLinkshell1 => 0,
InputChannel.CrossLinkshell3 => 2, InputChannel.CrossLinkshell2 => 1,
InputChannel.CrossLinkshell4 => 3, InputChannel.CrossLinkshell3 => 2,
InputChannel.CrossLinkshell5 => 4, InputChannel.CrossLinkshell4 => 3,
InputChannel.CrossLinkshell6 => 5, InputChannel.CrossLinkshell5 => 4,
InputChannel.CrossLinkshell7 => 6, InputChannel.CrossLinkshell6 => 5,
InputChannel.CrossLinkshell8 => 7, InputChannel.CrossLinkshell7 => 6,
InputChannel.ExtraChatLinkshell1 => 0, InputChannel.CrossLinkshell8 => 7,
InputChannel.ExtraChatLinkshell2 => 1, InputChannel.ExtraChatLinkshell1 => 0,
InputChannel.ExtraChatLinkshell3 => 2, InputChannel.ExtraChatLinkshell2 => 1,
InputChannel.ExtraChatLinkshell4 => 3, InputChannel.ExtraChatLinkshell3 => 2,
InputChannel.ExtraChatLinkshell5 => 4, InputChannel.ExtraChatLinkshell4 => 3,
InputChannel.ExtraChatLinkshell6 => 5, InputChannel.ExtraChatLinkshell5 => 4,
InputChannel.ExtraChatLinkshell7 => 6, InputChannel.ExtraChatLinkshell6 => 5,
InputChannel.ExtraChatLinkshell8 => 7, InputChannel.ExtraChatLinkshell7 => 6,
_ => uint.MaxValue, InputChannel.ExtraChatLinkshell8 => 7,
}; _ => uint.MaxValue,
};
public static string Prefix(this InputChannel channel) => channel switch public static string Prefix(this InputChannel channel) =>
{ channel switch
InputChannel.Tell => "/t", {
InputChannel.Say => "/s", InputChannel.Tell => "/t",
InputChannel.Party => "/p", InputChannel.Say => "/s",
InputChannel.Alliance => "/a", InputChannel.Party => "/p",
InputChannel.Yell => "/y", InputChannel.Alliance => "/a",
InputChannel.Shout => "/sh", InputChannel.Yell => "/y",
InputChannel.FreeCompany => "/fc", InputChannel.Shout => "/sh",
InputChannel.PvpTeam => "/pt", InputChannel.FreeCompany => "/fc",
InputChannel.NoviceNetwork => "/b", InputChannel.PvpTeam => "/pt",
InputChannel.CrossLinkshell1 => "/cwl1", InputChannel.NoviceNetwork => "/b",
InputChannel.CrossLinkshell2 => "/cwl2", InputChannel.CrossLinkshell1 => "/cwl1",
InputChannel.CrossLinkshell3 => "/cwl3", InputChannel.CrossLinkshell2 => "/cwl2",
InputChannel.CrossLinkshell4 => "/cwl4", InputChannel.CrossLinkshell3 => "/cwl3",
InputChannel.CrossLinkshell5 => "/cwl5", InputChannel.CrossLinkshell4 => "/cwl4",
InputChannel.CrossLinkshell6 => "/cwl6", InputChannel.CrossLinkshell5 => "/cwl5",
InputChannel.CrossLinkshell7 => "/cwl7", InputChannel.CrossLinkshell6 => "/cwl6",
InputChannel.CrossLinkshell8 => "/cwl8", InputChannel.CrossLinkshell7 => "/cwl7",
InputChannel.Linkshell1 => "/l1", InputChannel.CrossLinkshell8 => "/cwl8",
InputChannel.Linkshell2 => "/l2", InputChannel.Linkshell1 => "/l1",
InputChannel.Linkshell3 => "/l3", InputChannel.Linkshell2 => "/l2",
InputChannel.Linkshell4 => "/l4", InputChannel.Linkshell3 => "/l3",
InputChannel.Linkshell5 => "/l5", InputChannel.Linkshell4 => "/l4",
InputChannel.Linkshell6 => "/l6", InputChannel.Linkshell5 => "/l5",
InputChannel.Linkshell7 => "/l7", InputChannel.Linkshell6 => "/l6",
InputChannel.Linkshell8 => "/l8", InputChannel.Linkshell7 => "/l7",
InputChannel.ExtraChatLinkshell1 => "/ecl1", InputChannel.Linkshell8 => "/l8",
InputChannel.ExtraChatLinkshell2 => "/ecl2", InputChannel.ExtraChatLinkshell1 => "/ecl1",
InputChannel.ExtraChatLinkshell3 => "/ecl3", InputChannel.ExtraChatLinkshell2 => "/ecl2",
InputChannel.ExtraChatLinkshell4 => "/ecl4", InputChannel.ExtraChatLinkshell3 => "/ecl3",
InputChannel.ExtraChatLinkshell5 => "/ecl5", InputChannel.ExtraChatLinkshell4 => "/ecl4",
InputChannel.ExtraChatLinkshell6 => "/ecl6", InputChannel.ExtraChatLinkshell5 => "/ecl5",
InputChannel.ExtraChatLinkshell7 => "/ecl7", InputChannel.ExtraChatLinkshell6 => "/ecl6",
InputChannel.ExtraChatLinkshell8 => "/ecl8", InputChannel.ExtraChatLinkshell7 => "/ecl7",
_ => "/e", InputChannel.ExtraChatLinkshell8 => "/ecl8",
}; _ => "/e",
};
public static IEnumerable<TextCommand>? TextCommands(this InputChannel channel) public static IEnumerable<TextCommand>? TextCommands(this InputChannel channel)
{ {
@@ -145,51 +148,56 @@ internal static class InputChannelExt
if (ids.Length == 0) if (ids.Length == 0)
return null; return null;
return ids.Where(id => Sheets.TextCommandSheet.HasRow(id)).Select(id => Sheets.TextCommandSheet.GetRow(id)); return ids.Where(id => Sheets.TextCommandSheet.HasRow(id))
.Select(id => Sheets.TextCommandSheet.GetRow(id));
} }
internal static bool IsLinkshell(this InputChannel channel) => channel switch internal static bool IsLinkshell(this InputChannel channel) =>
{ channel switch
InputChannel.Linkshell1 => true, {
InputChannel.Linkshell2 => true, InputChannel.Linkshell1 => true,
InputChannel.Linkshell3 => true, InputChannel.Linkshell2 => true,
InputChannel.Linkshell4 => true, InputChannel.Linkshell3 => true,
InputChannel.Linkshell5 => true, InputChannel.Linkshell4 => true,
InputChannel.Linkshell6 => true, InputChannel.Linkshell5 => true,
InputChannel.Linkshell7 => true, InputChannel.Linkshell6 => true,
InputChannel.Linkshell8 => true, InputChannel.Linkshell7 => true,
_ => false, InputChannel.Linkshell8 => true,
}; _ => false,
};
internal static bool IsCrossLinkshell(this InputChannel channel) => channel switch internal static bool IsCrossLinkshell(this InputChannel channel) =>
{ channel switch
InputChannel.CrossLinkshell1 => true, {
InputChannel.CrossLinkshell2 => true, InputChannel.CrossLinkshell1 => true,
InputChannel.CrossLinkshell3 => true, InputChannel.CrossLinkshell2 => true,
InputChannel.CrossLinkshell4 => true, InputChannel.CrossLinkshell3 => true,
InputChannel.CrossLinkshell5 => true, InputChannel.CrossLinkshell4 => true,
InputChannel.CrossLinkshell6 => true, InputChannel.CrossLinkshell5 => true,
InputChannel.CrossLinkshell7 => true, InputChannel.CrossLinkshell6 => true,
InputChannel.CrossLinkshell8 => true, InputChannel.CrossLinkshell7 => true,
_ => false, InputChannel.CrossLinkshell8 => true,
}; _ => false,
};
internal static bool IsExtraChatLinkshell(this InputChannel channel) => channel switch internal static bool IsExtraChatLinkshell(this InputChannel channel) =>
{ channel switch
InputChannel.ExtraChatLinkshell1 => true, {
InputChannel.ExtraChatLinkshell2 => true, InputChannel.ExtraChatLinkshell1 => true,
InputChannel.ExtraChatLinkshell3 => true, InputChannel.ExtraChatLinkshell2 => true,
InputChannel.ExtraChatLinkshell4 => true, InputChannel.ExtraChatLinkshell3 => true,
InputChannel.ExtraChatLinkshell5 => true, InputChannel.ExtraChatLinkshell4 => true,
InputChannel.ExtraChatLinkshell6 => true, InputChannel.ExtraChatLinkshell5 => true,
InputChannel.ExtraChatLinkshell7 => true, InputChannel.ExtraChatLinkshell6 => true,
InputChannel.ExtraChatLinkshell8 => true, InputChannel.ExtraChatLinkshell7 => true,
_ => false, InputChannel.ExtraChatLinkshell8 => true,
}; _ => false,
};
internal static bool IsValid(this InputChannel channel) => channel switch internal static bool IsValid(this InputChannel channel) =>
{ channel switch
InputChannel.Invalid => false, {
_ => true, InputChannel.Invalid => false,
}; _ => true,
};
} }
+13 -6
View File
@@ -16,15 +16,22 @@ internal sealed class Commands : IDisposable
{ {
foreach (var wrapper in Registered.Values) foreach (var wrapper in Registered.Values)
{ {
Plugin.CommandManager.AddHandler(wrapper.Name, new CommandInfo(Invoke) Plugin.CommandManager.AddHandler(
{ wrapper.Name,
HelpMessage = wrapper.Description ?? string.Empty, new CommandInfo(Invoke)
ShowInHelp = wrapper.ShowInHelp, {
}); HelpMessage = wrapper.Description ?? string.Empty,
ShowInHelp = wrapper.ShowInHelp,
}
);
} }
} }
internal CommandWrapper Register(string name, string? description = null, bool? showInHelp = null) internal CommandWrapper Register(
string name,
string? description = null,
bool? showInHelp = null
)
{ {
if (Registered.TryGetValue(name, out var wrapper)) if (Registered.TryGetValue(name, out var wrapper))
{ {
+215 -147
View File
@@ -1,14 +1,14 @@
using System.Collections; using System.Collections;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud; using Dalamud;
using Dalamud.Bindings.ImGui;
using Dalamud.Configuration; using Dalamud.Configuration;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.FontIdentifier; using Dalamud.Interface.FontIdentifier;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat; namespace HellionChat;
@@ -27,7 +27,7 @@ public class ConfigKeyBind
modString += Language.Keybind_Modifier_Shift + " + "; modString += Language.Keybind_Modifier_Shift + " + ";
if (Modifier.HasFlag(ModifierFlag.Alt)) if (Modifier.HasFlag(ModifierFlag.Alt))
modString += Language.Keybind_Modifier_Alt + " + "; modString += Language.Keybind_Modifier_Alt + " + ";
return modString+Key.GetFancyName(); return modString + Key.GetFancyName();
} }
} }
@@ -45,10 +45,10 @@ public class Configuration : IPluginConfiguration
// HellionThemeWindowOpacity beim Bump v13 → v14. // HellionThemeWindowOpacity beim Bump v13 → v14.
public float WindowOpacity = 0.85f; public float WindowOpacity = 0.85f;
// v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden // v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
// vorab angelegt, damit später keine Migration nötig ist. // vorab angelegt, damit später keine Migration nötig ist.
public bool ReduceMotion; public bool ReduceMotion;
// v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus // v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
// v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender: // v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
// Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
@@ -60,8 +60,10 @@ public class Configuration : IPluginConfiguration
// Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default). // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
// Master-switch defaults to true; set false to restore upstream behavior. // Master-switch defaults to true; set false to restore upstream behavior.
public bool PrivacyFilterEnabled = true; public bool PrivacyFilterEnabled = true;
// Empty set means the migration has not run yet — see Plugin.cs v6→v7. // Empty set means the migration has not run yet — see Plugin.cs v6→v7.
public HashSet<ChatType> PrivacyPersistChannels = []; public HashSet<ChatType> PrivacyPersistChannels = [];
// Failsafe for ChatTypes added by future FFXIV patches we don't know about. // Failsafe for ChatTypes added by future FFXIV patches we don't know about.
public bool PrivacyPersistUnknownChannels; public bool PrivacyPersistUnknownChannels;
@@ -103,15 +105,19 @@ public class Configuration : IPluginConfiguration
// /tell spawns a session-only tab dedicated to that conversation // /tell spawns a session-only tab dedicated to that conversation
// partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian). // partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian).
public bool EnableAutoTellTabs = true; public bool EnableAutoTellTabs = true;
// Hard cap on simultaneously open auto tell tabs. Range enforced by the // Hard cap on simultaneously open auto tell tabs. Range enforced by the
// settings slider (150). LRU drop favors greeted tabs first. // settings slider (150). LRU drop favors greeted tabs first.
public int AutoTellTabsLimit = 15; public int AutoTellTabsLimit = 15;
// When true the sidebar shows only a thin separator before the temp // When true the sidebar shows only a thin separator before the temp
// tabs; when false a section header "Active Tells (n)" is rendered. // tabs; when false a section header "Active Tells (n)" is rendered.
public bool AutoTellTabsCompactDisplay; public bool AutoTellTabsCompactDisplay;
// Number of prior tells to preload from the message store when an // Number of prior tells to preload from the message store when an
// auto tell tab is spawned. Range 0100; 0 disables preload. // auto tell tab is spawned. Range 0100; 0 disables preload.
public int AutoTellTabsHistoryPreload = 20; public int AutoTellTabsHistoryPreload = 20;
// Show the greeter "marked-as-greeted" toggle button next to each // Show the greeter "marked-as-greeted" toggle button next to each
// temp tab and dim the tab name when set. Off by default because the // temp tab and dim the tab name when set. Off by default because the
// workflow is specific to club-greeter use cases — most users just // workflow is specific to club-greeter use cases — most users just
@@ -160,6 +166,7 @@ public class Configuration : IPluginConfiguration
public bool HideWhenUiHidden = true; public bool HideWhenUiHidden = true;
public bool HideInLoadingScreens; public bool HideInLoadingScreens;
public bool HideInBattle; public bool HideInBattle;
// v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
// versteckt zu halten ist konsistent mit den anderen Hide-Defaults // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
// (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story- // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
@@ -179,11 +186,13 @@ public class Configuration : IPluginConfiguration
public bool NativeItemTooltips = true; public bool NativeItemTooltips = true;
public bool PrettierTimestamps = true; public bool PrettierTimestamps = true;
public bool MoreCompactPretty; public bool MoreCompactPretty;
// v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
// innerhalb derselben Minute lesen sich als Rauschen; ein einziger // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
// Timestamp pro Minute reicht aus um die Konversation zu verorten. // Timestamp pro Minute reicht aus um die Konversation zu verorten.
public bool HideSameTimestamps = true; public bool HideSameTimestamps = true;
public bool ShowNoviceNetwork; public bool ShowNoviceNetwork;
// Hellion Chat — vertical sidebar tab layout reads better than the // Hellion Chat — vertical sidebar tab layout reads better than the
// horizontal tab strip in the company of Auto-Tell-Tabs (a club // horizontal tab strip in the company of Auto-Tell-Tabs (a club
// greeter typically tracks 515 simultaneous conversations). Bestand // greeter typically tracks 515 simultaneous conversations). Bestand
@@ -209,11 +218,13 @@ public class Configuration : IPluginConfiguration
public bool CollapseKeepUniqueLinks; public bool CollapseKeepUniqueLinks;
public bool PlaySounds = true; public bool PlaySounds = true;
public bool KeepInputFocus = true; public bool KeepInputFocus = true;
// v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range- // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
// Hardware bei langen Sessions spürbar langsamer (Card-Layout // Hardware bei langen Sessions spürbar langsamer (Card-Layout
// re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
// und bleibt smooth. User die mehr brauchen können bis 10000 hoch. // und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
public int MaxLinesToRender = 2_500; // 1-10000 public int MaxLinesToRender = 2_500; // 1-10000
// Default ON to match a German / European 24h locale. The // Default ON to match a German / European 24h locale. The
// ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
// CultureInfo.InvariantCulture so the result is consistent across // CultureInfo.InvariantCulture so the result is consistent across
@@ -246,6 +257,7 @@ public class Configuration : IPluginConfiguration
}; };
public float TooltipOffset; public float TooltipOffset;
// v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
// First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen // First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
// neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
@@ -257,7 +269,9 @@ public class Configuration : IPluginConfiguration
private static Dictionary<ChatType, uint> BuildDefaultChatColours() private static Dictionary<ChatType, uint> BuildDefaultChatColours()
{ {
var defaults = new Dictionary<ChatType, uint>(); var defaults = new Dictionary<ChatType, uint>();
foreach (var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours) foreach (
var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours
)
defaults[channel] = colour; defaults[channel] = colour;
return defaults; return defaults;
} }
@@ -284,7 +298,10 @@ public class Configuration : IPluginConfiguration
HideWhenInactive = other.HideWhenInactive; HideWhenInactive = other.HideWhenInactive;
InactivityHideTimeout = other.InactivityHideTimeout; InactivityHideTimeout = other.InactivityHideTimeout;
InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle; InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle;
InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(pair => pair.Key, pair => pair.Value); InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(
pair => pair.Key,
pair => pair.Value
);
InactivityHideExtraChatAll = other.InactivityHideExtraChatAll; InactivityHideExtraChatAll = other.InactivityHideExtraChatAll;
InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet(); InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet();
ShowHideButton = other.ShowHideButton; ShowHideButton = other.ShowHideButton;
@@ -349,32 +366,37 @@ public class Configuration : IPluginConfiguration
// settings get a fresh empty MessageList; deleted tabs lose their // settings get a fresh empty MessageList; deleted tabs lose their
// history (intended). // history (intended).
var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList(); var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
var livePersistentSession = Tabs var livePersistentSession = Tabs.Where(t => !t.IsTempTab)
.Where(t => !t.IsTempTab)
.ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread)); .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t => Tabs = other
{ .Tabs.Where(t => !t.IsTempTab)
var clone = t.Clone(); .Select(t =>
if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
{ {
clone.Messages = live.Messages; var clone = t.Clone();
clone.LastSendUnread = live.LastSendUnread; if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
} {
return clone; clone.Messages = live.Messages;
}).ToList(); clone.LastSendUnread = live.LastSendUnread;
}
return clone;
})
.ToList();
Tabs.AddRange(liveTempTabs); Tabs.AddRange(liveTempTabs);
ChatTabForward = other.ChatTabForward; ChatTabForward = other.ChatTabForward;
ChatTabBackward = other.ChatTabBackward; ChatTabBackward = other.ChatTabBackward;
PrivacyFilterEnabled = other.PrivacyFilterEnabled; PrivacyFilterEnabled = other.PrivacyFilterEnabled;
PrivacyPersistChannels = [..other.PrivacyPersistChannels]; PrivacyPersistChannels = [.. other.PrivacyPersistChannels];
PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels; PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels;
RetentionEnabled = other.RetentionEnabled; RetentionEnabled = other.RetentionEnabled;
RetentionDefaultDays = other.RetentionDefaultDays; RetentionDefaultDays = other.RetentionDefaultDays;
RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(p => p.Key, p => p.Value); RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(
p => p.Key,
p => p.Value
);
RetentionLastRunAt = other.RetentionLastRunAt; RetentionLastRunAt = other.RetentionLastRunAt;
FirstRunCompleted = other.FirstRunCompleted; FirstRunCompleted = other.FirstRunCompleted;
@@ -410,21 +432,23 @@ public enum UnreadMode
public static class UnreadModeExt public static class UnreadModeExt
{ {
internal static string Name(this UnreadMode mode) => mode switch internal static string Name(this UnreadMode mode) =>
{ mode switch
UnreadMode.All => Language.UnreadMode_All, {
UnreadMode.Unseen => Language.UnreadMode_Unseen, UnreadMode.All => Language.UnreadMode_All,
UnreadMode.None => Language.UnreadMode_None, UnreadMode.Unseen => Language.UnreadMode_Unseen,
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), UnreadMode.None => Language.UnreadMode_None,
}; _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
};
internal static string? Tooltip(this UnreadMode mode) => mode switch internal static string? Tooltip(this UnreadMode mode) =>
{ mode switch
UnreadMode.All => Language.UnreadMode_All_Tooltip, {
UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip, UnreadMode.All => Language.UnreadMode_All_Tooltip,
UnreadMode.None => Language.UnreadMode_None_Tooltip, UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
_ => null, UnreadMode.None => Language.UnreadMode_None_Tooltip,
}; _ => null,
};
} }
[Serializable] [Serializable]
@@ -468,29 +492,50 @@ public class Tab
public bool AllSenderMessages; public bool AllSenderMessages;
public TellTarget TellTarget = TellTarget.Empty(); public TellTarget TellTarget = TellTarget.Empty();
[NonSerialized] public uint Unread; [NonSerialized]
[NonSerialized] public uint LastSendUnread; public uint Unread;
[NonSerialized] public long LastActivity;
[NonSerialized] public MessageList Messages = new();
[NonSerialized] public UsedChannel CurrentChannel = new(); [NonSerialized]
public uint LastSendUnread;
[NonSerialized] public Guid Identifier = Guid.NewGuid(); [NonSerialized]
public long LastActivity;
[NonSerialized]
public MessageList Messages = new();
[NonSerialized]
public UsedChannel CurrentChannel = new();
[NonSerialized]
public Guid Identifier = Guid.NewGuid();
// Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the // Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the
// sidebar to mark a tell partner as already greeted in the current // sidebar to mark a tell partner as already greeted in the current
// session. NonSerialized because the temp tab itself is session-only. // session. NonSerialized because the temp tab itself is session-only.
[NonSerialized] public bool IsGreeted; [NonSerialized]
public bool IsGreeted;
// v1.4.2 — TabTintCache uses separate validation keys per cache so a // v1.4.2 — TabTintCache uses separate validation keys per cache so a
// TellTarget change picked up by GetTint can't strand GetIcon (or vice // TellTarget change picked up by GetTint can't strand GetIcon (or vice
// versa) with a stale entry that looks fresh on the shared key. // versa) with a stale entry that looks fresh on the shared key.
[NonSerialized] internal string? _cachedTintTellName; [NonSerialized]
[NonSerialized] internal uint _cachedTintTellWorld; internal string? _cachedTintTellName;
[NonSerialized] internal uint _cachedTellTint;
[NonSerialized] internal string? _cachedIconTellName; [NonSerialized]
[NonSerialized] internal uint _cachedIconTellWorld; internal uint _cachedTintTellWorld;
[NonSerialized] internal string? _cachedTellIcon;
[NonSerialized]
internal uint _cachedTellTint;
[NonSerialized]
internal string? _cachedIconTellName;
[NonSerialized]
internal uint _cachedIconTellWorld;
[NonSerialized]
internal string? _cachedTellIcon;
public bool Matches(Message message) public bool Matches(Message message)
{ {
@@ -517,12 +562,17 @@ public class Tab
return; return;
Unread += 1; Unread += 1;
if (message.Matches(Plugin.Config.InactivityHideChannelsV2, Plugin.Config.InactivityHideExtraChatAll, Plugin.Config.InactivityHideExtraChatChannels)) if (
message.Matches(
Plugin.Config.InactivityHideChannelsV2,
Plugin.Config.InactivityHideExtraChatAll,
Plugin.Config.InactivityHideExtraChatChannels
)
)
LastActivity = Environment.TickCount64; LastActivity = Environment.TickCount64;
} }
public void Clear() public void Clear() => Messages.Clear();
=> Messages.Clear();
public Tab Clone() public Tab Clone()
{ {
@@ -660,8 +710,14 @@ public class Tab
get get
{ {
LockSlim.Wait(-1); LockSlim.Wait(-1);
try { return Messages.Count; } try
finally { LockSlim.Release(); } {
return Messages.Count;
}
finally
{
LockSlim.Release();
}
} }
} }
@@ -691,7 +747,9 @@ public class Tab
return new RLockedMessageList(LockSlim, Messages); return new RLockedMessageList(LockSlim, Messages);
} }
public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages) : IReadOnlyList<Message>, IDisposable public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages)
: IReadOnlyList<Message>,
IDisposable
{ {
public IEnumerator<Message> GetEnumerator() public IEnumerator<Message> GetEnumerator()
{ {
@@ -750,15 +808,16 @@ public enum PreviewPosition
public static class PreviewPositionExt public static class PreviewPositionExt
{ {
public static string Name(this PreviewPosition position) => position switch public static string Name(this PreviewPosition position) =>
{ position switch
PreviewPosition.None => Language.Options_Preview_None, {
PreviewPosition.Inside => Language.Options_Preview_Inside, PreviewPosition.None => Language.Options_Preview_None,
PreviewPosition.Top => Language.Options_Preview_Top, PreviewPosition.Inside => Language.Options_Preview_Inside,
PreviewPosition.Bottom => Language.Options_Preview_Bottom, PreviewPosition.Top => Language.Options_Preview_Top,
PreviewPosition.Tooltip => Language.Options_Preview_Tooltip, PreviewPosition.Bottom => Language.Options_Preview_Bottom,
_ => throw new ArgumentOutOfRangeException(nameof(position), position, null), PreviewPosition.Tooltip => Language.Options_Preview_Tooltip,
}; _ => throw new ArgumentOutOfRangeException(nameof(position), position, null),
};
} }
[Serializable] [Serializable]
@@ -771,13 +830,14 @@ public enum CommandHelpSide
public static class CommandHelpSideExt public static class CommandHelpSideExt
{ {
public static string Name(this CommandHelpSide side) => side switch public static string Name(this CommandHelpSide side) =>
{ side switch
CommandHelpSide.None => Language.CommandHelpSide_None, {
CommandHelpSide.Left => Language.CommandHelpSide_Left, CommandHelpSide.None => Language.CommandHelpSide_None,
CommandHelpSide.Right => Language.CommandHelpSide_Right, CommandHelpSide.Left => Language.CommandHelpSide_Left,
_ => throw new ArgumentOutOfRangeException(nameof(side), side, null), CommandHelpSide.Right => Language.CommandHelpSide_Right,
}; _ => throw new ArgumentOutOfRangeException(nameof(side), side, null),
};
} }
[Serializable] [Serializable]
@@ -789,19 +849,21 @@ public enum KeybindMode
public static class KeybindModeExt public static class KeybindModeExt
{ {
public static string Name(this KeybindMode mode) => mode switch public static string Name(this KeybindMode mode) =>
{ mode switch
KeybindMode.Flexible => Language.KeybindMode_Flexible_Name, {
KeybindMode.Strict => Language.KeybindMode_Strict_Name, KeybindMode.Flexible => Language.KeybindMode_Flexible_Name,
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), KeybindMode.Strict => Language.KeybindMode_Strict_Name,
}; _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
};
public static string? Tooltip(this KeybindMode mode) => mode switch public static string? Tooltip(this KeybindMode mode) =>
{ mode switch
KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip, {
KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip, KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
_ => null, KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
}; _ => null,
};
} }
[Serializable] [Serializable]
@@ -830,49 +892,51 @@ public enum LanguageOverride
public static class LanguageOverrideExt public static class LanguageOverrideExt
{ {
public static string Name(this LanguageOverride mode) => mode switch public static string Name(this LanguageOverride mode) =>
{ mode switch
LanguageOverride.None => Language.LanguageOverride_None, {
LanguageOverride.ChineseSimplified => "简体中文", LanguageOverride.None => Language.LanguageOverride_None,
LanguageOverride.ChineseTraditional => "繁體中文", LanguageOverride.ChineseSimplified => "简体中文",
LanguageOverride.Dutch => "Nederlands", LanguageOverride.ChineseTraditional => "繁體中文",
LanguageOverride.English => "English", LanguageOverride.Dutch => "Nederlands",
LanguageOverride.French => "Français", LanguageOverride.English => "English",
LanguageOverride.German => "Deutsch", LanguageOverride.French => "Français",
LanguageOverride.Greek => "Ελληνικά", LanguageOverride.German => "Deutsch",
// LanguageOverride.Italian => "Italiano", LanguageOverride.Greek => "Ελληνικά",
LanguageOverride.Japanese => "日本語", // LanguageOverride.Italian => "Italiano",
// LanguageOverride.Korean => "한국어 (Korean)", LanguageOverride.Japanese => "日本語",
// LanguageOverride.Norwegian => "Norsk", // LanguageOverride.Korean => "한국어 (Korean)",
LanguageOverride.PortugueseBrazil => "Português do Brasil", // LanguageOverride.Norwegian => "Norsk",
LanguageOverride.Romanian => "Română", LanguageOverride.PortugueseBrazil => "Português do Brasil",
LanguageOverride.Russian => "Русский", LanguageOverride.Romanian => "Română",
LanguageOverride.Spanish => "Español", LanguageOverride.Russian => "Русский",
LanguageOverride.Swedish => "Svenska", LanguageOverride.Spanish => "Español",
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), LanguageOverride.Swedish => "Svenska",
}; _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
};
public static string Code(this LanguageOverride mode) => mode switch public static string Code(this LanguageOverride mode) =>
{ mode switch
LanguageOverride.None => "", {
LanguageOverride.ChineseSimplified => "zh-hans", LanguageOverride.None => "",
LanguageOverride.ChineseTraditional => "zh-hant", LanguageOverride.ChineseSimplified => "zh-hans",
LanguageOverride.Dutch => "nl", LanguageOverride.ChineseTraditional => "zh-hant",
LanguageOverride.English => "en", LanguageOverride.Dutch => "nl",
LanguageOverride.French => "fr", LanguageOverride.English => "en",
LanguageOverride.German => "de", LanguageOverride.French => "fr",
LanguageOverride.Greek => "el", LanguageOverride.German => "de",
// LanguageOverride.Italian => "it", LanguageOverride.Greek => "el",
LanguageOverride.Japanese => "ja", // LanguageOverride.Italian => "it",
// LanguageOverride.Korean => "ko", LanguageOverride.Japanese => "ja",
// LanguageOverride.Norwegian => "no", // LanguageOverride.Korean => "ko",
LanguageOverride.PortugueseBrazil => "pt-br", // LanguageOverride.Norwegian => "no",
LanguageOverride.Romanian => "ro", LanguageOverride.PortugueseBrazil => "pt-br",
LanguageOverride.Russian => "ru", LanguageOverride.Romanian => "ro",
LanguageOverride.Spanish => "es", LanguageOverride.Russian => "ru",
LanguageOverride.Swedish => "sv", LanguageOverride.Spanish => "es",
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), LanguageOverride.Swedish => "sv",
}; _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
};
} }
[Serializable] [Serializable]
@@ -890,27 +954,31 @@ public enum ExtraGlyphRanges
public static class ExtraGlyphRangesExt public static class ExtraGlyphRangesExt
{ {
public static string Name(this ExtraGlyphRanges ranges) => ranges switch public static string Name(this ExtraGlyphRanges ranges) =>
{ ranges switch
ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name, {
ExtraGlyphRanges.ChineseSimplifiedCommon => Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name, ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name, ExtraGlyphRanges.ChineseSimplifiedCommon =>
ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name, Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name,
ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name, ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name,
ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name, ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name,
ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name, ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null), ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
}; ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
};
public static unsafe nint Range(this ExtraGlyphRanges ranges) => ranges switch public static unsafe nint Range(this ExtraGlyphRanges ranges) =>
{ ranges switch
ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(), {
ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(), ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(),
ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(), ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)
ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(), ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(),
ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(), ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(),
ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(), ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(),
ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(), ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null), ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
}; ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
};
} }
+66 -22
View File
@@ -2,10 +2,10 @@
using System.Numerics; using System.Numerics;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Textures; using Dalamud.Interface.Textures;
using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
@@ -15,11 +15,31 @@ public static class EmoteCache
{ {
private static readonly string[] NotWorking = private static readonly string[] NotWorking =
[ [
":tf:", "(ditto)", "c!", "h!", "l!", "M&Mjc", "LUL3D", "p!", ":tf:",
"POLICE2", "r!", "Pussy", "s!", "v!", "w!", "x0r6ztGiggle", "(ditto)",
"z!", "xar2EDM", "iron95Pls", "Clap2", "AlienPls3", "Life", "c!",
"peepoPogClimbingTreeHard4House", "monkaGIGAftRobertDowneyJr", "h!",
"DogLookingSussyAndCold", "DICKS" "l!",
"M&Mjc",
"LUL3D",
"p!",
"POLICE2",
"r!",
"Pussy",
"s!",
"v!",
"w!",
"x0r6ztGiggle",
"z!",
"xar2EDM",
"iron95Pls",
"Clap2",
"AlienPls3",
"Life",
"peepoPogClimbingTreeHard4House",
"monkaGIGAftRobertDowneyJr",
"DogLookingSussyAndCold",
"DICKS",
]; ];
private static readonly HttpClient Client = new(); private static readonly HttpClient Client = new();
@@ -56,7 +76,7 @@ public static class EmoteCache
{ {
Unloaded, Unloaded,
Loading, Loading,
Done Done,
} }
// All of this data is uninitalized while State is not `LoadingState.Done` // All of this data is uninitalized while State is not `LoadingState.Done`
@@ -80,11 +100,16 @@ public static class EmoteCache
internal static void TrackLoad(Task loadTask, string emoteCode) internal static void TrackLoad(Task loadTask, string emoteCode)
{ {
PendingLoads.Add(loadTask.ContinueWith(t => PendingLoads.Add(
{ loadTask.ContinueWith(
if (t.IsFaulted) t =>
Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}"); {
}, TaskScheduler.Default)); if (t.IsFaulted)
Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
},
TaskScheduler.Default
)
);
} }
public static async Task LoadData() public static async Task LoadData()
@@ -121,7 +146,10 @@ public static class EmoteCache
// load. Skip them defensively so a single bad row no longer // load. Skip them defensively so a single bad row no longer
// breaks the cache for everyone else. // breaks the cache for everyone else.
foreach (var emote in jsonList) foreach (var emote in jsonList)
if (!string.IsNullOrEmpty(emote.Emote.Code) && !NotWorking.Contains(emote.Emote.Code)) if (
!string.IsNullOrEmpty(emote.Emote.Code)
&& !NotWorking.Contains(emote.Emote.Code)
)
Cache.TryAdd(emote.Emote.Code, emote.Emote); Cache.TryAdd(emote.Emote.Code, emote.Emote);
lastId = jsonList.Last().Id; lastId = jsonList.Last().Id;
@@ -225,13 +253,19 @@ public static class EmoteCache
// upstream could still hand us "../foo" and write into the // upstream could still hand us "../foo" and write into the
// pluginConfigs root (or worse). Resolve the candidate path and // pluginConfigs root (or worse). Resolve the candidate path and
// refuse anything that escapes the cache directory. // refuse anything that escapes the cache directory.
var dir = Path.GetFullPath(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")); var dir = Path.GetFullPath(
Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
);
Directory.CreateDirectory(dir); Directory.CreateDirectory(dir);
var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar) ? dir : dir + Path.DirectorySeparatorChar; var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar)
? dir
: dir + Path.DirectorySeparatorChar;
var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}")); var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}"));
if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal)) if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal))
throw new InvalidOperationException($"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"); throw new InvalidOperationException(
$"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"
);
if (File.Exists(filePath)) if (File.Exists(filePath))
{ {
@@ -242,7 +276,12 @@ public static class EmoteCache
var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct); var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
RawData = await content.Content.ReadAsByteArrayAsync(ct); RawData = await content.Content.ReadAsByteArrayAsync(ct);
await using var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read); await using var stream = new FileStream(
filePath,
FileMode.Create,
FileAccess.Write,
FileShare.Read
);
await stream.WriteAsync(RawData, ct); await stream.WriteAsync(RawData, ct);
} }
@@ -271,12 +310,13 @@ public static class EmoteCache
return; return;
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
Texture = await Plugin.TextureProvider.CreateFromImageAsync(image, cancellationToken: ct); Texture = await Plugin.TextureProvider.CreateFromImageAsync(
image,
cancellationToken: ct
);
IsLoaded = true; IsLoaded = true;
} }
catch (OperationCanceledException) catch (OperationCanceledException) { }
{
}
catch (Exception ex) catch (Exception ex)
{ {
Failed = true; Failed = true;
@@ -363,7 +403,11 @@ public static class EmoteCache
var buffer = new byte[4 * frame.Width * frame.Height]; var buffer = new byte[4 * frame.Width * frame.Height];
frame.CopyPixelDataTo(buffer); frame.CopyPixelDataTo(buffer);
var tex = await Plugin.TextureProvider.CreateFromRawAsync(RawImageSpecification.Rgba32(frame.Width, frame.Height), buffer, cancellationToken: ct); var tex = await Plugin.TextureProvider.CreateFromRawAsync(
RawImageSpecification.Rgba32(frame.Width, frame.Height),
buffer,
cancellationToken: ct
);
frames.Add((tex, delay)); frames.Add((tex, delay));
} }
+71 -31
View File
@@ -13,21 +13,23 @@ internal enum ExportFormat
internal static class ExportFormatExt internal static class ExportFormatExt
{ {
internal static string Extension(this ExportFormat fmt) => fmt switch internal static string Extension(this ExportFormat fmt) =>
{ fmt switch
ExportFormat.Markdown => "md", {
ExportFormat.Json => "json", ExportFormat.Markdown => "md",
ExportFormat.Csv => "csv", ExportFormat.Json => "json",
_ => "txt", ExportFormat.Csv => "csv",
}; _ => "txt",
};
internal static string Filter(this ExportFormat fmt) => fmt switch internal static string Filter(this ExportFormat fmt) =>
{ fmt switch
ExportFormat.Markdown => ".md", {
ExportFormat.Json => ".json", ExportFormat.Markdown => ".md",
ExportFormat.Csv => ".csv", ExportFormat.Json => ".json",
_ => ".txt", ExportFormat.Csv => ".csv",
}; _ => ".txt",
};
} }
/// <summary> /// <summary>
@@ -42,13 +44,15 @@ internal static class MessageExporter
IReadOnlyCollection<int>? ChatTypes, IReadOnlyCollection<int>? ChatTypes,
DateTimeOffset? From, DateTimeOffset? From,
DateTimeOffset? To, DateTimeOffset? To,
string? SenderSubstring); string? SenderSubstring
);
internal static int ExportToFile( internal static int ExportToFile(
string path, string path,
ExportFormat format, ExportFormat format,
IEnumerable<Message> messages, IEnumerable<Message> messages,
FilterDescription filter) FilterDescription filter
)
{ {
var matching = filter.SenderSubstring is { Length: > 0 } needle var matching = filter.SenderSubstring is { Length: > 0 } needle
? messages.Where(m => MatchesSender(m, needle)) ? messages.Where(m => MatchesSender(m, needle))
@@ -64,10 +68,14 @@ internal static class MessageExporter
}; };
} }
private static bool MatchesSender(Message m, string needle) private static bool MatchesSender(Message m, string needle) =>
=> m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase); m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
private static int WriteMarkdown(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter) private static int WriteMarkdown(
StreamWriter w,
IEnumerable<Message> messages,
FilterDescription filter
)
{ {
w.WriteLine("# Hellion Chat Export"); w.WriteLine("# Hellion Chat Export");
w.WriteLine(); w.WriteLine();
@@ -107,7 +115,9 @@ internal static class MessageExporter
private static void WriteFilterSummaryMarkdown(StreamWriter w, FilterDescription filter) private static void WriteFilterSummaryMarkdown(StreamWriter w, FilterDescription filter)
{ {
if (filter.ChatTypes is { Count: > 0 }) if (filter.ChatTypes is { Count: > 0 })
w.WriteLine($"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}"); w.WriteLine(
$"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}"
);
if (filter.From is not null) if (filter.From is not null)
w.WriteLine($"From: {filter.From.Value.ToLocalTime():yyyy-MM-dd HH:mm}"); w.WriteLine($"From: {filter.From.Value.ToLocalTime():yyyy-MM-dd HH:mm}");
if (filter.To is not null) if (filter.To is not null)
@@ -116,7 +126,11 @@ internal static class MessageExporter
w.WriteLine($"Sender contains: \"{filter.SenderSubstring}\""); w.WriteLine($"Sender contains: \"{filter.SenderSubstring}\"");
} }
private static int WriteJson(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter) private static int WriteJson(
StreamWriter w,
IEnumerable<Message> messages,
FilterDescription filter
)
{ {
// Manual JSON to avoid pulling in System.Text.Json policy choices. // Manual JSON to avoid pulling in System.Text.Json policy choices.
// Output is a single object with metadata and an array of messages. // Output is a single object with metadata and an array of messages.
@@ -130,9 +144,17 @@ internal static class MessageExporter
else else
w.Write("null"); w.Write("null");
w.Write(",\n \"from\": "); w.Write(",\n \"from\": ");
w.Write(filter.From is null ? "null" : "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\""); w.Write(
filter.From is null
? "null"
: "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
);
w.Write(",\n \"to\": "); w.Write(",\n \"to\": ");
w.Write(filter.To is null ? "null" : "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\""); w.Write(
filter.To is null
? "null"
: "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
);
w.Write(",\n \"sender_substring\": "); w.Write(",\n \"sender_substring\": ");
w.Write(filter.SenderSubstring is null ? "null" : JsonString(filter.SenderSubstring)); w.Write(filter.SenderSubstring is null ? "null" : JsonString(filter.SenderSubstring));
w.Write("\n },\n \"messages\": [\n"); w.Write("\n },\n \"messages\": [\n");
@@ -166,7 +188,11 @@ internal static class MessageExporter
return count; return count;
} }
private static int WriteCsv(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter) private static int WriteCsv(
StreamWriter w,
IEnumerable<Message> messages,
FilterDescription filter
)
{ {
// Header line always written so empty exports are still importable. // Header line always written so empty exports are still importable.
w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId"); w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
@@ -201,13 +227,27 @@ internal static class MessageExporter
{ {
switch (c) switch (c)
{ {
case '"': sb.Append("\\\""); break; case '"':
case '\\': sb.Append("\\\\"); break; sb.Append("\\\"");
case '\b': sb.Append("\\b"); break; break;
case '\f': sb.Append("\\f"); break; case '\\':
case '\n': sb.Append("\\n"); break; sb.Append("\\\\");
case '\r': sb.Append("\\r"); break; break;
case '\t': sb.Append("\\t"); break; case '\b':
sb.Append("\\b");
break;
case '\f':
sb.Append("\\f");
break;
case '\n':
sb.Append("\\n");
break;
case '\r':
sb.Append("\\r");
break;
case '\t':
sb.Append("\\t");
break;
default: default:
if (c < 0x20) if (c < 0x20)
sb.Append($"\\u{(int)c:x4}"); sb.Append($"\\u{(int)c:x4}");
+108 -60
View File
@@ -1,10 +1,10 @@
using Dalamud; using Dalamud;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.FontIdentifier; using Dalamud.Interface.FontIdentifier;
using Dalamud.Interface.GameFonts; using Dalamud.Interface.GameFonts;
using Dalamud.Interface.ManagedFontAtlas; using Dalamud.Interface.ManagedFontAtlas;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Bindings.ImGui;
namespace HellionChat; namespace HellionChat;
@@ -23,9 +23,22 @@ public class FontManager
public static readonly HashSet<float> AxisFontSizeList = public static readonly HashSet<float> AxisFontSizeList =
[ [
9.6f, 10f, 12f, 14f, 16f, 9.6f,
18f, 18.4f, 20f, 23f, 34f, 10f,
36f, 40f, 45f, 46f, 68f, 90f, 12f,
14f,
16f,
18f,
18.4f,
20f,
23f,
34f,
36f,
40f,
45f,
46f,
68f,
90f,
]; ];
/// <summary> /// <summary>
@@ -41,8 +54,11 @@ public class FontManager
if (HellionFontBytes is not null) if (HellionFontBytes is not null)
return HellionFontBytes; return HellionFontBytes;
using var stream = typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf") using var stream =
?? throw new FileNotFoundException("Hellion font resource not embedded in the assembly"); typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
?? throw new FileNotFoundException(
"Hellion font resource not embedded in the assembly"
);
using var ms = new MemoryStream(); using var ms = new MemoryStream();
stream.CopyTo(ms); stream.CopyTo(ms);
HellionFontBytes = ms.ToArray(); HellionFontBytes = ms.ToArray();
@@ -66,8 +82,8 @@ public class FontManager
if (chars[i] == 0) if (chars[i] == 0)
break; break;
for (var j = (uint) chars[i]; j <= chars[i + 1]; j++) for (var j = (uint)chars[i]; j <= chars[i + 1]; j++)
builder.AddChar((ushort) j); builder.AddChar((ushort)j);
} }
} }
@@ -85,7 +101,7 @@ public class FontManager
// "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460 // "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
for (var i = 0x2460; i <= 0x24B5; i++) for (var i = 0x2460; i <= 0x24B5; i++)
builder.AddChar((char) i); builder.AddChar((char)i);
builder.AddChar('⓪'); builder.AddChar('⓪');
return builder.BuildRangesToArray(); return builder.BuildRangesToArray();
@@ -117,66 +133,84 @@ public class FontManager
{ {
SetUpRanges(); SetUpRanges();
Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))); Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2)) new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
{ );
SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6 AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
}); new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
{
SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6,
}
);
FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e => FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
{ {
e.OnPreBuild(tk => tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() })); e.OnPreBuild(tk =>
tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() })
);
e.OnPostBuild(tk => tk.FitRatio(tk.Font)); e.OnPostBuild(tk => tk.FitRatio(tk.Font));
}); });
RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle( RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
e => e.OnPreBuild( e.OnPreBuild(tk =>
tk => {
// v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font)
// wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
// Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem
// Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei
// UseHellionFont=true wirkungslos, was 4K-User mit größerer
// Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten).
var basePt = Plugin.Config.UseHellionFont
? Plugin.Config.FontSizeV2
: Plugin.Config.GlobalFontV2.SizePt;
var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
config.MergeFont = Plugin.Config.UseHellionFont
? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
config.GlyphRanges = JpRange;
AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
config.SizePt = Plugin.Config.SymbolsFontSizeV2;
tk.AddGameSymbol(config);
tk.Font = config.MergeFont;
})
);
if (Plugin.Config.ItalicEnabled)
{
ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
e.OnPreBuild(tk =>
{ {
// v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font) var config = new SafeFontConfig
// wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet. {
// Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem SizePt = Plugin.Config.ItalicFontV2.SizePt,
// Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei GlyphRanges = Ranges,
// UseHellionFont=true wirkungslos, was 4K-User mit größerer };
// Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten). config.MergeFont = AddFontWithFallback(
var basePt = Plugin.Config.UseHellionFont tk,
? Plugin.Config.FontSizeV2 Plugin.Config.ItalicFontV2.FontId,
: Plugin.Config.GlobalFontV2.SizePt; config,
var config = new SafeFontConfig {SizePt = basePt, GlyphRanges = Ranges}; "italic"
config.MergeFont = Plugin.Config.UseHellionFont );
? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt; config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
config.GlyphRanges = JpRange; config.GlyphRanges = JpRange;
AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese"); AddFontWithFallback(
tk,
Plugin.Config.JapaneseFontV2.FontId,
config,
"japanese"
);
config.SizePt = Plugin.Config.SymbolsFontSizeV2; config.SizePt = Plugin.Config.SymbolsFontSizeV2;
tk.AddGameSymbol(config); tk.AddGameSymbol(config);
tk.Font = config.MergeFont; tk.Font = config.MergeFont;
} })
)); );
if (Plugin.Config.ItalicEnabled)
{
ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(
e => e.OnPreBuild(
tk =>
{
var config = new SafeFontConfig {SizePt = Plugin.Config.ItalicFontV2.SizePt, GlyphRanges = Ranges};
config.MergeFont = AddFontWithFallback(tk, Plugin.Config.ItalicFontV2.FontId, config, "italic");
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
config.GlyphRanges = JpRange;
AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
config.SizePt = Plugin.Config.SymbolsFontSizeV2;
tk.AddGameSymbol(config);
tk.Font = config.MergeFont;
}
));
} }
else else
{ {
@@ -191,21 +225,35 @@ public class FontManager
/// pointing at a font the user uninstalled or that never existed on /// pointing at a font the user uninstalled or that never existed on
/// Linux (e.g. "Crimson Text") tears down the entire font atlas build. /// Linux (e.g. "Crimson Text") tears down the entire font atlas build.
/// </summary> /// </summary>
private static ImFontPtr AddFontWithFallback(IFontAtlasBuildToolkitPreBuild tk, IFontId fontId, SafeFontConfig config, string slot) private static ImFontPtr AddFontWithFallback(
IFontAtlasBuildToolkitPreBuild tk,
IFontId fontId,
SafeFontConfig config,
string slot
)
{ {
try try
{ {
return fontId.AddToBuildToolkit(tk, config); return fontId.AddToBuildToolkit(tk, config);
} }
catch (Exception e) when (e is FileNotFoundException or DirectoryNotFoundException or IOException) catch (Exception e)
when (e is FileNotFoundException or DirectoryNotFoundException or IOException)
{ {
Plugin.Log.Warning(e, $"Configured {slot} font unavailable, falling back to NotoSansCjkRegular"); Plugin.Log.Warning(
e,
$"Configured {slot} font unavailable, falling back to NotoSansCjkRegular"
);
var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular); var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
return fallback.AddToBuildToolkit(tk, config); return fallback.AddToBuildToolkit(tk, config);
} }
} }
public static float SizeInPt(float px) => (float) (px * 3.0 / 4.0); public static float SizeInPt(float px) => (float)(px * 3.0 / 4.0);
public static float SizeInPx(float pt) => (float) (pt * 4.0 / 3.0);
public static float GetFontSize() => Plugin.Config.FontsEnabled ? Plugin.Config.GlobalFontV2.SizePx : SizeInPx(Plugin.Config.FontSizeV2); public static float SizeInPx(float pt) => (float)(pt * 4.0 / 3.0);
public static float GetFontSize() =>
Plugin.Config.FontsEnabled
? Plugin.Config.GlobalFontV2.SizePx
: SizeInPx(Plugin.Config.FontSizeV2);
} }
+251 -74
View File
@@ -1,8 +1,4 @@
using System.Text; using System.Text;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Config; using Dalamud.Game.Config;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Hooking; using Dalamud.Hooking;
@@ -17,9 +13,12 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using FFXIVClientStructs.FFXIV.Client.UI.Shell; using FFXIVClientStructs.FFXIV.Client.UI.Shell;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using InteropGenerator.Runtime; using InteropGenerator.Runtime;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType; using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -28,20 +27,55 @@ internal sealed unsafe class Chat : IDisposable
{ {
// Functions // Functions
[Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8D B9 ?? ?? ?? ?? 33 C0")] [Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8D B9 ?? ?? ?? ?? 33 C0")]
private readonly delegate* unmanaged<RaptureLogModule*, ushort, Utf8String*, Utf8String*, ulong, ulong, ushort, byte, int, byte, void> PrintTellNative = null!; private readonly delegate* unmanaged<
RaptureLogModule*,
ushort,
Utf8String*,
Utf8String*,
ulong,
ulong,
ushort,
byte,
int,
byte,
void> PrintTellNative = null!;
[Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24")] [Signature(
private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, ushort, ushort, byte> SendTellNative = null!; "E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24"
)]
private readonly delegate* unmanaged<
NetworkModule*,
ulong,
ushort,
Utf8String*,
Utf8String*,
ushort,
ushort,
byte> SendTellNative = null!;
// Client::UI::AddonChatLog.OnRefresh // Client::UI::AddonChatLog.OnRefresh
[Signature("40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8", DetourName = nameof(ChatLogRefreshDetour))] [Signature(
"40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8",
DetourName = nameof(ChatLogRefreshDetour)
)]
private Hook<ChatLogRefreshDelegate>? ChatLogRefreshHook = null!; private Hook<ChatLogRefreshDelegate>? ChatLogRefreshHook = null!;
private delegate byte ChatLogRefreshDelegate(nint log, ushort eventId, AtkValue* value); private delegate byte ChatLogRefreshDelegate(nint log, ushort eventId, AtkValue* value);
// Replace with CS version later // Replace with CS version later
[Signature("48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9", DetourName = nameof(ContextMenuTellInForayDetour))] [Signature(
"48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9",
DetourName = nameof(ContextMenuTellInForayDetour)
)]
private Hook<ContextMenuTellInForayDelegate>? ContextMenuTellInForayHook = null!; private Hook<ContextMenuTellInForayDelegate>? ContextMenuTellInForayHook = null!;
private delegate void ContextMenuTellInForayDelegate(RaptureShellModule* module, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason); private delegate void ContextMenuTellInForayDelegate(
RaptureShellModule* module,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason
);
private readonly Hook<AgentChatLog.Delegates.ChangeChannelName>? ChangeChannelNameHook; private readonly Hook<AgentChatLog.Delegates.ChangeChannelName>? ChangeChannelNameHook;
private readonly Hook<RaptureShellModule.Delegates.ReplyInSelectedChatMode>? ReplyInSelectedChatModeHook; private readonly Hook<RaptureShellModule.Delegates.ReplyInSelectedChatMode>? ReplyInSelectedChatModeHook;
@@ -58,7 +92,7 @@ internal sealed unsafe class Chat : IDisposable
FullName = 0, FullName = 0,
SurnameAbbreviated = 1, SurnameAbbreviated = 1,
ForenameAbbreviated = 2, ForenameAbbreviated = 2,
Initials = 3 Initials = 3,
} }
private long LastPlayerNameDisplayTypeRefresh; private long LastPlayerNameDisplayTypeRefresh;
@@ -72,13 +106,25 @@ internal sealed unsafe class Chat : IDisposable
ChatLogRefreshHook?.Enable(); ChatLogRefreshHook?.Enable();
ContextMenuTellInForayHook?.Enable(); ContextMenuTellInForayHook?.Enable();
ChangeChannelNameHook = Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(AgentChatLog.MemberFunctionPointers.ChangeChannelName, ChangeChannelNameDetour); ChangeChannelNameHook =
Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(
AgentChatLog.MemberFunctionPointers.ChangeChannelName,
ChangeChannelNameDetour
);
ChangeChannelNameHook.Enable(); ChangeChannelNameHook.Enable();
ReplyInSelectedChatModeHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode, ReplyInSelectedChatModeDetour); ReplyInSelectedChatModeHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(
RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode,
ReplyInSelectedChatModeDetour
);
ReplyInSelectedChatModeHook.Enable(); ReplyInSelectedChatModeHook.Enable();
SetChatLogTellTargetHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(RaptureShellModule.MemberFunctionPointers.SetContextTellTarget, SetContextTellTarget); SetChatLogTellTargetHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(
RaptureShellModule.MemberFunctionPointers.SetContextTellTarget,
SetContextTellTarget
);
SetChatLogTellTargetHook.Enable(); SetChatLogTellTargetHook.Enable();
Plugin.ClientState.Login += Login; Plugin.ClientState.Login += Login;
@@ -108,12 +154,13 @@ internal sealed unsafe class Chat : IDisposable
return utf == null ? null : utf->ToString(); return utf == null ? null : utf->ToString();
} }
private static int GetRotateIdx(RotateMode mode) => mode switch private static int GetRotateIdx(RotateMode mode) =>
{ mode switch
RotateMode.Forward => 1, {
RotateMode.Reverse => -1, RotateMode.Forward => 1,
_ => 0, RotateMode.Reverse => -1,
}; _ => 0,
};
internal static void RotateLinkshellHistory(RotateMode mode) internal static void RotateLinkshellHistory(RotateMode mode)
{ {
@@ -174,7 +221,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
string? input = null; string? input = null;
var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter+0x4, 2); var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter + 0x4, 2);
var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray(); var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray();
if (chars.Length == 0) if (chars.Length == 0)
return; return;
@@ -185,7 +232,9 @@ internal sealed unsafe class Chat : IDisposable
try try
{ {
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input, }); Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input }
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -197,7 +246,7 @@ internal sealed unsafe class Chat : IDisposable
string? addIfNotPresent = null; string? addIfNotPresent = null;
var str = value + 2; var str = value + 2;
if (str != null && ((int) str->Type & 0xF) == (int) ValueType.String && str->String.HasValue) if (str != null && ((int)str->Type & 0xF) == (int)ValueType.String && str->String.HasValue)
{ {
var add = str->String.ToString(); var add = str->String.ToString();
if (add.Length > 0) if (add.Length > 0)
@@ -214,7 +263,12 @@ internal sealed unsafe class Chat : IDisposable
return ChatLogRefreshHook!.Original(log, eventId, value); return ChatLogRefreshHook!.Original(log, eventId, value);
} }
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { AddIfNotPresent = addIfNotPresent, }); Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(new ChannelSwitchInfo(null))
{
AddIfNotPresent = addIfNotPresent,
}
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -231,9 +285,9 @@ internal sealed unsafe class Chat : IDisposable
if (agent == null) if (agent == null)
return ret; return ret;
var channel = (uint) RaptureShellModule.Instance()->ChatType; var channel = (uint)RaptureShellModule.Instance()->ChatType;
if (channel is 17 or 18) if (channel is 17 or 18)
channel = (uint) InputChannel.Tell; channel = (uint)InputChannel.Tell;
var name = SeString.Parse(agent->ChannelLabel); var name = SeString.Parse(agent->ChannelLabel);
if (name.Payloads.Count == 0) if (name.Payloads.Count == 0)
@@ -248,7 +302,7 @@ internal sealed unsafe class Chat : IDisposable
string? playerName = null; string? playerName = null;
ushort worldId = 0; ushort worldId = 0;
if (channel == (uint) InputChannel.Tell) if (channel == (uint)InputChannel.Tell)
{ {
playerName = SeString.Parse(agent->TellPlayerName).TextValue; playerName = SeString.Parse(agent->TellPlayerName).TextValue;
worldId = agent->TellWorldId; worldId = agent->TellWorldId;
@@ -257,9 +311,9 @@ internal sealed unsafe class Chat : IDisposable
Plugin.CurrentTab.CurrentChannel = new UsedChannel Plugin.CurrentTab.CurrentChannel = new UsedChannel
{ {
Channel = (InputChannel) channel, Channel = (InputChannel)channel,
Name = nameChunks, Name = nameChunks,
TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null,
}; };
return ret; return ret;
@@ -274,22 +328,40 @@ internal sealed unsafe class Chat : IDisposable
return; return;
} }
SetChannel((InputChannel) replyMode); SetChannel((InputChannel)replyMode);
ReplyInSelectedChatModeHook!.Original(agent); ReplyInSelectedChatModeHook!.Original(agent);
} }
private bool SetContextTellTarget(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason, bool setChatType) private bool SetContextTellTarget(
RaptureShellModule* a1,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason,
bool setChatType
)
{ {
if (playerName != null) if (playerName != null)
{ {
try try
{ {
var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason); var target = new TellTarget(
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)) playerName->ToString(),
{ worldId,
TellReason = (TellReason) reason, contentId,
TellTarget = target, (TellReason)reason
}); );
Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(
new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
)
{
TellReason = (TellReason)reason,
TellTarget = target,
}
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -297,10 +369,27 @@ internal sealed unsafe class Chat : IDisposable
} }
} }
return SetChatLogTellTargetHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason, setChatType); return SetChatLogTellTargetHook!.Original(
a1,
playerName,
worldName,
worldId,
accountId,
contentId,
reason,
setChatType
);
} }
private void ContextMenuTellInForayDetour(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason) private void ContextMenuTellInForayDetour(
RaptureShellModule* a1,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason
)
{ {
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel) if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true; Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
@@ -309,13 +398,20 @@ internal sealed unsafe class Chat : IDisposable
{ {
try try
{ {
var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason); var target = new TellTarget(
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell)) playerName->ToString(),
{ worldId,
TellReason = (TellReason) reason, contentId,
TellTarget = target, (TellReason)reason
TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special );
}); Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
{
TellReason = (TellReason)reason,
TellTarget = target,
TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
}
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -323,7 +419,15 @@ internal sealed unsafe class Chat : IDisposable
} }
} }
ContextMenuTellInForayHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason); ContextMenuTellInForayHook!.Original(
a1,
playerName,
worldName,
worldId,
accountId,
contentId,
reason
);
} }
/// <summary> /// <summary>
@@ -346,17 +450,22 @@ internal sealed unsafe class Chat : IDisposable
{ {
if (idx > 7) if (idx > 7)
return false; return false;
return InfoProxyLinkshell.Instance()->LinkShells[(int) idx].Id != 0; return InfoProxyLinkshell.Instance()->LinkShells[(int)idx].Id != 0;
} }
internal static bool ValidCrossLinkshell(uint idx) internal static bool ValidCrossLinkshell(uint idx)
{ {
if (idx > 7) if (idx > 7)
return false; return false;
return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int) idx].Name.Length > 0; return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int)idx].Name.Length
> 0;
} }
private static uint? RotateLinkshell(uint currentIndex, RotateMode rotate, Func<uint, bool> validFn) private static uint? RotateLinkshell(
uint currentIndex,
RotateMode rotate,
Func<uint, bool> validFn
)
{ {
if (rotate == RotateMode.None) if (rotate == RotateMode.None)
return null; return null;
@@ -365,13 +474,13 @@ internal sealed unsafe class Chat : IDisposable
{ {
RotateMode.Forward => 1, RotateMode.Forward => 1,
RotateMode.Reverse => -1, RotateMode.Reverse => -1,
_ => 1 _ => 1,
}; };
// Iterate up to 8 times to find a valid linkshell. // Iterate up to 8 times to find a valid linkshell.
for (var i = 0; i < 8; i++) for (var i = 0; i < 8; i++)
{ {
currentIndex = (uint) ((8 + currentIndex + delta) % 8); currentIndex = (uint)((8 + currentIndex + delta) % 8);
if (validFn(currentIndex)) if (validFn(currentIndex))
return currentIndex; return currentIndex;
} }
@@ -379,27 +488,40 @@ internal sealed unsafe class Chat : IDisposable
return null; return null;
} }
internal static InputChannel? ResolveTempInputChannel(InputChannel? currentTempChannel, InputChannel channel, RotateMode rotate) internal static InputChannel? ResolveTempInputChannel(
InputChannel? currentTempChannel,
InputChannel channel,
RotateMode rotate
)
{ {
switch (channel) switch (channel)
{ {
case InputChannel.Linkshell1 or InputChannel.CrossLinkshell1 when rotate != RotateMode.None: case InputChannel.Linkshell1
or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
{ {
var module = UIModule.Instance(); var module = UIModule.Instance();
var currentIndex = channel is InputChannel.Linkshell1 ? (uint) module->LinkshellCycle : (uint) module->CrossWorldLinkshellCycle; var currentIndex =
channel is InputChannel.Linkshell1
? (uint)module->LinkshellCycle
: (uint)module->CrossWorldLinkshellCycle;
if (currentTempChannel != null) if (currentTempChannel != null)
{ {
switch (channel) switch (channel)
{ {
case InputChannel.Linkshell1 when currentTempChannel.Value.IsLinkshell(): case InputChannel.Linkshell1 when currentTempChannel.Value.IsLinkshell():
case InputChannel.CrossLinkshell1 when currentTempChannel.Value.IsCrossLinkshell(): case InputChannel.CrossLinkshell1
when currentTempChannel.Value.IsCrossLinkshell():
currentIndex = currentTempChannel.Value.LinkshellIndex(); currentIndex = currentTempChannel.Value.LinkshellIndex();
break; break;
} }
} }
var idx = RotateLinkshell(currentIndex, rotate, channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell); var idx = RotateLinkshell(
currentIndex,
rotate,
channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell
);
// RotateLinkshell returns null when no valid linkshell is found within 8 iterations. // RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
// Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic. // Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
return idx is null ? null : channel + idx.Value; return idx is null ? null : channel + idx.Value;
@@ -427,11 +549,21 @@ internal sealed unsafe class Chat : IDisposable
if (!ValidAnyLinkshell(channel)) if (!ValidAnyLinkshell(channel))
return; return;
RaptureShellModule.Instance()->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true); RaptureShellModule
.Instance()
->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
target->Dtor(true); target->Dtor(true);
} }
internal void SetEurekaTellChannel(string name, string worldName, ushort worldId, ulong accountId, ulong objectId, ushort reason, bool setChatType) internal void SetEurekaTellChannel(
string name,
string worldName,
ushort worldId,
ulong accountId,
ulong objectId,
ushort reason,
bool setChatType
)
{ {
// param6 is 0 for contentId and 1 for objectId // param6 is 0 for contentId and 1 for objectId
// param7 is always 0 ? // param7 is always 0 ?
@@ -446,7 +578,17 @@ internal sealed unsafe class Chat : IDisposable
var utfName = Utf8String.FromString(name); var utfName = Utf8String.FromString(name);
var utfWorld = Utf8String.FromString(worldName); var utfWorld = Utf8String.FromString(worldName);
RaptureShellModule.Instance()->SetTellTargetInForay(utfName, utfWorld, worldId, accountId, objectId, reason, setChatType); RaptureShellModule
.Instance()
->SetTellTargetInForay(
utfName,
utfWorld,
worldId,
accountId,
objectId,
reason,
setChatType
);
utfName->Dtor(true); utfName->Dtor(true);
utfWorld->Dtor(true); utfWorld->Dtor(true);
@@ -475,19 +617,30 @@ internal sealed unsafe class Chat : IDisposable
mes->Dtor(true); mes->Dtor(true);
} }
internal void SendTell(TellReason reason, ulong contentId, string name, ushort homeWorld, byte[] message, string rawText) internal void SendTell(
TellReason reason,
ulong contentId,
string name,
ushort homeWorld,
byte[] message,
string rawText
)
{ {
if (contentId == 0) if (contentId == 0)
{ {
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error); Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
Plugin.Log.Warning("Tried to send a tell with ContentId being 0, sorry this is an internal error."); Plugin.Log.Warning(
"Tried to send a tell with ContentId being 0, sorry this is an internal error."
);
return; return;
} }
var uName = Utf8String.FromString(name); var uName = Utf8String.FromString(name);
var uMessage = Utf8String.FromSequence(message.NullTerminate()); var uMessage = Utf8String.FromSequence(message.NullTerminate());
var encoded = Utf8String.FromUtf8String(PronounModule.Instance()->ProcessString(uMessage, true)); var encoded = Utf8String.FromUtf8String(
PronounModule.Instance()->ProcessString(uMessage, true)
);
var decoded = EncodeMessage(rawText); var decoded = EncodeMessage(rawText);
AutoTranslate.ReplaceWithPayload(ref decoded); AutoTranslate.ReplaceWithPayload(ref decoded);
@@ -500,9 +653,28 @@ internal sealed unsafe class Chat : IDisposable
if (reason == TellReason.Direct) if (reason == TellReason.Direct)
reason = TellReason.Friend; reason = TellReason.Friend;
var ok = SendTellNative(networkModule, contentId, homeWorld, uName, encoded, (ushort) reason, homeWorld); var ok = SendTellNative(
networkModule,
contentId,
homeWorld,
uName,
encoded,
(ushort)reason,
homeWorld
);
if (ok == 1) if (ok == 1)
PrintTellNative(logModule, 33, uName, &decodedUtf8String, 0, contentId, homeWorld, 255, 0, 0); PrintTellNative(
logModule,
33,
uName,
&decodedUtf8String,
0,
contentId,
homeWorld,
255,
0,
0
);
else else
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error); Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
@@ -511,7 +683,8 @@ internal sealed unsafe class Chat : IDisposable
uMessage->Dtor(true); uMessage->Dtor(true);
} }
private static byte[] EncodeMessage(string str) { private static byte[] EncodeMessage(string str)
{
using var input = new Utf8String(str); using var input = new Utf8String(str);
using var output = new Utf8String(); using var output = new Utf8String();
@@ -524,7 +697,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
var uC = Utf8String.FromString(c.ToString()); var uC = Utf8String.FromString(c.ToString());
uC->SanitizeString((AllowedEntities) 0x27F); uC->SanitizeString((AllowedEntities)0x27F);
var wasValid = uC->ToString().Length > 0; var wasValid = uC->ToString().Length > 0;
uC->Dtor(true); uC->Dtor(true);
@@ -537,7 +710,7 @@ internal sealed unsafe class Chat : IDisposable
var ok = Plugin.GameConfig.TryGet(UiConfigOption.LogNameType, out uint type); var ok = Plugin.GameConfig.TryGet(UiConfigOption.LogNameType, out uint type);
if (!ok || !Enum.IsDefined(typeof(PlayerNameDisplayType), type)) if (!ok || !Enum.IsDefined(typeof(PlayerNameDisplayType), type))
return PlayerNameDisplayType.FullName; return PlayerNameDisplayType.FullName;
return (PlayerNameDisplayType) type; return (PlayerNameDisplayType)type;
} }
internal string AbbreviatePlayerName(string playerName) internal string AbbreviatePlayerName(string playerName)
@@ -557,10 +730,13 @@ internal sealed unsafe class Chat : IDisposable
return CurrentPlayerNameDisplayType switch return CurrentPlayerNameDisplayType switch
{ {
PlayerNameDisplayType.SurnameAbbreviated => $"{split.First()} {split.Last().FirstOrDefault('A')}.", PlayerNameDisplayType.SurnameAbbreviated =>
PlayerNameDisplayType.ForenameAbbreviated => $"{split.First().FirstOrDefault('A')}. {split.Last()}", $"{split.First()} {split.Last().FirstOrDefault('A')}.",
PlayerNameDisplayType.Initials => $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.", PlayerNameDisplayType.ForenameAbbreviated =>
_ => playerName $"{split.First().FirstOrDefault('A')}. {split.Last()}",
PlayerNameDisplayType.Initials =>
$"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
_ => playerName,
}; };
} }
@@ -571,6 +747,7 @@ internal sealed unsafe class Chat : IDisposable
// second before the cutscene actually starts, because the game sets // second before the cutscene actually starts, because the game sets
// the cutscene conditions before processing the skip. // the cutscene conditions before processing the skip.
var raptureAtkUnitManager = RaptureAtkUnitManager.Instance(); var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
return raptureAtkUnitManager == null || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat); return raptureAtkUnitManager == null
|| raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
} }
} }
+6 -3
View File
@@ -1,8 +1,8 @@
using System.Text; using System.Text;
using HellionChat.Resources;
using Dalamud.Memory; using Dalamud.Memory;
using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using HellionChat.Resources;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -27,7 +27,10 @@ public unsafe class ChatBox
// Utf8String->SanitizeString, which only resolves in-process. Returns the // Utf8String->SanitizeString, which only resolves in-process. Returns the
// already-encoded bytes so SendMessage doesn't pay GetBytes twice. // already-encoded bytes so SendMessage doesn't pay GetBytes twice.
// TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs // TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
internal static byte[] ValidateMessage(string message, Func<string, string>? sanitiserOverride = null) internal static byte[] ValidateMessage(
string message,
Func<string, string>? sanitiserOverride = null
)
{ {
var bytes = Encoding.UTF8.GetBytes(message); var bytes = Encoding.UTF8.GetBytes(message);
if (bytes.Length == 0) if (bytes.Length == 0)
@@ -47,7 +50,7 @@ public unsafe class ChatBox
{ {
var uText = Utf8String.FromString(text); var uText = Utf8String.FromString(text);
uText->SanitizeString((AllowedEntities) 0x27F); uText->SanitizeString((AllowedEntities)0x27F);
var sanitised = uText->ToString(); var sanitised = uText->ToString();
uText->Dtor(true); uText->Dtor(true);
+4 -2
View File
@@ -1,7 +1,7 @@
using HellionChat.Util;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Client.UI.Info; using FFXIVClientStructs.FFXIV.Client.UI.Info;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using HellionChat.Util;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -10,7 +10,9 @@ internal sealed unsafe class Context
internal static void InviteToNoviceNetwork(string name, ushort world) internal static void InviteToNoviceNetwork(string name, ushort world)
{ {
// can specify content id if we have it, but there's no need // can specify content id if we have it, but there's no need
InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes()); InfoProxyNoviceNetwork
.Instance()
->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
} }
internal static void TryOn(uint itemId, byte stainId) internal static void TryOn(uint itemId, byte stainId)
+37 -12
View File
@@ -23,9 +23,17 @@ internal unsafe class GameFunctions : IDisposable
internal const string NewGamePlusAddonName = "QuestRedo"; internal const string NewGamePlusAddonName = "QuestRedo";
#region Hooks #region Hooks
[Signature("E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F", DetourName = nameof(ResolveTextCommandPlaceholderDetour))] [Signature(
"E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F",
DetourName = nameof(ResolveTextCommandPlaceholderDetour)
)]
private Hook<ResolveTextCommandPlaceholderDelegate>? ResolveTextCommandPlaceholderHook = null!; private Hook<ResolveTextCommandPlaceholderDelegate>? ResolveTextCommandPlaceholderHook = null!;
private delegate nint ResolveTextCommandPlaceholderDelegate(nint a1, byte* placeholderText, byte a3, byte a4); private delegate nint ResolveTextCommandPlaceholderDelegate(
nint a1,
byte* placeholderText,
byte a3,
byte a4
);
#endregion #endregion
private Plugin Plugin { get; } private Plugin Plugin { get; }
@@ -81,7 +89,8 @@ internal unsafe class GameFunctions : IDisposable
ChatBox.SendMessage($"/{commandName} add {Placeholder}"); ChatBox.SendMessage($"/{commandName} add {Placeholder}");
} }
private static T* GetAddon<T>(string name) where T : unmanaged private static T* GetAddon<T>(string name)
where T : unmanaged
{ {
var addon = RaptureAtkModule.Instance()->RaptureAtkUnitManager.GetAddonByName(name); var addon = RaptureAtkModule.Instance()->RaptureAtkUnitManager.GetAddonByName(name);
return addon != null && addon->IsReady ? (T*)addon : null; return addon != null && addon->IsReady ? (T*)addon : null;
@@ -164,14 +173,15 @@ internal unsafe class GameFunctions : IDisposable
{ {
var addonId = lfg->GetAddonId(); var addonId = lfg->GetAddonId();
var atkModule = RaptureAtkModule.Instance(); var atkModule = RaptureAtkModule.Instance();
var atkModuleVtbl = (void**) atkModule->AtkModule.VirtualTable; var atkModuleVtbl = (void**)atkModule->AtkModule.VirtualTable;
var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>) atkModuleVtbl[27]; var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>)
atkModuleVtbl[27];
vf27(atkModule, addonId, 1); vf27(atkModule, addonId, 1);
} }
else else
{ {
// 6.05: 8443DD // 6.05: 8443DD
if (*(uint*) ((nint) lfg + 0x2C20) > 0) if (*(uint*)((nint)lfg + 0x2C20) > 0)
lfg->Hide(); lfg->Hide();
else else
lfg->Show(); lfg->Show();
@@ -197,7 +207,14 @@ internal unsafe class GameFunctions : IDisposable
return; return;
} }
if (!uint.TryParse(splits[1], NumberStyles.Any, CultureInfo.InvariantCulture, out var questId)) if (
!uint.TryParse(
splits[1],
NumberStyles.Any,
CultureInfo.InvariantCulture,
out var questId
)
)
{ {
Plugin.ChatGui.Print("Unable to parse quest id"); Plugin.ChatGui.Print("Unable to parse quest id");
return; return;
@@ -239,9 +256,10 @@ internal unsafe class GameFunctions : IDisposable
{ {
var agent = AgentChatLog.Instance(); var agent = AgentChatLog.Instance();
// case 3 // case 3
var value = new AtkValue { Type = ValueType.Int, Int = 3, }; var value = new AtkValue { Type = ValueType.Int, Int = 3 };
var result = 0; var result = 0;
var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*) agent->VirtualTable; var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
agent->VirtualTable;
vf0(agent, &result, &value, 0, 0); vf0(agent, &result, &value, 0, 0);
} }
@@ -250,7 +268,12 @@ internal unsafe class GameFunctions : IDisposable
private readonly string Placeholder = $"<{Guid.NewGuid():N}>"; private readonly string Placeholder = $"<{Guid.NewGuid():N}>";
private string? ReplacementName; private string? ReplacementName;
private nint ResolveTextCommandPlaceholderDetour(nint a1, byte* placeholderText, byte a3, byte a4) private nint ResolveTextCommandPlaceholderDetour(
nint a1,
byte* placeholderText,
byte a3,
byte a4
)
{ {
// The detour is only invoked through the hook, so the hook should // The detour is only invoked through the hook, so the hook should
// never be null here, but the nullable field declaration forces us // never be null here, but the nullable field declaration forces us
@@ -258,7 +281,7 @@ internal unsafe class GameFunctions : IDisposable
if (ResolveTextCommandPlaceholderHook is null) if (ResolveTextCommandPlaceholderHook is null)
return nint.Zero; return nint.Zero;
var placeholder = MemoryHelper.ReadStringNullTerminated((nint) placeholderText); var placeholder = MemoryHelper.ReadStringNullTerminated((nint)placeholderText);
if (ReplacementName == null || placeholder != Placeholder) if (ReplacementName == null || placeholder != Placeholder)
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4); return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
@@ -268,7 +291,9 @@ internal unsafe class GameFunctions : IDisposable
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName); var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
if (byteCount >= PlaceholderBufferSize) if (byteCount >= PlaceholderBufferSize)
{ {
Plugin.Log.Warning($"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."); Plugin.Log.Warning(
$"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
);
ReplacementName = null; ReplacementName = null;
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4); return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
} }
+135 -89
View File
@@ -1,23 +1,25 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.Config; using Dalamud.Game.Config;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag; using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
internal enum KeyboardSource { internal enum KeyboardSource
{
Game, Game,
ImGui ImGui,
} }
internal unsafe class KeybindManager : IDisposable { internal unsafe class KeybindManager : IDisposable
{
private Plugin Plugin { get; } private Plugin Plugin { get; }
internal bool DirectChat; internal bool DirectChat;
@@ -26,70 +28,79 @@ internal unsafe class KeybindManager : IDisposable {
private bool VanillaTextInputHasFocus; private bool VanillaTextInputHasFocus;
private readonly Dictionary<string, Keybind> Keybinds = new(); private readonly Dictionary<string, Keybind> Keybinds = new();
private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept = new Dictionary<string, ChannelSwitchInfo> private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept =
{ new Dictionary<string, ChannelSwitchInfo>
["CMD_CHAT"] = new(null), {
["CMD_COMMAND"] = new(null, text: "/"), ["CMD_CHAT"] = new(null),
["CMD_REPLY"] = new(InputChannel.Tell, rotate: RotateMode.Forward), ["CMD_COMMAND"] = new(null, text: "/"),
["CMD_REPLY_REV"] = new(InputChannel.Tell, rotate: RotateMode.Reverse), ["CMD_REPLY"] = new(InputChannel.Tell, rotate: RotateMode.Forward),
["CMD_SAY"] = new(InputChannel.Say), ["CMD_REPLY_REV"] = new(InputChannel.Tell, rotate: RotateMode.Reverse),
["CMD_YELL"] = new(InputChannel.Yell), ["CMD_SAY"] = new(InputChannel.Say),
["CMD_SHOUT"] = new(InputChannel.Shout), ["CMD_YELL"] = new(InputChannel.Yell),
["CMD_PARTY"] = new(InputChannel.Party), ["CMD_SHOUT"] = new(InputChannel.Shout),
["CMD_ALLIANCE"] = new(InputChannel.Alliance), ["CMD_PARTY"] = new(InputChannel.Party),
["CMD_FREECOM"] = new(InputChannel.FreeCompany), ["CMD_ALLIANCE"] = new(InputChannel.Alliance),
["PVPTEAM_CHAT"] = new(InputChannel.PvpTeam), ["CMD_FREECOM"] = new(InputChannel.FreeCompany),
["CMD_CWLINKSHELL"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Forward), ["PVPTEAM_CHAT"] = new(InputChannel.PvpTeam),
["CMD_CWLINKSHELL_REV"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Reverse), ["CMD_CWLINKSHELL"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Forward),
["CMD_CWLINKSHELL_1"] = new(InputChannel.CrossLinkshell1), ["CMD_CWLINKSHELL_REV"] = new(InputChannel.CrossLinkshell1, rotate: RotateMode.Reverse),
["CMD_CWLINKSHELL_2"] = new(InputChannel.CrossLinkshell2), ["CMD_CWLINKSHELL_1"] = new(InputChannel.CrossLinkshell1),
["CMD_CWLINKSHELL_3"] = new(InputChannel.CrossLinkshell3), ["CMD_CWLINKSHELL_2"] = new(InputChannel.CrossLinkshell2),
["CMD_CWLINKSHELL_4"] = new(InputChannel.CrossLinkshell4), ["CMD_CWLINKSHELL_3"] = new(InputChannel.CrossLinkshell3),
["CMD_CWLINKSHELL_5"] = new(InputChannel.CrossLinkshell5), ["CMD_CWLINKSHELL_4"] = new(InputChannel.CrossLinkshell4),
["CMD_CWLINKSHELL_6"] = new(InputChannel.CrossLinkshell6), ["CMD_CWLINKSHELL_5"] = new(InputChannel.CrossLinkshell5),
["CMD_CWLINKSHELL_7"] = new(InputChannel.CrossLinkshell7), ["CMD_CWLINKSHELL_6"] = new(InputChannel.CrossLinkshell6),
["CMD_CWLINKSHELL_8"] = new(InputChannel.CrossLinkshell8), ["CMD_CWLINKSHELL_7"] = new(InputChannel.CrossLinkshell7),
["CMD_LINKSHELL"] = new(InputChannel.Linkshell1, rotate: RotateMode.Forward), ["CMD_CWLINKSHELL_8"] = new(InputChannel.CrossLinkshell8),
["CMD_LINKSHELL_REV"] = new(InputChannel.Linkshell1, rotate: RotateMode.Reverse), ["CMD_LINKSHELL"] = new(InputChannel.Linkshell1, rotate: RotateMode.Forward),
["CMD_LINKSHELL_1"] = new(InputChannel.Linkshell1), ["CMD_LINKSHELL_REV"] = new(InputChannel.Linkshell1, rotate: RotateMode.Reverse),
["CMD_LINKSHELL_2"] = new(InputChannel.Linkshell2), ["CMD_LINKSHELL_1"] = new(InputChannel.Linkshell1),
["CMD_LINKSHELL_3"] = new(InputChannel.Linkshell3), ["CMD_LINKSHELL_2"] = new(InputChannel.Linkshell2),
["CMD_LINKSHELL_4"] = new(InputChannel.Linkshell4), ["CMD_LINKSHELL_3"] = new(InputChannel.Linkshell3),
["CMD_LINKSHELL_5"] = new(InputChannel.Linkshell5), ["CMD_LINKSHELL_4"] = new(InputChannel.Linkshell4),
["CMD_LINKSHELL_6"] = new(InputChannel.Linkshell6), ["CMD_LINKSHELL_5"] = new(InputChannel.Linkshell5),
["CMD_LINKSHELL_7"] = new(InputChannel.Linkshell7), ["CMD_LINKSHELL_6"] = new(InputChannel.Linkshell6),
["CMD_LINKSHELL_8"] = new(InputChannel.Linkshell8), ["CMD_LINKSHELL_7"] = new(InputChannel.Linkshell7),
["CMD_BEGINNER"] = new(InputChannel.NoviceNetwork), ["CMD_LINKSHELL_8"] = new(InputChannel.Linkshell8),
["CMD_REPLY_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Forward), ["CMD_BEGINNER"] = new(InputChannel.NoviceNetwork),
["CMD_REPLY_REV_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Reverse), ["CMD_REPLY_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Forward),
["CMD_SAY_ALWAYS"] = new(InputChannel.Say, true), ["CMD_REPLY_REV_ALWAYS"] = new(InputChannel.Tell, true, RotateMode.Reverse),
["CMD_YELL_ALWAYS"] = new(InputChannel.Yell, true), ["CMD_SAY_ALWAYS"] = new(InputChannel.Say, true),
["CMD_PARTY_ALWAYS"] = new(InputChannel.Party, true), ["CMD_YELL_ALWAYS"] = new(InputChannel.Yell, true),
["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true), ["CMD_PARTY_ALWAYS"] = new(InputChannel.Party, true),
["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true), ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true), ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
["CMD_CWLINKSHELL_ALWAYS"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Forward), ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
["CMD_CWLINKSHELL_ALWAYS_REV"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Reverse), ["CMD_CWLINKSHELL_ALWAYS"] = new(
["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true), InputChannel.CrossLinkshell1,
["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true), true,
["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true), RotateMode.Forward
["CMD_CWLINKSHELL_4_ALWAYS"] = new(InputChannel.CrossLinkshell4, true), ),
["CMD_CWLINKSHELL_5_ALWAYS"] = new(InputChannel.CrossLinkshell5, true), ["CMD_CWLINKSHELL_ALWAYS_REV"] = new(
["CMD_CWLINKSHELL_6_ALWAYS"] = new(InputChannel.CrossLinkshell6, true), InputChannel.CrossLinkshell1,
["CMD_CWLINKSHELL_7_ALWAYS"] = new(InputChannel.CrossLinkshell7, true), true,
["CMD_CWLINKSHELL_8_ALWAYS"] = new(InputChannel.CrossLinkshell8, true), RotateMode.Reverse
["CMD_LINKSHELL_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Forward), ),
["CMD_LINKSHELL_REV_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Reverse), ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
["CMD_LINKSHELL_1_ALWAYS"] = new(InputChannel.Linkshell1, true), ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
["CMD_LINKSHELL_2_ALWAYS"] = new(InputChannel.Linkshell2, true), ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
["CMD_LINKSHELL_3_ALWAYS"] = new(InputChannel.Linkshell3, true), ["CMD_CWLINKSHELL_4_ALWAYS"] = new(InputChannel.CrossLinkshell4, true),
["CMD_LINKSHELL_4_ALWAYS"] = new(InputChannel.Linkshell4, true), ["CMD_CWLINKSHELL_5_ALWAYS"] = new(InputChannel.CrossLinkshell5, true),
["CMD_LINKSHELL_5_ALWAYS"] = new(InputChannel.Linkshell5, true), ["CMD_CWLINKSHELL_6_ALWAYS"] = new(InputChannel.CrossLinkshell6, true),
["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true), ["CMD_CWLINKSHELL_7_ALWAYS"] = new(InputChannel.CrossLinkshell7, true),
["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true), ["CMD_CWLINKSHELL_8_ALWAYS"] = new(InputChannel.CrossLinkshell8, true),
["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true), ["CMD_LINKSHELL_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Forward),
["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true) ["CMD_LINKSHELL_REV_ALWAYS"] = new(InputChannel.Linkshell1, true, RotateMode.Reverse),
}; ["CMD_LINKSHELL_1_ALWAYS"] = new(InputChannel.Linkshell1, true),
["CMD_LINKSHELL_2_ALWAYS"] = new(InputChannel.Linkshell2, true),
["CMD_LINKSHELL_3_ALWAYS"] = new(InputChannel.Linkshell3, true),
["CMD_LINKSHELL_4_ALWAYS"] = new(InputChannel.Linkshell4, true),
["CMD_LINKSHELL_5_ALWAYS"] = new(InputChannel.Linkshell5, true),
["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true),
};
// List of keys that can be used as a part of keybinds while the chat is // List of keys that can be used as a part of keybinds while the chat is
// focused WITHOUT modifiers. All other keys can only be used if their // focused WITHOUT modifiers. All other keys can only be used if their
@@ -353,12 +364,22 @@ internal unsafe class KeybindManager : IDisposable {
return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey); return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey);
} }
private static bool ComboPressed(KeyboardSource source, VirtualKey key, ModifierFlag modifier, ModifierFlag? modifierState = null, bool modifiersOnly = false) private static bool ComboPressed(
KeyboardSource source,
VirtualKey key,
ModifierFlag modifier,
ModifierFlag? modifierState = null,
bool modifiersOnly = false
)
{ {
// When we're in an input, we don't want to process any keybinds that // When we're in an input, we don't want to process any keybinds that
// don't have a modifier (or only use shift) and are not explicitly // don't have a modifier (or only use shift) and are not explicitly
// whitelisted. // whitelisted.
if (modifiersOnly && !ModifierlessChatKeys.Contains(key) && modifier is ModifierFlag.None or ModifierFlag.Shift) if (
modifiersOnly
&& !ModifierlessChatKeys.Contains(key)
&& modifier is ModifierFlag.None or ModifierFlag.Shift
)
return false; return false;
modifierState ??= GetModifiers(source); modifierState ??= GetModifiers(source);
@@ -366,26 +387,43 @@ internal unsafe class KeybindManager : IDisposable {
{ {
KeybindMode.Strict => modifier == modifierState.Value, KeybindMode.Strict => modifier == modifierState.Value,
KeybindMode.Flexible => modifierState.Value.HasFlag(modifier), KeybindMode.Flexible => modifierState.Value.HasFlag(modifier),
_ => false _ => false,
}; };
return KeyPressed(source, key) && modifierPressed; return KeyPressed(source, key) && modifierPressed;
} }
private static bool ConfigKeybindPressed(KeyboardSource source, ConfigKeyBind? bind, ModifierFlag? modifierState = null, bool modifiersOnly = false) private static bool ConfigKeybindPressed(
KeyboardSource source,
ConfigKeyBind? bind,
ModifierFlag? modifierState = null,
bool modifiersOnly = false
)
{ {
return bind != null && ComboPressed(source, bind.Key, bind.Modifier, modifierState: modifierState, modifiersOnly: modifiersOnly); return bind != null
&& ComboPressed(
source,
bind.Key,
bind.Modifier,
modifierState: modifierState,
modifiersOnly: modifiersOnly
);
} }
private void HandleKeybinds(IFramework _ ) => HandleKeybinds(KeyboardSource.Game); private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game);
internal void HandleKeybinds(KeyboardSource source, bool ignoreChatOpen = false, bool modifiersOnly = false) internal void HandleKeybinds(
KeyboardSource source,
bool ignoreChatOpen = false,
bool modifiersOnly = false
)
{ {
// Refresh current keybinds every 5s // Refresh current keybinds every 5s
if (LastRefresh + 5 * 1000 < Environment.TickCount64) if (LastRefresh + 5 * 1000 < Environment.TickCount64)
{ {
UpdateKeybinds(); UpdateKeybinds();
DirectChat = Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option; DirectChat =
Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
LastRefresh = Environment.TickCount64; LastRefresh = Environment.TickCount64;
} }
@@ -433,10 +471,18 @@ internal unsafe class KeybindManager : IDisposable {
void Intercept(VirtualKey vk, ModifierFlag modifier) void Intercept(VirtualKey vk, ModifierFlag modifier)
{ {
if (!ComboPressed(source, vk, modifier, modifierState: modifierState, modifiersOnly: modifiersOnly)) if (
!ComboPressed(
source,
vk,
modifier,
modifierState: modifierState,
modifiersOnly: modifiersOnly
)
)
return; return;
var bits = BitOperations.PopCount((uint) modifier); var bits = BitOperations.PopCount((uint)modifier);
if (bits < currentBest.Item3) if (bits < currentBest.Item3)
return; return;
@@ -457,7 +503,7 @@ internal unsafe class KeybindManager : IDisposable {
try try
{ {
TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null; TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason, }); Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason });
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -494,11 +540,11 @@ internal unsafe class KeybindManager : IDisposable {
var key2 = outData.KeySettings[1]; var key2 = outData.KeySettings[1];
return new Keybind return new Keybind
{ {
Key1 = RemapInvalidVirtualKey((VirtualKey) key1.Key), Key1 = RemapInvalidVirtualKey((VirtualKey)key1.Key),
Modifier1 = (ModifierFlag) key1.KeyModifier, Modifier1 = (ModifierFlag)key1.KeyModifier,
Key2 = RemapInvalidVirtualKey((VirtualKey) key2.Key), Key2 = RemapInvalidVirtualKey((VirtualKey)key2.Key),
Modifier2 = (ModifierFlag) key2.KeyModifier, Modifier2 = (ModifierFlag)key2.KeyModifier,
}; };
} }
@@ -506,9 +552,9 @@ internal unsafe class KeybindManager : IDisposable {
{ {
return key switch return key switch
{ {
VirtualKey.F23 => VirtualKey.OEM_2, // /? VirtualKey.F23 => VirtualKey.OEM_2, // /?
(VirtualKey) 140 => VirtualKey.OEM_7, // '" (VirtualKey)140 => VirtualKey.OEM_7, // '"
_ => key _ => key,
}; };
} }
} }
+8 -5
View File
@@ -1,8 +1,8 @@
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Client.UI.Info; using FFXIVClientStructs.FFXIV.Client.UI.Info;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -11,7 +11,8 @@ internal static unsafe class Party
internal static void InviteSameWorld(string name, ushort world, ulong contentId) internal static void InviteSameWorld(string name, ushort world, ulong contentId)
{ {
// this only works if target is on the same world // this only works if target is on the same world
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world); InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world);
} }
} }
@@ -44,14 +45,16 @@ internal static unsafe class Party
internal static void Kick(string name, ulong contentId) internal static void Kick(string name, ulong contentId)
{ {
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
AgentPartyMember.Instance()->Kick(namePtr, 0, contentId); AgentPartyMember.Instance()->Kick(namePtr, 0, contentId);
} }
} }
internal static void Promote(string name, ulong contentId) internal static void Promote(string name, ulong contentId)
{ {
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
AgentPartyMember.Instance()->Promote(namePtr, 0, contentId); AgentPartyMember.Instance()->Promote(namePtr, 0, contentId);
} }
} }
@@ -2,13 +2,19 @@ using HellionChat.Code;
namespace HellionChat.GameFunctions.Types; namespace HellionChat.GameFunctions.Types;
internal class ChannelSwitchInfo { internal class ChannelSwitchInfo
{
internal InputChannel? Channel { get; } internal InputChannel? Channel { get; }
internal bool Permanent { get; } internal bool Permanent { get; }
internal RotateMode Rotate { get; } internal RotateMode Rotate { get; }
internal string? Text { get; } internal string? Text { get; }
internal ChannelSwitchInfo(InputChannel? channel, bool permanent = false, RotateMode rotate = RotateMode.None, string? text = null) internal ChannelSwitchInfo(
InputChannel? channel,
bool permanent = false,
RotateMode rotate = RotateMode.None,
string? text = null
)
{ {
Channel = channel; Channel = channel;
Permanent = permanent; Permanent = permanent;
@@ -19,14 +19,14 @@ public class TellTarget
Reason = reason; Reason = reason;
} }
public bool IsSet() public bool IsSet() => !string.IsNullOrEmpty(Name) && World > 0;
=> !string.IsNullOrEmpty(Name) && World > 0;
public string ToWorldString() public string ToWorldString() =>
=> Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty; Sheets.WorldSheet.TryGetRow(World, out var worldRow)
? worldRow.Name.ToString()
: string.Empty;
public string ToTargetString() public string ToTargetString() => $"{Name}@{ToWorldString()}";
=> $"{Name}@{ToWorldString()}";
public unsafe void FromTarget(IPlayerCharacter target) public unsafe void FromTarget(IPlayerCharacter target)
{ {
@@ -39,5 +39,6 @@ public class TellTarget
} }
public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct); public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason); public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
} }
-2
View File
@@ -80,7 +80,6 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<!-- Plugin icon. Copy images/* into the build output so Dalamud <!-- Plugin icon. Copy images/* into the build output so Dalamud
finds the icon next to the DLL, and let the SDK default finds the icon next to the DLL, and let the SDK default
DalamudPackager pipeline include the same path in the DalamudPackager pipeline include the same path in the
@@ -94,5 +93,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>
+178 -178
View File
@@ -2,220 +2,220 @@ name: Hellion Chat
author: JonKazama-Hellion author: JonKazama-Hellion
punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2) punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
description: |- description: |-
Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV
based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
removed (the optional webinterface) and a stack of privacy controls is removed (the optional webinterface) and a stack of privacy controls is
added on top. Tabs, channel filters, RGB colours, emotes, screenshot added on top. Tabs, channel filters, RGB colours, emotes, screenshot
mode, IPC integration and the chat replacement window itself work the mode, IPC integration and the chat replacement window itself work the
same. The webinterface is intentionally not part of Hellion Chat because same. The webinterface is intentionally not part of Hellion Chat because
it serves a different use case from the smaller default footprint this it serves a different use case from the smaller default footprint this
plugin is built around. plugin is built around.
On top of that, Hellion Chat adds privacy and data-handling controls On top of that, Hellion Chat adds privacy and data-handling controls
designed to align with the modern data protection rules that apply designed to align with the modern data protection rules that apply
across the EU, the United States and Japan. By default only your own across the EU, the United States and Japan. By default only your own
conversations are stored; messages from strangers, NPCs and system conversations are stored; messages from strangers, NPCs and system
spam stay out of the database. Retention windows are configurable per spam stay out of the database. Retention windows are configurable per
channel, history can be wiped retroactively, and stored data can be channel, history can be wiped retroactively, and stored data can be
exported on demand. exported on demand.
Key privacy and data-handling features: Key privacy and data-handling features:
- Channel whitelist with a Privacy-First default - Channel whitelist with a Privacy-First default
- Per-channel retention with a daily background sweep - Per-channel retention with a daily background sweep
- Retroactive cleanup with a Ctrl+Shift confirm - Retroactive cleanup with a Ctrl+Shift confirm
- Export to Markdown, JSON or CSV - Export to Markdown, JSON or CSV
- First-run wizard with three preset profiles (Privacy-First, Casual, - First-run wizard with three preset profiles (Privacy-First, Casual,
Full History) Full History)
- Bilingual UI (English and German) with live language switching - Bilingual UI (English and German) with live language switching
- Independent plugin state — own config file and database directory, - Independent plugin state — own config file and database directory,
so Hellion Chat does not share state with upstream Chat 2 so Hellion Chat does not share state with upstream Chat 2
v1.3.0 First plugin integration cycle. Honorific custom titles v1.3.0 First plugin integration cycle. Honorific custom titles
are shown in the chat header above the message log, with auto-detect are shown in the chat header above the message log, with auto-detect
and silent fallback when Honorific is not installed. and silent fallback when Honorific is not installed.
v1.4.0 — Critical Lifecycle Fixes. Plugin reload and shutdown v1.4.0 — Critical Lifecycle Fixes. Plugin reload and shutdown
are cleaner: SQLite no longer leans on GC pressure to release are cleaner: SQLite no longer leans on GC pressure to release
its file, worker threads are explicitly background, deferred its file, worker threads are explicitly background, deferred
config saves no longer get lost mid-disable, and pre-v13 config config saves no longer get lost mid-disable, and pre-v13 config
backups carry the user's custom theme opacity into the v14 schema backups carry the user's custom theme opacity into the v14 schema
instead of falling back to the default. instead of falling back to the default.
v1.4.1 — Theme Engine Performance plus a tenth built-in. v1.4.1 — Theme Engine Performance plus a tenth built-in.
HellionStyle.PushGlobal reads pre-computed ABGR values from a HellionStyle.PushGlobal reads pre-computed ABGR values from a
per-theme cache instead of converting RGBA per slot per frame per-theme cache instead of converting RGBA per slot per frame
(~13 % render-time recovery in typical scenes). Custom-theme (~13 % render-time recovery in typical scenes). Custom-theme
hot-reload survives transient file locks (editor mid-save hot-reload survives transient file locks (editor mid-save
keeps the last-known-good snapshot). Synthwave Sunset joins keeps the last-known-good snapshot). Synthwave Sunset joins
as the tenth built-in theme — Hot Magenta + Cyan on midnight as the tenth built-in theme — Hot Magenta + Cyan on midnight
violet, 80s neon-grid vibes. violet, 80s neon-grid vibes.
v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation
patterns gone from the chat-log render path: card-mode borders patterns gone from the chat-log render path: card-mode borders
hoist invariants out of the per-message loop, auto-tell tab hoist invariants out of the per-message loop, auto-tell tab
tint and icon get a per-tab cache, and the status bar gates tint and icon get a per-tab cache, and the status bar gates
its tab aggregation behind the same one-second cache it uses its tab aggregation behind the same one-second cache it uses
for the format strings. for the format strings.
v1.4.3 — Plugin-Load Async-Init plus Repo-Cutover. Plugin v1.4.3 — Plugin-Load Async-Init plus Repo-Cutover. Plugin
migrated to Dalamud's IAsyncDalamudPlugin so the heavy work migrated to Dalamud's IAsyncDalamudPlugin so the heavy work
(migrations, service allocations, window construction, hook (migrations, service allocations, window construction, hook
subscription) runs in LoadAsync without blocking Dalamud's subscription) runs in LoadAsync without blocking Dalamud's
UI. Schema-gate replaces the v9 → v16 migration chain; UI. Schema-gate replaces the v9 → v16 migration chain;
configs on schema v16+ load directly. Custom-repo URL moves configs on schema v16+ load directly. Custom-repo URL moves
to gitea.hellion-forge.cloud, the GitHub repo stays as a to gitea.hellion-forge.cloud, the GitHub repo stays as a
frozen v1.4.2 snapshot. frozen v1.4.2 snapshot.
Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2. Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
Modding & support: join the Hellion Forge Discord at Modding & support: join the Hellion Forge Discord at
https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
other Hellion Online Media plugins/tools. other Hellion Online Media plugins/tools.
repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
accepts_feedback: true accepts_feedback: true
icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
image_urls: image_urls:
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
tags: tags:
- Social - Social
- UI - UI
- Chat - Chat
- Replacement - Replacement
- Privacy - Privacy
changelog: |- changelog: |-
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)** **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)**
Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin` Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin`
API. The constructor now does only the bootstrap-essentials API. The constructor now does only the bootstrap-essentials
(config load, language init, conflict detection); migrations, (config load, language init, conflict detection); migrations,
service allocations, window construction and hook subscription service allocations, window construction and hook subscription
move to LoadAsync. Dalamud can keep its UI responsive while the move to LoadAsync. Dalamud can keep its UI responsive while the
heavy work runs. heavy work runs.
- IAsyncDalamudPlugin two-phase load with per-line CaptureFailure - IAsyncDalamudPlugin two-phase load with per-line CaptureFailure
in DisposeAsync (mirrors LightlessSync's pattern); idempotency in DisposeAsync (mirrors LightlessSync's pattern); idempotency
guard protects against reload races guard protects against reload races
- Schema-gate replaces the v9 → v16 migration chain. Configs - Schema-gate replaces the v9 → v16 migration chain. Configs
on schema v16+ load directly; older configs trigger an on schema v16+ load directly; older configs trigger an
"install v1.4.2 first" error so the historic migration "install v1.4.2 first" error so the historic migration
path stays intact path stays intact
- AutoTranslate.PreloadCache moved off the load path. First - AutoTranslate.PreloadCache moved off the load path. First
use may have a sub-second hitch instead of every-load; the use may have a sub-second hitch instead of every-load; the
upstream chose differently, we accept first-use latency upstream chose differently, we accept first-use latency
- FontManager.BuildFonts is called sync at the start of - FontManager.BuildFonts is called sync at the start of
LoadAsync; Dalamud rebuilds the font atlas on its own LoadAsync; Dalamud rebuilds the font atlas on its own
pipeline so the custom Hellion-Exo2 font appears with a pipeline so the custom Hellion-Exo2 font appears with a
brief font-pop after load (matches ChatTwo's behaviour) brief font-pop after load (matches ChatTwo's behaviour)
- Custom-repo URL moved to gitea.hellion-forge.cloud/ - Custom-repo URL moved to gitea.hellion-forge.cloud/
JonKazama-Hellion/HellionChat. GitHub repo stays as a JonKazama-Hellion/HellionChat. GitHub repo stays as a
frozen v1.4.2 snapshot; new releases ship from Gitea. frozen v1.4.2 snapshot; new releases ship from Gitea.
Existing testers need to update the custom-repo URL once Existing testers need to update the custom-repo URL once
- Plugin-load time in this release sits at ~3.7 s median - Plugin-load time in this release sits at ~3.7 s median
(5 reloads), comparable to v1.4.2. Async migration is (5 reloads), comparable to v1.4.2. Async migration is
foundational for v1.4.4 Lazy-Init optimisations rather foundational for v1.4.4 Lazy-Init optimisations rather
than an immediate user-perceived win than an immediate user-perceived win
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2). Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path** **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
Third sub-patch of the v1.4.x Polish Sweep series. Per-frame Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
allocations from the chat-log render path eliminated. allocations from the chat-log render path eliminated.
- DrawMessages card-mode hoists theme/drawList/winLeft/winRight/ - DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
borderColorAbgr out of the per-message loop. About 500 borderColorAbgr out of the per-message loop. About 500
redundant calls per frame at 100 visible messages, multiplied redundant calls per frame at 100 visible messages, multiplied
by every pop-out window by every pop-out window
- Auto-tell tab tint and icon use a per-tab cache. Hash - Auto-tell tab tint and icon use a per-tab cache. Hash
computation and string allocation only happen when the tell computation and string allocation only happen when the tell
target name or world drifts. AutoTellTabTint stays a pure target name or world drifts. AutoTellTabTint stays a pure
hash helper; cache lives in a thin TabTintCache wrapper hash helper; cache lives in a thin TabTintCache wrapper
- Status bar gates its tab aggregation behind the same - Status bar gates its tab aggregation behind the same
one-second cache it already used for the format strings. one-second cache it already used for the format strings.
LINQ Sum and Count replaced with a single foreach pass LINQ Sum and Count replaced with a single foreach pass
that runs on roughly 1% of frames that runs on roughly 1% of frames
Realistic frame-time recovery: 2-5% in typical scenes, more Realistic frame-time recovery: 2-5% in typical scenes, more
on pop-out-heavy setups because the card-border hoist scales on pop-out-heavy setups because the card-border hoist scales
per window. per window.
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2). Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.4.1 — Theme Engine Performance** **Hellion Chat 1.4.1 — Theme Engine Performance**
Second sub-patch of the v1.4.x Polish Sweep series. Heap Second sub-patch of the v1.4.x Polish Sweep series. Heap
pressure from the theme engine's per-frame render path pressure from the theme engine's per-frame render path
removed, plus a tenth built-in theme and hardening for removed, plus a tenth built-in theme and hardening for
the custom-theme hot-reload. the custom-theme hot-reload.
- Theme records carry a pre-computed ABGR-packed cache - Theme records carry a pre-computed ABGR-packed cache
for every color slot; cache is filled when the theme for every color slot; cache is filled when the theme
is registered and refreshed defensively on every is registered and refreshed defensively on every
Switch() Switch()
- HellionStyle.PushGlobal reads ABGR values from the - HellionStyle.PushGlobal reads ABGR values from the
cache instead of calling ColourUtil.RgbaToAbgr per cache instead of calling ColourUtil.RgbaToAbgr per
slot per frame; ~13 % render-time recovery measured slot per frame; ~13 % render-time recovery measured
in typical scenes (plan estimate was 26 %, real in typical scenes (plan estimate was 26 %, real
~1015 %) ~1015 %)
- ThemeRegistry custom-theme reload distinguishes a - ThemeRegistry custom-theme reload distinguishes a
recoverable file lock (editor mid-save) from a recoverable file lock (editor mid-save) from a
permanent IO failure; locked themes keep their permanent IO failure; locked themes keep their
last-known-good snapshot and retry on the next last-known-good snapshot and retry on the next
lookup instead of dropping out of the picker lookup instead of dropping out of the picker
- New built-in: Synthwave Sunset — Hot Magenta + Cyan - New built-in: Synthwave Sunset — Hot Magenta + Cyan
on midnight violet, 80s neon-grid vibes; tenth theme on midnight violet, 80s neon-grid vibes; tenth theme
in the picker in the picker
- Author credits refreshed: brand themes are credited - Author credits refreshed: brand themes are credited
as "Hellion Forge"; Mint Grove and Forge Merchantman as "Hellion Forge"; Mint Grove and Forge Merchantman
now credited to Carla Beleandis as a community thanks now credited to Carla Beleandis as a community thanks
No schema bump, no user-visible behaviour change other No schema bump, no user-visible behaviour change other
than smoother frames on GC-sensitive setups and one than smoother frames on GC-sensitive setups and one
additional colour option. additional colour option.
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2). Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes** **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
First sub-patch of the v1.4.x Polish Sweep series. Seven First sub-patch of the v1.4.x Polish Sweep series. Seven
known lifecycle and race bugs eliminated before any known lifecycle and race bugs eliminated before any
performance refactor sits on top. performance refactor sits on top.
- MessageStore disposal no longer triggers GC.Collect - MessageStore disposal no longer triggers GC.Collect
globally; Pooling=false on the SQLite connection means globally; Pooling=false on the SQLite connection means
there's nothing left to clean up by hand there's nothing left to clean up by hand
- PendingMessage and RetentionSweep worker threads are - PendingMessage and RetentionSweep worker threads are
explicitly marked IsBackground=true so the plugin domain explicitly marked IsBackground=true so the plugin domain
can unload during XIVLauncher reload without waiting can unload during XIVLauncher reload without waiting
for them for them
- EmoteCache image and gif loaders moved from async-void - EmoteCache image and gif loaders moved from async-void
to async Task with a shared task tracker, draining to async Task with a shared task tracker, draining
on Dispose so an in-flight load can no longer write on Dispose so an in-flight load can no longer write
to a disposed EmoteImages entry to a disposed EmoteImages entry
- DisposeAsync 10s timeout now warns loudly instead of - DisposeAsync 10s timeout now warns loudly instead of
silently leaving the worker behind silently leaving the worker behind
- Plugin.Dispose flushes any pending DeferredSaveFrames - Plugin.Dispose flushes any pending DeferredSaveFrames
before tearing services down, so settings changes before tearing services down, so settings changes
made in the last few frames before disable are no made in the last few frames before disable are no
longer lost longer lost
- The v13→v14 config migration now reads the pre-v13 - The v13→v14 config migration now reads the pre-v13
backup and carries HellionThemeWindowOpacity into the backup and carries HellionThemeWindowOpacity into the
new WindowOpacity field instead of falling back to new WindowOpacity field instead of falling back to
the default 0.85 the default 0.85
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2). Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
--- ---
Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
+33 -21
View File
@@ -39,7 +39,11 @@ internal sealed class HonorificService : IDisposable
public bool IsAvailable { get; private set; } public bool IsAvailable { get; private set; }
public (uint Major, uint Minor)? DetectedApiVersion { get; private set; } public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }
public HonorificService(IDalamudPluginInterface pluginInterface, IPluginLog log, IFramework framework) public HonorificService(
IDalamudPluginInterface pluginInterface,
IPluginLog log,
IFramework framework
)
{ {
_framework = framework; _framework = framework;
_log = log; _log = log;
@@ -61,16 +65,15 @@ internal sealed class HonorificService : IDisposable
// schedule the initial pull onto the framework thread via // schedule the initial pull onto the framework thread via
// IFramework.RunOnFrameworkThread so the IPC call sees the right // IFramework.RunOnFrameworkThread so the IPC call sees the right
// thread context. // thread context.
_apiVersion = pluginInterface _apiVersion = pluginInterface.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion"); _getLocalCharacterTitle = pluginInterface.GetIpcSubscriber<string>(
_getLocalCharacterTitle = pluginInterface $"{IpcNamespace}.GetLocalCharacterTitle"
.GetIpcSubscriber<string>($"{IpcNamespace}.GetLocalCharacterTitle"); );
_localCharacterTitleChanged = pluginInterface _localCharacterTitleChanged = pluginInterface.GetIpcSubscriber<string, object>(
.GetIpcSubscriber<string, object>($"{IpcNamespace}.LocalCharacterTitleChanged"); $"{IpcNamespace}.LocalCharacterTitleChanged"
_ready = pluginInterface );
.GetIpcSubscriber<object>($"{IpcNamespace}.Ready"); _ready = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
_disposing = pluginInterface _disposing = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
_localCharacterTitleChanged.Subscribe(OnTitleChanged); _localCharacterTitleChanged.Subscribe(OnTitleChanged);
_ready.Subscribe(OnReady); _ready.Subscribe(OnReady);
@@ -103,9 +106,11 @@ internal sealed class HonorificService : IDisposable
if (!_versionWarningLogged) if (!_versionWarningLogged)
{ {
_log.Warning( _log.Warning(
"Honorific API version mismatch — expected major 3, " + "Honorific API version mismatch — expected major 3, "
"found {Major}.{Minor}. Disabling Honorific integration.", + "found {Major}.{Minor}. Disabling Honorific integration.",
version.Item1, version.Item2); version.Item1,
version.Item2
);
_versionWarningLogged = true; _versionWarningLogged = true;
} }
IsAvailable = false; IsAvailable = false;
@@ -142,7 +147,8 @@ internal sealed class HonorificService : IDisposable
// Honorific (e.g. version mismatch). Subscription stays live in case a // Honorific (e.g. version mismatch). Subscription stays live in case a
// compatible Honorific reloads, in which case Ready triggers TryInitialPull // compatible Honorific reloads, in which case Ready triggers TryInitialPull
// and sets IsAvailable back to true. // and sets IsAvailable back to true.
if (!IsAvailable) return; if (!IsAvailable)
return;
CurrentTitle = ParseTitleJson(json); CurrentTitle = ParseTitleJson(json);
} }
@@ -233,13 +239,19 @@ internal sealed class HonorificService : IDisposable
internal static bool ShouldRenderSlot( internal static bool ShouldRenderSlot(
bool toggleEnabled, bool toggleEnabled,
bool isAvailable, bool isAvailable,
HonorificTitleData? title) HonorificTitleData? title
)
{ {
if (!toggleEnabled) return false; if (!toggleEnabled)
if (!isAvailable) return false; return false;
if (title is null) return false; if (!isAvailable)
if (title.IsOriginal) return false; return false;
if (string.IsNullOrEmpty(title.Title)) return false; if (title is null)
return false;
if (title.IsOriginal)
return false;
if (string.IsNullOrEmpty(title.Title))
return false;
return true; return true;
} }
} }
+21 -6
View File
@@ -15,8 +15,14 @@ public sealed class ExtraChat : IDisposable
#pragma warning restore CS0649 #pragma warning restore CS0649
private ICallGateSubscriber<OverrideInfo, object> OverrideChannelGate { get; } private ICallGateSubscriber<OverrideInfo, object> OverrideChannelGate { get; }
private ICallGateSubscriber<Dictionary<string, uint>, Dictionary<string, uint>> ChannelCommandColoursGate { get; } private ICallGateSubscriber<
private ICallGateSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>> ChannelNamesGate { get; } Dictionary<string, uint>,
Dictionary<string, uint>
> ChannelCommandColoursGate { get; }
private ICallGateSubscriber<
Dictionary<Guid, string>,
Dictionary<Guid, string>
> ChannelNamesGate { get; }
internal (string, uint)? ChannelOverride { get; set; } internal (string, uint)? ChannelOverride { get; set; }
@@ -25,16 +31,25 @@ public sealed class ExtraChat : IDisposable
// Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs // Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
// the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01]. // the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new(); private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
internal IReadOnlyDictionary<string, uint> ChannelCommandColours => ChannelCommandColoursInternal; internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
ChannelCommandColoursInternal;
private volatile Dictionary<Guid, string> ChannelNamesInternal = new(); private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal; internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;
internal ExtraChat() internal ExtraChat()
{ {
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>("ExtraChat.OverrideChannelColour"); OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<Dictionary<string, uint>, Dictionary<string, uint>>("ExtraChat.ChannelCommandColours"); "ExtraChat.OverrideChannelColour"
ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>>("ExtraChat.ChannelNames"); );
ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<
Dictionary<string, uint>,
Dictionary<string, uint>
>("ExtraChat.ChannelCommandColours");
ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<
Dictionary<Guid, string>,
Dictionary<Guid, string>
>("ExtraChat.ChannelNames");
OverrideChannelGate.Subscribe(OnOverrideChannel); OverrideChannelGate.Subscribe(OnOverrideChannel);
ChannelCommandColoursGate.Subscribe(OnChannelCommandColours); ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
+23 -9
View File
@@ -1,9 +1,16 @@
using HellionChat.Code;
using Dalamud.Plugin.Ipc; using Dalamud.Plugin.Ipc;
using HellionChat.Code;
namespace HellionChat.Ipc; namespace HellionChat.Ipc;
using ChatInputState = (bool InputVisible, bool InputFocused, bool HasText, bool IsTyping, int TextLength, ChatType ChannelType); using ChatInputState = (
bool InputVisible,
bool InputFocused,
bool HasText,
bool IsTyping,
int TextLength,
ChatType ChannelType
);
internal sealed class TypingIpc : IDisposable internal sealed class TypingIpc : IDisposable
{ {
@@ -19,8 +26,12 @@ internal sealed class TypingIpc : IDisposable
{ {
Plugin = plugin; Plugin = plugin;
StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>("HellionChat.GetChatInputState"); StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>("HellionChat.ChatInputStateChanged"); "HellionChat.GetChatInputState"
);
StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
"HellionChat.ChatInputStateChanged"
);
StateQueryGate.RegisterFunc(GetState); StateQueryGate.RegisterFunc(GetState);
} }
@@ -30,19 +41,22 @@ internal sealed class TypingIpc : IDisposable
var log = Plugin.ChatLogWindow; var log = Plugin.ChatLogWindow;
var usedChannel = Plugin.CurrentTab.CurrentChannel; var usedChannel = Plugin.CurrentTab.CurrentChannel;
var inputChannel = usedChannel.UseTempChannel ? usedChannel.TempChannel : usedChannel.Channel; var inputChannel = usedChannel.UseTempChannel
? usedChannel.TempChannel
: usedChannel.Channel;
var channelType = inputChannel.ToChatType(); var channelType = inputChannel.ToChatType();
return (InputVisible: !log.IsHidden, return (
InputVisible: !log.IsHidden,
log.InputFocused, log.InputFocused,
HasText: log.Chat.Length > 0, HasText: log.Chat.Length > 0,
IsTyping: log is { InputFocused: true, Chat.Length: > 0 }, IsTyping: log is { InputFocused: true, Chat.Length: > 0 },
TextLength: log.Chat.Length, TextLength: log.Chat.Length,
ChannelType: channelType); ChannelType: channelType
);
} }
private ChatInputState GetState() private ChatInputState GetState() => BuildState();
=> BuildState();
internal void Update() internal void Update()
{ {
+26 -3
View File
@@ -9,7 +9,15 @@ internal sealed class IpcManager : IDisposable
private ICallGateProvider<string> RegisterGate { get; } private ICallGateProvider<string> RegisterGate { get; }
private ICallGateProvider<string, object?> UnregisterGate { get; } private ICallGateProvider<string, object?> UnregisterGate { get; }
private ICallGateProvider<object?> AvailableGate { get; } private ICallGateProvider<object?> AvailableGate { get; }
private ICallGateProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?> InvokeGate { get; } private ICallGateProvider<
string,
PlayerPayload?,
ulong,
Payload?,
SeString?,
SeString?,
object?
> InvokeGate { get; }
internal List<string> Registered { get; } = []; internal List<string> Registered { get; } = [];
@@ -23,12 +31,27 @@ internal sealed class IpcManager : IDisposable
UnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>("HellionChat.Unregister"); UnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>("HellionChat.Unregister");
UnregisterGate.RegisterAction(Unregister); UnregisterGate.RegisterAction(Unregister);
InvokeGate = Plugin.Interface.GetIpcProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?>("HellionChat.Invoke"); InvokeGate = Plugin.Interface.GetIpcProvider<
string,
PlayerPayload?,
ulong,
Payload?,
SeString?,
SeString?,
object?
>("HellionChat.Invoke");
AvailableGate.SendMessage(); AvailableGate.SendMessage();
} }
internal void Invoke(string id, PlayerPayload? sender, ulong contentId, Payload? payload, SeString? senderString, SeString? content) internal void Invoke(
string id,
PlayerPayload? sender,
ulong contentId,
Payload? payload,
SeString? senderString,
SeString? content
)
{ {
InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content); InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
} }
+120 -36
View File
@@ -1,12 +1,12 @@
using System.Text; using System.Text;
using HellionChat.Code;
using HellionChat.Util;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Utility; using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using HellionChat.Code;
using HellionChat.Util;
namespace HellionChat; namespace HellionChat;
@@ -33,7 +33,16 @@ public partial class Message
public Dictionary<Guid, float?> Height { get; } = new(); public Dictionary<Guid, float?> Height { get; } = new();
public Dictionary<Guid, bool> IsVisible { get; } = new(); public Dictionary<Guid, bool> IsVisible { get; } = new();
public Message(ulong receiver, ulong contentId, ulong accountId, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource) public Message(
ulong receiver,
ulong contentId,
ulong accountId,
ChatCode code,
List<Chunk> sender,
List<Chunk> content,
SeString senderSource,
SeString contentSource
)
{ {
var extraChatChannel = ExtractExtraChatChannel(contentSource); var extraChatChannel = ExtractExtraChatChannel(contentSource);
Receiver = receiver; Receiver = receiver;
@@ -56,7 +65,18 @@ public partial class Message
chunk.Message = this; chunk.Message = this;
} }
public Message(Guid id, ulong receiver, ulong contentId, DateTimeOffset date, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource, Guid extraChatChannel) public Message(
Guid id,
ulong receiver,
ulong contentId,
DateTimeOffset date,
ChatCode code,
List<Chunk> sender,
List<Chunk> content,
SeString senderSource,
SeString contentSource,
Guid extraChatChannel
)
{ {
Id = id; Id = id;
Receiver = receiver; Receiver = receiver;
@@ -82,7 +102,11 @@ public partial class Message
return new Message(0, 0, 0, code, [], content, new SeString(), new SeString()); return new Message(0, 0, 0, code, [], content, new SeString(), new SeString());
} }
public bool Matches(Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels, bool allExtraChatChannels, HashSet<Guid> extraChatChannels) public bool Matches(
Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels,
bool allExtraChatChannels,
HashSet<Guid> extraChatChannels
)
{ {
if (ExtraChatChannel != Guid.Empty) if (ExtraChatChannel != Guid.Empty)
return allExtraChatChannels || extraChatChannels.Contains(ExtraChatChannel); return allExtraChatChannels || extraChatChannels.Contains(ExtraChatChannel);
@@ -90,16 +114,21 @@ public partial class Message
var source = (ChatSource)(1 << (int)Code.Source); var source = (ChatSource)(1 << (int)Code.Source);
var target = (ChatSource)(1 << (int)Code.Target); var target = (ChatSource)(1 << (int)Code.Target);
return Code.Type.IsGm() return Code.Type.IsGm()
|| channels.TryGetValue(Code.Type, out var sources) || channels.TryGetValue(Code.Type, out var sources)
&& (Code.Source is 0 || sources.Source.HasFlag(source) || sources.Target.HasFlag(target)); && (
Code.Source is 0
|| sources.Source.HasFlag(source)
|| sources.Target.HasFlag(target)
);
} }
private int GenerateHash() private int GenerateHash()
{ {
var hash = SortCodeV2.GetHashCode() var hash =
^ ExtraChatChannel.GetHashCode() SortCodeV2.GetHashCode()
^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode() ^ ExtraChatChannel.GetHashCode()
^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode(); ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
if (Plugin.Config.CollapseKeepUniqueLinks) if (Plugin.Config.CollapseKeepUniqueLinks)
{ {
@@ -146,13 +175,15 @@ public partial class Message
} }
var nextIsAutoTranslate = false; var nextIsAutoTranslate = false;
var checkForEmotes = (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes; var checkForEmotes =
(Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
foreach (var chunk in oldChunks) foreach (var chunk in oldChunks)
{ {
// Use as is if it's not a text chunk, it already has a payload, or is auto translate // Use as is if it's not a text chunk, it already has a payload, or is auto translate
if (chunk is not TextChunk text || chunk.Link != null || nextIsAutoTranslate) if (chunk is not TextChunk text || chunk.Link != null || nextIsAutoTranslate)
{ {
nextIsAutoTranslate = chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin }; nextIsAutoTranslate =
chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin };
// No need to call AddChunkWithMessage here since the chunk // No need to call AddChunkWithMessage here since the chunk
// already has the Message field set. // already has the Message field set.
@@ -173,15 +204,23 @@ public partial class Message
var word = wordBuilder.ToString(); var word = wordBuilder.ToString();
wordBuilder.Clear(); wordBuilder.Clear();
var wordUsed = false; var wordUsed = false;
var tokenUsed = false; var tokenUsed = false;
if (checkForEmotes && EmoteCache.Exists(word) && !Plugin.Config.BlockedEmotes.Contains(word)) if (
checkForEmotes
&& EmoteCache.Exists(word)
&& !Plugin.Config.BlockedEmotes.Contains(word)
)
{ {
// Add the previous sentence before adding the emote // Add the previous sentence before adding the emote
AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString())); AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString()));
AddChunkWithMessage(new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word) { FallbackColour = text.FallbackColour }); AddChunkWithMessage(
new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word)
{
FallbackColour = text.FallbackColour,
}
);
wordUsed = true; wordUsed = true;
sentenceBuilder.Clear(); sentenceBuilder.Clear();
@@ -190,15 +229,31 @@ public partial class Message
if (token.TokenType == Tokenizer.TokenType.UrlString) if (token.TokenType == Tokenizer.TokenType.UrlString)
{ {
// Add the previous sentence before adding the url // Add the previous sentence before adding the url
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, sentenceBuilder.Append(!wordUsed ? word : "").ToString())); AddChunkWithMessage(
text.NewWithStyle(
chunk.Source,
chunk.Link,
sentenceBuilder.Append(!wordUsed ? word : "").ToString()
)
);
try try
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, UriPayload.ResolveUri(token.Value), token.Value)); AddChunkWithMessage(
text.NewWithStyle(
chunk.Source,
UriPayload.ResolveUri(token.Value),
token.Value
)
);
} }
catch (UriFormatException) catch (UriFormatException)
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, token.Value)); AddChunkWithMessage(
Plugin.Log.Debug($"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"); text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
);
Plugin.Log.Debug(
$"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
);
} }
wordUsed = true; wordUsed = true;
@@ -215,7 +270,12 @@ public partial class Message
} }
// End of string reached, we add our leftover // End of string reached, we add our leftover
AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.Append(!wordUsed ? word : "").ToString())); AddChunkWithMessage(
text.NewWithStyle(
chunk,
sentenceBuilder.Append(!wordUsed ? word : "").ToString()
)
);
} }
} }
@@ -281,20 +341,30 @@ public partial class Message
< 500_000 => ItemKind.Normal, < 500_000 => ItemKind.Normal,
< 1_000_000 => ItemKind.Collectible, < 1_000_000 => ItemKind.Collectible,
< 2_000_000 => ItemKind.Hq, < 2_000_000 => ItemKind.Hq,
_ => ItemKind.EventItem _ => ItemKind.EventItem,
}; };
var name = kind != ItemKind.EventItem var name =
? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString() kind != ItemKind.EventItem
: Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString(); ? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString()
: Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString();
var link = new ItemPayload(item.ItemId, kind, $"{SeIconChar.LinkMarker.ToIconChar()}{name}"); var link = new ItemPayload(
AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown")); item.ItemId,
kind,
$"{SeIconChar.LinkMarker.ToIconChar()}{name}"
);
AddChunkWithMessage(
text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown")
);
} }
else if (split == "<status>") else if (split == "<status>")
{ {
var statusId = AgentChatLog.Instance()->ContextStatusId; var statusId = AgentChatLog.Instance()->ContextStatusId;
if (statusId == 0 || !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow)) if (
statusId == 0
|| !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow)
)
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split)); AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
continue; continue;
@@ -305,7 +375,7 @@ public partial class Message
{ {
1 => $"{SeIconChar.Buff.ToIconString()}{nameValue}", 1 => $"{SeIconChar.Buff.ToIconString()}{nameValue}",
2 => $"{SeIconChar.Debuff.ToIconString()}{nameValue}", 2 => $"{SeIconChar.Debuff.ToIconString()}{nameValue}",
_ => nameValue _ => nameValue,
}; };
var link = new StatusPayload(statusId); var link = new StatusPayload(statusId);
@@ -321,13 +391,27 @@ public partial class Message
} }
var mapCoords = agentMap->FlagMapMarkers[0]; var mapCoords = agentMap->FlagMapMarkers[0];
var rawX = (int)(MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000); var rawX = (int)(
var rawY = (int)(MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000); MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000
);
var rawY = (int)(
MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000
);
var link = new MapLinkPayload(mapCoords.TerritoryId, mapCoords.MapId, rawX, rawY); var link = new MapLinkPayload(
AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}")); mapCoords.TerritoryId,
mapCoords.MapId,
rawX,
rawY
);
AddChunkWithMessage(
text.NewWithStyle(
chunk.Source,
link,
$"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"
)
);
} }
} }
catch (Exception) catch (Exception)
{ {
+78 -27
View File
@@ -1,9 +1,6 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Diagnostics; using System.Diagnostics;
using System.Text; using System.Text;
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Chat; using Dalamud.Game.Chat;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
@@ -11,6 +8,9 @@ using Dalamud.Hooking;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
using Lumina.Text.Expressions; using Lumina.Text.Expressions;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
@@ -68,13 +68,19 @@ internal class MessageManager : IAsyncDisposable
// IsBackground so a stuck worker never blocks plugin unload. // IsBackground so a stuck worker never blocks plugin unload.
// Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net. // Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net.
PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token)) PendingMessageThread = new Thread(() =>
ProcessPendingMessages(PendingThreadCancellationToken.Token)
)
{ {
IsBackground = true, IsBackground = true,
}; };
PendingMessageThread.Start(); PendingMessageThread.Start();
ContentIdResolverHook = Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry, ContentIdResolver); ContentIdResolverHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(
RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry,
ContentIdResolver
);
ContentIdResolverHook.Enable(); ContentIdResolverHook.Enable();
Plugin.ChatGui.ChatMessageUnhandled += ChatMessage; Plugin.ChatGui.ChatMessageUnhandled += ChatMessage;
@@ -100,9 +106,10 @@ internal class MessageManager : IAsyncDisposable
if (PendingMessageThread.IsAlive) if (PendingMessageThread.IsAlive)
Plugin.Log.Warning( Plugin.Log.Warning(
"PendingMessageThread did not observe cancellation within 10s. " + "PendingMessageThread did not observe cancellation within 10s. "
"Worker remains on a background thread; next plugin reload releases it. " + + "Worker remains on a background thread; next plugin reload releases it. "
"If this recurs, file a bug with /xllog after the previous reload."); + "If this recurs, file a bug with /xllog after the previous reload."
);
// CTS owns an unmanaged WaitHandle; dispose even if the worker is // CTS owns an unmanaged WaitHandle; dispose even if the worker is
// alive — it checks IsCancellationRequested via the linked token. // alive — it checks IsCancellationRequested via the linked token.
@@ -183,16 +190,20 @@ internal class MessageManager : IAsyncDisposable
// AutoTellTabsService, ein DB-Refilter würde sie nur partial // AutoTellTabsService, ein DB-Refilter würde sie nur partial
// wiederherstellen falls Tells in DB liegen, oder leer lassen wenn // wiederherstellen falls Tells in DB liegen, oder leer lassen wenn
// Privacy-Filter sie blockiert hat. // Privacy-Filter sie blockiert hat.
var pendingTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).Select(tab => (tab, new List<Message>())).ToList(); var pendingTabs = Plugin
.Config.Tabs.Where(t => !t.IsTempTab)
.Select(tab => (tab, new List<Message>()))
.ToList();
foreach (var message in messages) foreach (var message in messages)
foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message))) foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
pendingMessages.Add(message); pendingMessages.Add(message);
// Apply the messages to the chat log in one go. // Apply the messages to the chat log in one go.
foreach (var (tab, pendingMessages) in pendingTabs) foreach (var (tab, pendingMessages) in pendingTabs)
tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit); tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit);
if (!messages.DidError) return; if (!messages.DidError)
return;
WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error); WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error);
@@ -226,6 +237,7 @@ internal class MessageManager : IAsyncDisposable
} }
public (SeString? Sender, SeString? Message) LastMessage = (null, null); public (SeString? Sender, SeString? Message) LastMessage = (null, null);
private void ChatMessage(IChatMessage message) private void ChatMessage(IChatMessage message)
{ {
LastMessage = (message.Sender, message.Message); LastMessage = (message.Sender, message.Message);
@@ -254,11 +266,25 @@ internal class MessageManager : IAsyncDisposable
// message's content ID. If multiple messages are received in the same tick, // message's content ID. If multiple messages are received in the same tick,
// this will be called for each message immediately after ChatMessage is // this will be called for each message immediately after ChatMessage is
// called for each message. // called for each message.
private unsafe void ContentIdResolver(RaptureLogModule* agent, ulong contentId, ulong accountId, int messageIndex, ushort worldId, ushort chatType) private unsafe void ContentIdResolver(
RaptureLogModule* agent,
ulong contentId,
ulong accountId,
int messageIndex,
ushort worldId,
ushort chatType
)
{ {
try try
{ {
ContentIdResolverHook?.Original(agent, contentId, accountId, messageIndex, worldId, chatType); ContentIdResolverHook?.Original(
agent,
contentId,
accountId,
messageIndex,
worldId,
chatType
);
if (PendingSync.Last is not { } last) if (PendingSync.Last is not { } last)
return; return;
@@ -273,7 +299,11 @@ internal class MessageManager : IAsyncDisposable
private void ProcessMessage(PendingMessage pendingMessage) private void ProcessMessage(PendingMessage pendingMessage)
{ {
var chatCode = new ChatCode(pendingMessage.LogKind, pendingMessage.SourceKind, pendingMessage.TargetKind); var chatCode = new ChatCode(
pendingMessage.LogKind,
pendingMessage.SourceKind,
pendingMessage.TargetKind
);
NameFormatting? formatting = null; NameFormatting? formatting = null;
if (pendingMessage.Sender.Payloads.Count > 0) if (pendingMessage.Sender.Payloads.Count > 0)
@@ -282,13 +312,36 @@ internal class MessageManager : IAsyncDisposable
var senderChunks = new List<Chunk>(); var senderChunks = new List<Chunk>();
if (formatting is { IsPresent: true }) if (formatting is { IsPresent: true })
{ {
senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.Before) { FallbackColour = chatCode.Type }); senderChunks.Add(
senderChunks.AddRange(ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type)); new TextChunk(ChunkSource.None, null, formatting.Before)
senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.After) { FallbackColour = chatCode.Type }); {
FallbackColour = chatCode.Type,
}
);
senderChunks.AddRange(
ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type)
);
senderChunks.Add(
new TextChunk(ChunkSource.None, null, formatting.After)
{
FallbackColour = chatCode.Type,
}
);
} }
var contentChunks = ChunkUtil.ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type).ToList(); var contentChunks = ChunkUtil
var message = new Message(CurrentContentId, pendingMessage.ContentId, pendingMessage.AccountId, chatCode, senderChunks, contentChunks, pendingMessage.Sender, pendingMessage.Content); .ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type)
.ToList();
var message = new Message(
CurrentContentId,
pendingMessage.ContentId,
pendingMessage.AccountId,
chatCode,
senderChunks,
contentChunks,
pendingMessage.Sender,
pendingMessage.Content
);
if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle()) if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
Store.UpsertMessage(message); Store.UpsertMessage(message);
@@ -296,7 +349,9 @@ internal class MessageManager : IAsyncDisposable
var currentMatches = Plugin.CurrentTab.Matches(message); var currentMatches = Plugin.CurrentTab.Matches(message);
foreach (var tab in Plugin.Config.Tabs) foreach (var tab in Plugin.Config.Tabs)
{ {
var unread = !(tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches); var unread = !(
tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches
);
if (tab.Matches(message)) if (tab.Matches(message))
tab.AddMessage(message, unread); tab.AddMessage(message, unread);
@@ -313,16 +368,12 @@ internal class MessageManager : IAsyncDisposable
internal static NameFormatting Empty() internal static NameFormatting Empty()
{ {
return new NameFormatting { IsPresent = false, }; return new NameFormatting { IsPresent = false };
} }
internal static NameFormatting Of(string before, string after) internal static NameFormatting Of(string before, string after)
{ {
return new NameFormatting return new NameFormatting { Before = before, After = after };
{
Before = before,
After = after,
};
} }
} }
+173 -61
View File
@@ -1,15 +1,14 @@
using System.Buffers; using System.Buffers;
using System.Collections; using System.Collections;
using System.Data.Common; using System.Data.Common;
using Dalamud.Game.Text.SeStringHandling;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Ui; using HellionChat.Ui;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Game.Text.SeStringHandling;
using MessagePack; using MessagePack;
using MessagePack.Formatters; using MessagePack.Formatters;
using MessagePack.Resolvers; using MessagePack.Resolvers;
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;
using DalamudUtil = Dalamud.Utility.Util; using DalamudUtil = Dalamud.Utility.Util;
using Encoding = System.Text.Encoding; using Encoding = System.Text.Encoding;
@@ -36,7 +35,11 @@ internal enum PayloadMessagePackType : byte
public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?> public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
{ {
public void Serialize(ref MessagePackWriter writer, Payload? value, MessagePackSerializerOptions options) public void Serialize(
ref MessagePackWriter writer,
Payload? value,
MessagePackSerializerOptions options
)
{ {
if (value == null) if (value == null)
{ {
@@ -100,14 +103,22 @@ public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
public class SeStringMessagePackFormatter : IMessagePackFormatter<SeString?> public class SeStringMessagePackFormatter : IMessagePackFormatter<SeString?>
{ {
public void Serialize(ref MessagePackWriter writer, SeString? value, MessagePackSerializerOptions options) public void Serialize(
ref MessagePackWriter writer,
SeString? value,
MessagePackSerializerOptions options
)
{ {
options.Resolver.GetFormatter<List<Payload>>()!.Serialize(ref writer, value?.Payloads ?? [], options); options
.Resolver.GetFormatter<List<Payload>>()!
.Serialize(ref writer, value?.Payloads ?? [], options);
} }
public SeString Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options) public SeString Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
{ {
return new SeString(options.Resolver.GetFormatter<List<Payload>>()!.Deserialize(ref reader, options)); return new SeString(
options.Resolver.GetFormatter<List<Payload>>()!.Deserialize(ref reader, options)
);
} }
} }
@@ -119,8 +130,13 @@ internal class MessageStore : IDisposable
private SqliteConnection Connection { get; set; } private SqliteConnection Connection { get; set; }
internal static readonly MessagePackSerializerOptions MsgPackOptions = MessagePackSerializerOptions.Standard internal static readonly MessagePackSerializerOptions MsgPackOptions =
.WithResolver(CompositeResolver.Create([new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()], [StandardResolver.Instance])); MessagePackSerializerOptions.Standard.WithResolver(
CompositeResolver.Create(
[new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()],
[StandardResolver.Instance]
)
);
internal MessageStore(string dbPath) internal MessageStore(string dbPath)
{ {
@@ -193,7 +209,8 @@ internal class MessageStore : IDisposable
private void Migrate0() private void Migrate0()
{ {
Plugin.Log.Information("Running migration 0: Creating tables"); Plugin.Log.Information("Running migration 0: Creating tables");
Connection.Execute(@" Connection.Execute(
@"
CREATE TABLE IF NOT EXISTS messages ( CREATE TABLE IF NOT EXISTS messages (
Id BLOB PRIMARY KEY NOT NULL, -- Guid Id BLOB PRIMARY KEY NOT NULL, -- Guid
Receiver INTEGER NOT NULL, -- uint64 (first bits are always 0) Receiver INTEGER NOT NULL, -- uint64 (first bits are always 0)
@@ -210,7 +227,8 @@ internal class MessageStore : IDisposable
CREATE INDEX IF NOT EXISTS idx_messages_receiver ON messages (Receiver); CREATE INDEX IF NOT EXISTS idx_messages_receiver ON messages (Receiver);
CREATE INDEX IF NOT EXISTS idx_messages_date ON messages (Date); CREATE INDEX IF NOT EXISTS idx_messages_date ON messages (Date);
"); "
);
SetMigrationVersion(0); SetMigrationVersion(0);
} }
@@ -218,10 +236,12 @@ internal class MessageStore : IDisposable
private void Migrate1() private void Migrate1()
{ {
Plugin.Log.Information("Running migration 1: Adding Deleted column"); Plugin.Log.Information("Running migration 1: Adding Deleted column");
Connection.Execute(@" Connection.Execute(
@"
-- Migration 1: Add Deleted column -- Migration 1: Add Deleted column
ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false; ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
"); "
);
SetMigrationVersion(1); SetMigrationVersion(1);
} }
@@ -229,11 +249,13 @@ internal class MessageStore : IDisposable
private void Migrate2() private void Migrate2()
{ {
Plugin.Log.Information("Running migration 2: Adding Channel generated column"); Plugin.Log.Information("Running migration 2: Adding Channel generated column");
Connection.Execute(@" Connection.Execute(
@"
-- Migration 2: Add Channel generated column -- Migration 2: Add Channel generated column
ALTER TABLE messages ADD COLUMN Channel INTEGER GENERATED ALWAYS AS (Code & 0x7f) VIRTUAL; ALTER TABLE messages ADD COLUMN Channel INTEGER GENERATED ALWAYS AS (Code & 0x7f) VIRTUAL;
CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages (Channel); CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages (Channel);
"); "
);
SetMigrationVersion(2); SetMigrationVersion(2);
} }
@@ -263,12 +285,15 @@ internal class MessageStore : IDisposable
// user_version was never bumped, just record the version and exit. // user_version was never bumped, just record the version and exit.
if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code")) if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
{ {
Plugin.Log.Information("Migration 3: schema already migrated, only bumping user_version"); Plugin.Log.Information(
"Migration 3: schema already migrated, only bumping user_version"
);
SetMigrationVersion(3); SetMigrationVersion(3);
return; return;
} }
Connection.Execute(@" Connection.Execute(
@"
-- Migration 3: Fix log kinds to fit the new format -- Migration 3: Fix log kinds to fit the new format
-- Add new ChatType, SourceKind, TargetKind (byte), SortCodeV2 -- Add new ChatType, SourceKind, TargetKind (byte), SortCodeV2
-- Migrate OldChatColumn -- Migrate OldChatColumn
@@ -293,7 +318,8 @@ internal class MessageStore : IDisposable
ALTER TABLE messages DROP COLUMN Channel; ALTER TABLE messages DROP COLUMN Channel;
ALTER TABLE messages DROP COLUMN Code; ALTER TABLE messages DROP COLUMN Code;
ALTER TABLE messages DROP COLUMN SortCode; ALTER TABLE messages DROP COLUMN SortCode;
"); "
);
SetMigrationVersion(3); SetMigrationVersion(3);
} }
@@ -325,7 +351,8 @@ internal class MessageStore : IDisposable
{ {
var result = new Dictionary<int, long>(); var result = new Dictionary<int, long>();
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = "SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;"; cmd.CommandText =
"SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;";
cmd.CommandTimeout = 120; cmd.CommandTimeout = 120;
using var reader = cmd.ExecuteReader(); using var reader = cmd.ExecuteReader();
while (reader.Read()) while (reader.Read())
@@ -343,13 +370,22 @@ internal class MessageStore : IDisposable
/// computed from "now" at call time. Runs VACUUM only if anything was /// computed from "now" at call time. Runs VACUUM only if anything was
/// removed. Returns the number of rows deleted. /// removed. Returns the number of rows deleted.
/// </summary> /// </summary>
internal long DeleteByRetentionPolicy(IReadOnlyDictionary<int, int> chatTypeDaysMap, int defaultDays) internal long DeleteByRetentionPolicy(
IReadOnlyDictionary<int, int> chatTypeDaysMap,
int defaultDays
)
{ {
if (defaultDays < 0) if (defaultDays < 0)
throw new ArgumentOutOfRangeException(nameof(defaultDays), "Negative retention is not allowed."); throw new ArgumentOutOfRangeException(
nameof(defaultDays),
"Negative retention is not allowed."
);
foreach (var (_, days) in chatTypeDaysMap) foreach (var (_, days) in chatTypeDaysMap)
if (days < 0) if (days < 0)
throw new ArgumentOutOfRangeException(nameof(chatTypeDaysMap), "Negative retention is not allowed."); throw new ArgumentOutOfRangeException(
nameof(chatTypeDaysMap),
"Negative retention is not allowed."
);
var nowMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); var nowMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
@@ -381,10 +417,13 @@ internal class MessageStore : IDisposable
var defaultCutoff = nowMs - defaultDays * 86400000L; var defaultCutoff = nowMs - defaultDays * 86400000L;
cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff); cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff);
var explicitPlaceholders = chatTypeDaysMap.Count > 0 var explicitPlaceholders =
? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys) chatTypeDaysMap.Count > 0
: "-1"; // empty list would produce invalid SQL ? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys)
clauses.Add($"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)"); : "-1"; // empty list would produce invalid SQL
clauses.Add(
$"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)"
);
} }
if (clauses.Count == 0) if (clauses.Count == 0)
@@ -411,7 +450,9 @@ internal class MessageStore : IDisposable
{ {
// Defensive: refuse a "delete everything" disguised as a filter. // Defensive: refuse a "delete everything" disguised as a filter.
// Use ClearMessages() if a full wipe is actually intended. // Use ClearMessages() if a full wipe is actually intended.
throw new InvalidOperationException("CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."); throw new InvalidOperationException(
"CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."
);
} }
long deleted; long deleted;
@@ -428,15 +469,19 @@ internal class MessageStore : IDisposable
internal void PerformMaintenance() internal void PerformMaintenance()
{ {
Connection.Execute(@" Connection.Execute(
@"
VACUUM; VACUUM;
REINDEX messages; REINDEX messages;
ANALYZE; ANALYZE;
"); "
);
} }
private string LogPath => DbPath + "-wal"; private string LogPath => DbPath + "-wal";
internal long DatabaseSize() => !File.Exists(DbPath) ? 0 : new FileInfo(DbPath).Length; internal long DatabaseSize() => !File.Exists(DbPath) ? 0 : new FileInfo(DbPath).Length;
internal long DatabaseLogSize() => !File.Exists(LogPath) ? 0 : new FileInfo(LogPath).Length; internal long DatabaseLogSize() => !File.Exists(LogPath) ? 0 : new FileInfo(LogPath).Length;
internal int MessageCount() internal int MessageCount()
@@ -461,7 +506,8 @@ internal class MessageStore : IDisposable
} }
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = @" cmd.CommandText =
@"
INSERT INTO messages ( INSERT INTO messages (
Id, Id,
Receiver, Receiver,
@@ -513,10 +559,22 @@ internal class MessageStore : IDisposable
cmd.Parameters.AddWithValue("$ChatType", message.Code.Type); cmd.Parameters.AddWithValue("$ChatType", message.Code.Type);
cmd.Parameters.AddWithValue("$SourceKind", message.Code.Source); cmd.Parameters.AddWithValue("$SourceKind", message.Code.Source);
cmd.Parameters.AddWithValue("$TargetKind", message.Code.Target); cmd.Parameters.AddWithValue("$TargetKind", message.Code.Target);
cmd.Parameters.AddWithValue("$Sender", MessagePackSerializer.Serialize(message.Sender, MsgPackOptions)); cmd.Parameters.AddWithValue(
cmd.Parameters.AddWithValue("$Content", MessagePackSerializer.Serialize(message.Content, MsgPackOptions)); "$Sender",
cmd.Parameters.AddWithValue("$SenderSource", MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions)); MessagePackSerializer.Serialize(message.Sender, MsgPackOptions)
cmd.Parameters.AddWithValue("$ContentSource", MessagePackSerializer.Serialize(message.ContentSource, MsgPackOptions)); );
cmd.Parameters.AddWithValue(
"$Content",
MessagePackSerializer.Serialize(message.Content, MsgPackOptions)
);
cmd.Parameters.AddWithValue(
"$SenderSource",
MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions)
);
cmd.Parameters.AddWithValue(
"$ContentSource",
MessagePackSerializer.Serialize(message.ContentSource, MsgPackOptions)
);
cmd.Parameters.AddWithValue("$ExtraChatChannel", message.ExtraChatChannel); cmd.Parameters.AddWithValue("$ExtraChatChannel", message.ExtraChatChannel);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
@@ -532,7 +590,8 @@ internal class MessageStore : IDisposable
internal MessageEnumerator StreamForExport( internal MessageEnumerator StreamForExport(
IReadOnlyCollection<int>? chatTypes, IReadOnlyCollection<int>? chatTypes,
DateTimeOffset? from, DateTimeOffset? from,
DateTimeOffset? to) DateTimeOffset? to
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -544,7 +603,8 @@ internal class MessageStore : IDisposable
if (to is not null) if (to is not null)
clauses.Add("Date <= $To"); clauses.Add("Date <= $To");
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -559,7 +619,9 @@ internal class MessageStore : IDisposable
ContentSource, ContentSource,
ExtraChatChannel ExtraChatChannel
FROM messages FROM messages
WHERE " + string.Join(" AND ", clauses) + @" WHERE "
+ string.Join(" AND ", clauses)
+ @"
ORDER BY Date ASC;"; ORDER BY Date ASC;";
cmd.CommandTimeout = 600; cmd.CommandTimeout = 600;
@@ -577,7 +639,11 @@ internal class MessageStore : IDisposable
/// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param> /// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param>
/// <param name="since">Only show messages since this date. If null, no filtering is performed.</param> /// <param name="since">Only show messages since this date. If null, no filtering is performed.</param>
/// <param name="count">The amount to return. Defaults to 10,000.</param> /// <param name="count">The amount to return. Defaults to 10,000.</param>
internal MessageEnumerator GetMostRecentMessages(ulong? receiver = null, DateTimeOffset? since = null, int count = MessageQueryLimit) internal MessageEnumerator GetMostRecentMessages(
ulong? receiver = null,
DateTimeOffset? since = null,
int count = MessageQueryLimit
)
{ {
List<string> whereClauses = ["deleted = false"]; List<string> whereClauses = ["deleted = false"];
if (receiver != null) if (receiver != null)
@@ -590,7 +656,8 @@ internal class MessageStore : IDisposable
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT * SELECT *
FROM ( FROM (
SELECT SELECT
@@ -607,7 +674,9 @@ internal class MessageStore : IDisposable
ContentSource, ContentSource,
ExtraChatChannel ExtraChatChannel
FROM messages FROM messages
" + whereClause + @" "
+ whereClause
+ @"
ORDER BY Date DESC ORDER BY Date DESC
LIMIT $Count LIMIT $Count
) )
@@ -645,7 +714,8 @@ internal class MessageStore : IDisposable
string senderName, string senderName,
uint senderWorld, uint senderWorld,
int limit, int limit,
int sqlScanLimit = 500) int sqlScanLimit = 500
)
{ {
if (limit <= 0) if (limit <= 0)
{ {
@@ -653,7 +723,8 @@ internal class MessageStore : IDisposable
} }
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -714,7 +785,12 @@ internal class MessageStore : IDisposable
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
internal long CountDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null) internal long CountDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null
)
{ {
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
@@ -729,7 +805,8 @@ internal class MessageStore : IDisposable
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT COUNT(*) SELECT COUNT(*)
FROM messages FROM messages
" + whereClause; " + whereClause;
@@ -737,14 +814,19 @@ internal class MessageStore : IDisposable
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
cmd.CommandTimeout = 120; // this could take a while on slow computers cmd.CommandTimeout = 120; // this could take a while on slow computers
return (long) cmd.ExecuteScalar()!; return (long)cmd.ExecuteScalar()!;
} }
internal MessageEnumerator GetDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null) internal MessageEnumerator GetDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -759,7 +841,8 @@ internal class MessageStore : IDisposable
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -780,13 +863,19 @@ internal class MessageStore : IDisposable
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
return new MessageEnumerator(cmd.ExecuteReader()); return new MessageEnumerator(cmd.ExecuteReader());
} }
internal MessageEnumerator GetPagedDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null, int page = 0) internal MessageEnumerator GetPagedDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null,
int page = 0
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -801,7 +890,8 @@ internal class MessageStore : IDisposable
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -816,7 +906,9 @@ internal class MessageStore : IDisposable
ContentSource, ContentSource,
ExtraChatChannel ExtraChatChannel
FROM messages FROM messages
" + whereClause + @" "
+ whereClause
+ @"
ORDER BY Date ORDER BY Date
LIMIT $Offset, $OffsetCount; LIMIT $Offset, $OffsetCount;
"; ";
@@ -825,8 +917,8 @@ internal class MessageStore : IDisposable
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page); cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage); cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
@@ -852,7 +944,10 @@ internal class MessageStore : IDisposable
} }
} }
internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, IDisposable, IAsyncDisposable internal class MessageEnumerator(DbDataReader reader)
: IEnumerable<Message>,
IDisposable,
IAsyncDisposable
{ {
private const int MaxErrorLogs = 10; private const int MaxErrorLogs = 10;
@@ -876,11 +971,27 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
(ulong)reader.GetInt64(1), (ulong)reader.GetInt64(1),
(ulong)reader.GetInt64(2), (ulong)reader.GetInt64(2),
DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64(3)), DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64(3)),
new ChatCode((byte)reader.GetInt32(4), (byte)reader.GetInt32(5), (byte)reader.GetInt32(6)), new ChatCode(
MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(7), MessageStore.MsgPackOptions), (byte)reader.GetInt32(4),
MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(8), MessageStore.MsgPackOptions), (byte)reader.GetInt32(5),
MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(9), MessageStore.MsgPackOptions), (byte)reader.GetInt32(6)
MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(10), MessageStore.MsgPackOptions), ),
MessagePackSerializer.Deserialize<List<Chunk>>(
reader.GetFieldValue<byte[]>(7),
MessageStore.MsgPackOptions
),
MessagePackSerializer.Deserialize<List<Chunk>>(
reader.GetFieldValue<byte[]>(8),
MessageStore.MsgPackOptions
),
MessagePackSerializer.Deserialize<SeString>(
reader.GetFieldValue<byte[]>(9),
MessageStore.MsgPackOptions
),
MessagePackSerializer.Deserialize<SeString>(
reader.GetFieldValue<byte[]>(10),
MessageStore.MsgPackOptions
),
reader.GetGuid(11) reader.GetGuid(11)
); );
} }
@@ -915,6 +1026,7 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
{ {
reader.Dispose(); reader.Dispose();
} }
public async ValueTask DisposeAsync() public async ValueTask DisposeAsync()
{ {
await reader.DisposeAsync(); await reader.DisposeAsync();
+182 -50
View File
@@ -1,8 +1,5 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes; using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.SubKinds;
@@ -18,11 +15,14 @@ using Dalamud.Interface.Utility.Raii;
using Dalamud.Utility; using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Lumina.Excel.Sheets; using Lumina.Excel.Sheets;
using Action = System.Action; using Action = System.Action;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload; using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace HellionChat; namespace HellionChat;
@@ -107,7 +107,9 @@ public sealed class PayloadHandler
ImGui.Separator(); ImGui.Separator();
var contentId = chunk.Message?.ContentId ?? 0; var contentId = chunk.Message?.ContentId ?? 0;
var sender = chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload) as PlayerPayload; var sender =
chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload)
as PlayerPayload;
using var menu = ImRaii.Menu(Language.Context_Integrations); using var menu = ImRaii.Menu(Language.Context_Integrations);
if (!menu.Success) if (!menu.Success)
@@ -118,7 +120,14 @@ public sealed class PayloadHandler
{ {
try try
{ {
LogWindow.Plugin.Ipc.Invoke(id, sender, contentId, payload, chunk.Message?.SenderSource, chunk.Message?.ContentSource); LogWindow.Plugin.Ipc.Invoke(
id,
sender,
contentId,
payload,
chunk.Message?.SenderSource,
chunk.Message?.ContentSource
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -128,7 +137,10 @@ public sealed class PayloadHandler
if (cursor == ImGui.GetCursorPos()) if (cursor == ImGui.GetCursorPos())
{ {
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]); using var pushedColor = ImRaii.PushColor(
ImGuiCol.Text,
ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
);
ImGui.Text("No integrations available"); ImGui.Text("No integrations available");
} }
} }
@@ -168,10 +180,16 @@ public sealed class PayloadHandler
if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent)) if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent))
{ {
ImGui.SetClipboardText(StringifyMessage(message)); ImGui.SetClipboardText(StringifyMessage(message));
WrapperUtil.AddNotification(Language.Context_CopyContentSuccess, NotificationType.Info); WrapperUtil.AddNotification(
Language.Context_CopyContentSuccess,
NotificationType.Info
);
} }
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]); using var pushedColor = ImRaii.PushColor(
ImGuiCol.Text,
ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
);
ImGui.TextUnformatted(message.Code.Type.Name()); ImGui.TextUnformatted(message.Code.Type.Name());
} }
@@ -184,7 +202,8 @@ public sealed class PayloadHandler
return string.Empty; return string.Empty;
var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content; var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content;
return chunks.Where(chunk => chunk is TextChunk) return chunks
.Where(chunk => chunk is TextChunk)
.Cast<TextChunk>() .Cast<TextChunk>()
.Select(text => text.Content) .Select(text => text.Content)
.Aggregate(string.Concat); .Aggregate(string.Concat);
@@ -255,7 +274,10 @@ public sealed class PayloadHandler
public unsafe void MoveTooltip(AddonEvent type, AddonArgs args) public unsafe void MoveTooltip(AddonEvent type, AddonArgs args)
{ {
// Only move if the user has the "Next to Cursor" option selected // Only move if the user has the "Next to Cursor" option selected
if (!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected) || selected != 0) if (
!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected)
|| selected != 0
)
return; return;
if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle) if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle)
@@ -274,7 +296,10 @@ public sealed class PayloadHandler
var component = atkBase->WindowNode->AtkResNode; var component = atkBase->WindowNode->AtkResNode;
var atkPos = new Vector2(component.ScreenX, component.ScreenY); var atkPos = new Vector2(component.ScreenX, component.ScreenY);
var atkSize = new Vector2(component.GetWidth() * component.ScaleX, component.GetHeight() * component.GetScaleY()); var atkSize = new Vector2(
component.GetWidth() * component.ScaleX,
component.GetHeight() * component.GetScaleY()
);
var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize); var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize);
var addonRect = new MathUtil.Rectangle(atkPos, atkSize); var addonRect = new MathUtil.Rectangle(atkPos, atkSize);
@@ -302,7 +327,7 @@ public sealed class PayloadHandler
if (!chatRect.HasOverlap(addonRect)) if (!chatRect.HasOverlap(addonRect))
{ {
atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y); atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
return; return;
} }
@@ -320,7 +345,7 @@ public sealed class PayloadHandler
if (!chatRect.HasOverlap(addonRect)) if (!chatRect.HasOverlap(addonRect))
{ {
atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y); atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
return; return;
} }
@@ -329,7 +354,7 @@ public sealed class PayloadHandler
var y = Math.Clamp(chatRect.SizeY - atkSize.Y, 0, float.MaxValue); var y = Math.Clamp(chatRect.SizeY - atkSize.Y, 0, float.MaxValue);
y -= isTop ? 0 : Plugin.Config.TooltipOffset; // offset to prevent cut-off on the bottom y -= isTop ? 0 : Plugin.Config.TooltipOffset; // offset to prevent cut-off on the bottom
atkBase->SetPosition((short) x, (short) y); atkBase->SetPosition((short)x, (short)y);
} }
private const float MaxInlineIconSize = 32f; private const float MaxInlineIconSize = 32f;
@@ -339,20 +364,25 @@ public sealed class PayloadHandler
if (icon.Size.X <= 0 || icon.Size.Y <= 0) if (icon.Size.X <= 0 || icon.Size.Y <= 0)
return; return;
var width = (float) icon.Size.X; var width = (float)icon.Size.X;
var height = (float) icon.Size.Y; var height = (float)icon.Size.Y;
var scale = Math.Min(1f, Math.Min(MaxInlineIconSize / width, MaxInlineIconSize / height)); var scale = Math.Min(1f, Math.Min(MaxInlineIconSize / width, MaxInlineIconSize / height));
var size = ImGuiHelpers.ScaledVector2(width * scale, height * scale); var size = ImGuiHelpers.ScaledVector2(width * scale, height * scale);
var cursor = ImGui.GetCursorPos(); var cursor = ImGui.GetCursorPos();
ImGui.Image(icon.Handle, size); ImGui.Image(icon.Handle, size);
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetCursorPos(cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())); ImGui.SetCursorPos(
cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())
);
} }
private void HoverStatus(StatusPayload status) private void HoverStatus(StatusPayload status)
{ {
if (Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is { } icon) if (
Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var builder = new SeStringBuilder(); var builder = new SeStringBuilder();
@@ -374,7 +404,11 @@ public sealed class PayloadHandler
LogWindow.DrawChunks(name.ToList()); LogWindow.DrawChunks(name.ToList());
ImGui.Separator(); ImGui.Separator();
var desc = ChunkUtil.ToChunks(status.Status.Value.Description.ToDalamudString(), ChunkSource.None, null); var desc = ChunkUtil.ToChunks(
status.Status.Value.Description.ToDalamudString(),
ChunkSource.None,
null
);
LogWindow.DrawChunks(desc.ToList()); LogWindow.DrawChunks(desc.ToList());
} }
@@ -389,14 +423,23 @@ public sealed class PayloadHandler
if (!item.Item.TryGetValue(out Item resolvedItem)) if (!item.Item.TryGetValue(out Item resolvedItem))
return; return;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null); var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null);
LogWindow.DrawChunks(name.ToList()); LogWindow.DrawChunks(name.ToList());
ImGui.Separator(); ImGui.Separator();
var desc = ChunkUtil.ToChunks(resolvedItem.Description.ToDalamudString(), ChunkSource.None, null); var desc = ChunkUtil.ToChunks(
resolvedItem.Description.ToDalamudString(),
ChunkSource.None,
null
);
LogWindow.DrawChunks(desc.ToList()); LogWindow.DrawChunks(desc.ToList());
} }
@@ -405,7 +448,12 @@ public sealed class PayloadHandler
if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow)) if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow))
return; return;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null); var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null);
@@ -415,7 +463,11 @@ public sealed class PayloadHandler
if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow)) if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow))
return; return;
LogWindow.DrawChunks(ChunkUtil.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null).ToList()); LogWindow.DrawChunks(
ChunkUtil
.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null)
.ToList()
);
} }
private void HoverUri(UriPayload uri) private void HoverUri(UriPayload uri)
@@ -438,7 +490,10 @@ public sealed class PayloadHandler
ClickLinkPayload(chunk, payload, link); ClickLinkPayload(chunk, payload, link);
break; break;
case DalamudPartyFinderPayload pf: case DalamudPartyFinderPayload pf:
if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification) if (
pf.LinkType
== DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification
)
GameFunctions.GameFunctions.OpenPartyFinder(); GameFunctions.GameFunctions.OpenPartyFinder();
else else
GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId); GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId);
@@ -473,7 +528,12 @@ public sealed class PayloadHandler
return; return;
var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList(); var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList();
if (!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value)) if (
!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue(
(link.Plugin, link.CommandId),
out var value
)
)
{ {
Plugin.Log.Warning("Could not find DalamudLinkHandlers"); Plugin.Log.Warning("Could not find DalamudLinkHandlers");
return; return;
@@ -508,7 +568,12 @@ public sealed class PayloadHandler
return; return;
var hq = payload.Kind == ItemKind.Hq; var hq = payload.Kind == ItemKind.Hq;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = itemRow.Name.ToDalamudString(); var name = itemRow.Name.ToDalamudString();
@@ -554,10 +619,18 @@ public sealed class PayloadHandler
return; return;
var item = Sheets.EventItemSheet.GetRow(payload.ItemId); var item = Sheets.EventItemSheet.GetRow(payload.ItemId);
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
LogWindow.DrawChunks(ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(), false); LogWindow.DrawChunks(
ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(),
false
);
ImGui.Separator(); ImGui.Separator();
var realItemId = payload.RawItemId; var realItemId = payload.RawItemId;
@@ -585,7 +658,7 @@ public sealed class PayloadHandler
{ {
name.AddRange([ name.AddRange([
new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld), new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld),
new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()) new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()),
]); ]);
} }
@@ -606,7 +679,15 @@ public sealed class PayloadHandler
} }
else if (validContentId) else if (validContentId)
{ {
LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Value.Name.ToString(), (ushort) world.RowId, 0, chunk.Message!.ContentId, 0, false); LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(
player.PlayerName,
world.Value.Name.ToString(),
(ushort)world.RowId,
0,
chunk.Message!.ContentId,
0,
false
);
} }
LogWindow.Activate = true; LogWindow.Activate = true;
@@ -615,12 +696,18 @@ public sealed class PayloadHandler
if (world.Value.IsPublic) if (world.Value.IsPublic)
{ {
var party = Plugin.PartyList; var party = Plugin.PartyList;
var leader = party[(int) party.PartyLeaderIndex]?.ContentId; var leader = party[(int)party.PartyLeaderIndex]?.ContentId;
var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader; var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader;
var member = party.FirstOrDefault(member => member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId); var member = party.FirstOrDefault(member =>
member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId
);
var isInParty = member != null; var isInParty = member != null;
var inInstance = GameFunctions.GameFunctions.IsInInstance(); var inInstance = GameFunctions.GameFunctions.IsInInstance();
var inPartyInstance = Sheets.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType).TerritoryIntendedUse.RowId is (41 or 47 or 48 or 52 or 53 or 61); var inPartyInstance =
Sheets
.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType)
.TerritoryIntendedUse.RowId
is (41 or 47 or 48 or 52 or 53 or 61);
if (isLeader) if (isLeader)
{ {
if (!isInParty) if (!isInParty)
@@ -636,10 +723,20 @@ public sealed class PayloadHandler
if (menu.Success) if (menu.Success)
{ {
if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld)) if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld))
GameFunctions.Party.InviteSameWorld(player.PlayerName, (ushort)world.RowId, chunk.Message?.ContentId ?? 0); GameFunctions.Party.InviteSameWorld(
player.PlayerName,
(ushort)world.RowId,
chunk.Message?.ContentId ?? 0
);
if (validContentId && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)) if (
GameFunctions.Party.InviteOtherWorld(chunk.Message!.ContentId, (ushort)world.RowId); validContentId
&& ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)
)
GameFunctions.Party.InviteOtherWorld(
chunk.Message!.ContentId,
(ushort)world.RowId
);
} }
} }
} }
@@ -654,23 +751,41 @@ public sealed class PayloadHandler
} }
} }
var isFriend = GameFunctions.GameFunctions.GetFriends().Any(friend => friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId); var isFriend = GameFunctions
.GameFunctions.GetFriends()
.Any(friend =>
friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId
);
if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest)) if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest))
LogWindow.Plugin.Functions.SendFriendRequest(player.PlayerName, (ushort) world.RowId); LogWindow.Plugin.Functions.SendFriendRequest(
player.PlayerName,
(ushort)world.RowId
);
using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions)) using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions))
{ {
if (menuBlockFunctions.Success) if (menuBlockFunctions.Success)
{ {
if (ImGui.Selectable(Language.Context_AddToBlacklist)) if (ImGui.Selectable(Language.Context_AddToBlacklist))
LogWindow.Plugin.Functions.AddToBlacklist(player.PlayerName, (ushort)world.RowId); LogWindow.Plugin.Functions.AddToBlacklist(
player.PlayerName,
(ushort)world.RowId
);
if (chunk.Message != null) if (chunk.Message != null)
{ {
var message = chunk.Message; var message = chunk.Message;
if (message.AccountId != 0 && ImGui.Selectable(Language.Context_AddToMuteList)) if (
LogWindow.Plugin.Functions.AddToMuteList(message.AccountId, message.ContentId, player.PlayerName, (short) world.RowId); message.AccountId != 0
&& ImGui.Selectable(Language.Context_AddToMuteList)
)
LogWindow.Plugin.Functions.AddToMuteList(
message.AccountId,
message.ContentId,
player.PlayerName,
(short)world.RowId
);
if (ImGui.Selectable(Language.Context_AddToTermsFilter)) if (ImGui.Selectable(Language.Context_AddToTermsFilter))
LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource); LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource);
@@ -678,8 +793,11 @@ public sealed class PayloadHandler
} }
} }
if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)) if (
GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort) world.RowId); GameFunctions.GameFunctions.IsMentor()
&& ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
)
GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
} }
var inputChannel = chunk.Message?.Code.Type.ToInputChannel(); var inputChannel = chunk.Message?.Code.Type.ToInputChannel();
@@ -694,7 +812,10 @@ public sealed class PayloadHandler
if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate)) if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate))
if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId)) if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId))
WrapperUtil.AddNotification(Language.Context_AdventurerPlateError, NotificationType.Warning); WrapperUtil.AddNotification(
Language.Context_AdventurerPlateError,
NotificationType.Warning
);
} }
private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload) private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload)
@@ -728,13 +849,21 @@ public sealed class PayloadHandler
if (ImGui.Selectable(Language.Context_CopyLink)) if (ImGui.Selectable(Language.Context_CopyLink))
{ {
ImGui.SetClipboardText(uri.Uri.ToString()); ImGui.SetClipboardText(uri.Uri.ToString());
WrapperUtil.AddNotification(Language.Context_CopyLinkNotification, NotificationType.Info); WrapperUtil.AddNotification(
Language.Context_CopyLinkNotification,
NotificationType.Info
);
} }
} }
private void DrawStatusPopup(StatusPayload status) private void DrawStatusPopup(StatusPayload status)
{ {
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var builder = new SeStringBuilder(); var builder = new SeStringBuilder();
@@ -752,7 +881,10 @@ public sealed class PayloadHandler
break; break;
} }
LogWindow.DrawChunks(ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(), false); LogWindow.DrawChunks(
ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(),
false
);
ImGui.Separator(); ImGui.Separator();
if (ImGui.Selectable(Language.Context_Link)) if (ImGui.Selectable(Language.Context_Link))
+212 -102
View File
@@ -3,17 +3,17 @@ using System.Diagnostics.CodeAnalysis;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Runtime.ExceptionServices; using System.Runtime.ExceptionServices;
using HellionChat.Ipc; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Interface.ImGuiFileDialog;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using Dalamud.Bindings.ImGui; using HellionChat.Ipc;
using Dalamud.Interface.ImGuiFileDialog; using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
namespace HellionChat; namespace HellionChat;
@@ -22,27 +22,68 @@ public sealed class Plugin : IAsyncDalamudPlugin
{ {
public const string PluginName = "Hellion Chat"; public const string PluginName = "Hellion Chat";
[PluginService] public static IPluginLog Log { get; private set; } = null!; [PluginService]
[PluginService] public static IDalamudPluginInterface Interface { get; private set; } = null!; public static IPluginLog Log { get; private set; } = null!;
[PluginService] public static IChatGui ChatGui { get; private set; } = null!;
[PluginService] public static IClientState ClientState { get; private set; } = null!; [PluginService]
[PluginService] public static ICommandManager CommandManager { get; private set; } = null!; public static IDalamudPluginInterface Interface { get; private set; } = null!;
[PluginService] public static ICondition Condition { get; private set; } = null!;
[PluginService] public static IDataManager DataManager { get; private set; } = null!; [PluginService]
[PluginService] public static IFramework Framework { get; private set; } = null!; public static IChatGui ChatGui { get; private set; } = null!;
[PluginService] public static IGameGui GameGui { get; private set; } = null!;
[PluginService] public static IKeyState KeyState { get; private set; } = null!; [PluginService]
[PluginService] public static IObjectTable ObjectTable { get; private set; } = null!; public static IClientState ClientState { get; private set; } = null!;
[PluginService] public static IPartyList PartyList { get; private set; } = null!;
[PluginService] public static ITargetManager TargetManager { get; private set; } = null!; [PluginService]
[PluginService] public static ITextureProvider TextureProvider { get; private set; } = null!; public static ICommandManager CommandManager { get; private set; } = null!;
[PluginService] public static IGameInteropProvider GameInteropProvider { get; private set; } = null!;
[PluginService] public static IGameConfig GameConfig { get; private set; } = null!; [PluginService]
[PluginService] public static INotificationManager Notification { get; private set; } = null!; public static ICondition Condition { get; private set; } = null!;
[PluginService] public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
[PluginService] public static IPlayerState PlayerState { get; private set; } = null!; [PluginService]
[PluginService] public static ISeStringEvaluator Evaluator { get; private set; } = null!; public static IDataManager DataManager { get; private set; } = null!;
[PluginService] public static ISelfTestRegistry SelfTestRegistry { get; private set; } = null!;
[PluginService]
public static IFramework Framework { get; private set; } = null!;
[PluginService]
public static IGameGui GameGui { get; private set; } = null!;
[PluginService]
public static IKeyState KeyState { get; private set; } = null!;
[PluginService]
public static IObjectTable ObjectTable { get; private set; } = null!;
[PluginService]
public static IPartyList PartyList { get; private set; } = null!;
[PluginService]
public static ITargetManager TargetManager { get; private set; } = null!;
[PluginService]
public static ITextureProvider TextureProvider { get; private set; } = null!;
[PluginService]
public static IGameInteropProvider GameInteropProvider { get; private set; } = null!;
[PluginService]
public static IGameConfig GameConfig { get; private set; } = null!;
[PluginService]
public static INotificationManager Notification { get; private set; } = null!;
[PluginService]
public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
[PluginService]
public static IPlayerState PlayerState { get; private set; } = null!;
[PluginService]
public static ISeStringEvaluator Evaluator { get; private set; } = null!;
[PluginService]
public static ISelfTestRegistry SelfTestRegistry { get; private set; } = null!;
public static Configuration Config = null!; public static Configuration Config = null!;
public static FileDialogManager FileDialogManager { get; private set; } = null!; public static FileDialogManager FileDialogManager { get; private set; } = null!;
@@ -136,8 +177,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (Config.Version < 16) if (Config.Version < 16)
{ {
throw new InvalidOperationException( throw new InvalidOperationException(
$"HellionChat v1.4.3 requires config schema v16, got v{Config.Version}. " + $"HellionChat v1.4.3 requires config schema v16, got v{Config.Version}. "
"Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.3."); + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.3."
);
} }
// Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig // Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig
@@ -219,13 +261,15 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Auto-Tell-Tabs subscribes to MessageManager.MessageProcessed for // Auto-Tell-Tabs subscribes to MessageManager.MessageProcessed for
// live tells and to ClientState.Logout for cleanup; needs the live // live tells and to ClientState.Logout for cleanup; needs the live
// store handed in at construction. // store handed in at construction.
AutoTellTabsService = new AutoTellTabsService(this, MessageManager, MessageManager.Store); AutoTellTabsService = new AutoTellTabsService(
this,
MessageManager,
MessageManager.Store
);
AutoTellTabsService.Initialize(); AutoTellTabsService.Initialize();
// SelfTest steps poll Active per frame and need the registry wired. // SelfTest steps poll Active per frame and need the registry wired.
SelfTestRegistry.RegisterTestSteps([ SelfTestRegistry.RegisterTestSteps([new SelfTests.ThemeSwitchSelfTestStep(this)]);
new SelfTests.ThemeSwitchSelfTestStep(this),
]);
ChatLogWindow = new ChatLogWindow(this); ChatLogWindow = new ChatLogWindow(this);
SettingsWindow = new SettingsWindow(this); SettingsWindow = new SettingsWindow(this);
@@ -268,14 +312,14 @@ public sealed class Plugin : IAsyncDalamudPlugin
Interface.UiBuilder.DisableCutsceneUiHide = true; Interface.UiBuilder.DisableCutsceneUiHide = true;
Interface.UiBuilder.DisableGposeUiHide = true; Interface.UiBuilder.DisableGposeUiHide = true;
#if !DEBUG #if !DEBUG
// Fire-and-forget on a worker thread. The first auto-translate use of // Fire-and-forget on a worker thread. The first auto-translate use of
// a session may have a sub-second hitch if the cache hasn't filled yet, // a session may have a sub-second hitch if the cache hasn't filled yet,
// but that's preferable to making every user wait ~300 ms during // but that's preferable to making every user wait ~300 ms during
// plugin load for a cache they may never touch. ChatTwo (upstream) // plugin load for a cache they may never touch. ChatTwo (upstream)
// does this sync; we trade load-time for first-use latency. // does this sync; we trade load-time for first-use latency.
_ = Task.Run(AutoTranslate.PreloadCache, cancellationToken); _ = Task.Run(AutoTranslate.PreloadCache, cancellationToken);
#endif #endif
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@@ -296,8 +340,13 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Mirror the v1.4.0 load-failure recovery: hand off to DisposeAsync // Mirror the v1.4.0 load-failure recovery: hand off to DisposeAsync
// so partially-built services are torn down. Swallow the cleanup // so partially-built services are torn down. Swallow the cleanup
// exception so the original load failure stays the visible cause. // exception so the original load failure stays the visible cause.
try { await DisposeAsync().ConfigureAwait(false); } try
catch { /* keep original failure */ } {
await DisposeAsync().ConfigureAwait(false);
}
catch
{ /* keep original failure */
}
throw; throw;
} }
} }
@@ -324,14 +373,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
// v1.4.0 F5.3 — flush a pending DeferredSave before service teardown, // v1.4.0 F5.3 — flush a pending DeferredSave before service teardown,
// since FrameworkUpdate just got unsubscribed and won't fire it. // since FrameworkUpdate just got unsubscribed and won't fire it.
failure = CaptureFailure(failure, () => failure = CaptureFailure(
{ failure,
if (DeferredSaveFrames >= 0) () =>
{ {
SaveConfig(); if (DeferredSaveFrames >= 0)
DeferredSaveFrames = -1; {
SaveConfig();
DeferredSaveFrames = -1;
}
} }
}); );
// Auto-Tell-Tabs unsubscribes from MessageProcessed before MessageManager // Auto-Tell-Tabs unsubscribes from MessageProcessed before MessageManager
// goes away. Pure-memory cleanup, no framework-thread requirement. // goes away. Pure-memory cleanup, no framework-thread requirement.
@@ -342,7 +394,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
// framework-block so the worker threads are quiesced first. // framework-block so the worker threads are quiesced first.
if (MessageManager is not null) if (MessageManager is not null)
{ {
failure = await CaptureFailureAsync(failure, () => MessageManager.DisposeAsync().AsTask()) failure = await CaptureFailureAsync(
failure,
() => MessageManager.DisposeAsync().AsTask()
)
.ConfigureAwait(false); .ConfigureAwait(false);
} }
@@ -354,32 +409,37 @@ public sealed class Plugin : IAsyncDalamudPlugin
// behind it; mirrors Lightless DisposeFrameworkBoundServicesAsync. // behind it; mirrors Lightless DisposeFrameworkBoundServicesAsync.
try try
{ {
await Framework.RunOnFrameworkThread(() => await Framework
{ .RunOnFrameworkThread(() =>
// Game-Functions first — other services may still query {
// chat-interactable state during their Dispose. // Game-Functions first — other services may still query
failure = CaptureFailure(failure, () => GameFunctions.GameFunctions.SetChatInteractable(true)); // chat-interactable state during their Dispose.
failure = CaptureFailure(
failure,
() => GameFunctions.GameFunctions.SetChatInteractable(true)
);
// IPC subscribers — dispose before windows so any final // IPC subscribers — dispose before windows so any final
// event firing from the IPC source can't reach a half-torn // event firing from the IPC source can't reach a half-torn
// ChatLogWindow. // ChatLogWindow.
failure = CaptureFailure(failure, () => HonorificService?.Dispose()); failure = CaptureFailure(failure, () => HonorificService?.Dispose());
failure = CaptureFailure(failure, () => TypingIpc?.Dispose()); failure = CaptureFailure(failure, () => TypingIpc?.Dispose());
failure = CaptureFailure(failure, () => ExtraChat?.Dispose()); failure = CaptureFailure(failure, () => ExtraChat?.Dispose());
failure = CaptureFailure(failure, () => Ipc?.Dispose()); failure = CaptureFailure(failure, () => Ipc?.Dispose());
// Windows — RemoveAllWindows first, then per-window Dispose. // Windows — RemoveAllWindows first, then per-window Dispose.
// Order matches the pre-v1.4.3 Dispose body byte-for-byte. // Order matches the pre-v1.4.3 Dispose body byte-for-byte.
// CommandHelpWindow and FirstRunWizard don't implement // CommandHelpWindow and FirstRunWizard don't implement
// IDisposable; their resources are reclaimed via WindowSystem. // IDisposable; their resources are reclaimed via WindowSystem.
failure = CaptureFailure(failure, () => WindowSystem?.RemoveAllWindows()); failure = CaptureFailure(failure, () => WindowSystem?.RemoveAllWindows());
failure = CaptureFailure(failure, () => ChatLogWindow?.Dispose()); failure = CaptureFailure(failure, () => ChatLogWindow?.Dispose());
failure = CaptureFailure(failure, () => DbViewer?.Dispose()); failure = CaptureFailure(failure, () => DbViewer?.Dispose());
failure = CaptureFailure(failure, () => InputPreview?.Dispose()); failure = CaptureFailure(failure, () => InputPreview?.Dispose());
failure = CaptureFailure(failure, () => SettingsWindow?.Dispose()); failure = CaptureFailure(failure, () => SettingsWindow?.Dispose());
failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose()); failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose());
failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose()); failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose());
}).ConfigureAwait(false); })
.ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -401,15 +461,30 @@ public sealed class Plugin : IAsyncDalamudPlugin
// skip every cleanup behind it and leave services half-torn. // skip every cleanup behind it and leave services half-torn.
private static Exception? CaptureFailure(Exception? failure, Action action) private static Exception? CaptureFailure(Exception? failure, Action action)
{ {
try { action(); } try
catch (Exception ex) { failure ??= ex; } {
action();
}
catch (Exception ex)
{
failure ??= ex;
}
return failure; return failure;
} }
private static async ValueTask<Exception?> CaptureFailureAsync(Exception? failure, Func<Task> action) private static async ValueTask<Exception?> CaptureFailureAsync(
Exception? failure,
Func<Task> action
)
{ {
try { await action().ConfigureAwait(false); } try
catch (Exception ex) { failure ??= ex; } {
await action().ConfigureAwait(false);
}
catch (Exception ex)
{
failure ??= ex;
}
return failure; return failure;
} }
@@ -434,12 +509,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (!File.Exists(ourConfigFile) && File.Exists(legacyConfigFile)) if (!File.Exists(ourConfigFile) && File.Exists(legacyConfigFile))
{ {
File.Move(legacyConfigFile, ourConfigFile); File.Move(legacyConfigFile, ourConfigFile);
Log.Information($"HellionChat: migrated config file {legacyConfigFile} → {ourConfigFile}"); Log.Information(
$"HellionChat: migrated config file {legacyConfigFile} → {ourConfigFile}"
);
} }
} }
catch (IOException e) catch (IOException e)
{ {
Log.Warning(e, $"HellionChat: config file move blocked, leaving {legacyConfigFile} in place"); Log.Warning(
e,
$"HellionChat: config file move blocked, leaving {legacyConfigFile} in place"
);
lockedBlocker = true; lockedBlocker = true;
} }
@@ -469,7 +549,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
} }
catch (IOException e) catch (IOException e)
{ {
Log.Warning(e, $"HellionChat: file move blocked for {file}, will retry on next load"); Log.Warning(
e,
$"HellionChat: file move blocked for {file}, will retry on next load"
);
lockedBlocker = true; lockedBlocker = true;
} }
} }
@@ -486,7 +569,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
} }
catch (IOException e) catch (IOException e)
{ {
Log.Warning(e, $"HellionChat: subdir move blocked for {dir}, will retry on next load"); Log.Warning(
e,
$"HellionChat: subdir move blocked for {dir}, will retry on next load"
);
lockedBlocker = true; lockedBlocker = true;
} }
} }
@@ -507,15 +593,18 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Surface the most common cause to the user as a notification // Surface the most common cause to the user as a notification
// so they don't think Hellion Chat lost their history when in // so they don't think Hellion Chat lost their history when in
// fact upstream Chat 2 was still holding the database file. // fact upstream Chat 2 was still holding the database file.
Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification Notification.AddNotification(
{ new Dalamud.Interface.ImGuiNotification.Notification
Title = "Hellion Chat", {
Content = "Could not migrate the Chat 2 database — the file appears to be in use. " + Title = "Hellion Chat",
"Disable Chat 2, fully close the game, then start it again. " + Content =
"See the README troubleshooting section if the issue persists.", "Could not migrate the Chat 2 database — the file appears to be in use. "
Type = Dalamud.Interface.ImGuiNotification.NotificationType.Warning, + "Disable Chat 2, fully close the game, then start it again. "
InitialDuration = TimeSpan.FromSeconds(30), + "See the README troubleshooting section if the issue persists.",
}); Type = Dalamud.Interface.ImGuiNotification.NotificationType.Warning,
InitialDuration = TimeSpan.FromSeconds(30),
}
);
} }
} }
@@ -575,11 +664,13 @@ public sealed class Plugin : IAsyncDalamudPlugin
// — the .Wait() here would return as soon as the inner Task.Run was // — the .Wait() here would return as soon as the inner Task.Run was
// dispatched, racing the next sweep cycle against the still-running // dispatched, racing the next sweep cycle against the still-running
// filter pass. See AUDIT-2026-05-05 [QUAL-02]. // filter pass. See AUDIT-2026-05-05 [QUAL-02].
Framework.Run(() => Framework
{ .Run(() =>
MessageManager.ClearAllTabs(); {
MessageManager.FilterAllTabs(); MessageManager.ClearAllTabs();
}).Wait(); MessageManager.FilterAllTabs();
})
.Wait();
} }
else else
{ {
@@ -595,7 +686,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
lock (RetentionSweepLock) lock (RetentionSweepLock)
RetentionSweepRunning = false; RetentionSweepRunning = false;
} }
}) { IsBackground = true }.Start(); })
{
IsBackground = true,
}.Start();
} }
private void Draw() private void Draw()
@@ -603,7 +697,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes // Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes
// Theme statt einem deaktivierten Hellion-Theme. Active wird einmal // Theme statt einem deaktivierten Hellion-Theme. Active wird einmal
// pro Frame aus der Registry gelesen. // pro Frame aus der Registry gelesen.
using IDisposable _style = HellionStyle.PushGlobal(ThemeRegistry.Active, Config.WindowOpacity); using IDisposable _style = HellionStyle.PushGlobal(
ThemeRegistry.Active,
Config.WindowOpacity
);
ChatLogWindow.BeginFrame(); ChatLogWindow.BeginFrame();
@@ -617,7 +714,12 @@ public sealed class Plugin : IAsyncDalamudPlugin
// v1.0.2 — global skip while the New Game+ menu (QuestRedo addon) is // v1.0.2 — global skip while the New Game+ menu (QuestRedo addon) is
// open. Hides every plugin window in one shot (chat log, pop-outs, // open. Hides every plugin window in one shot (chat log, pop-outs,
// settings, db viewer, etc.), matching the LoadingScreens pattern. // settings, db viewer, etc.), matching the LoadingScreens pattern.
if (Config.HideInNewGamePlusMenu && GameFunctions.GameFunctions.IsAddonInteractable(GameFunctions.GameFunctions.NewGamePlusAddonName)) if (
Config.HideInNewGamePlusMenu
&& GameFunctions.GameFunctions.IsAddonInteractable(
GameFunctions.GameFunctions.NewGamePlusAddonName
)
)
{ {
ChatLogWindow.FinalizeFrame(); ChatLogWindow.FinalizeFrame();
TypingIpc.Update(); TypingIpc.Update();
@@ -627,7 +729,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
ChatLogWindow.HideStateCheck(); ChatLogWindow.HideStateCheck();
Interface.UiBuilder.DisableUserUiHide = !Config.HideWhenUiHidden; Interface.UiBuilder.DisableUserUiHide = !Config.HideWhenUiHidden;
ChatLogWindow.DefaultText = ImGui.GetStyle().Colors[(int) ImGuiCol.Text]; ChatLogWindow.DefaultText = ImGui.GetStyle().Colors[(int)ImGuiCol.Text];
using ((Config.FontsEnabled ? FontManager.RegularFont : FontManager.Axis).Push()) using ((Config.FontsEnabled ? FontManager.RegularFont : FontManager.Axis).Push())
WindowSystem.Draw(); WindowSystem.Draw();
@@ -655,9 +757,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
internal void LanguageChanged(string langCode) internal void LanguageChanged(string langCode)
{ {
var info = Config.LanguageOverride is LanguageOverride.None var info =
? new CultureInfo(langCode) Config.LanguageOverride is LanguageOverride.None
: new CultureInfo(Config.LanguageOverride.Code()); ? new CultureInfo(langCode)
: new CultureInfo(Config.LanguageOverride.Code());
Language.Culture = info; Language.Culture = info;
HellionStrings.Culture = info; HellionStrings.Culture = info;
@@ -669,7 +772,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
"ChatLogPanel_0", "ChatLogPanel_0",
"ChatLogPanel_1", "ChatLogPanel_1",
"ChatLogPanel_2", "ChatLogPanel_2",
"ChatLogPanel_3" "ChatLogPanel_3",
]; ];
private void FrameworkUpdate(IFramework framework) private void FrameworkUpdate(IFramework framework)
@@ -687,7 +790,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
public static bool InBattle => Condition[ConditionFlag.InCombat]; public static bool InBattle => Condition[ConditionFlag.InCombat];
public static bool GposeActive => Condition[ConditionFlag.WatchingCutscene]; public static bool GposeActive => Condition[ConditionFlag.WatchingCutscene];
public static bool CutsceneActive => Condition[ConditionFlag.OccupiedInCutSceneEvent] || Condition[ConditionFlag.WatchingCutscene78]; public static bool CutsceneActive =>
Condition[ConditionFlag.OccupiedInCutSceneEvent]
|| Condition[ConditionFlag.WatchingCutscene78];
// v1.1.0 — wenn der themes/-Ordner leer ist, schreiben wir die embedded // v1.1.0 — wenn der themes/-Ordner leer ist, schreiben wir die embedded
// example-theme.json als Vorlage rein. Bestehende User-Customs werden // example-theme.json als Vorlage rein. Bestehende User-Customs werden
@@ -698,7 +803,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
return; return;
var examplePath = Path.Combine(dir, "example-theme.json"); var examplePath = Path.Combine(dir, "example-theme.json");
var resourceStream = typeof(Plugin).Assembly.GetManifestResourceStream("HellionChat.Themes.Builtin.example-theme.json"); var resourceStream = typeof(Plugin).Assembly.GetManifestResourceStream(
"HellionChat.Themes.Builtin.example-theme.json"
);
if (resourceStream is null) if (resourceStream is null)
{ {
Log.Warning("Themes example template not found in assembly resources; skipping seed."); Log.Warning("Themes example template not found in assembly resources; skipping seed.");
@@ -713,7 +820,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
} }
catch (IOException ex) catch (IOException ex)
{ {
Log.Warning(ex, "Failed to seed example-theme.json; user can create custom themes manually."); Log.Warning(
ex,
"Failed to seed example-theme.json; user can create custom themes manually."
);
} }
finally finally
{ {
+48 -44
View File
@@ -46,50 +46,53 @@ internal static class PrivacyDefaults
// here fall back to Configuration.RetentionDefaultDays. Reflects the // here fall back to Configuration.RetentionDefaultDays. Reflects the
// design spec: Tells 365, own-conversation channels 90, everything else // design spec: Tells 365, own-conversation channels 90, everything else
// shorter via the global default. // shorter via the global default.
internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays = new Dictionary<ChatType, int> internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
{ new Dictionary<ChatType, int>
[ChatType.TellIncoming] = 365, {
[ChatType.TellOutgoing] = 365, [ChatType.TellIncoming] = 365,
[ChatType.TellOutgoing] = 365,
[ChatType.Party] = 90, [ChatType.Party] = 90,
[ChatType.CrossParty] = 90, [ChatType.CrossParty] = 90,
[ChatType.Alliance] = 90, [ChatType.Alliance] = 90,
[ChatType.PvpTeam] = 90, [ChatType.PvpTeam] = 90,
[ChatType.FreeCompany] = 90, [ChatType.FreeCompany] = 90,
[ChatType.Linkshell1] = 90, [ChatType.Linkshell1] = 90,
[ChatType.Linkshell2] = 90, [ChatType.Linkshell2] = 90,
[ChatType.Linkshell3] = 90, [ChatType.Linkshell3] = 90,
[ChatType.Linkshell4] = 90, [ChatType.Linkshell4] = 90,
[ChatType.Linkshell5] = 90, [ChatType.Linkshell5] = 90,
[ChatType.Linkshell6] = 90, [ChatType.Linkshell6] = 90,
[ChatType.Linkshell7] = 90, [ChatType.Linkshell7] = 90,
[ChatType.Linkshell8] = 90, [ChatType.Linkshell8] = 90,
[ChatType.CrossLinkshell1] = 90, [ChatType.CrossLinkshell1] = 90,
[ChatType.CrossLinkshell2] = 90, [ChatType.CrossLinkshell2] = 90,
[ChatType.CrossLinkshell3] = 90, [ChatType.CrossLinkshell3] = 90,
[ChatType.CrossLinkshell4] = 90, [ChatType.CrossLinkshell4] = 90,
[ChatType.CrossLinkshell5] = 90, [ChatType.CrossLinkshell5] = 90,
[ChatType.CrossLinkshell6] = 90, [ChatType.CrossLinkshell6] = 90,
[ChatType.CrossLinkshell7] = 90, [ChatType.CrossLinkshell7] = 90,
[ChatType.CrossLinkshell8] = 90, [ChatType.CrossLinkshell8] = 90,
[ChatType.ExtraChatLinkshell1] = 90, [ChatType.ExtraChatLinkshell1] = 90,
[ChatType.ExtraChatLinkshell2] = 90, [ChatType.ExtraChatLinkshell2] = 90,
[ChatType.ExtraChatLinkshell3] = 90, [ChatType.ExtraChatLinkshell3] = 90,
[ChatType.ExtraChatLinkshell4] = 90, [ChatType.ExtraChatLinkshell4] = 90,
[ChatType.ExtraChatLinkshell5] = 90, [ChatType.ExtraChatLinkshell5] = 90,
[ChatType.ExtraChatLinkshell6] = 90, [ChatType.ExtraChatLinkshell6] = 90,
[ChatType.ExtraChatLinkshell7] = 90, [ChatType.ExtraChatLinkshell7] = 90,
[ChatType.ExtraChatLinkshell8] = 90, [ChatType.ExtraChatLinkshell8] = 90,
}; };
// Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both // Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both
// emote types, Novice Network), kept for a short 24-hour window so the // emote types, Novice Network), kept for a short 24-hour window so the
// last RP scene or shout trade is still searchable but third-party data // last RP scene or shout trade is still searchable but third-party data
// doesn't accumulate forever. // doesn't accumulate forever.
internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(PrivacyFirstWhitelist) internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
PrivacyFirstWhitelist
)
{ {
ChatType.Say, ChatType.Say,
ChatType.Shout, ChatType.Shout,
@@ -99,13 +102,14 @@ internal static class PrivacyDefaults
ChatType.NoviceNetwork, ChatType.NoviceNetwork,
}; };
internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides = new Dictionary<ChatType, int> internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides =
{ new Dictionary<ChatType, int>
[ChatType.Say] = 1, {
[ChatType.Shout] = 1, [ChatType.Say] = 1,
[ChatType.Yell] = 1, [ChatType.Shout] = 1,
[ChatType.CustomEmote] = 1, [ChatType.Yell] = 1,
[ChatType.StandardEmote] = 1, [ChatType.CustomEmote] = 1,
[ChatType.NoviceNetwork] = 1, [ChatType.StandardEmote] = 1,
}; [ChatType.NoviceNetwork] = 1,
};
} }
+51 -43
View File
@@ -13,7 +13,8 @@ public sealed record ChatColourPreset(
string DisplayName, string DisplayName,
string LocalizationKey, string LocalizationKey,
bool IsBrandPreset, bool IsBrandPreset,
IReadOnlyDictionary<ChatType, uint> Colours); IReadOnlyDictionary<ChatType, uint> Colours
);
public static class ChatColourPresets public static class ChatColourPresets
{ {
@@ -27,37 +28,44 @@ public static class ChatColourPresets
DisplayName: "ChatTwo Default", DisplayName: "ChatTwo Default",
LocalizationKey: "ChatColourPresets_Default", LocalizationKey: "ChatColourPresets_Default",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildDefault()), Colours: BuildDefault()
),
["HighContrast"] = new( ["HighContrast"] = new(
DisplayName: "High-Contrast", DisplayName: "High-Contrast",
LocalizationKey: "ChatColourPresets_HighContrast", LocalizationKey: "ChatColourPresets_HighContrast",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildHighContrast()), Colours: BuildHighContrast()
),
["Pastell"] = new( ["Pastell"] = new(
DisplayName: "Pastell", DisplayName: "Pastell",
LocalizationKey: "ChatColourPresets_Pastell", LocalizationKey: "ChatColourPresets_Pastell",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildPastell()), Colours: BuildPastell()
),
["DarkModeTuned"] = new( ["DarkModeTuned"] = new(
DisplayName: "Dark-Mode-Tuned", DisplayName: "Dark-Mode-Tuned",
LocalizationKey: "ChatColourPresets_DarkModeTuned", LocalizationKey: "ChatColourPresets_DarkModeTuned",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildDarkModeTuned()), Colours: BuildDarkModeTuned()
),
["Hellion"] = new( ["Hellion"] = new(
DisplayName: "Hellion", DisplayName: "Hellion",
LocalizationKey: "ChatColourPresets_Hellion", LocalizationKey: "ChatColourPresets_Hellion",
IsBrandPreset: true, IsBrandPreset: true,
Colours: BuildHellion()), Colours: BuildHellion()
),
["NightBlue"] = new( ["NightBlue"] = new(
DisplayName: "Night Blue", DisplayName: "Night Blue",
LocalizationKey: "ChatColourPresets_NightBlue", LocalizationKey: "ChatColourPresets_NightBlue",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildNightBlue()), Colours: BuildNightBlue()
),
["IndigoViolet"] = new( ["IndigoViolet"] = new(
DisplayName: "Indigo Violet", DisplayName: "Indigo Violet",
LocalizationKey: "ChatColourPresets_IndigoViolet", LocalizationKey: "ChatColourPresets_IndigoViolet",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildIndigoViolet()), Colours: BuildIndigoViolet()
),
}; };
} }
@@ -187,39 +195,39 @@ public static class ChatColourPresets
return new Dictionary<ChatType, uint> return new Dictionary<ChatType, uint>
{ {
// Standard / Tell — Cyan-Familie (Brand-Primary) // Standard / Tell — Cyan-Familie (Brand-Primary)
[ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8 [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8
[ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan #00BED2 [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan #00BED2
[ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark #0097A7 [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark #0097A7
// Laute Channels — Ember/Warning // Laute Channels — Ember/Warning
[ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning #F0AD4E [ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning #F0AD4E
[ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember #F97316 [ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember #F97316
// Gruppen-Channels — Success/Ember-dark/Cyan // Gruppen-Channels — Success/Ember-dark/Cyan
[ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success #5CB85C [ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success #5CB85C
[ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark #E85D04 [ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark #E85D04
[ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
[ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232),// Cyan-light [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
// Linkshells 1-8 — über das ganze Brand-Spektrum verteilt // Linkshells 1-8 — über das ganze Brand-Spektrum verteilt
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60), // Ember-light #FB923C [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60), // Ember-light #FB923C
[ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning
[ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success
[ChatType.Linkshell4] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light [ChatType.Linkshell4] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
[ChatType.Linkshell5] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan [ChatType.Linkshell5] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
[ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
[ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember
[ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79), // Danger #D9534F [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79), // Danger #D9534F
// CrossWorld-Linkshells 1-8 — dunklere/sattersere Varianten // CrossWorld-Linkshells 1-8 — dunklere/sattersere Varianten
[ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark
[ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50), // Warning-dark [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50), // Warning-dark
[ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60), // Success-dark [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60), // Success-dark
[ChatType.CrossLinkshell4] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan [ChatType.CrossLinkshell4] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
[ChatType.CrossLinkshell5] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark [ChatType.CrossLinkshell5] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
[ChatType.CrossLinkshell6] = ColourUtil.ComponentsToRgba(0, 110, 130), // Cyan-darker [ChatType.CrossLinkshell6] = ColourUtil.ComponentsToRgba(0, 110, 130), // Cyan-darker
[ChatType.CrossLinkshell7] = ColourUtil.ComponentsToRgba(220, 90, 30), // Ember-medium [ChatType.CrossLinkshell7] = ColourUtil.ComponentsToRgba(220, 90, 30), // Ember-medium
[ChatType.CrossLinkshell8] = ColourUtil.ComponentsToRgba(170, 60, 60), // Danger-dark [ChatType.CrossLinkshell8] = ColourUtil.ComponentsToRgba(170, 60, 60), // Danger-dark
}; };
} }
@@ -233,19 +241,19 @@ public static class ChatColourPresets
return new Dictionary<ChatType, uint> return new Dictionary<ChatType, uint>
{ {
// Standard / Tell — Royal Blue Akzent-Familie // Standard / Tell — Royal Blue Akzent-Familie
[ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary
[ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255),// akzent-hot [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255), // akzent-hot
[ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
// Laute Channels — Warning/Danger Status-Töne // Laute Channels — Warning/Danger Status-Töne
[ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), // warning [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), // warning
[ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), // danger [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), // danger
// Gruppen — Success/Akzent-Variations // Gruppen — Success/Akzent-Variations
[ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), // success [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), // success
[ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), // warm-orange-light [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), // warm-orange-light
[ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
[ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191),// text-dim [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191), // text-dim
// Linkshells 1-8 — über Spektrum verteilt // Linkshells 1-8 — über Spektrum verteilt
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
@@ -278,8 +286,8 @@ public static class ChatColourPresets
return new Dictionary<ChatType, uint> return new Dictionary<ChatType, uint>
{ {
// Standard / Tell — Royal Violet Akzent-Familie // Standard / Tell — Royal Violet Akzent-Familie
[ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary (light lavender) [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary (light lavender)
[ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255),// akzent-hot [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255), // akzent-hot
[ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
// Laute Channels — geteilt mit Night Blue (Status-Farben) // Laute Channels — geteilt mit Night Blue (Status-Farben)
@@ -289,8 +297,8 @@ public static class ChatColourPresets
// Gruppen // Gruppen
[ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),
[ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),
[ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
[ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208),// text-dim [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208), // text-dim
// Linkshells 1-8 // Linkshells 1-8
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
@@ -40,7 +40,9 @@ internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
if (this.initialSlug is null) if (this.initialSlug is null)
{ {
this.initialSlug = active.Slug; this.initialSlug = active.Slug;
ImGui.Text($"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme."); ImGui.Text(
$"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme."
);
return SelfTestStepResult.Waiting; return SelfTestStepResult.Waiting;
} }
@@ -77,9 +79,6 @@ internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
private static bool HasPopulatedCache(Theme theme) private static bool HasPopulatedCache(Theme theme)
{ {
var cache = theme.AbgrCache; var cache = theme.AbgrCache;
return (cache.Primary return (cache.Primary | cache.WindowBg | cache.TextPrimary | cache.Border) != 0u;
| cache.WindowBg
| cache.TextPrimary
| cache.Border) != 0u;
} }
} }
+2 -2
View File
@@ -32,8 +32,8 @@ public static class Sheets
} }
public static bool IsInForay() => public static bool IsInForay() =>
TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row) && TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row)
row.TerritoryIntendedUse.RowId is 41 or 61; && row.TerritoryIntendedUse.RowId is 41 or 61;
public static IEnumerable<World> WorldsOnDatacenter(IPlayerCharacter character) public static IEnumerable<World> WorldsOnDatacenter(IPlayerCharacter character)
{ {
+43 -41
View File
@@ -6,45 +6,47 @@ internal static class Chat2Classic
{ {
public const string Slug = "chat2-classic"; public const string Slug = "chat2-classic";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Chat 2 Klassik", Slug: Slug,
Author: "Upstream (Infi & Anna)", Name: "Chat 2 Klassik",
Description: "Steel-blue accents on neutral dark grey, eckige Kanten. Vertraut für ChatTwo-Veteranen.", Author: "Upstream (Infi & Anna)",
Colors: new ThemeColors( Description: "Steel-blue accents on neutral dark grey, eckige Kanten. Vertraut für ChatTwo-Veteranen.",
PrimaryDark: ColourUtil.HexToRgba("#3D6E92"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#4682B4"), PrimaryDark: ColourUtil.HexToRgba("#3D6E92"),
PrimaryLight: ColourUtil.HexToRgba("#5C9DC8"), Primary: ColourUtil.HexToRgba("#4682B4"),
PrimaryGlow: ColourUtil.HexToRgba("#4682B466"), PrimaryLight: ColourUtil.HexToRgba("#5C9DC8"),
PrimaryGlow: ColourUtil.HexToRgba("#4682B466"),
AccentDark: ColourUtil.HexToRgba("#3D6E92"), AccentDark: ColourUtil.HexToRgba("#3D6E92"),
Accent: ColourUtil.HexToRgba("#4682B4"), Accent: ColourUtil.HexToRgba("#4682B4"),
AccentLight: ColourUtil.HexToRgba("#5C9DC8"), AccentLight: ColourUtil.HexToRgba("#5C9DC8"),
Identity: ColourUtil.HexToRgba("#4682B4"),
Identity: ColourUtil.HexToRgba("#4682B4"), WindowBg: ColourUtil.HexToRgba("#0F0F0FF2"),
ChildBg: ColourUtil.HexToRgba("#141414"),
WindowBg: ColourUtil.HexToRgba("#0F0F0FF2"), FrameBg: ColourUtil.HexToRgba("#1A1A1A"),
ChildBg: ColourUtil.HexToRgba("#141414"), Surface: ColourUtil.HexToRgba("#202020"),
FrameBg: ColourUtil.HexToRgba("#1A1A1A"), SurfaceHover: ColourUtil.HexToRgba("#2C2C2C"),
Surface: ColourUtil.HexToRgba("#202020"), Border: ColourUtil.HexToRgba("#404040"),
SurfaceHover: ColourUtil.HexToRgba("#2C2C2C"), TextPrimary: ColourUtil.HexToRgba("#E6E6E6"),
Border: ColourUtil.HexToRgba("#404040"), TextMuted: ColourUtil.HexToRgba("#999999"),
TextDim: ColourUtil.HexToRgba("#666666"),
TextPrimary: ColourUtil.HexToRgba("#E6E6E6"), StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
TextMuted: ColourUtil.HexToRgba("#999999"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
TextDim: ColourUtil.HexToRgba("#666666"), StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
StatusInfo: ColourUtil.HexToRgba("#4682B4")
StatusSuccess: ColourUtil.HexToRgba("#5CB85C"), ),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#F0AD4E"), WindowRounding: 0f,
StatusInfo: ColourUtil.HexToRgba("#4682B4") ChildRounding: 0f,
), PopupRounding: 0f,
Layout: new ThemeLayout( FrameRounding: 0f,
WindowRounding: 0f, ChildRounding: 0f, PopupRounding: 0f, GrabRounding: 0f,
FrameRounding: 0f, GrabRounding: 0f, TabRounding: 0f, TabRounding: 0f,
ScrollbarRounding: 0f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 0f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true ),
); Typography: new ThemeTypography(),
IsBuiltIn: true
);
} }
+72 -68
View File
@@ -6,72 +6,76 @@ internal static class EventHorizon
{ {
public const string Slug = "event-horizon"; public const string Slug = "event-horizon";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Event Horizon", Slug: Slug,
Author: "Hellion Forge", Name: "Event Horizon",
Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.", Author: "Hellion Forge",
Colors: new ThemeColors( Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.",
PrimaryDark: ColourUtil.HexToRgba("#7B3FCF"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#9D5CFF"), PrimaryDark: ColourUtil.HexToRgba("#7B3FCF"),
PrimaryLight: ColourUtil.HexToRgba("#B585FF"), Primary: ColourUtil.HexToRgba("#9D5CFF"),
PrimaryGlow: ColourUtil.HexToRgba("#9D5CFF99"), PrimaryLight: ColourUtil.HexToRgba("#B585FF"),
PrimaryGlow: ColourUtil.HexToRgba("#9D5CFF99"),
AccentDark: ColourUtil.HexToRgba("#C9982E"), AccentDark: ColourUtil.HexToRgba("#C9982E"),
Accent: ColourUtil.HexToRgba("#E0AB36"), Accent: ColourUtil.HexToRgba("#E0AB36"),
AccentLight: ColourUtil.HexToRgba("#F2C25C"), AccentLight: ColourUtil.HexToRgba("#F2C25C"),
Identity: ColourUtil.HexToRgba("#9D5CFF"),
Identity: ColourUtil.HexToRgba("#9D5CFF"), WindowBg: ColourUtil.HexToRgba("#040308"),
ChildBg: ColourUtil.HexToRgba("#0A081A"),
WindowBg: ColourUtil.HexToRgba("#040308"), FrameBg: ColourUtil.HexToRgba("#140F23"),
ChildBg: ColourUtil.HexToRgba("#0A081A"), Surface: ColourUtil.HexToRgba("#1B1530"),
FrameBg: ColourUtil.HexToRgba("#140F23"), SurfaceHover: ColourUtil.HexToRgba("#251D40"),
Surface: ColourUtil.HexToRgba("#1B1530"), Border: ColourUtil.HexToRgba("#9D5CFF44"),
SurfaceHover: ColourUtil.HexToRgba("#251D40"), TextPrimary: ColourUtil.HexToRgba("#E6E0F5"),
Border: ColourUtil.HexToRgba("#9D5CFF44"), TextMuted: ColourUtil.HexToRgba("#9890B5"),
TextDim: ColourUtil.HexToRgba("#5A5570"),
TextPrimary: ColourUtil.HexToRgba("#E6E0F5"), StatusSuccess: ColourUtil.HexToRgba("#26A269"),
TextMuted: ColourUtil.HexToRgba("#9890B5"), StatusDanger: ColourUtil.HexToRgba("#ED333B"),
TextDim: ColourUtil.HexToRgba("#5A5570"), StatusWarning: ColourUtil.HexToRgba("#E0AB36"),
StatusInfo: ColourUtil.HexToRgba("#9D5CFF")
StatusSuccess: ColourUtil.HexToRgba("#26A269"), ),
StatusDanger: ColourUtil.HexToRgba("#ED333B"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#E0AB36"), WindowRounding: 6f,
StatusInfo: ColourUtil.HexToRgba("#9D5CFF") ChildRounding: 5f,
), PopupRounding: 5f,
Layout: new ThemeLayout( FrameRounding: 4f,
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, GrabRounding: 4f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, TabRounding: 4f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 4f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen ChatColors: new ThemeChatColors(
// Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta- new Dictionary<HellionChat.Code.ChatType, uint>
// Lila. Channel-Identität bleibt klar erkennbar. {
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#E6E0F5"), // Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F2C25C"), // Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta-
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF9050"), // Lila. Channel-Identität bleibt klar erkennbar.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#E090FF"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#E6E0F5"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#E090FF"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F2C25C"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#90A0FF"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF9050"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FFAA80"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#E090FF"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#9090E8"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#E090FF"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A0E090"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#90A0FF"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#90A0FF"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FFAA80"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A0E090"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#9090E8"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0B070"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A0E090"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F2C25C"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#90A0FF"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0B0"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A0E090"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#90A0FF"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0B070"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#B585FF"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F2C25C"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E090FF"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0B0"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#D0A0F0"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#90A0FF"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E0B870"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#B585FF"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E0B870"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E090FF"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9890B5"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#D0A0F0"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E0B870"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E0B870"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9890B5"),
}
)
);
} }
+71 -67
View File
@@ -6,71 +6,75 @@ internal static class ForgeMerchantman
{ {
public const string Slug = "forge-merchantman"; public const string Slug = "forge-merchantman";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Forge Merchantman", Slug: Slug,
Author: "Carla Beleandis", Name: "Forge Merchantman",
Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.", Author: "Carla Beleandis",
Colors: new ThemeColors( Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.",
PrimaryDark: ColourUtil.HexToRgba("#1F8A82"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#2DB39E"), PrimaryDark: ColourUtil.HexToRgba("#1F8A82"),
PrimaryLight: ColourUtil.HexToRgba("#4FC9B0"), Primary: ColourUtil.HexToRgba("#2DB39E"),
PrimaryGlow: ColourUtil.HexToRgba("#2DB39E99"), PrimaryLight: ColourUtil.HexToRgba("#4FC9B0"),
PrimaryGlow: ColourUtil.HexToRgba("#2DB39E99"),
AccentDark: ColourUtil.HexToRgba("#B86A20"), AccentDark: ColourUtil.HexToRgba("#B86A20"),
Accent: ColourUtil.HexToRgba("#D9892C"), Accent: ColourUtil.HexToRgba("#D9892C"),
AccentLight: ColourUtil.HexToRgba("#E8A04A"), AccentLight: ColourUtil.HexToRgba("#E8A04A"),
Identity: ColourUtil.HexToRgba("#1F8A82"),
Identity: ColourUtil.HexToRgba("#1F8A82"), WindowBg: ColourUtil.HexToRgba("#050B0A"),
ChildBg: ColourUtil.HexToRgba("#0B1413"),
WindowBg: ColourUtil.HexToRgba("#050B0A"), FrameBg: ColourUtil.HexToRgba("#11201D"),
ChildBg: ColourUtil.HexToRgba("#0B1413"), Surface: ColourUtil.HexToRgba("#182925"),
FrameBg: ColourUtil.HexToRgba("#11201D"), SurfaceHover: ColourUtil.HexToRgba("#213631"),
Surface: ColourUtil.HexToRgba("#182925"), Border: ColourUtil.HexToRgba("#2DB39E66"),
SurfaceHover: ColourUtil.HexToRgba("#213631"), TextPrimary: ColourUtil.HexToRgba("#D8EFE8"),
Border: ColourUtil.HexToRgba("#2DB39E66"), TextMuted: ColourUtil.HexToRgba("#8FA39B"),
TextDim: ColourUtil.HexToRgba("#5A6E66"),
TextPrimary: ColourUtil.HexToRgba("#D8EFE8"), StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
TextMuted: ColourUtil.HexToRgba("#8FA39B"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
TextDim: ColourUtil.HexToRgba("#5A6E66"), StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
StatusInfo: ColourUtil.HexToRgba("#2DB39E")
StatusSuccess: ColourUtil.HexToRgba("#5CB85C"), ),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#F0AD4E"), WindowRounding: 4f,
StatusInfo: ColourUtil.HexToRgba("#2DB39E") ChildRounding: 3f,
), PopupRounding: 3f,
Layout: new ThemeLayout( FrameRounding: 2f,
WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f, GrabRounding: 2f,
FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f, TabRounding: 2f,
ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 2f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in ChatColors: new ThemeChatColors(
// Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten. new Dictionary<HellionChat.Code.ChatType, uint>
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"), {
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0C060"), // Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#E8902C"), // Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0C060"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AC9B0"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#E8902C"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E8A04A"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FB8A0"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AC9B0"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AC9B0"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E8A04A"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FB8A0"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E8A04A"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0C060"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AC9B0"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8B0"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AC9B0"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E8A04A"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0C060"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8B0"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AC9B0"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8FA39B"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8FA39B"),
}
)
);
} }
+71 -67
View File
@@ -6,71 +6,75 @@ internal static class HellionArctic
{ {
public const string Slug = "hellion-arctic"; public const string Slug = "hellion-arctic";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Hellion Arctic", Slug: Slug,
Author: "Hellion Forge", Name: "Hellion Arctic",
Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.", Author: "Hellion Forge",
Colors: new ThemeColors( Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.",
PrimaryDark: ColourUtil.HexToRgba("#0097A7"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#00BED2"), PrimaryDark: ColourUtil.HexToRgba("#0097A7"),
PrimaryLight: ColourUtil.HexToRgba("#4DD9E8"), Primary: ColourUtil.HexToRgba("#00BED2"),
PrimaryGlow: ColourUtil.HexToRgba("#00BED299"), PrimaryLight: ColourUtil.HexToRgba("#4DD9E8"),
PrimaryGlow: ColourUtil.HexToRgba("#00BED299"),
AccentDark: ColourUtil.HexToRgba("#E85D04"), AccentDark: ColourUtil.HexToRgba("#E85D04"),
Accent: ColourUtil.HexToRgba("#F97316"), Accent: ColourUtil.HexToRgba("#F97316"),
AccentLight: ColourUtil.HexToRgba("#FB923C"), AccentLight: ColourUtil.HexToRgba("#FB923C"),
Identity: ColourUtil.HexToRgba("#0097A7"),
Identity: ColourUtil.HexToRgba("#0097A7"), WindowBg: ColourUtil.HexToRgba("#070B12"),
ChildBg: ColourUtil.HexToRgba("#0C1220"),
WindowBg: ColourUtil.HexToRgba("#070B12"), FrameBg: ColourUtil.HexToRgba("#141E30"),
ChildBg: ColourUtil.HexToRgba("#0C1220"), Surface: ColourUtil.HexToRgba("#1A2538"),
FrameBg: ColourUtil.HexToRgba("#141E30"), SurfaceHover: ColourUtil.HexToRgba("#22303F"),
Surface: ColourUtil.HexToRgba("#1A2538"), Border: ColourUtil.HexToRgba("#00BED266"),
SurfaceHover: ColourUtil.HexToRgba("#22303F"), TextPrimary: ColourUtil.HexToRgba("#E6F4F1"),
Border: ColourUtil.HexToRgba("#00BED266"), TextMuted: ColourUtil.HexToRgba("#8FA3B5"),
TextDim: ColourUtil.HexToRgba("#566273"),
TextPrimary: ColourUtil.HexToRgba("#E6F4F1"), StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
TextMuted: ColourUtil.HexToRgba("#8FA3B5"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
TextDim: ColourUtil.HexToRgba("#566273"), StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
StatusInfo: ColourUtil.HexToRgba("#00BED2")
StatusSuccess: ColourUtil.HexToRgba("#5CB85C"), ),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#F0AD4E"), WindowRounding: 4f,
StatusInfo: ColourUtil.HexToRgba("#00BED2") ChildRounding: 3f,
), PopupRounding: 3f,
Layout: new ThemeLayout( FrameRounding: 2f,
WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f, GrabRounding: 2f,
FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f, TabRounding: 2f,
ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 2f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den ChatColors: new ThemeChatColors(
// blauen Channels (Party/FC). Channel-Identität bleibt klar. new Dictionary<HellionChat.Code.ChatType, uint>
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"), {
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FFE066"), // Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FFA040"), // blauen Channels (Party/FC). Channel-Identität bleibt klar.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FFE066"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#80C0E8"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FFA040"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FFB870"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4DD9E8"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#80C0E8"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#80C0E8"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FFB870"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4DD9E8"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FFC080"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFE066"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#80C0E8"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8A8"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#80C0E8"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FFC080"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFE066"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8A8"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#80C0E8"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"),
}
)
);
} }
+72 -68
View File
@@ -12,72 +12,76 @@ internal static class HellionSpectrum
{ {
public const string Slug = "hellion-spectrum"; public const string Slug = "hellion-spectrum";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Hellion Spectrum", Slug: Slug,
Author: "Hellion Forge", Name: "Hellion Spectrum",
Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.", Author: "Hellion Forge",
Colors: new ThemeColors( Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.",
PrimaryDark: ColourUtil.HexToRgba("#005983"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#0072B2"), PrimaryDark: ColourUtil.HexToRgba("#005983"),
PrimaryLight: ColourUtil.HexToRgba("#3E9BD0"), Primary: ColourUtil.HexToRgba("#0072B2"),
PrimaryGlow: ColourUtil.HexToRgba("#0072B299"), PrimaryLight: ColourUtil.HexToRgba("#3E9BD0"),
PrimaryGlow: ColourUtil.HexToRgba("#0072B299"),
AccentDark: ColourUtil.HexToRgba("#B07F00"), AccentDark: ColourUtil.HexToRgba("#B07F00"),
Accent: ColourUtil.HexToRgba("#E69F00"), Accent: ColourUtil.HexToRgba("#E69F00"),
AccentLight: ColourUtil.HexToRgba("#F0B73A"), AccentLight: ColourUtil.HexToRgba("#F0B73A"),
Identity: ColourUtil.HexToRgba("#005983"),
Identity: ColourUtil.HexToRgba("#005983"), WindowBg: ColourUtil.HexToRgba("#0A0F14"),
ChildBg: ColourUtil.HexToRgba("#101620"),
WindowBg: ColourUtil.HexToRgba("#0A0F14"), FrameBg: ColourUtil.HexToRgba("#1A222E"),
ChildBg: ColourUtil.HexToRgba("#101620"), Surface: ColourUtil.HexToRgba("#22303F"),
FrameBg: ColourUtil.HexToRgba("#1A222E"), SurfaceHover: ColourUtil.HexToRgba("#2D3E51"),
Surface: ColourUtil.HexToRgba("#22303F"), Border: ColourUtil.HexToRgba("#0072B266"),
SurfaceHover: ColourUtil.HexToRgba("#2D3E51"), TextPrimary: ColourUtil.HexToRgba("#F0F4F8"),
Border: ColourUtil.HexToRgba("#0072B266"), TextMuted: ColourUtil.HexToRgba("#9AA8B5"),
TextDim: ColourUtil.HexToRgba("#5E6B78"),
TextPrimary: ColourUtil.HexToRgba("#F0F4F8"), StatusSuccess: ColourUtil.HexToRgba("#009E73"),
TextMuted: ColourUtil.HexToRgba("#9AA8B5"), StatusDanger: ColourUtil.HexToRgba("#D55E00"),
TextDim: ColourUtil.HexToRgba("#5E6B78"), StatusWarning: ColourUtil.HexToRgba("#F0E442"),
StatusInfo: ColourUtil.HexToRgba("#56B4E9")
StatusSuccess: ColourUtil.HexToRgba("#009E73"), ),
StatusDanger: ColourUtil.HexToRgba("#D55E00"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#F0E442"), WindowRounding: 6f,
StatusInfo: ColourUtil.HexToRgba("#56B4E9") ChildRounding: 5f,
), PopupRounding: 5f,
Layout: new ThemeLayout( FrameRounding: 4f,
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, GrabRounding: 4f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, TabRounding: 4f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 4f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel ChatColors: new ThemeChatColors(
// identity. FC pulled slightly greener than vanilla cyan-teal so new Dictionary<HellionChat.Code.ChatType, uint>
// Party-blue and FC-green stay separable under deuteran sim. {
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"), // Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0E442"), // identity. FC pulled slightly greener than vanilla cyan-teal so
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#D55E00"), // Party-blue and FC-green stay separable under deuteran sim.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#CC79A7"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#CC79A7"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0E442"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#56B4E9"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#D55E00"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E69F00"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#CC79A7"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#009E73"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#CC79A7"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#94CC4A"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#56B4E9"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#56B4E9"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E69F00"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#94CC4A"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#009E73"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E69F00"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#94CC4A"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0E442"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#56B4E9"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#66D9A8"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#94CC4A"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#56B4E9"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E69F00"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#8B7DD0"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0E442"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E0A0C0"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#66D9A8"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#DAA0DA"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#56B4E9"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#C9A56F"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#8B7DD0"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#C9A56F"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E0A0C0"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#DAA0DA"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#C9A56F"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#C9A56F"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"),
}
)
);
} }
+72 -68
View File
@@ -6,72 +6,76 @@ internal static class IndigoViolet
{ {
public const string Slug = "indigo-violet"; public const string Slug = "indigo-violet";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Indigo Violet", Slug: Slug,
Author: "Julia Moon", Name: "Indigo Violet",
Description: "Royal Violet auf Deep Indigo — Glitter-Galaxy mit Türkis-Mint-Aurora.", Author: "Julia Moon",
Colors: new ThemeColors( Description: "Royal Violet auf Deep Indigo — Glitter-Galaxy mit Türkis-Mint-Aurora.",
PrimaryDark: ColourUtil.HexToRgba("#6B3AB0"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#8B4DDE"), PrimaryDark: ColourUtil.HexToRgba("#6B3AB0"),
PrimaryLight: ColourUtil.HexToRgba("#B07CFF"), Primary: ColourUtil.HexToRgba("#8B4DDE"),
PrimaryGlow: ColourUtil.HexToRgba("#8B4DDE99"), PrimaryLight: ColourUtil.HexToRgba("#B07CFF"),
PrimaryGlow: ColourUtil.HexToRgba("#8B4DDE99"),
AccentDark: ColourUtil.HexToRgba("#36A89C"), AccentDark: ColourUtil.HexToRgba("#36A89C"),
Accent: ColourUtil.HexToRgba("#4FC9B8"), Accent: ColourUtil.HexToRgba("#4FC9B8"),
AccentLight: ColourUtil.HexToRgba("#7AE0CF"), AccentLight: ColourUtil.HexToRgba("#7AE0CF"),
Identity: ColourUtil.HexToRgba("#6B3AB0"),
Identity: ColourUtil.HexToRgba("#6B3AB0"), WindowBg: ColourUtil.HexToRgba("#0D061F"),
ChildBg: ColourUtil.HexToRgba("#1A0D3D"),
WindowBg: ColourUtil.HexToRgba("#0D061F"), FrameBg: ColourUtil.HexToRgba("#2A1556"),
ChildBg: ColourUtil.HexToRgba("#1A0D3D"), Surface: ColourUtil.HexToRgba("#3D1F78"),
FrameBg: ColourUtil.HexToRgba("#2A1556"), SurfaceHover: ColourUtil.HexToRgba("#5B2A9A"),
Surface: ColourUtil.HexToRgba("#3D1F78"), Border: ColourUtil.HexToRgba("#8B4DDE66"),
SurfaceHover: ColourUtil.HexToRgba("#5B2A9A"), TextPrimary: ColourUtil.HexToRgba("#F0E6FF"),
Border: ColourUtil.HexToRgba("#8B4DDE66"), TextMuted: ColourUtil.HexToRgba("#A890D0"),
TextDim: ColourUtil.HexToRgba("#7560A0"),
TextPrimary: ColourUtil.HexToRgba("#F0E6FF"), StatusSuccess: ColourUtil.HexToRgba("#3DDC97"),
TextMuted: ColourUtil.HexToRgba("#A890D0"), StatusDanger: ColourUtil.HexToRgba("#FF5C7A"),
TextDim: ColourUtil.HexToRgba("#7560A0"), StatusWarning: ColourUtil.HexToRgba("#FFB84A"),
StatusInfo: ColourUtil.HexToRgba("#8B4DDE")
StatusSuccess: ColourUtil.HexToRgba("#3DDC97"), ),
StatusDanger: ColourUtil.HexToRgba("#FF5C7A"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#FFB84A"), WindowRounding: 6f,
StatusInfo: ColourUtil.HexToRgba("#8B4DDE") ChildRounding: 5f,
), PopupRounding: 5f,
Layout: new ThemeLayout( FrameRounding: 4f,
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, GrabRounding: 4f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, TabRounding: 4f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 4f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis- ChatColors: new ThemeChatColors(
// Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell. new Dictionary<HellionChat.Code.ChatType, uint>
// Differenzierung zu Event Horizon: dunkler, dichter, Türkis statt Gold. {
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0E6FF"), // Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis-
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0D880"), // Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell.
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F09A60"), // Differenzierung zu Event Horizon: dunkler, dichter, Türkis statt Gold.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#E090FF"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0E6FF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#E090FF"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0D880"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AB8D0"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F09A60"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0A878"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#E090FF"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FC9B8"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#E090FF"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A0E090"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AB8D0"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AB8D0"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0A878"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A0E090"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FC9B8"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC92"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A0E090"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0D880"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AB8D0"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0C0"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A0E090"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AB8D0"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC92"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#B07CFF"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0D880"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E090FF"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0C0"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#C098D8"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AB8D0"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#B07CFF"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#E090FF"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A890D0"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#C098D8"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A890D0"),
}
)
);
} }
+72 -68
View File
@@ -6,72 +6,76 @@ internal static class MintGrove
{ {
public const string Slug = "mint-grove"; public const string Slug = "mint-grove";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Mint Grove", Slug: Slug,
Author: "Carla Beleandis", Name: "Mint Grove",
Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.", Author: "Carla Beleandis",
Colors: new ThemeColors( Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.",
PrimaryDark: ColourUtil.HexToRgba("#3CB371"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#5DD39E"), PrimaryDark: ColourUtil.HexToRgba("#3CB371"),
PrimaryLight: ColourUtil.HexToRgba("#8FE0B8"), Primary: ColourUtil.HexToRgba("#5DD39E"),
PrimaryGlow: ColourUtil.HexToRgba("#5DD39E99"), PrimaryLight: ColourUtil.HexToRgba("#8FE0B8"),
PrimaryGlow: ColourUtil.HexToRgba("#5DD39E99"),
AccentDark: ColourUtil.HexToRgba("#F4C870"), AccentDark: ColourUtil.HexToRgba("#F4C870"),
Accent: ColourUtil.HexToRgba("#F9D580"), Accent: ColourUtil.HexToRgba("#F9D580"),
AccentLight: ColourUtil.HexToRgba("#FCDD93"), AccentLight: ColourUtil.HexToRgba("#FCDD93"),
Identity: ColourUtil.HexToRgba("#5DD39E"),
Identity: ColourUtil.HexToRgba("#5DD39E"), WindowBg: ColourUtil.HexToRgba("#0A1410"),
ChildBg: ColourUtil.HexToRgba("#10201A"),
WindowBg: ColourUtil.HexToRgba("#0A1410"), FrameBg: ColourUtil.HexToRgba("#162B22"),
ChildBg: ColourUtil.HexToRgba("#10201A"), Surface: ColourUtil.HexToRgba("#1E372B"),
FrameBg: ColourUtil.HexToRgba("#162B22"), SurfaceHover: ColourUtil.HexToRgba("#284335"),
Surface: ColourUtil.HexToRgba("#1E372B"), Border: ColourUtil.HexToRgba("#5DD39E55"),
SurfaceHover: ColourUtil.HexToRgba("#284335"), TextPrimary: ColourUtil.HexToRgba("#E8F5EA"),
Border: ColourUtil.HexToRgba("#5DD39E55"), TextMuted: ColourUtil.HexToRgba("#9BB5A5"),
TextDim: ColourUtil.HexToRgba("#5C6F65"),
TextPrimary: ColourUtil.HexToRgba("#E8F5EA"), StatusSuccess: ColourUtil.HexToRgba("#5DD39E"),
TextMuted: ColourUtil.HexToRgba("#9BB5A5"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
TextDim: ColourUtil.HexToRgba("#5C6F65"), StatusWarning: ColourUtil.HexToRgba("#E8B590"),
StatusInfo: ColourUtil.HexToRgba("#5DA9C7")
StatusSuccess: ColourUtil.HexToRgba("#5DD39E"), ),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#E8B590"), WindowRounding: 5f,
StatusInfo: ColourUtil.HexToRgba("#5DA9C7") ChildRounding: 4f,
), PopupRounding: 4f,
Layout: new ThemeLayout( FrameRounding: 3f,
WindowRounding: 5f, ChildRounding: 4f, PopupRounding: 4f, GrabRounding: 3f,
FrameRounding: 3f, GrabRounding: 3f, TabRounding: 3f, TabRounding: 3f,
ScrollbarRounding: 3f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 3f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie, ChatColors: new ThemeChatColors(
// Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität new Dictionary<HellionChat.Code.ChatType, uint>
// bleibt erhalten für Erkennbarkeit. {
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#E8F5EA"), // Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie,
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F9D580"), // Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F0A050"), // bleibt erhalten für Erkennbarkeit.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#F098C8"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#E8F5EA"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#F098C8"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F9D580"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#80B8D0"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F0A050"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B070"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#F098C8"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#80C8B0"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#F098C8"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#8FE0B8"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#80B8D0"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#80B8D0"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B070"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#8FE0B8"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#80C8B0"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC80"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#8FE0B8"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F9D580"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#80B8D0"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0A0"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#8FE0B8"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#80B8D0"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC80"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A89DC0"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F9D580"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#F098C8"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E0A0"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#D0A8C8"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#80B8D0"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C088"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A89DC0"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C088"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#F098C8"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9BB5A5"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#D0A8C8"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C088"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C088"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9BB5A5"),
}
)
);
} }
+71 -67
View File
@@ -6,71 +6,75 @@ internal static class MoonlitBloom
{ {
public const string Slug = "moonlit-bloom"; public const string Slug = "moonlit-bloom";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Moonlit Bloom", Slug: Slug,
Author: "Hellion Forge", Name: "Moonlit Bloom",
Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.", Author: "Hellion Forge",
Colors: new ThemeColors( Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.",
PrimaryDark: ColourUtil.HexToRgba("#C957D0"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#E374E8"), PrimaryDark: ColourUtil.HexToRgba("#C957D0"),
PrimaryLight: ColourUtil.HexToRgba("#EF8AF4"), Primary: ColourUtil.HexToRgba("#E374E8"),
PrimaryGlow: ColourUtil.HexToRgba("#E374E899"), PrimaryLight: ColourUtil.HexToRgba("#EF8AF4"),
PrimaryGlow: ColourUtil.HexToRgba("#E374E899"),
AccentDark: ColourUtil.HexToRgba("#7AAC5C"), AccentDark: ColourUtil.HexToRgba("#7AAC5C"),
Accent: ColourUtil.HexToRgba("#9CCB7C"), Accent: ColourUtil.HexToRgba("#9CCB7C"),
AccentLight: ColourUtil.HexToRgba("#B6E297"), AccentLight: ColourUtil.HexToRgba("#B6E297"),
Identity: ColourUtil.HexToRgba("#E374E8"),
Identity: ColourUtil.HexToRgba("#E374E8"), WindowBg: ColourUtil.HexToRgba("#0E0C1F"),
ChildBg: ColourUtil.HexToRgba("#15122B"),
WindowBg: ColourUtil.HexToRgba("#0E0C1F"), FrameBg: ColourUtil.HexToRgba("#1F1A38"),
ChildBg: ColourUtil.HexToRgba("#15122B"), Surface: ColourUtil.HexToRgba("#28224A"),
FrameBg: ColourUtil.HexToRgba("#1F1A38"), SurfaceHover: ColourUtil.HexToRgba("#332B5B"),
Surface: ColourUtil.HexToRgba("#28224A"), Border: ColourUtil.HexToRgba("#E374E844"),
SurfaceHover: ColourUtil.HexToRgba("#332B5B"), TextPrimary: ColourUtil.HexToRgba("#ECE6F5"),
Border: ColourUtil.HexToRgba("#E374E844"), TextMuted: ColourUtil.HexToRgba("#9A8BB0"),
TextDim: ColourUtil.HexToRgba("#554B6E"),
TextPrimary: ColourUtil.HexToRgba("#ECE6F5"), StatusSuccess: ColourUtil.HexToRgba("#7AAC5C"),
TextMuted: ColourUtil.HexToRgba("#9A8BB0"), StatusDanger: ColourUtil.HexToRgba("#E85C6A"),
TextDim: ColourUtil.HexToRgba("#554B6E"), StatusWarning: ColourUtil.HexToRgba("#E8B590"),
StatusInfo: ColourUtil.HexToRgba("#6278FF")
StatusSuccess: ColourUtil.HexToRgba("#7AAC5C"), ),
StatusDanger: ColourUtil.HexToRgba("#E85C6A"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#E8B590"), WindowRounding: 6f,
StatusInfo: ColourUtil.HexToRgba("#6278FF") ChildRounding: 5f,
), PopupRounding: 5f,
Layout: new ThemeLayout( FrameRounding: 4f,
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, GrabRounding: 4f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, TabRounding: 4f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 4f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork ChatColors: new ThemeChatColors(
// und Linkshell4. Tell-Pink-Identität bleibt sichtbar. new Dictionary<HellionChat.Code.ChatType, uint>
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#ECE6F5"), {
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0D080"), // Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F09A60"), // und Linkshell4. Tell-Pink-Identität bleibt sichtbar.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#EF8AF4"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#ECE6F5"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#EF8AF4"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0D080"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#A0B0F0"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F09A60"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B090"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#EF8AF4"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#A8C8E8"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#EF8AF4"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#9CCB7C"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#A0B0F0"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#A0B0F0"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#9CCB7C"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#A8C8E8"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC92"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#9CCB7C"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0D080"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#A0B0F0"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#B6E297"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#9CCB7C"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#A0B0F0"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC92"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#C098D8"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0D080"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#EF8AF4"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#B6E297"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0E8"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#A0B0F0"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#C098D8"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#EF8AF4"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9A8BB0"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0E8"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9A8BB0"),
}
)
);
} }
+71 -67
View File
@@ -6,71 +6,75 @@ internal static class NightBlue
{ {
public const string Slug = "night-blue"; public const string Slug = "night-blue";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Night Blue", Slug: Slug,
Author: "Julia Moon", Name: "Night Blue",
Description: "Royal Blue auf Marineblau — kühles Tech-Dashboard-Mood.", Author: "Julia Moon",
Colors: new ThemeColors( Description: "Royal Blue auf Marineblau — kühles Tech-Dashboard-Mood.",
PrimaryDark: ColourUtil.HexToRgba("#3576C0"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#4A90E2"), PrimaryDark: ColourUtil.HexToRgba("#3576C0"),
PrimaryLight: ColourUtil.HexToRgba("#6AB0FF"), Primary: ColourUtil.HexToRgba("#4A90E2"),
PrimaryGlow: ColourUtil.HexToRgba("#4A90E299"), PrimaryLight: ColourUtil.HexToRgba("#6AB0FF"),
PrimaryGlow: ColourUtil.HexToRgba("#4A90E299"),
AccentDark: ColourUtil.HexToRgba("#C97A2E"), AccentDark: ColourUtil.HexToRgba("#C97A2E"),
Accent: ColourUtil.HexToRgba("#E8A040"), Accent: ColourUtil.HexToRgba("#E8A040"),
AccentLight: ColourUtil.HexToRgba("#F4B968"), AccentLight: ColourUtil.HexToRgba("#F4B968"),
Identity: ColourUtil.HexToRgba("#3576C0"),
Identity: ColourUtil.HexToRgba("#3576C0"), WindowBg: ColourUtil.HexToRgba("#050B18"),
ChildBg: ColourUtil.HexToRgba("#0A1628"),
WindowBg: ColourUtil.HexToRgba("#050B18"), FrameBg: ColourUtil.HexToRgba("#122039"),
ChildBg: ColourUtil.HexToRgba("#0A1628"), Surface: ColourUtil.HexToRgba("#1A2D4F"),
FrameBg: ColourUtil.HexToRgba("#122039"), SurfaceHover: ColourUtil.HexToRgba("#234070"),
Surface: ColourUtil.HexToRgba("#1A2D4F"), Border: ColourUtil.HexToRgba("#4A90E266"),
SurfaceHover: ColourUtil.HexToRgba("#234070"), TextPrimary: ColourUtil.HexToRgba("#E6EDF7"),
Border: ColourUtil.HexToRgba("#4A90E266"), TextMuted: ColourUtil.HexToRgba("#8CA0BF"),
TextDim: ColourUtil.HexToRgba("#5A6F8F"),
TextPrimary: ColourUtil.HexToRgba("#E6EDF7"), StatusSuccess: ColourUtil.HexToRgba("#3DDC97"),
TextMuted: ColourUtil.HexToRgba("#8CA0BF"), StatusDanger: ColourUtil.HexToRgba("#FF5C7A"),
TextDim: ColourUtil.HexToRgba("#5A6F8F"), StatusWarning: ColourUtil.HexToRgba("#FFB84A"),
StatusInfo: ColourUtil.HexToRgba("#4A90E2")
StatusSuccess: ColourUtil.HexToRgba("#3DDC97"), ),
StatusDanger: ColourUtil.HexToRgba("#FF5C7A"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#FFB84A"), WindowRounding: 6f,
StatusInfo: ColourUtil.HexToRgba("#4A90E2") ChildRounding: 5f,
), PopupRounding: 5f,
Layout: new ThemeLayout( FrameRounding: 4f,
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, GrabRounding: 4f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, TabRounding: 4f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 4f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/ ChatColors: new ThemeChatColors(
// Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten. new Dictionary<HellionChat.Code.ChatType, uint>
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"), {
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FFD060"), // Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FFA040"), // Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FFD060"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AA8E8"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FFA040"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E8B070"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FA8E8"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#6AA8E8"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AA8E8"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#E8B070"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#4FA8E8"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E8B070"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#A8E060"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD060"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#6AA8E8"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8A8"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#A8E060"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AA8E8"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#E8B070"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD060"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#80E8A8"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#6AA8E8"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B070"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A8A0F0"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B070"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#FF99CC"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8CA0BF"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0F0"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B070"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B070"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8CA0BF"),
}
)
);
} }
+71 -67
View File
@@ -6,71 +6,75 @@ internal static class SynthwaveSunset
{ {
public const string Slug = "synthwave-sunset"; public const string Slug = "synthwave-sunset";
public static Theme Build() => new( public static Theme Build() =>
Slug: Slug, new(
Name: "Synthwave Sunset", Slug: Slug,
Author: "Hellion Forge", Name: "Synthwave Sunset",
Description: "Hot Magenta + Cyan on midnight violet. 80s neon-grid vibes for late-night raids.", Author: "Hellion Forge",
Colors: new ThemeColors( Description: "Hot Magenta + Cyan on midnight violet. 80s neon-grid vibes for late-night raids.",
PrimaryDark: ColourUtil.HexToRgba("#C71585"), Colors: new ThemeColors(
Primary: ColourUtil.HexToRgba("#FF2D95"), PrimaryDark: ColourUtil.HexToRgba("#C71585"),
PrimaryLight: ColourUtil.HexToRgba("#FF6BB6"), Primary: ColourUtil.HexToRgba("#FF2D95"),
PrimaryGlow: ColourUtil.HexToRgba("#FF2D9599"), PrimaryLight: ColourUtil.HexToRgba("#FF6BB6"),
PrimaryGlow: ColourUtil.HexToRgba("#FF2D9599"),
AccentDark: ColourUtil.HexToRgba("#0098B8"), AccentDark: ColourUtil.HexToRgba("#0098B8"),
Accent: ColourUtil.HexToRgba("#00F0FF"), Accent: ColourUtil.HexToRgba("#00F0FF"),
AccentLight: ColourUtil.HexToRgba("#5CFFFE"), AccentLight: ColourUtil.HexToRgba("#5CFFFE"),
Identity: ColourUtil.HexToRgba("#FF2D95"),
Identity: ColourUtil.HexToRgba("#FF2D95"), WindowBg: ColourUtil.HexToRgba("#13041F"),
ChildBg: ColourUtil.HexToRgba("#1E0A35"),
WindowBg: ColourUtil.HexToRgba("#13041F"), FrameBg: ColourUtil.HexToRgba("#2A1247"),
ChildBg: ColourUtil.HexToRgba("#1E0A35"), Surface: ColourUtil.HexToRgba("#3A1860"),
FrameBg: ColourUtil.HexToRgba("#2A1247"), SurfaceHover: ColourUtil.HexToRgba("#4A2475"),
Surface: ColourUtil.HexToRgba("#3A1860"), Border: ColourUtil.HexToRgba("#FF2D9566"),
SurfaceHover: ColourUtil.HexToRgba("#4A2475"), TextPrimary: ColourUtil.HexToRgba("#F0DFFF"),
Border: ColourUtil.HexToRgba("#FF2D9566"), TextMuted: ColourUtil.HexToRgba("#A88BC4"),
TextDim: ColourUtil.HexToRgba("#6F4D8E"),
TextPrimary: ColourUtil.HexToRgba("#F0DFFF"), StatusSuccess: ColourUtil.HexToRgba("#39FF14"),
TextMuted: ColourUtil.HexToRgba("#A88BC4"), StatusDanger: ColourUtil.HexToRgba("#FF3838"),
TextDim: ColourUtil.HexToRgba("#6F4D8E"), StatusWarning: ColourUtil.HexToRgba("#FFD700"),
StatusInfo: ColourUtil.HexToRgba("#00F0FF")
StatusSuccess: ColourUtil.HexToRgba("#39FF14"), ),
StatusDanger: ColourUtil.HexToRgba("#FF3838"), Layout: new ThemeLayout(
StatusWarning: ColourUtil.HexToRgba("#FFD700"), WindowRounding: 5f,
StatusInfo: ColourUtil.HexToRgba("#00F0FF") ChildRounding: 4f,
), PopupRounding: 4f,
Layout: new ThemeLayout( FrameRounding: 3f,
WindowRounding: 5f, ChildRounding: 4f, PopupRounding: 4f, GrabRounding: 3f,
FrameRounding: 3f, GrabRounding: 3f, TabRounding: 3f, TabRounding: 3f,
ScrollbarRounding: 3f, WindowBorderSize: 1f, FrameBorderSize: 1f ScrollbarRounding: 3f,
), WindowBorderSize: 1f,
Typography: new ThemeTypography(), FrameBorderSize: 1f
IsBuiltIn: true, ),
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> Typography: new ThemeTypography(),
{ IsBuiltIn: true,
// Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC), ChatColors: new ThemeChatColors(
// Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels. new Dictionary<HellionChat.Code.ChatType, uint>
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0DFFF"), {
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FF2D95"), // Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC),
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF6BB6"), // Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels.
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#00F0FF"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0DFFF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#5CFFFE"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FF2D95"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#5CFFFE"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF6BB6"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FF8C00"), [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#00F0FF"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#FF2D95"), [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#39FF14"), [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#5CFFFE"), [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FF8C00"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#39FF14"), [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#FF2D95"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FF8C00"), [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#39FF14"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD700"), [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#00F0FF"), [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#39FF14"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#FF6BB6"), [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FF8C00"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#FF2D95"), [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD700"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#A88BC4"), [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#00F0FF"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#5CFFFE"), [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#FF6BB6"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#FF6BB6"), [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#FF2D95"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#A88BC4"), [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#A88BC4"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A88BC4"), [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#5CFFFE"),
}) [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#FF6BB6"),
); [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#A88BC4"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A88BC4"),
}
)
);
} }
+39 -39
View File
@@ -1,41 +1,41 @@
{ {
"schemaVersion": 1, "schemaVersion": 1,
"slug": "example-custom", "slug": "example-custom",
"name": "Example Custom", "name": "Example Custom",
"author": "You", "author": "You",
"description": "Starting template — duplicate, rename, edit colors and reload.", "description": "Starting template — duplicate, rename, edit colors and reload.",
"colors": { "colors": {
"primaryDark": "#0097A7", "primaryDark": "#0097A7",
"primary": "#00BED2", "primary": "#00BED2",
"primaryLight": "#4DD9E8", "primaryLight": "#4DD9E8",
"primaryGlow": "#00BED299", "primaryGlow": "#00BED299",
"accentDark": "#E85D04", "accentDark": "#E85D04",
"accent": "#F97316", "accent": "#F97316",
"accentLight": "#FB923C", "accentLight": "#FB923C",
"identity": "#0097A7", "identity": "#0097A7",
"windowBg": "#070B12", "windowBg": "#070B12",
"childBg": "#0C1220", "childBg": "#0C1220",
"frameBg": "#141E30", "frameBg": "#141E30",
"surface": "#1A2538", "surface": "#1A2538",
"surfaceHover": "#22303F", "surfaceHover": "#22303F",
"border": "#00BED266", "border": "#00BED266",
"textPrimary": "#E6F4F1", "textPrimary": "#E6F4F1",
"textMuted": "#8FA3B5", "textMuted": "#8FA3B5",
"textDim": "#566273", "textDim": "#566273",
"statusSuccess": "#5CB85C", "statusSuccess": "#5CB85C",
"statusDanger": "#D9534F", "statusDanger": "#D9534F",
"statusWarning": "#F0AD4E", "statusWarning": "#F0AD4E",
"statusInfo": "#00BED2" "statusInfo": "#00BED2"
}, },
"layout": { "layout": {
"windowRounding": 4, "windowRounding": 4,
"childRounding": 3, "childRounding": 3,
"popupRounding": 3, "popupRounding": 3,
"frameRounding": 2, "frameRounding": 2,
"grabRounding": 2, "grabRounding": 2,
"tabRounding": 2, "tabRounding": 2,
"scrollbarRounding": 2, "scrollbarRounding": 2,
"windowBorderSize": 1, "windowBorderSize": 1,
"frameBorderSize": 1 "frameBorderSize": 1
} }
} }
+40 -25
View File
@@ -21,38 +21,53 @@ public sealed record Theme(
public void RecomputeAbgrCache() public void RecomputeAbgrCache()
{ {
AbgrCache = new ThemeAbgrCache( AbgrCache = new ThemeAbgrCache(
PrimaryDark: ColourUtil.RgbaToAbgr(Colors.PrimaryDark), PrimaryDark: ColourUtil.RgbaToAbgr(Colors.PrimaryDark),
Primary: ColourUtil.RgbaToAbgr(Colors.Primary), Primary: ColourUtil.RgbaToAbgr(Colors.Primary),
PrimaryLight: ColourUtil.RgbaToAbgr(Colors.PrimaryLight), PrimaryLight: ColourUtil.RgbaToAbgr(Colors.PrimaryLight),
PrimaryGlow: ColourUtil.RgbaToAbgr(Colors.PrimaryGlow), PrimaryGlow: ColourUtil.RgbaToAbgr(Colors.PrimaryGlow),
AccentDark: ColourUtil.RgbaToAbgr(Colors.AccentDark), AccentDark: ColourUtil.RgbaToAbgr(Colors.AccentDark),
Accent: ColourUtil.RgbaToAbgr(Colors.Accent), Accent: ColourUtil.RgbaToAbgr(Colors.Accent),
AccentLight: ColourUtil.RgbaToAbgr(Colors.AccentLight), AccentLight: ColourUtil.RgbaToAbgr(Colors.AccentLight),
Identity: ColourUtil.RgbaToAbgr(Colors.Identity), Identity: ColourUtil.RgbaToAbgr(Colors.Identity),
WindowBg: ColourUtil.RgbaToAbgr(Colors.WindowBg), WindowBg: ColourUtil.RgbaToAbgr(Colors.WindowBg),
ChildBg: ColourUtil.RgbaToAbgr(Colors.ChildBg), ChildBg: ColourUtil.RgbaToAbgr(Colors.ChildBg),
FrameBg: ColourUtil.RgbaToAbgr(Colors.FrameBg), FrameBg: ColourUtil.RgbaToAbgr(Colors.FrameBg),
Surface: ColourUtil.RgbaToAbgr(Colors.Surface), Surface: ColourUtil.RgbaToAbgr(Colors.Surface),
SurfaceHover: ColourUtil.RgbaToAbgr(Colors.SurfaceHover), SurfaceHover: ColourUtil.RgbaToAbgr(Colors.SurfaceHover),
Border: ColourUtil.RgbaToAbgr(Colors.Border), Border: ColourUtil.RgbaToAbgr(Colors.Border),
TextPrimary: ColourUtil.RgbaToAbgr(Colors.TextPrimary), TextPrimary: ColourUtil.RgbaToAbgr(Colors.TextPrimary),
TextMuted: ColourUtil.RgbaToAbgr(Colors.TextMuted), TextMuted: ColourUtil.RgbaToAbgr(Colors.TextMuted),
TextDim: ColourUtil.RgbaToAbgr(Colors.TextDim), TextDim: ColourUtil.RgbaToAbgr(Colors.TextDim),
StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess), StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess),
StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger), StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger),
StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning), StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning),
StatusInfo: ColourUtil.RgbaToAbgr(Colors.StatusInfo)); StatusInfo: ColourUtil.RgbaToAbgr(Colors.StatusInfo)
);
} }
} }
// Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the // Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the
// contract — a new slot without its mirror fails the build. // contract — a new slot without its mirror fails the build.
public readonly record struct ThemeAbgrCache( public readonly record struct ThemeAbgrCache(
uint PrimaryDark, uint Primary, uint PrimaryLight, uint PrimaryGlow, uint PrimaryDark,
uint AccentDark, uint Accent, uint AccentLight, uint Primary,
uint PrimaryLight,
uint PrimaryGlow,
uint AccentDark,
uint Accent,
uint AccentLight,
uint Identity, uint Identity,
uint WindowBg, uint ChildBg, uint FrameBg, uint WindowBg,
uint Surface, uint SurfaceHover, uint Border, uint ChildBg,
uint TextPrimary, uint TextMuted, uint TextDim, uint FrameBg,
uint StatusSuccess, uint StatusDanger, uint StatusWarning, uint StatusInfo uint Surface,
uint SurfaceHover,
uint Border,
uint TextPrimary,
uint TextMuted,
uint TextDim,
uint StatusSuccess,
uint StatusDanger,
uint StatusWarning,
uint StatusInfo
); );
+1 -3
View File
@@ -6,6 +6,4 @@ namespace HellionChat.Themes;
// User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden. // User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden.
// Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel- // Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel-
// Farben unverändert. // Farben unverändert.
public sealed record ThemeChatColors( public sealed record ThemeChatColors(IReadOnlyDictionary<ChatType, uint> Channels);
IReadOnlyDictionary<ChatType, uint> Channels
);
-5
View File
@@ -6,24 +6,19 @@ public sealed record ThemeColors(
uint Primary, uint Primary,
uint PrimaryLight, uint PrimaryLight,
uint PrimaryGlow, uint PrimaryGlow,
uint AccentDark, uint AccentDark,
uint Accent, uint Accent,
uint AccentLight, uint AccentLight,
uint Identity, uint Identity,
uint WindowBg, uint WindowBg,
uint ChildBg, uint ChildBg,
uint FrameBg, uint FrameBg,
uint Surface, uint Surface,
uint SurfaceHover, uint SurfaceHover,
uint Border, uint Border,
uint TextPrimary, uint TextPrimary,
uint TextMuted, uint TextMuted,
uint TextDim, uint TextDim,
uint StatusSuccess, uint StatusSuccess,
uint StatusDanger, uint StatusDanger,
uint StatusWarning, uint StatusWarning,
+72 -48
View File
@@ -13,8 +13,14 @@ internal static class ThemeJsonLoader
throw new FormatException("Theme JSON is empty"); throw new FormatException("Theme JSON is empty");
JsonDocument doc; JsonDocument doc;
try { doc = JsonDocument.Parse(json); } try
catch (JsonException ex) { throw new FormatException("Theme JSON is not valid JSON", ex); } {
doc = JsonDocument.Parse(json);
}
catch (JsonException ex)
{
throw new FormatException("Theme JSON is not valid JSON", ex);
}
using (doc) using (doc)
{ {
@@ -22,21 +28,36 @@ internal static class ThemeJsonLoader
var schemaVersion = ReadInt(root, "schemaVersion"); var schemaVersion = ReadInt(root, "schemaVersion");
if (schemaVersion != SupportedSchemaVersion) if (schemaVersion != SupportedSchemaVersion)
throw new FormatException($"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}"); throw new FormatException(
$"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}"
);
var slug = ReadString(root, "slug"); var slug = ReadString(root, "slug");
var name = ReadString(root, "name"); var name = ReadString(root, "name");
var author = ReadString(root, "author"); var author = ReadString(root, "author");
var description = ReadString(root, "description"); var description = ReadString(root, "description");
var colors = ReadColors(root.GetProperty("colors")); var colors = ReadColors(root.GetProperty("colors"));
var layout = ReadLayout(root.GetProperty("layout")); var layout = ReadLayout(root.GetProperty("layout"));
ThemeChatColors? chatColors = null; ThemeChatColors? chatColors = null;
if (root.TryGetProperty("chatChannels", out var ch) && ch.ValueKind == JsonValueKind.Object) if (
root.TryGetProperty("chatChannels", out var ch)
&& ch.ValueKind == JsonValueKind.Object
)
chatColors = ReadChatColors(ch); chatColors = ReadChatColors(ch);
return new Theme(slug, name, author, description, colors, layout, new ThemeTypography(), IsBuiltIn: false, ChatColors: chatColors); return new Theme(
slug,
name,
author,
description,
colors,
layout,
new ThemeTypography(),
IsBuiltIn: false,
ChatColors: chatColors
);
} }
} }
@@ -49,7 +70,13 @@ internal static class ThemeJsonLoader
// Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names // Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names
// werden still übersprungen — Forward-Compat falls SE neue Channels // werden still übersprungen — Forward-Compat falls SE neue Channels
// einführt. // einführt.
if (!Enum.TryParse<HellionChat.Code.ChatType>(prop.Name, ignoreCase: true, out var channel)) if (
!Enum.TryParse<HellionChat.Code.ChatType>(
prop.Name,
ignoreCase: true,
out var channel
)
)
continue; continue;
if (prop.Value.ValueKind != JsonValueKind.String) if (prop.Value.ValueKind != JsonValueKind.String)
continue; continue;
@@ -71,46 +98,43 @@ internal static class ThemeJsonLoader
return LoadFromString(json); return LoadFromString(json);
} }
private static ThemeColors ReadColors(JsonElement el) => new( private static ThemeColors ReadColors(JsonElement el) =>
PrimaryDark: ColourUtil.HexToRgba(ReadString(el, "primaryDark")), new(
Primary: ColourUtil.HexToRgba(ReadString(el, "primary")), PrimaryDark: ColourUtil.HexToRgba(ReadString(el, "primaryDark")),
PrimaryLight: ColourUtil.HexToRgba(ReadString(el, "primaryLight")), Primary: ColourUtil.HexToRgba(ReadString(el, "primary")),
PrimaryGlow: ColourUtil.HexToRgba(ReadString(el, "primaryGlow")), PrimaryLight: ColourUtil.HexToRgba(ReadString(el, "primaryLight")),
PrimaryGlow: ColourUtil.HexToRgba(ReadString(el, "primaryGlow")),
AccentDark: ColourUtil.HexToRgba(ReadString(el, "accentDark")),
Accent: ColourUtil.HexToRgba(ReadString(el, "accent")),
AccentLight: ColourUtil.HexToRgba(ReadString(el, "accentLight")),
Identity: ColourUtil.HexToRgba(ReadString(el, "identity")),
WindowBg: ColourUtil.HexToRgba(ReadString(el, "windowBg")),
ChildBg: ColourUtil.HexToRgba(ReadString(el, "childBg")),
FrameBg: ColourUtil.HexToRgba(ReadString(el, "frameBg")),
Surface: ColourUtil.HexToRgba(ReadString(el, "surface")),
SurfaceHover: ColourUtil.HexToRgba(ReadString(el, "surfaceHover")),
Border: ColourUtil.HexToRgba(ReadString(el, "border")),
TextPrimary: ColourUtil.HexToRgba(ReadString(el, "textPrimary")),
TextMuted: ColourUtil.HexToRgba(ReadString(el, "textMuted")),
TextDim: ColourUtil.HexToRgba(ReadString(el, "textDim")),
StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")),
StatusDanger: ColourUtil.HexToRgba(ReadString(el, "statusDanger")),
StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")),
StatusInfo: ColourUtil.HexToRgba(ReadString(el, "statusInfo"))
);
AccentDark: ColourUtil.HexToRgba(ReadString(el, "accentDark")), private static ThemeLayout ReadLayout(JsonElement el) =>
Accent: ColourUtil.HexToRgba(ReadString(el, "accent")), new(
AccentLight: ColourUtil.HexToRgba(ReadString(el, "accentLight")), WindowRounding: ReadFloat(el, "windowRounding"),
ChildRounding: ReadFloat(el, "childRounding"),
Identity: ColourUtil.HexToRgba(ReadString(el, "identity")), PopupRounding: ReadFloat(el, "popupRounding"),
FrameRounding: ReadFloat(el, "frameRounding"),
WindowBg: ColourUtil.HexToRgba(ReadString(el, "windowBg")), GrabRounding: ReadFloat(el, "grabRounding"),
ChildBg: ColourUtil.HexToRgba(ReadString(el, "childBg")), TabRounding: ReadFloat(el, "tabRounding"),
FrameBg: ColourUtil.HexToRgba(ReadString(el, "frameBg")), ScrollbarRounding: ReadFloat(el, "scrollbarRounding"),
Surface: ColourUtil.HexToRgba(ReadString(el, "surface")), WindowBorderSize: ReadFloat(el, "windowBorderSize"),
SurfaceHover: ColourUtil.HexToRgba(ReadString(el, "surfaceHover")), FrameBorderSize: ReadFloat(el, "frameBorderSize")
Border: ColourUtil.HexToRgba(ReadString(el, "border")), );
TextPrimary: ColourUtil.HexToRgba(ReadString(el, "textPrimary")),
TextMuted: ColourUtil.HexToRgba(ReadString(el, "textMuted")),
TextDim: ColourUtil.HexToRgba(ReadString(el, "textDim")),
StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")),
StatusDanger: ColourUtil.HexToRgba(ReadString(el, "statusDanger")),
StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")),
StatusInfo: ColourUtil.HexToRgba(ReadString(el, "statusInfo"))
);
private static ThemeLayout ReadLayout(JsonElement el) => new(
WindowRounding: ReadFloat(el, "windowRounding"),
ChildRounding: ReadFloat(el, "childRounding"),
PopupRounding: ReadFloat(el, "popupRounding"),
FrameRounding: ReadFloat(el, "frameRounding"),
GrabRounding: ReadFloat(el, "grabRounding"),
TabRounding: ReadFloat(el, "tabRounding"),
ScrollbarRounding: ReadFloat(el, "scrollbarRounding"),
WindowBorderSize: ReadFloat(el, "windowBorderSize"),
FrameBorderSize: ReadFloat(el, "frameBorderSize")
);
private static string ReadString(JsonElement el, string name) private static string ReadString(JsonElement el, string name)
{ {
+27 -27
View File
@@ -17,39 +17,39 @@ internal static class ThemeJsonWriter
writer.WriteString("description", theme.Description); writer.WriteString("description", theme.Description);
writer.WriteStartObject("colors"); writer.WriteStartObject("colors");
WriteColor(writer, "primaryDark", theme.Colors.PrimaryDark); WriteColor(writer, "primaryDark", theme.Colors.PrimaryDark);
WriteColor(writer, "primary", theme.Colors.Primary); WriteColor(writer, "primary", theme.Colors.Primary);
WriteColor(writer, "primaryLight", theme.Colors.PrimaryLight); WriteColor(writer, "primaryLight", theme.Colors.PrimaryLight);
WriteColor(writer, "primaryGlow", theme.Colors.PrimaryGlow); WriteColor(writer, "primaryGlow", theme.Colors.PrimaryGlow);
WriteColor(writer, "accentDark", theme.Colors.AccentDark); WriteColor(writer, "accentDark", theme.Colors.AccentDark);
WriteColor(writer, "accent", theme.Colors.Accent); WriteColor(writer, "accent", theme.Colors.Accent);
WriteColor(writer, "accentLight", theme.Colors.AccentLight); WriteColor(writer, "accentLight", theme.Colors.AccentLight);
WriteColor(writer, "identity", theme.Colors.Identity); WriteColor(writer, "identity", theme.Colors.Identity);
WriteColor(writer, "windowBg", theme.Colors.WindowBg); WriteColor(writer, "windowBg", theme.Colors.WindowBg);
WriteColor(writer, "childBg", theme.Colors.ChildBg); WriteColor(writer, "childBg", theme.Colors.ChildBg);
WriteColor(writer, "frameBg", theme.Colors.FrameBg); WriteColor(writer, "frameBg", theme.Colors.FrameBg);
WriteColor(writer, "surface", theme.Colors.Surface); WriteColor(writer, "surface", theme.Colors.Surface);
WriteColor(writer, "surfaceHover", theme.Colors.SurfaceHover); WriteColor(writer, "surfaceHover", theme.Colors.SurfaceHover);
WriteColor(writer, "border", theme.Colors.Border); WriteColor(writer, "border", theme.Colors.Border);
WriteColor(writer, "textPrimary", theme.Colors.TextPrimary); WriteColor(writer, "textPrimary", theme.Colors.TextPrimary);
WriteColor(writer, "textMuted", theme.Colors.TextMuted); WriteColor(writer, "textMuted", theme.Colors.TextMuted);
WriteColor(writer, "textDim", theme.Colors.TextDim); WriteColor(writer, "textDim", theme.Colors.TextDim);
WriteColor(writer, "statusSuccess", theme.Colors.StatusSuccess); WriteColor(writer, "statusSuccess", theme.Colors.StatusSuccess);
WriteColor(writer, "statusDanger", theme.Colors.StatusDanger); WriteColor(writer, "statusDanger", theme.Colors.StatusDanger);
WriteColor(writer, "statusWarning", theme.Colors.StatusWarning); WriteColor(writer, "statusWarning", theme.Colors.StatusWarning);
WriteColor(writer, "statusInfo", theme.Colors.StatusInfo); WriteColor(writer, "statusInfo", theme.Colors.StatusInfo);
writer.WriteEndObject(); writer.WriteEndObject();
writer.WriteStartObject("layout"); writer.WriteStartObject("layout");
writer.WriteNumber("windowRounding", theme.Layout.WindowRounding); writer.WriteNumber("windowRounding", theme.Layout.WindowRounding);
writer.WriteNumber("childRounding", theme.Layout.ChildRounding); writer.WriteNumber("childRounding", theme.Layout.ChildRounding);
writer.WriteNumber("popupRounding", theme.Layout.PopupRounding); writer.WriteNumber("popupRounding", theme.Layout.PopupRounding);
writer.WriteNumber("frameRounding", theme.Layout.FrameRounding); writer.WriteNumber("frameRounding", theme.Layout.FrameRounding);
writer.WriteNumber("grabRounding", theme.Layout.GrabRounding); writer.WriteNumber("grabRounding", theme.Layout.GrabRounding);
writer.WriteNumber("tabRounding", theme.Layout.TabRounding); writer.WriteNumber("tabRounding", theme.Layout.TabRounding);
writer.WriteNumber("scrollbarRounding", theme.Layout.ScrollbarRounding); writer.WriteNumber("scrollbarRounding", theme.Layout.ScrollbarRounding);
writer.WriteNumber("windowBorderSize", theme.Layout.WindowBorderSize); writer.WriteNumber("windowBorderSize", theme.Layout.WindowBorderSize);
writer.WriteNumber("frameBorderSize", theme.Layout.FrameBorderSize); writer.WriteNumber("frameBorderSize", theme.Layout.FrameBorderSize);
writer.WriteEndObject(); writer.WriteEndObject();
if (theme.ChatColors is { Channels.Count: > 0 } cc) if (theme.ChatColors is { Channels.Count: > 0 } cc)
+24 -16
View File
@@ -7,7 +7,9 @@ public sealed class ThemeRegistry
public const string DefaultSlug = HellionArctic.Slug; public const string DefaultSlug = HellionArctic.Slug;
private readonly Dictionary<string, Theme> _builtIns; private readonly Dictionary<string, Theme> _builtIns;
private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(StringComparer.OrdinalIgnoreCase); private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(
StringComparer.OrdinalIgnoreCase
);
private readonly string? _customThemesDir; private readonly string? _customThemesDir;
private Theme _active; private Theme _active;
@@ -15,16 +17,16 @@ public sealed class ThemeRegistry
{ {
_builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase) _builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase)
{ {
{ HellionArctic.Slug, HellionArctic.Build() }, { HellionArctic.Slug, HellionArctic.Build() },
{ HellionSpectrum.Slug, HellionSpectrum.Build() }, { HellionSpectrum.Slug, HellionSpectrum.Build() },
{ Chat2Classic.Slug, Chat2Classic.Build() }, { Chat2Classic.Slug, Chat2Classic.Build() },
{ EventHorizon.Slug, EventHorizon.Build() }, { EventHorizon.Slug, EventHorizon.Build() },
{ MoonlitBloom.Slug, MoonlitBloom.Build() }, { MoonlitBloom.Slug, MoonlitBloom.Build() },
{ NightBlue.Slug, NightBlue.Build() }, { NightBlue.Slug, NightBlue.Build() },
{ IndigoViolet.Slug, IndigoViolet.Build() }, { IndigoViolet.Slug, IndigoViolet.Build() },
{ ForgeMerchantman.Slug, ForgeMerchantman.Build() }, { ForgeMerchantman.Slug, ForgeMerchantman.Build() },
{ MintGrove.Slug, MintGrove.Build() }, { MintGrove.Slug, MintGrove.Build() },
{ SynthwaveSunset.Slug, SynthwaveSunset.Build() }, { SynthwaveSunset.Slug, SynthwaveSunset.Build() },
}; };
// Centralised so the ten .Build() factories stay free of cache plumbing. // Centralised so the ten .Build() factories stay free of cache plumbing.
@@ -39,10 +41,12 @@ public sealed class ThemeRegistry
public Theme Get(string slug) public Theme Get(string slug)
{ {
if (_builtIns.TryGetValue(slug, out var b)) return b; if (_builtIns.TryGetValue(slug, out var b))
return b;
var custom = LoadCustomBySlug(slug); var custom = LoadCustomBySlug(slug);
if (custom != null) return custom; if (custom != null)
return custom;
return _builtIns[DefaultSlug]; return _builtIns[DefaultSlug];
} }
@@ -75,8 +79,10 @@ public sealed class ThemeRegistry
// neu eingelesen. // neu eingelesen.
private Theme? LoadCustomBySlug(string slug) private Theme? LoadCustomBySlug(string slug)
{ {
if (_customThemesDir is null) return null; if (_customThemesDir is null)
if (!Directory.Exists(_customThemesDir)) return null; return null;
if (!Directory.Exists(_customThemesDir))
return null;
foreach (var theme in RefreshCustomCache()) foreach (var theme in RefreshCustomCache())
if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase)) if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
@@ -111,7 +117,9 @@ public sealed class ThemeRegistry
{ {
// Editor mid-save: keep the cached snapshot, leave the stamp // Editor mid-save: keep the cached snapshot, leave the stamp
// alone so the next refresh retries automatically. // alone so the next refresh retries automatically.
Plugin.Log.Debug($"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"); Plugin.Log.Debug(
$"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
);
if (cached.Theme is not null) if (cached.Theme is not null)
theme = cached.Theme; theme = cached.Theme;
} }
+49 -38
View File
@@ -1,10 +1,10 @@
using System; using System;
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
using HellionChat._Helpers; using HellionChat._Helpers;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -36,9 +36,7 @@ public sealed class ChatInputBar
public bool IsFocused { get; private set; } public bool IsFocused { get; private set; }
// Stub. v0.6.0 belässt den Hauptfenster-Input wie er ist. // Stub. v0.6.0 belässt den Hauptfenster-Input wie er ist.
public void Render() public void Render() { }
{
}
// Compact rendering for pop-out windows. // Compact rendering for pop-out windows.
// //
@@ -79,12 +77,20 @@ public sealed class ChatInputBar
// window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue // window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue
// (matching v0.5.x ChatLogWindow.cs behavior). // (matching v0.5.x ChatLogWindow.cs behavior).
const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory; const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory;
ImGui.InputText($"##chat-compact-input-{tab.Identifier}", ref _state.Buffer, 500, flags, CompactCallback); ImGui.InputText(
$"##chat-compact-input-{tab.Identifier}",
ref _state.Buffer,
500,
flags,
CompactCallback
);
IsFocused = ImGui.IsItemActive(); IsFocused = ImGui.IsItemActive();
if (ImGui.IsItemDeactivated() if (
&& (ImGui.IsKeyDown(ImGuiKey.Enter) || ImGui.IsKeyDown(ImGuiKey.KeypadEnter))) ImGui.IsItemDeactivated()
&& (ImGui.IsKeyDown(ImGuiKey.Enter) || ImGui.IsKeyDown(ImGuiKey.KeypadEnter))
)
{ {
SubmitCompact(tab); SubmitCompact(tab);
} }
@@ -118,7 +124,8 @@ public sealed class ChatInputBar
_state.Buffer, _state.Buffer,
() => InputHistoryService.Count, () => InputHistoryService.Count,
InputHistoryService.Push, InputHistoryService.Push,
InputHistoryService.GetByCursor); InputHistoryService.GetByCursor
);
_state.HistoryCursor = cursor; _state.HistoryCursor = cursor;
if (replacement is null) if (replacement is null)
@@ -156,7 +163,10 @@ public sealed class ChatInputBar
// Single-letter glyph derived from the channel — quick visual cue // Single-letter glyph derived from the channel — quick visual cue
// until we have a proper icon font available in the compact bar. // until we have a proper icon font available in the compact bar.
var label = ChannelGlyph(inputType); var label = ChannelGlyph(inputType);
if (ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize)) && tab.Channel is null) if (
ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize))
&& tab.Channel is null
)
ImGui.OpenPopup(popupId); ImGui.OpenPopup(popupId);
} }
@@ -181,34 +191,35 @@ public sealed class ChatInputBar
} }
} }
private static string ChannelGlyph(ChatType type) => type switch private static string ChannelGlyph(ChatType type) =>
{ type switch
ChatType.Say => "S", {
ChatType.Yell => "Y", ChatType.Say => "S",
ChatType.Shout => "!", ChatType.Yell => "Y",
ChatType.TellIncoming or ChatType.TellOutgoing => "T", ChatType.Shout => "!",
ChatType.Party or ChatType.CrossParty => "P", ChatType.TellIncoming or ChatType.TellOutgoing => "T",
ChatType.Alliance => "A", ChatType.Party or ChatType.CrossParty => "P",
ChatType.FreeCompany => "F", ChatType.Alliance => "A",
ChatType.NoviceNetwork => "N", ChatType.FreeCompany => "F",
ChatType.Linkshell1 => "1", ChatType.NoviceNetwork => "N",
ChatType.Linkshell2 => "2", ChatType.Linkshell1 => "1",
ChatType.Linkshell3 => "3", ChatType.Linkshell2 => "2",
ChatType.Linkshell4 => "4", ChatType.Linkshell3 => "3",
ChatType.Linkshell5 => "5", ChatType.Linkshell4 => "4",
ChatType.Linkshell6 => "6", ChatType.Linkshell5 => "5",
ChatType.Linkshell7 => "7", ChatType.Linkshell6 => "6",
ChatType.Linkshell8 => "8", ChatType.Linkshell7 => "7",
ChatType.CrossLinkshell1 => "", ChatType.Linkshell8 => "8",
ChatType.CrossLinkshell2 => "", ChatType.CrossLinkshell1 => "",
ChatType.CrossLinkshell3 => "", ChatType.CrossLinkshell2 => "",
ChatType.CrossLinkshell4 => "", ChatType.CrossLinkshell3 => "",
ChatType.CrossLinkshell5 => "", ChatType.CrossLinkshell4 => "",
ChatType.CrossLinkshell6 => "", ChatType.CrossLinkshell5 => "",
ChatType.CrossLinkshell7 => "", ChatType.CrossLinkshell6 => "",
ChatType.CrossLinkshell8 => "", ChatType.CrossLinkshell7 => "",
_ => "?", ChatType.CrossLinkshell8 => "",
}; _ => "?",
};
// Forwards a tab-cycle keybind delta to the host so all windows // Forwards a tab-cycle keybind delta to the host so all windows
// navigate the same active-tab pointer (single source of truth). // navigate the same active-tab pointer (single source of truth).
File diff suppressed because it is too large Load Diff
+21 -9
View File
@@ -1,23 +1,30 @@
using System.Numerics; using System.Numerics;
using HellionChat.Util; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui; using HellionChat.Util;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace HellionChat.Ui; namespace HellionChat.Ui;
public class CommandHelpWindow : Window { public class CommandHelpWindow : Window
{
private ChatLogWindow LogWindow { get; } private ChatLogWindow LogWindow { get; }
private ReadOnlySeString? CommandDescription { get; set; } private ReadOnlySeString? CommandDescription { get; set; }
internal CommandHelpWindow(ChatLogWindow logWindow) : base("command help##chat2-commandhelp") internal CommandHelpWindow(ChatLogWindow logWindow)
: base("command help##chat2-commandhelp")
{ {
LogWindow = logWindow; LogWindow = logWindow;
Flags = ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoMove | Flags =
ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.AlwaysAutoResize; ImGuiWindowFlags.NoSavedSettings
| ImGuiWindowFlags.NoTitleBar
| ImGuiWindowFlags.NoMove
| ImGuiWindowFlags.NoResize
| ImGuiWindowFlags.NoFocusOnAppearing
| ImGuiWindowFlags.AlwaysAutoResize;
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
@@ -31,7 +38,8 @@ public class CommandHelpWindow : Window {
var width = 350; var width = 350;
var scaledWidth = width * ImGuiHelpers.GlobalScale; var scaledWidth = width * ImGuiHelpers.GlobalScale;
var pos = LogWindow.LastWindowPos; var pos = LogWindow.LastWindowPos;
switch (Plugin.Config.CommandHelpSide) { switch (Plugin.Config.CommandHelpSide)
{
case CommandHelpSide.Right: case CommandHelpSide.Right:
pos.X += LogWindow.LastWindowSize.X; pos.X += LogWindow.LastWindowSize.X;
break; break;
@@ -51,7 +59,7 @@ public class CommandHelpWindow : Window {
// coordinate space as Position above; otherwise the help window // coordinate space as Position above; otherwise the help window
// ends up the wrong width at non-100% DPI. // ends up the wrong width at non-100% DPI.
MinimumSize = new Vector2(scaledWidth, 0), MinimumSize = new Vector2(scaledWidth, 0),
MaximumSize = LogWindow.LastWindowSize with { X = scaledWidth } MaximumSize = LogWindow.LastWindowSize with { X = scaledWidth },
}; };
IsOpen = true; IsOpen = true;
@@ -62,6 +70,10 @@ public class CommandHelpWindow : Window {
if (CommandDescription == null) if (CommandDescription == null)
return; return;
LogWindow.DrawChunks(ChunkUtil.ToChunks(CommandDescription.Value.ToDalamudString(), ChunkSource.None, null).ToList()); LogWindow.DrawChunks(
ChunkUtil
.ToChunks(CommandDescription.Value.ToDalamudString(), ChunkSource.None, null)
.ToList()
);
} }
} }
+192 -51
View File
@@ -2,18 +2,18 @@
using System.Globalization; using System.Globalization;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources; using Dalamud.Game.Text.SeStringHandling.Payloads;
using HellionChat.Util;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Components;
using Dalamud.Interface.ImGuiNotification;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using Dalamud.Game.Text.SeStringHandling.Payloads; using HellionChat.Resources;
using Dalamud.Interface.Components; using HellionChat.Util;
using Dalamud.Interface.ImGuiNotification;
using Lumina.Data.Files; using Lumina.Data.Files;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using MoreLinq; using MoreLinq;
@@ -47,8 +47,8 @@ public class DbViewer : Window
private readonly string DateTimeFormat; private readonly string DateTimeFormat;
private long Count; private long Count;
private Message[] Messages = []; // Messages are only touched while processing is false private Message[] Messages = []; // Messages are only touched while processing is false
private ConcurrentStack<Message> Filtered = []; // Is used every frame, so ConcurrentStack for safety private ConcurrentStack<Message> Filtered = []; // Is used every frame, so ConcurrentStack for safety
private bool IsExporting; private bool IsExporting;
private string InputPath = string.Empty; private string InputPath = string.Empty;
@@ -56,7 +56,8 @@ public class DbViewer : Window
private bool NeedsScrollReset; private bool NeedsScrollReset;
public DbViewer(Plugin plugin) : base("DBViewer###chat2-dbviewer") public DbViewer(Plugin plugin)
: base("DBViewer###chat2-dbviewer")
{ {
Plugin = plugin; Plugin = plugin;
SelectedChannels = TabsUtil.MostlyPlayer; SelectedChannels = TabsUtil.MostlyPlayer;
@@ -64,24 +65,42 @@ public class DbViewer : Window
DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern; DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
DateTimeFormat = "ddd, dd MMM yyy HH:mm:ss"; DateTimeFormat = "ddd, dd MMM yyy HH:mm:ss";
LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count); LastProcessed = (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
);
DateReset(); DateReset();
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute += Toggle; Plugin
.Commands.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
)
.Execute += Toggle;
} }
public void Dispose() public void Dispose()
{ {
Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute -= Toggle; Plugin
.Commands.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
)
.Execute -= Toggle;
} }
private void Toggle(string _, string __) => Toggle(); private void Toggle(string _, string __) => Toggle();
@@ -102,8 +121,21 @@ public class DbViewer : Window
ImGui.SameLine(); ImGui.SameLine();
var spacing = 3.0f * ImGuiHelpers.GlobalScale; var spacing = 3.0f * ImGuiHelpers.GlobalScale;
DateWidget.DatePickerWithInput("##FromDate", 1, ref MinDateString, ref AfterDate, DateFormat); DateWidget.DatePickerWithInput(
DateWidget.DatePickerWithInput("##ToDate", 2, ref MaxDateString, ref BeforeDate, DateFormat, true); "##FromDate",
1,
ref MinDateString,
ref AfterDate,
DateFormat
);
DateWidget.DatePickerWithInput(
"##ToDate",
2,
ref MaxDateString,
ref BeforeDate,
DateFormat,
true
);
ImGui.SameLine(0, spacing); ImGui.SameLine(0, spacing);
@@ -118,7 +150,11 @@ public class DbViewer : Window
ChannelSelection(); ChannelSelection();
var skipText = Language.DbViewer_CharacterOption; var skipText = Language.DbViewer_CharacterOption;
var textLength = ImGui.GetTextLineHeight() + ImGui.CalcTextSize(skipText).X + ImGui.GetStyle().ItemInnerSpacing.X + ImGui.GetStyle().FramePadding.X * 2; var textLength =
ImGui.GetTextLineHeight()
+ ImGui.CalcTextSize(skipText).X
+ ImGui.GetStyle().ItemInnerSpacing.X
+ ImGui.GetStyle().FramePadding.X * 2;
ImGui.SameLine(ImGui.GetContentRegionMax().X - textLength); ImGui.SameLine(ImGui.GetContentRegionMax().X - textLength);
ImGui.Checkbox(skipText, ref OnlyCurrentCharacter); ImGui.Checkbox(skipText, ref OnlyCurrentCharacter);
@@ -139,7 +175,16 @@ public class DbViewer : Window
using (var innerPopup = ImRaii.Popup("InputPathDialog")) using (var innerPopup = ImRaii.Popup("InputPathDialog"))
{ {
if (innerPopup.Success) if (innerPopup.Success)
Plugin.FileDialogManager.OpenFolderDialog(Language.Folder_Selection_Header, (b, s) => { if (b) InputPath = s; }, null, true); Plugin.FileDialogManager.OpenFolderDialog(
Language.Folder_Selection_Header,
(b, s) =>
{
if (b)
InputPath = s;
},
null,
true
);
} }
ImGui.SameLine(0, spacing); ImGui.SameLine(0, spacing);
@@ -157,7 +202,8 @@ public class DbViewer : Window
UserDismissable = false, UserDismissable = false,
InitialDuration = TimeSpan.FromSeconds(10000), InitialDuration = TimeSpan.FromSeconds(10000),
Progress = 0.0f, Progress = 0.0f,
}); }
);
CreateTxtBackup(); CreateTxtBackup();
} }
} }
@@ -176,12 +222,34 @@ public class DbViewer : Window
var loadingIndicator = IsProcessing && ProcessingStart < Environment.TickCount64; var loadingIndicator = IsProcessing && ProcessingStart < Environment.TickCount64;
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(string.Format(Language.DbViewer_Page, CurrentPage, totalPages, Count, loadingIndicator ? Language.DbViewer_LoadingIndicator : "")); ImGui.TextUnformatted(
ImGuiUtil.DrawArrows(ref CurrentPage, 1, totalPages, spacing, tooltipLeft: Language.Page_ArrowLeft_Tooltip, tooltipRight: Language.Page_ArrowRight_Tooltip); string.Format(
Language.DbViewer_Page,
CurrentPage,
totalPages,
Count,
loadingIndicator ? Language.DbViewer_LoadingIndicator : ""
)
);
ImGuiUtil.DrawArrows(
ref CurrentPage,
1,
totalPages,
spacing,
tooltipLeft: Language.Page_ArrowLeft_Tooltip,
tooltipRight: Language.Page_ArrowRight_Tooltip
);
ImGui.SameLine(ImGui.GetContentRegionMax().X - width); ImGui.SameLine(ImGui.GetContentRegionMax().X - width);
ImGui.SetNextItemWidth(width); ImGui.SetNextItemWidth(width);
if (ImGui.InputTextWithHint("##searchbar", Language.DbViewer_SearcHint, ref SimpleSearchTerm, 30)) if (
ImGui.InputTextWithHint(
"##searchbar",
Language.DbViewer_SearcHint,
ref SimpleSearchTerm,
30
)
)
Filtered = Filter(Messages); Filtered = Filter(Messages);
// Third row // Third row
@@ -189,7 +257,17 @@ public class DbViewer : Window
if (DateWidget.Validate(MinimalDate, ref AfterDate, ref BeforeDate)) if (DateWidget.Validate(MinimalDate, ref AfterDate, ref BeforeDate))
DateRefresh(); DateRefresh();
if (!IsProcessing && LastProcessed != (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count)) if (
!IsProcessing
&& LastProcessed
!= (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
)
)
{ {
// Page hasn't changed, so we reset it back to 1 // Page hasn't changed, so we reset it back to 1
if (LastProcessed.Page == CurrentPage) if (LastProcessed.Page == CurrentPage)
@@ -198,19 +276,37 @@ public class DbViewer : Window
AdjustDates(); AdjustDates();
IsProcessing = true; IsProcessing = true;
ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second
LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count); LastProcessed = (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
);
Task.Run(() => Task.Run(() =>
{ {
try try
{ {
ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null; ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null;
var channels = SelectedChannels.Select(pair => (byte) pair.Key).ToArray(); var channels = SelectedChannels.Select(pair => (byte)pair.Key).ToArray();
// We only want to fetch count if this is the first page // We only want to fetch count if this is the first page
if (CurrentPage == 1) if (CurrentPage == 1)
Count = Plugin.MessageManager.Store.CountDateRange(AfterDate, BeforeDate, channels, character); Count = Plugin.MessageManager.Store.CountDateRange(
AfterDate,
BeforeDate,
channels,
character
);
using var rangeMessageEnumerator = Plugin.MessageManager.Store.GetPagedDateRange(AfterDate, BeforeDate, channels, character, CurrentPage - 1); using var rangeMessageEnumerator =
Plugin.MessageManager.Store.GetPagedDateRange(
AfterDate,
BeforeDate,
channels,
character,
CurrentPage - 1
);
Messages = rangeMessageEnumerator.ToArray(); Messages = rangeMessageEnumerator.ToArray();
Filtered = Filter(Messages); Filtered = Filter(Messages);
@@ -231,7 +327,11 @@ public class DbViewer : Window
if (Filtered.IsEmpty) if (Filtered.IsEmpty)
{ {
ImGui.TextUnformatted(SimpleSearchTerm == "" ? Language.DbViewer_Status_NothingFound : Language.DbViewer_Status_NoSearchResult); ImGui.TextUnformatted(
SimpleSearchTerm == ""
? Language.DbViewer_Status_NothingFound
: Language.DbViewer_Status_NoSearchResult
);
return; return;
} }
@@ -245,13 +345,24 @@ public class DbViewer : Window
ImGui.SetScrollY(0.0f); ImGui.SetScrollY(0.0f);
} }
using var table = ImRaii.Table("##messageHistory", 4, ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.Resizable); using var table = ImRaii.Table(
"##messageHistory",
4,
ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.Resizable
);
if (!table.Success) if (!table.Success)
return; return;
var columnWidth = ImGui.CalcTextSize(Language.DbViewer_TableField_Type); var columnWidth = ImGui.CalcTextSize(Language.DbViewer_TableField_Type);
ImGui.TableSetupColumn(Language.DbViewer_TableField_Date, ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize); ImGui.TableSetupColumn(
ImGui.TableSetupColumn(Language.DbViewer_TableField_Type, ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize, columnWidth.X); Language.DbViewer_TableField_Date,
ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize
);
ImGui.TableSetupColumn(
Language.DbViewer_TableField_Type,
ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize,
columnWidth.X
);
ImGui.TableSetupColumn(Language.DbViewer_TableField_Sender); ImGui.TableSetupColumn(Language.DbViewer_TableField_Sender);
ImGui.TableSetupColumn(Language.DbViewer_TableField_Content); ImGui.TableSetupColumn(Language.DbViewer_TableField_Content);
@@ -349,10 +460,18 @@ public class DbViewer : Window
return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date)); return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date));
return new ConcurrentStack<Message>( return new ConcurrentStack<Message>(
messages.Reverse().Where(m => messages
ChunkUtil.ToRawString(m.Sender).Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase) || .Reverse()
ChunkUtil.ToRawString(m.Content).Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase) .Where(m =>
).OrderByDescending(m => m.Date)); ChunkUtil
.ToRawString(m.Sender)
.Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
|| ChunkUtil
.ToRawString(m.Content)
.Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
)
.OrderByDescending(m => m.Date)
);
} }
private void DateRefresh() private void DateRefresh()
@@ -386,7 +505,12 @@ public class DbViewer : Window
ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null; ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null;
var channels = SelectedChannels.Select(pair => (byte)pair.Key).ToArray(); var channels = SelectedChannels.Select(pair => (byte)pair.Key).ToArray();
var rangeMessageEnumerator = Plugin.MessageManager.Store.GetDateRange(AfterDate, BeforeDate, channels, character); var rangeMessageEnumerator = Plugin.MessageManager.Store.GetDateRange(
AfterDate,
BeforeDate,
channels,
character
);
var messageHistory = rangeMessageEnumerator.ToArray(); var messageHistory = rangeMessageEnumerator.ToArray();
await rangeMessageEnumerator.DisposeAsync(); await rangeMessageEnumerator.DisposeAsync();
@@ -397,28 +521,46 @@ public class DbViewer : Window
var totalCount = filteredHistory.Count; var totalCount = filteredHistory.Count;
var sb = new StringBuilder(); var sb = new StringBuilder();
await using var stream = new StreamWriter(Path.Join(InputPath, $"Chat2_{DateTime.Now:yyyy_dd_M__HH_mm_ss}.txt")); await using var stream = new StreamWriter(
Path.Join(InputPath, $"Chat2_{DateTime.Now:yyyy_dd_M__HH_mm_ss}.txt")
);
var batch = 0; var batch = 0;
foreach (var messages in filteredHistory.Batch(5000)) foreach (var messages in filteredHistory.Batch(5000))
{ {
await Plugin.Framework.RunOnTick(() => await Plugin.Framework.RunOnTick(
{ () =>
foreach (var message in messages)
{ {
if (!Sheets.LogKindSheet.TryGetRow((uint)message.Code.Type, out var logKind)) foreach (var message in messages)
logKind = Sheets.LogKindSheet.GetRow(10); // default to say {
if (
!Sheets.LogKindSheet.TryGetRow(
(uint)message.Code.Type,
out var logKind
)
)
logKind = Sheets.LogKindSheet.GetRow(10); // default to say
var rossSender = new ReadOnlySeString(message.SenderSource.Encode()); var rossSender = new ReadOnlySeString(
var rossMessage = new ReadOnlySeString(message.ContentSource.Encode()); message.SenderSource.Encode()
);
var rossMessage = new ReadOnlySeString(
message.ContentSource.Encode()
);
var timestamp = message.Date.ToLocalTime().ToString(DateTimeFormat); var timestamp = message.Date.ToLocalTime().ToString(DateTimeFormat);
var text = Plugin.Evaluator.Evaluate(logKind.Format, [rossSender, rossMessage]).ToString(); var text = Plugin
sb.AppendLine($"[{timestamp}][{message.Code.Type.Name()}] {text}"); .Evaluator.Evaluate(logKind.Format, [rossSender, rossMessage])
.ToString();
sb.AppendLine(
$"[{timestamp}][{message.Code.Type.Name()}] {text}"
);
batch++; batch++;
} }
}, delayTicks: 5); },
delayTicks: 5
);
Notification.Progress = (float)batch / totalCount; Notification.Progress = (float)batch / totalCount;
Notification.Content = $"Exported {batch} of {totalCount} messages"; Notification.Content = $"Exported {batch} of {totalCount} messages";
@@ -447,5 +589,4 @@ public class DbViewer : Window
} }
}); });
} }
} }
+27 -12
View File
@@ -1,10 +1,10 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -14,7 +14,8 @@ public class DebuggerWindow : Window, IDisposable
private readonly Plugin Plugin; private readonly Plugin Plugin;
private readonly ChatLogWindow ChatLogWindow; private readonly ChatLogWindow ChatLogWindow;
public DebuggerWindow(Plugin plugin) : base("Debugger###chat2-debugger") public DebuggerWindow(Plugin plugin)
: base("Debugger###chat2-debugger")
{ {
Plugin = plugin; Plugin = plugin;
ChatLogWindow = plugin.ChatLogWindow; ChatLogWindow = plugin.ChatLogWindow;
@@ -22,7 +23,7 @@ public class DebuggerWindow : Window, IDisposable
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
@@ -40,7 +41,7 @@ public class DebuggerWindow : Window, IDisposable
public override unsafe void Draw() public override unsafe void Draw()
{ {
var agent = (nint) AgentItemDetail.Instance(); var agent = (nint)AgentItemDetail.Instance();
ImGui.TextUnformatted($"Current Cursor Pos: {ChatLogWindow.CursorPos}"); ImGui.TextUnformatted($"Current Cursor Pos: {ChatLogWindow.CursorPos}");
if (ImGui.Selectable($"Agent Address: {agent:X}")) if (ImGui.Selectable($"Agent Address: {agent:X}"))
ImGui.SetClipboardText(agent.ToString("X")); ImGui.SetClipboardText(agent.ToString("X"));
@@ -50,23 +51,37 @@ public class DebuggerWindow : Window, IDisposable
ImGui.TextUnformatted($"Handle Tooltips: {ChatLogWindow.PayloadHandler.HandleTooltips}"); ImGui.TextUnformatted($"Handle Tooltips: {ChatLogWindow.PayloadHandler.HandleTooltips}");
ImGui.TextUnformatted($"Hovered Item: {ChatLogWindow.PayloadHandler.HoveredItem}"); ImGui.TextUnformatted($"Hovered Item: {ChatLogWindow.PayloadHandler.HoveredItem}");
ImGui.TextUnformatted($"Hover Counter: {ChatLogWindow.PayloadHandler.HoverCounter}"); ImGui.TextUnformatted($"Hover Counter: {ChatLogWindow.PayloadHandler.HoverCounter}");
ImGui.TextUnformatted($"Last Hover Counter: {ChatLogWindow.PayloadHandler.LastHoverCounter}"); ImGui.TextUnformatted(
$"Last Hover Counter: {ChatLogWindow.PayloadHandler.LastHoverCounter}"
);
ImGuiHelpers.ScaledDummy(5.0f); ImGuiHelpers.ScaledDummy(5.0f);
ImGui.TextColored(ImGuiColors.DalamudOrange, "Current Tab"); ImGui.TextColored(ImGuiColors.DalamudOrange, "Current Tab");
ImGui.TextUnformatted($"Name: {Plugin.CurrentTab.Name}"); ImGui.TextUnformatted($"Name: {Plugin.CurrentTab.Name}");
ImGui.TextUnformatted($"Channel: {Plugin.CurrentTab.CurrentChannel.Channel.ToChatType().Name()}"); ImGui.TextUnformatted(
ImGui.TextUnformatted($"Tell Target: {Plugin.CurrentTab.CurrentChannel.TellTarget?.ToTargetString() ?? "Null"}"); $"Channel: {Plugin.CurrentTab.CurrentChannel.Channel.ToChatType().Name()}"
);
ImGui.TextUnformatted(
$"Tell Target: {Plugin.CurrentTab.CurrentChannel.TellTarget?.ToTargetString() ?? "Null"}"
);
ImGui.TextUnformatted($"Use Temp? {Plugin.CurrentTab.CurrentChannel.UseTempChannel}"); ImGui.TextUnformatted($"Use Temp? {Plugin.CurrentTab.CurrentChannel.UseTempChannel}");
ImGui.TextUnformatted($"Temp Channel: {Plugin.CurrentTab.CurrentChannel.TempChannel.ToChatType().Name()}"); ImGui.TextUnformatted(
ImGui.TextUnformatted($"Temp Tell Target: {Plugin.CurrentTab.CurrentChannel.TempTellTarget?.ToTargetString() ?? "Null"}"); $"Temp Channel: {Plugin.CurrentTab.CurrentChannel.TempChannel.ToChatType().Name()}"
);
ImGui.TextUnformatted(
$"Temp Tell Target: {Plugin.CurrentTab.CurrentChannel.TempTellTarget?.ToTargetString() ?? "Null"}"
);
ImGui.TextUnformatted($"Name Set? {Plugin.CurrentTab.CurrentChannel.Name.Count > 0}"); ImGui.TextUnformatted($"Name Set? {Plugin.CurrentTab.CurrentChannel.Name.Count > 0}");
ImGui.TextUnformatted($"Name {string.Join(" ", Plugin.CurrentTab.CurrentChannel.Name.Select(c => c.StringValue()))}"); ImGui.TextUnformatted(
$"Name {string.Join(" ", Plugin.CurrentTab.CurrentChannel.Name.Select(c => c.StringValue()))}"
);
ImGuiHelpers.ScaledDummy(5.0f); ImGuiHelpers.ScaledDummy(5.0f);
ImGui.TextColored(ImGuiColors.DalamudOrange, "Vanilla Chat"); ImGui.TextColored(ImGuiColors.DalamudOrange, "Vanilla Chat");
ImGui.TextUnformatted($"Channel: {new ReadOnlySeString(AgentChatLog.Instance()->ChannelLabel).ExtractText()}"); ImGui.TextUnformatted(
$"Channel: {new ReadOnlySeString(AgentChatLog.Instance()->ChannelLabel).ExtractText()}"
);
} }
} }
+39 -15
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Privacy; using HellionChat.Privacy;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -13,7 +13,8 @@ public sealed class FirstRunWizard : Window
{ {
private readonly Plugin Plugin; private readonly Plugin Plugin;
internal FirstRunWizard(Plugin plugin) : base($"{HellionStrings.Wizard_Title}###hellion-firstrun") internal FirstRunWizard(Plugin plugin)
: base($"{HellionStrings.Wizard_Title}###hellion-firstrun")
{ {
Plugin = plugin; Plugin = plugin;
@@ -50,33 +51,54 @@ public sealed class FirstRunWizard : Window
var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f; var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f;
var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing(); var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing();
DrawCard("privacy-first", cardWidth, cardHeight, DrawCard(
"privacy-first",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_PrivacyFirst_Heading, HellionStrings.Wizard_Profile_PrivacyFirst_Heading,
HellionStrings.Wizard_Profile_PrivacyFirst_Description, HellionStrings.Wizard_Profile_PrivacyFirst_Description,
null, null,
HellionStrings.Wizard_Profile_PrivacyFirst_Apply, HellionStrings.Wizard_Profile_PrivacyFirst_Apply,
ApplyPrivacyFirst); ApplyPrivacyFirst
);
ImGui.SameLine(); ImGui.SameLine();
DrawCard("casual", cardWidth, cardHeight, DrawCard(
"casual",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_Casual_Heading, HellionStrings.Wizard_Profile_Casual_Heading,
HellionStrings.Wizard_Profile_Casual_Description, HellionStrings.Wizard_Profile_Casual_Description,
null, null,
HellionStrings.Wizard_Profile_Casual_Apply, HellionStrings.Wizard_Profile_Casual_Apply,
ApplyCasual); ApplyCasual
);
ImGui.SameLine(); ImGui.SameLine();
DrawCard("full-history", cardWidth, cardHeight, DrawCard(
"full-history",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_FullHistory_Heading, HellionStrings.Wizard_Profile_FullHistory_Heading,
HellionStrings.Wizard_Profile_FullHistory_Description, HellionStrings.Wizard_Profile_FullHistory_Description,
HellionStrings.Wizard_Profile_FullHistory_GdprWarning, HellionStrings.Wizard_Profile_FullHistory_GdprWarning,
HellionStrings.Wizard_Profile_FullHistory_Apply, HellionStrings.Wizard_Profile_FullHistory_Apply,
ApplyFullHistory); ApplyFullHistory
);
} }
private void DrawCard(string id, float width, float height, string heading, string description, string? warning, string buttonLabel, Action onApply) private void DrawCard(
string id,
float width,
float height,
string heading,
string description,
string? warning,
string buttonLabel,
Action onApply
)
{ {
using var child = ImRaii.Child($"##wizard-card-{id}", new Vector2(width, height), true); using var child = ImRaii.Child($"##wizard-card-{id}", new Vector2(width, height), true);
if (!child.Success) if (!child.Success)
@@ -113,19 +135,21 @@ public sealed class FirstRunWizard : Window
private void ApplyPrivacyFirst() private void ApplyPrivacyFirst()
{ {
Plugin.Config.PrivacyFilterEnabled = true; Plugin.Config.PrivacyFilterEnabled = true;
Plugin.Config.PrivacyPersistChannels = [..PrivacyDefaults.PrivacyFirstWhitelist]; Plugin.Config.PrivacyPersistChannels = [.. PrivacyDefaults.PrivacyFirstWhitelist];
Plugin.Config.PrivacyPersistUnknownChannels = false; Plugin.Config.PrivacyPersistUnknownChannels = false;
Plugin.Config.RetentionEnabled = true; Plugin.Config.RetentionEnabled = true;
Plugin.Config.RetentionDefaultDays = 30; Plugin.Config.RetentionDefaultDays = 30;
Plugin.Config.RetentionPerChannelDays = Plugin.Config.RetentionPerChannelDays = PrivacyDefaults.DefaultRetentionDays.ToDictionary(
PrivacyDefaults.DefaultRetentionDays.ToDictionary(p => p.Key, p => p.Value); p => p.Key,
p => p.Value
);
} }
private void ApplyCasual() private void ApplyCasual()
{ {
Plugin.Config.PrivacyFilterEnabled = true; Plugin.Config.PrivacyFilterEnabled = true;
Plugin.Config.PrivacyPersistChannels = [..PrivacyDefaults.CasualWhitelist]; Plugin.Config.PrivacyPersistChannels = [.. PrivacyDefaults.CasualWhitelist];
Plugin.Config.PrivacyPersistUnknownChannels = false; Plugin.Config.PrivacyPersistUnknownChannels = false;
Plugin.Config.RetentionEnabled = true; Plugin.Config.RetentionEnabled = true;
+55 -55
View File
@@ -1,7 +1,7 @@
using HellionChat.Themes;
using HellionChat.Util;
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using HellionChat.Themes;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -21,18 +21,18 @@ internal static class HellionStyle
{ {
var a = theme.AbgrCache; var a = theme.AbgrCache;
var stack = new StackHandle(); var stack = new StackHandle();
stack.PushColorAbgr(ImGuiCol.Button, a.Primary); stack.PushColorAbgr(ImGuiCol.Button, a.Primary);
stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight); stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight);
stack.PushColorAbgr(ImGuiCol.ButtonActive, a.PrimaryDark); stack.PushColorAbgr(ImGuiCol.ButtonActive, a.PrimaryDark);
stack.PushColorAbgr(ImGuiCol.FrameBg, a.FrameBg); stack.PushColorAbgr(ImGuiCol.FrameBg, a.FrameBg);
stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover); stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover);
stack.PushColorAbgr(ImGuiCol.FrameBgActive, a.Surface); stack.PushColorAbgr(ImGuiCol.FrameBgActive, a.Surface);
stack.PushColorAbgr(ImGuiCol.Border, a.Border); stack.PushColorAbgr(ImGuiCol.Border, a.Border);
stack.PushColorAbgr(ImGuiCol.Header, a.Surface); stack.PushColorAbgr(ImGuiCol.Header, a.Surface);
stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover); stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover);
stack.PushColorAbgr(ImGuiCol.HeaderActive, a.Identity); stack.PushColorAbgr(ImGuiCol.HeaderActive, a.Identity);
stack.PushColorAbgr(ImGuiCol.CheckMark, a.Primary); stack.PushColorAbgr(ImGuiCol.CheckMark, a.Primary);
stack.PushColorAbgr(ImGuiCol.SliderGrab, a.Primary); stack.PushColorAbgr(ImGuiCol.SliderGrab, a.Primary);
stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.PrimaryLight); stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.PrimaryLight);
return stack; return stack;
} }
@@ -67,71 +67,71 @@ internal static class HellionStyle
var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha; var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;
// Layout // Layout
stack.PushStyleVar(ImGuiStyleVar.WindowRounding, l.WindowRounding); stack.PushStyleVar(ImGuiStyleVar.WindowRounding, l.WindowRounding);
stack.PushStyleVar(ImGuiStyleVar.ChildRounding, l.ChildRounding); stack.PushStyleVar(ImGuiStyleVar.ChildRounding, l.ChildRounding);
stack.PushStyleVar(ImGuiStyleVar.PopupRounding, l.PopupRounding); stack.PushStyleVar(ImGuiStyleVar.PopupRounding, l.PopupRounding);
stack.PushStyleVar(ImGuiStyleVar.FrameRounding, l.FrameRounding); stack.PushStyleVar(ImGuiStyleVar.FrameRounding, l.FrameRounding);
stack.PushStyleVar(ImGuiStyleVar.GrabRounding, l.GrabRounding); stack.PushStyleVar(ImGuiStyleVar.GrabRounding, l.GrabRounding);
stack.PushStyleVar(ImGuiStyleVar.TabRounding, l.TabRounding); stack.PushStyleVar(ImGuiStyleVar.TabRounding, l.TabRounding);
stack.PushStyleVar(ImGuiStyleVar.ScrollbarRounding, l.ScrollbarRounding); stack.PushStyleVar(ImGuiStyleVar.ScrollbarRounding, l.ScrollbarRounding);
stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, l.WindowBorderSize); stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, l.WindowBorderSize);
stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, l.FrameBorderSize); stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, l.FrameBorderSize);
// Surfaces — WindowBg/ChildBg use the per-push opacity-modulated value, // Surfaces — WindowBg/ChildBg use the per-push opacity-modulated value,
// so they go through the RGBA path; everything else reads from cache. // so they go through the RGBA path; everything else reads from cache.
stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha); stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha);
stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha); stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha);
stack.PushColorAbgr(ImGuiCol.PopupBg, a.ChildBg); stack.PushColorAbgr(ImGuiCol.PopupBg, a.ChildBg);
stack.PushColorAbgr(ImGuiCol.Border, a.Border); stack.PushColorAbgr(ImGuiCol.Border, a.Border);
stack.PushColorAbgr(ImGuiCol.BorderShadow, 0u); stack.PushColorAbgr(ImGuiCol.BorderShadow, 0u);
// Frames // Frames
stack.PushColorAbgr(ImGuiCol.FrameBg, a.FrameBg); stack.PushColorAbgr(ImGuiCol.FrameBg, a.FrameBg);
stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover); stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover);
stack.PushColorAbgr(ImGuiCol.FrameBgActive, a.Surface); stack.PushColorAbgr(ImGuiCol.FrameBgActive, a.Surface);
// Title bars // Title bars
stack.PushColorAbgr(ImGuiCol.TitleBg, a.WindowBg); stack.PushColorAbgr(ImGuiCol.TitleBg, a.WindowBg);
stack.PushColorAbgr(ImGuiCol.TitleBgActive, a.Identity); stack.PushColorAbgr(ImGuiCol.TitleBgActive, a.Identity);
stack.PushColorAbgr(ImGuiCol.TitleBgCollapsed, a.WindowBg); stack.PushColorAbgr(ImGuiCol.TitleBgCollapsed, a.WindowBg);
// Buttons // Buttons
stack.PushColorAbgr(ImGuiCol.Button, a.Primary); stack.PushColorAbgr(ImGuiCol.Button, a.Primary);
stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight); stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight);
stack.PushColorAbgr(ImGuiCol.ButtonActive, a.PrimaryDark); stack.PushColorAbgr(ImGuiCol.ButtonActive, a.PrimaryDark);
// Headers / selectables // Headers / selectables
stack.PushColorAbgr(ImGuiCol.Header, a.Surface); stack.PushColorAbgr(ImGuiCol.Header, a.Surface);
stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover); stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover);
stack.PushColorAbgr(ImGuiCol.HeaderActive, a.Identity); stack.PushColorAbgr(ImGuiCol.HeaderActive, a.Identity);
// Tabs // Tabs
stack.PushColorAbgr(ImGuiCol.Tab, a.FrameBg); stack.PushColorAbgr(ImGuiCol.Tab, a.FrameBg);
stack.PushColorAbgr(ImGuiCol.TabHovered, a.PrimaryLight); stack.PushColorAbgr(ImGuiCol.TabHovered, a.PrimaryLight);
stack.PushColorAbgr(ImGuiCol.TabActive, a.Identity); stack.PushColorAbgr(ImGuiCol.TabActive, a.Identity);
stack.PushColorAbgr(ImGuiCol.TabUnfocused, a.ChildBg); stack.PushColorAbgr(ImGuiCol.TabUnfocused, a.ChildBg);
stack.PushColorAbgr(ImGuiCol.TabUnfocusedActive, a.PrimaryDark); stack.PushColorAbgr(ImGuiCol.TabUnfocusedActive, a.PrimaryDark);
// Scrollbar // Scrollbar
stack.PushColorAbgr(ImGuiCol.ScrollbarBg, a.WindowBg); stack.PushColorAbgr(ImGuiCol.ScrollbarBg, a.WindowBg);
stack.PushColorAbgr(ImGuiCol.ScrollbarGrab, a.Surface); stack.PushColorAbgr(ImGuiCol.ScrollbarGrab, a.Surface);
stack.PushColorAbgr(ImGuiCol.ScrollbarGrabHovered, a.AccentLight); stack.PushColorAbgr(ImGuiCol.ScrollbarGrabHovered, a.AccentLight);
stack.PushColorAbgr(ImGuiCol.ScrollbarGrabActive, a.Accent); stack.PushColorAbgr(ImGuiCol.ScrollbarGrabActive, a.Accent);
// Resize grip // Resize grip
stack.PushColorAbgr(ImGuiCol.ResizeGrip, a.FrameBg); stack.PushColorAbgr(ImGuiCol.ResizeGrip, a.FrameBg);
stack.PushColorAbgr(ImGuiCol.ResizeGripHovered, a.AccentLight); stack.PushColorAbgr(ImGuiCol.ResizeGripHovered, a.AccentLight);
stack.PushColorAbgr(ImGuiCol.ResizeGripActive, a.Accent); stack.PushColorAbgr(ImGuiCol.ResizeGripActive, a.Accent);
// Check mark + slider grab // Check mark + slider grab
stack.PushColorAbgr(ImGuiCol.CheckMark, a.Primary); stack.PushColorAbgr(ImGuiCol.CheckMark, a.Primary);
stack.PushColorAbgr(ImGuiCol.SliderGrab, a.Primary); stack.PushColorAbgr(ImGuiCol.SliderGrab, a.Primary);
stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.PrimaryLight); stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.PrimaryLight);
// Separator // Separator
stack.PushColorAbgr(ImGuiCol.Separator, a.Border); stack.PushColorAbgr(ImGuiCol.Separator, a.Border);
stack.PushColorAbgr(ImGuiCol.SeparatorHovered, a.PrimaryLight); stack.PushColorAbgr(ImGuiCol.SeparatorHovered, a.PrimaryLight);
stack.PushColorAbgr(ImGuiCol.SeparatorActive, a.Primary); stack.PushColorAbgr(ImGuiCol.SeparatorActive, a.Primary);
return stack; return stack;
} }
@@ -140,14 +140,14 @@ internal static class HellionStyle
{ {
private readonly List<IDisposable> _items = new(64); private readonly List<IDisposable> _items = new(64);
internal void PushColor(ImGuiCol slot, uint rgba) internal void PushColor(ImGuiCol slot, uint rgba) =>
=> _items.Add(ImRaii.PushColor(slot, ColourUtil.RgbaToAbgr(rgba))); _items.Add(ImRaii.PushColor(slot, ColourUtil.RgbaToAbgr(rgba)));
internal void PushColorAbgr(ImGuiCol slot, uint abgr) internal void PushColorAbgr(ImGuiCol slot, uint abgr) =>
=> _items.Add(ImRaii.PushColor(slot, abgr)); _items.Add(ImRaii.PushColor(slot, abgr));
internal void PushStyleVar(ImGuiStyleVar var, float value) internal void PushStyleVar(ImGuiStyleVar var, float value) =>
=> _items.Add(ImRaii.PushStyle(var, value)); _items.Add(ImRaii.PushStyle(var, value));
public void Dispose() public void Dispose()
{ {
+48 -14
View File
@@ -1,16 +1,16 @@
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -30,12 +30,18 @@ public partial class InputPreview : Window
internal int SelectedCursorPos = -1; internal int SelectedCursorPos = -1;
internal InputPreview(ChatLogWindow logWindow) : base("##chat2-inputpreview") internal InputPreview(ChatLogWindow logWindow)
: base("##chat2-inputpreview")
{ {
LogWindow = logWindow; LogWindow = logWindow;
Flags = ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoMove | Flags =
ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoScrollbar; ImGuiWindowFlags.NoSavedSettings
| ImGuiWindowFlags.NoTitleBar
| ImGuiWindowFlags.NoMove
| ImGuiWindowFlags.NoResize
| ImGuiWindowFlags.NoFocusOnAppearing
| ImGuiWindowFlags.NoScrollbar;
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
@@ -49,7 +55,10 @@ public partial class InputPreview : Window
Plugin.Framework.Update -= UpdateConditionCheck; Plugin.Framework.Update -= UpdateConditionCheck;
} }
private bool ValidDraw => !string.IsNullOrEmpty(LogWindow.Chat) && LogWindow.Chat.Length >= Plugin.Config.PreviewMinimum; private bool ValidDraw =>
!string.IsNullOrEmpty(LogWindow.Chat)
&& LogWindow.Chat.Length >= Plugin.Config.PreviewMinimum;
private void UpdateConditionCheck(IFramework framework) private void UpdateConditionCheck(IFramework framework)
{ {
Drawing = ValidDraw; Drawing = ValidDraw;
@@ -70,7 +79,9 @@ public partial class InputPreview : Window
var bytes = Encoding.UTF8.GetBytes(LogWindow.Chat.Trim()); var bytes = Encoding.UTF8.GetBytes(LogWindow.Chat.Trim());
AutoTranslate.ReplaceWithPayload(ref bytes); AutoTranslate.ReplaceWithPayload(ref bytes);
var chunks = ChunkUtil.ToChunks(SeString.Parse(bytes), ChunkSource.Content, ChatType.Say).ToList(); var chunks = ChunkUtil
.ToChunks(SeString.Parse(bytes), ChunkSource.Content, ChatType.Say)
.ToList();
PreviewMessage = Message.FakeMessage(chunks, new ChatCode(XivChatType.Say, 0, 0)); PreviewMessage = Message.FakeMessage(chunks, new ChatCode(XivChatType.Say, 0, 0));
PreviewMessage.DecodeTextParam(); PreviewMessage.DecodeTextParam();
} }
@@ -79,7 +90,9 @@ public partial class InputPreview : Window
internal bool IsDrawable => ValidDraw && HasEvaluation; internal bool IsDrawable => ValidDraw && HasEvaluation;
private static bool IsWindowMode => Plugin.Config.PreviewPosition is PreviewPosition.Top or PreviewPosition.Bottom; private static bool IsWindowMode =>
Plugin.Config.PreviewPosition is PreviewPosition.Top or PreviewPosition.Bottom;
public override bool DrawConditions() public override bool DrawConditions()
{ {
return IsWindowMode && IsDrawable; return IsWindowMode && IsDrawable;
@@ -96,7 +109,11 @@ public partial class InputPreview : Window
{ {
PreviewPosition.Top => pos.Y - PreviewHeight, PreviewPosition.Top => pos.Y - PreviewHeight,
PreviewPosition.Bottom => pos.Y + size.Y, PreviewPosition.Bottom => pos.Y + size.Y,
_ => throw new ArgumentOutOfRangeException(nameof(Plugin.Config.PreviewPosition), Plugin.Config.PreviewPosition, null) _ => throw new ArgumentOutOfRangeException(
nameof(Plugin.Config.PreviewPosition),
Plugin.Config.PreviewPosition,
null
),
}; };
Position = pos with { Y = y }; Position = pos with { Y = y };
@@ -141,7 +158,12 @@ public partial class InputPreview : Window
} }
} }
private void DrawChunksPreview(IReadOnlyList<Chunk> chunks, PayloadHandler? handler = null, float lineWidth = 0f, int unique = 0) private void DrawChunksPreview(
IReadOnlyList<Chunk> chunks,
PayloadHandler? handler = null,
float lineWidth = 0f,
int unique = 0
)
{ {
CursorPosition = 0; CursorPosition = 0;
@@ -168,7 +190,12 @@ public partial class InputPreview : Window
} }
} }
private void DrawChunkPreview(Chunk chunk, PayloadHandler? handler = null, float lineWidth = 0f, int unique = 0) private void DrawChunkPreview(
Chunk chunk,
PayloadHandler? handler = null,
float lineWidth = 0f,
int unique = 0
)
{ {
if (chunk is IconChunk icon) if (chunk is IconChunk icon)
{ {
@@ -248,7 +275,14 @@ public partial class InputPreview : Window
var letterSize = ImGui.CalcTextSize(letter.ToString()); var letterSize = ImGui.CalcTextSize(letter.ToString());
CursorPosition++; CursorPosition++;
if (ImGui.Selectable($"{letter}##{CursorPosition + unique}", false, ImGuiSelectableFlags.None, letterSize)) if (
ImGui.Selectable(
$"{letter}##{CursorPosition + unique}",
false,
ImGuiSelectableFlags.None,
letterSize
)
)
{ {
SelectedCursorPos = CursorPosition; SelectedCursorPos = CursorPosition;
LogWindow.FocusedPreview = true; LogWindow.FocusedPreview = true;
+34 -10
View File
@@ -1,8 +1,8 @@
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Style; using Dalamud.Interface.Style;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -27,7 +27,8 @@ internal class Popout : Window
// matching pop-out window when an LRU temp tab gets evicted. // matching pop-out window when an LRU temp tab gets evicted.
internal Guid TabIdentifier => Tab.Identifier; internal Guid TabIdentifier => Tab.Identifier;
public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx) : base($"{tab.Name}##popout") public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx)
: base($"{tab.Name}##popout")
{ {
ChatLogWindow = chatLogWindow; ChatLogWindow = chatLogWindow;
Tab = tab; Tab = tab;
@@ -59,7 +60,11 @@ internal class Popout : Window
if (Tab.IndependentHide ? HideStateCheck() : ChatLogWindow.IsHidden) if (Tab.IndependentHide ? HideStateCheck() : ChatLogWindow.IsHidden)
return false; return false;
if (!Plugin.Config.HideWhenInactive || (!Plugin.Config.InactivityHideActiveDuringBattle && Plugin.InBattle) || !Tab.UnhideOnActivity) if (
!Plugin.Config.HideWhenInactive
|| (!Plugin.Config.InactivityHideActiveDuringBattle && Plugin.InBattle)
|| !Tab.UnhideOnActivity
)
{ {
LastActivityTime = FrameTime; LastActivityTime = FrameTime;
return true; return true;
@@ -169,7 +174,13 @@ internal class Popout : Window
var dismiss = false; var dismiss = false;
var openSettings = false; var openSettings = false;
using (var child = ImRaii.Child("##v060-pop-out-hint", new System.Numerics.Vector2(0f, 64f), true)) using (
var child = ImRaii.Child(
"##v060-pop-out-hint",
new System.Numerics.Vector2(0f, 64f),
true
)
)
{ {
if (child) if (child)
{ {
@@ -222,7 +233,7 @@ internal class Popout : Window
Cutscene, Cutscene,
CutsceneOverride, CutsceneOverride,
User, User,
Battle Battle,
} }
private HideState CurrentHideState = HideState.None; private HideState CurrentHideState = HideState.None;
@@ -244,7 +255,11 @@ internal class Popout : Window
} }
// if the chat has no hide state and in a cutscene, set the hide state to cutscene // if the chat has no hide state and in a cutscene, set the hide state to cutscene
if (Tab.HideDuringCutscenes && CurrentHideState == HideState.None && (Plugin.CutsceneActive || Plugin.GposeActive)) if (
Tab.HideDuringCutscenes
&& CurrentHideState == HideState.None
&& (Plugin.CutsceneActive || Plugin.GposeActive)
)
{ {
if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags()) if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
{ {
@@ -254,9 +269,15 @@ internal class Popout : Window
} }
// if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none // if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none
if (CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride && !Plugin.CutsceneActive && !Plugin.GposeActive) if (
CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride
&& !Plugin.CutsceneActive
&& !Plugin.GposeActive
)
{ {
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: {CurrentHideState} → None (cutscene/gpose ended)"); Plugin.Log.Verbose(
$"Popout HideState [{Tab.Name}]: {CurrentHideState} → None (cutscene/gpose ended)"
);
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
} }
@@ -264,7 +285,9 @@ internal class Popout : Window
if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate) if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
{ {
CurrentHideState = HideState.CutsceneOverride; CurrentHideState = HideState.CutsceneOverride;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Cutscene → CutsceneOverride (user activate)"); Plugin.Log.Verbose(
$"Popout HideState [{Tab.Name}]: Cutscene → CutsceneOverride (user activate)"
);
} }
// if the user hid the chat and is now activating chat, reset the hide state // if the user hid the chat and is now activating chat, reset the hide state
@@ -274,6 +297,7 @@ internal class Popout : Window
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User → None (activate)"); Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User → None (activate)");
} }
return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle || (Tab.HideWhenNotLoggedIn && !Plugin.ClientState.IsLoggedIn); return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle
|| (Tab.HideWhenNotLoggedIn && !Plugin.ClientState.IsLoggedIn);
} }
} }
+174 -107
View File
@@ -1,13 +1,13 @@
using System.Globalization; using System.Globalization;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using HellionChat.Util; using Dalamud.Bindings.ImGui;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
using Dalamud.Utility; using Dalamud.Utility;
using HellionChat.Util;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload; using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -16,29 +16,30 @@ public class SeStringDebugger : Window
{ {
private readonly Plugin Plugin; private readonly Plugin Plugin;
public SeStringDebugger(Plugin plugin) : base("SeString Debugger###chat2-sestringdebugger") public SeStringDebugger(Plugin plugin)
: base("SeString Debugger###chat2-sestringdebugger")
{ {
Plugin = plugin; Plugin = plugin;
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
#if DEBUG #if DEBUG
Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute += Toggle; Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute += Toggle;
#endif #endif
} }
public void Dispose() public void Dispose()
{ {
#if DEBUG #if DEBUG
Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute -= Toggle; Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute -= Toggle;
#endif #endif
} }
private void Toggle(string _, string __) => Toggle(); private void Toggle(string _, string __) => Toggle();
@@ -75,99 +76,143 @@ public class SeStringDebugger : Window
{ {
case UIForegroundPayload color: case UIForegroundPayload color:
{ {
RenderMetadataDictionary("Link ForegroundColor", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link ForegroundColor",
{ "Enabled?", color.IsEnabled.ToString() }, new Dictionary<string, string?>
{ "ColorKey", color.IsEnabled ? color.ColorKey.ToString() : "Color Ended" }, {
}); { "Enabled?", color.IsEnabled.ToString() },
{
"ColorKey",
color.IsEnabled ? color.ColorKey.ToString() : "Color Ended"
},
}
);
break; break;
} }
case MapLinkPayload map: case MapLinkPayload map:
{ {
RenderMetadataDictionary("Link MapLinkPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link MapLinkPayload",
{ "Map.RowId", map.Map.RowId.ToString() }, new Dictionary<string, string?>
{ "Map.PlaceName", map.Map.Value.PlaceName.Value.Name.ToString() }, {
{ "Map.PlaceNameRegion", map.Map.Value.PlaceNameRegion.Value.Name.ToString() }, { "Map.RowId", map.Map.RowId.ToString() },
{ "Map.PlaceNameSub", map.Map.Value.PlaceNameSub.Value.Name.ToString() }, { "Map.PlaceName", map.Map.Value.PlaceName.Value.Name.ToString() },
{ "TerritoryType.RowId", map.TerritoryType.RowId.ToString() }, {
{ "RawX", map.RawX.ToString() }, "Map.PlaceNameRegion",
{ "RawY", map.RawY.ToString() }, map.Map.Value.PlaceNameRegion.Value.Name.ToString()
{ "XCoord", map.XCoord.ToString(CultureInfo.InvariantCulture) }, },
{ "YCoord", map.YCoord.ToString(CultureInfo.InvariantCulture) }, {
{ "CoordinateString", map.CoordinateString }, "Map.PlaceNameSub",
{ "DataString", map.DataString }, map.Map.Value.PlaceNameSub.Value.Name.ToString()
}); },
{ "TerritoryType.RowId", map.TerritoryType.RowId.ToString() },
{ "RawX", map.RawX.ToString() },
{ "RawY", map.RawY.ToString() },
{ "XCoord", map.XCoord.ToString(CultureInfo.InvariantCulture) },
{ "YCoord", map.YCoord.ToString(CultureInfo.InvariantCulture) },
{ "CoordinateString", map.CoordinateString },
{ "DataString", map.DataString },
}
);
break; break;
} }
case QuestPayload quest: case QuestPayload quest:
{ {
RenderMetadataDictionary("Link QuestPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link QuestPayload",
{ "Quest.RowId", quest.Quest.RowId.ToString() }, new Dictionary<string, string?>
{ "Quest.Name", quest.Quest.Value.Name.ToString() }, {
}); { "Quest.RowId", quest.Quest.RowId.ToString() },
{ "Quest.Name", quest.Quest.Value.Name.ToString() },
}
);
break; break;
} }
case DalamudLinkPayload link: case DalamudLinkPayload link:
{ {
RenderMetadataDictionary("Link DalamudLinkPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link DalamudLinkPayload",
{ "CommandId", link.CommandId.ToString() }, new Dictionary<string, string?>
{ "Plugin", link.Plugin }, {
}); { "CommandId", link.CommandId.ToString() },
{ "Plugin", link.Plugin },
}
);
break; break;
} }
case DalamudPartyFinderPayload pf: case DalamudPartyFinderPayload pf:
{ {
RenderMetadataDictionary("Link PartyFinderPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link PartyFinderPayload",
{ "ListingId", pf.ListingId.ToString() }, new Dictionary<string, string?>
{ "LinkType", EnumName(pf.LinkType) }, {
}); { "ListingId", pf.ListingId.ToString() },
{ "LinkType", EnumName(pf.LinkType) },
}
);
break; break;
} }
case PlayerPayload player: case PlayerPayload player:
{ {
RenderMetadataDictionary("Link PlayerPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link PlayerPayload",
{ "Displayed", player.DisplayedName }, new Dictionary<string, string?>
{ "Player Name", player.PlayerName }, {
{ "World Name", player.World.Value.Name.ExtractText() }, { "Displayed", player.DisplayedName },
{ "Data", string.Join(" ", player.Encode().Select(b => b.ToString("X2"))) }, { "Player Name", player.PlayerName },
}); { "World Name", player.World.Value.Name.ExtractText() },
{
"Data",
string.Join(" ", player.Encode().Select(b => b.ToString("X2")))
},
}
);
break; break;
} }
case ItemPayload item: case ItemPayload item:
{ {
RenderMetadataDictionary("Link ItemPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link ItemPayload",
{ "ItemId", item.ItemId.ToString() }, new Dictionary<string, string?>
{ "RawItemId", item.RawItemId.ToString() }, {
{ "Kind", EnumName(item.Kind) }, { "ItemId", item.ItemId.ToString() },
{ "IsHQ", item.IsHQ.ToString() }, { "RawItemId", item.RawItemId.ToString() },
{ "Item.Name", item.Kind == ItemKind.EventItem ? Sheets.EventItemSheet.GetRow(item.ItemId).Name.ExtractText() : Sheets.ItemSheet.GetRow(item.ItemId).Name.ExtractText() }, { "Kind", EnumName(item.Kind) },
}); { "IsHQ", item.IsHQ.ToString() },
{
"Item.Name",
item.Kind == ItemKind.EventItem
? Sheets.EventItemSheet.GetRow(item.ItemId).Name.ExtractText()
: Sheets.ItemSheet.GetRow(item.ItemId).Name.ExtractText()
},
}
);
break; break;
} }
case AutoTranslatePayload at: case AutoTranslatePayload at:
{ {
RenderMetadataDictionary("Link AutoTranslatePayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link AutoTranslatePayload",
{ "Text", at.Text }, new Dictionary<string, string?>
{ "Key/Group", $"{at.Key}/{at.Group}" }, {
{ "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) }, { "Text", at.Text },
}); { "Key/Group", $"{at.Key}/{at.Group}" },
{ "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) },
}
);
break; break;
} }
case IconPayload icon: case IconPayload icon:
{ {
var found = IconUtil.GfdFileView.TryGetEntry((uint) icon.Icon, out _); var found = IconUtil.GfdFileView.TryGetEntry((uint)icon.Icon, out _);
RenderMetadataDictionary("Link IconPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link IconPayload",
{ "Found", found.ToString() }, new Dictionary<string, string?>
{ "Icon ID", ((uint) icon.Icon).ToString() }, {
}); { "Found", found.ToString() },
{ "Icon ID", ((uint)icon.Icon).ToString() },
}
);
break; break;
} }
case RawPayload raw: case RawPayload raw:
@@ -175,48 +220,60 @@ public class SeStringDebugger : Window
var colorPayload = ColorPayload.From(raw.Data); var colorPayload = ColorPayload.From(raw.Data);
if (colorPayload != null) if (colorPayload != null)
{ {
RenderMetadataDictionary("Link ColorPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link ColorPayload",
{ "Unshifted", colorPayload.UnshiftedColor.ToString("X8") }, new Dictionary<string, string?>
{ "Color", colorPayload.Color.ToString("X8") }, {
{ "Enabled?", colorPayload.Enabled.ToString() }, { "Unshifted", colorPayload.UnshiftedColor.ToString("X8") },
}); { "Color", colorPayload.Color.ToString("X8") },
{ "Enabled?", colorPayload.Enabled.ToString() },
}
);
} }
else else
{ {
RenderMetadataDictionary("Link RawPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link RawPayload",
{ "Data", string.Join(" ", raw.Data.Select(b => b.ToString("X2"))) }, new Dictionary<string, string?>
{ "Type", EnumName(raw.Type) }, {
}); {
"Data",
string.Join(" ", raw.Data.Select(b => b.ToString("X2")))
},
{ "Type", EnumName(raw.Type) },
}
);
} }
break; break;
} }
case StatusPayload status: case StatusPayload status:
{ {
RenderMetadataDictionary("Link StatusPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link StatusPayload",
{ "Status.RowId", status.Status.RowId.ToString() }, new Dictionary<string, string?>
{ "Status.Name", status.Status.Value.Name.ExtractText() }, {
{ "Status.Icon", status.Status.Value.Icon.ToString() } { "Status.RowId", status.Status.RowId.ToString() },
}); { "Status.Name", status.Status.Value.Name.ExtractText() },
{ "Status.Icon", status.Status.Value.Icon.ToString() },
}
);
break; break;
} }
case Util.PartyFinderPayload pf: case Util.PartyFinderPayload pf:
{ {
RenderMetadataDictionary("Link PartyFinderPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link PartyFinderPayload",
{ "Id", pf.Id.ToString() } new Dictionary<string, string?> { { "Id", pf.Id.ToString() } }
}); );
break; break;
} }
case AchievementPayload achievement: case AchievementPayload achievement:
{ {
RenderMetadataDictionary("Link AchievementPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link AchievementPayload",
{ "Id", achievement.Id.ToString() } new Dictionary<string, string?> { { "Id", achievement.Id.ToString() } }
}); );
break; break;
} }
default: default:
@@ -224,35 +281,45 @@ public class SeStringDebugger : Window
if (payloadData.Length == 0) if (payloadData.Length == 0)
{ {
RenderMetadataDictionary("Empty Payload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Empty Payload",
{ "Type", payload.GetType().Name }, new Dictionary<string, string?> { { "Type", payload.GetType().Name } }
}); );
break; break;
} }
var initialByte = payloadData[0]; var initialByte = payloadData[0];
if (initialByte != 0x02) if (initialByte != 0x02)
{ {
RenderMetadataDictionary("Text Payload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Text Payload",
{ "Content", Encoding.UTF8.GetString(payloadData) }, new Dictionary<string, string?>
}); {
{ "Content", Encoding.UTF8.GetString(payloadData) },
}
);
} }
else else
{ {
var unknown = new RawPayload(payloadData); var unknown = new RawPayload(payloadData);
RenderMetadataDictionary("Link Unknown", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link Unknown",
{ "Unknown", string.Join(" ", unknown.Data.Select(b => b.ToString("X2"))) }, new Dictionary<string, string?>
}); {
{
"Unknown",
string.Join(" ", unknown.Data.Select(b => b.ToString("X2")))
},
}
);
} }
break; break;
} }
} }
} }
private static string? EnumName<T>(T? value) where T : Enum private static string? EnumName<T>(T? value)
where T : Enum
{ {
if (value == null) if (value == null)
{ {
+61 -31
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Ui.SettingsTabs;
using HellionChat.Util;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Ui.SettingsTabs;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -25,7 +25,8 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
private SettingsView View = SettingsView.Overview; private SettingsView View = SettingsView.Overview;
private readonly SettingsOverview Overview; private readonly SettingsOverview Overview;
internal SettingsWindow(Plugin plugin) : base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings") internal SettingsWindow(Plugin plugin)
: base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings")
{ {
Flags = ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse; Flags = ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse;
@@ -33,7 +34,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
Plugin = plugin; Plugin = plugin;
@@ -60,7 +61,9 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
Initialise(); Initialise();
Plugin.Commands.Register("/hellion", "Perform various actions with Hellion Chat.").Execute += Command; Plugin
.Commands.Register("/hellion", "Perform various actions with Hellion Chat.")
.Execute += Command;
Plugin.Interface.UiBuilder.OpenConfigUi += Toggle; Plugin.Interface.UiBuilder.OpenConfigUi += Toggle;
} }
@@ -93,9 +96,11 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster // Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster
// fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe // fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe
// Util/SearchSelector.cs:37). // Util/SearchSelector.cs:37).
if (View == SettingsView.Detail if (
View == SettingsView.Detail
&& ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows) && ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows)
&& ImGui.IsKeyPressed(ImGuiKey.Escape)) && ImGui.IsKeyPressed(ImGuiKey.Escape)
)
{ {
View = SettingsView.Overview; View = SettingsView.Overview;
return; return;
@@ -150,7 +155,12 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// der User in eine andere Section will, geht er zurück zur Overview // der User in eine andere Section will, geht er zurück zur Overview
// (Breadcrumb / ESC). // (Breadcrumb / ESC).
var style = ImGui.GetStyle(); var style = ImGui.GetStyle();
var height = ImGui.GetContentRegionAvail().Y - style.FramePadding.Y * 2 - style.ItemSpacing.Y - style.ItemInnerSpacing.Y * 2 - ImGui.CalcTextSize("A").Y; var height =
ImGui.GetContentRegionAvail().Y
- style.FramePadding.Y * 2
- style.ItemSpacing.Y
- style.ItemInnerSpacing.Y * 2
- ImGui.CalcTextSize("A").Y;
using var child = ImRaii.Child("##chat2-settings-detail", new Vector2(-1, height)); using var child = ImRaii.Child("##chat2-settings-detail", new Vector2(-1, height));
if (child.Success) if (child.Success)
@@ -184,9 +194,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
using (ImRaii.PushColor(ImGuiCol.ButtonActive, ColourUtil.RgbaToAbgr(0xFF4542FF))) using (ImRaii.PushColor(ImGuiCol.ButtonActive, ColourUtil.RgbaToAbgr(0xFF4542FF)))
using (ImRaii.PushColor(ImGuiCol.Text, 0xFFFFFFFF)) using (ImRaii.PushColor(ImGuiCol.Text, 0xFFFFFFFF))
{ {
var buttonWidth = ImGui.CalcTextSize(buttonLabel).X + ImGui.GetStyle().FramePadding.X * 2; var buttonWidth =
var buttonWidth2 = ImGui.CalcTextSize(buttonLabel2).X + ImGui.GetStyle().FramePadding.X * 2; ImGui.CalcTextSize(buttonLabel).X + ImGui.GetStyle().FramePadding.X * 2;
ImGui.SameLine(ImGui.GetContentRegionAvail().X - buttonWidth - buttonWidth2 - ImGui.GetStyle().ItemSpacing.X); var buttonWidth2 =
ImGui.CalcTextSize(buttonLabel2).X + ImGui.GetStyle().FramePadding.X * 2;
ImGui.SameLine(
ImGui.GetContentRegionAvail().X
- buttonWidth
- buttonWidth2
- ImGui.GetStyle().ItemSpacing.X
);
if (ImGui.Button(buttonLabel2)) if (ImGui.Button(buttonLabel2))
Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii"); Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii");
@@ -203,13 +220,15 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// calculate all conditions before updating config // calculate all conditions before updating config
var hideChanged = !Mutable.HideChat && Mutable.HideChat != Plugin.Config.HideChat; var hideChanged = !Mutable.HideChat && Mutable.HideChat != Plugin.Config.HideChat;
var languageChanged = Mutable.LanguageOverride != Plugin.Config.LanguageOverride; var languageChanged = Mutable.LanguageOverride != Plugin.Config.LanguageOverride;
var fontChanged = Mutable.GlobalFontV2 != Plugin.Config.GlobalFontV2 var fontChanged =
|| Mutable.JapaneseFontV2 != Plugin.Config.JapaneseFontV2 Mutable.GlobalFontV2 != Plugin.Config.GlobalFontV2
|| Mutable.ItalicFontV2 != Plugin.Config.ItalicFontV2 || Mutable.JapaneseFontV2 != Plugin.Config.JapaneseFontV2
|| Mutable.ExtraGlyphRanges != Plugin.Config.ExtraGlyphRanges || Mutable.ItalicFontV2 != Plugin.Config.ItalicFontV2
|| Mutable.UseHellionFont != Plugin.Config.UseHellionFont; || Mutable.ExtraGlyphRanges != Plugin.Config.ExtraGlyphRanges
var fontSizeChanged = Math.Abs(Mutable.SymbolsFontSizeV2 - Plugin.Config.SymbolsFontSizeV2) > 0.001 || Mutable.UseHellionFont != Plugin.Config.UseHellionFont;
|| Math.Abs(Mutable.FontSizeV2 - Plugin.Config.FontSizeV2) > 0.001; var fontSizeChanged =
Math.Abs(Mutable.SymbolsFontSizeV2 - Plugin.Config.SymbolsFontSizeV2) > 0.001
|| Math.Abs(Mutable.FontSizeV2 - Plugin.Config.FontSizeV2) > 0.001;
var italicStateChanged = Mutable.ItalicEnabled != Plugin.Config.ItalicEnabled; var italicStateChanged = Mutable.ItalicEnabled != Plugin.Config.ItalicEnabled;
// v1.2.0 — Refilter only if a filter-relevant setting actually // v1.2.0 — Refilter only if a filter-relevant setting actually
// changed. The Clear+Refilter cycle reloads messages from the DB, // changed. The Clear+Refilter cycle reloads messages from the DB,
@@ -258,21 +277,26 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
private bool HasFilterRelevantChanges() private bool HasFilterRelevantChanges()
{ {
// Top-level privacy controls. // Top-level privacy controls.
if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled) return true; if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled)
if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels) return true; return true;
if (!Mutable.PrivacyPersistChannels.SetEquals(Plugin.Config.PrivacyPersistChannels)) return true; if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels)
return true;
if (!Mutable.PrivacyPersistChannels.SetEquals(Plugin.Config.PrivacyPersistChannels))
return true;
// FilterIncludePreviousSessions changes the GetMostRecentMessages // FilterIncludePreviousSessions changes the GetMostRecentMessages
// window in MessageManager.FilterAllTabs and is therefore filter- // window in MessageManager.FilterAllTabs and is therefore filter-
// relevant even though it lives outside the Privacy block. // relevant even though it lives outside the Privacy block.
if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions) return true; if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions)
return true;
// Per-tab channel selection. Compare persistent tabs only — // Per-tab channel selection. Compare persistent tabs only —
// TempTabs are session-only and never refiltered anyway. // TempTabs are session-only and never refiltered anyway.
var origPersistent = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList(); var origPersistent = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList();
var newPersistent = Mutable.Tabs.Where(t => !t.IsTempTab).ToList(); var newPersistent = Mutable.Tabs.Where(t => !t.IsTempTab).ToList();
if (origPersistent.Count != newPersistent.Count) return true; // add or delete if (origPersistent.Count != newPersistent.Count)
return true; // add or delete
for (var i = 0; i < origPersistent.Count; i++) for (var i = 0; i < origPersistent.Count; i++)
{ {
@@ -282,18 +306,24 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// Identifier mismatch at the same index means reorder or // Identifier mismatch at the same index means reorder or
// a slot got swapped — treat as filter-relevant so the new // a slot got swapped — treat as filter-relevant so the new
// channel-selection layout actually applies. // channel-selection layout actually applies.
if (orig.Identifier != neu.Identifier) return true; if (orig.Identifier != neu.Identifier)
return true;
if (orig.ExtraChatAll != neu.ExtraChatAll) return true; if (orig.ExtraChatAll != neu.ExtraChatAll)
if (!orig.ExtraChatChannels.SetEquals(neu.ExtraChatChannels)) return true; return true;
if (!orig.ExtraChatChannels.SetEquals(neu.ExtraChatChannels))
return true;
// SelectedChannels is a Dictionary<ChatType, (ChatSource, ChatSource)> // SelectedChannels is a Dictionary<ChatType, (ChatSource, ChatSource)>
// — value-tuple equality already does the right thing per-pair. // — value-tuple equality already does the right thing per-pair.
if (orig.SelectedChannels.Count != neu.SelectedChannels.Count) return true; if (orig.SelectedChannels.Count != neu.SelectedChannels.Count)
return true;
foreach (var pair in orig.SelectedChannels) foreach (var pair in orig.SelectedChannels)
{ {
if (!neu.SelectedChannels.TryGetValue(pair.Key, out var nv)) return true; if (!neu.SelectedChannels.TryGetValue(pair.Key, out var nv))
if (!pair.Value.Equals(nv)) return true; return true;
if (!pair.Value.Equals(nv))
return true;
} }
} }
+50 -12
View File
@@ -18,16 +18,40 @@ internal sealed class SettingsOverview
// + Export + DB-Viewer + Advanced. // + Export + DB-Viewer + Advanced.
private static readonly (FontAwesomeIcon Icon, string TitleKey, string SubtextKey)[] CardDefs = private static readonly (FontAwesomeIcon Icon, string TitleKey, string SubtextKey)[] CardDefs =
[ [
(FontAwesomeIcon.SlidersH, "Settings_Card_General_Title", "Settings_Card_General_Subtext"), (FontAwesomeIcon.SlidersH, "Settings_Card_General_Title", "Settings_Card_General_Subtext"),
(FontAwesomeIcon.Palette, "Settings_Card_ThemeAndLayout_Title", "Settings_Card_ThemeAndLayout_Subtext"), (
(FontAwesomeIcon.Font, "Settings_Card_FontsAndColours_Title", "Settings_Card_FontsAndColours_Subtext"), FontAwesomeIcon.Palette,
(FontAwesomeIcon.WindowMaximize, "Settings_Card_Window_Title", "Settings_Card_Window_Subtext"), "Settings_Card_ThemeAndLayout_Title",
(FontAwesomeIcon.Comments, "Settings_Card_Chat_Title", "Settings_Card_Chat_Subtext"), "Settings_Card_ThemeAndLayout_Subtext"
(FontAwesomeIcon.FolderTree, "Settings_Card_Tabs_Title", "Settings_Card_Tabs_Subtext"), ),
(FontAwesomeIcon.ShieldAlt, "Settings_Card_Privacy_Title", "Settings_Card_Privacy_Subtext"), (
(FontAwesomeIcon.Database, "Settings_Card_DataManagement_Title", "Settings_Card_DataManagement_Subtext"), FontAwesomeIcon.Font,
(FontAwesomeIcon.Plug, "Settings_Card_Integrations_Title", "Settings_Card_Integrations_Subtext"), "Settings_Card_FontsAndColours_Title",
(FontAwesomeIcon.InfoCircle, "Settings_Card_Information_Title", "Settings_Card_Information_Subtext"), "Settings_Card_FontsAndColours_Subtext"
),
(
FontAwesomeIcon.WindowMaximize,
"Settings_Card_Window_Title",
"Settings_Card_Window_Subtext"
),
(FontAwesomeIcon.Comments, "Settings_Card_Chat_Title", "Settings_Card_Chat_Subtext"),
(FontAwesomeIcon.FolderTree, "Settings_Card_Tabs_Title", "Settings_Card_Tabs_Subtext"),
(FontAwesomeIcon.ShieldAlt, "Settings_Card_Privacy_Title", "Settings_Card_Privacy_Subtext"),
(
FontAwesomeIcon.Database,
"Settings_Card_DataManagement_Title",
"Settings_Card_DataManagement_Subtext"
),
(
FontAwesomeIcon.Plug,
"Settings_Card_Integrations_Title",
"Settings_Card_Integrations_Subtext"
),
(
FontAwesomeIcon.InfoCircle,
"Settings_Card_Information_Title",
"Settings_Card_Information_Subtext"
),
]; ];
public SettingsOverview(SettingsWindow window) public SettingsOverview(SettingsWindow window)
@@ -57,7 +81,14 @@ internal sealed class SettingsOverview
} }
} }
private void DrawCard(int index, FontAwesomeIcon icon, string title, string subtext, float w, float h) private void DrawCard(
int index,
FontAwesomeIcon icon,
string title,
string subtext,
float w,
float h
)
{ {
// BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item. // BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item.
// Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die // Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die
@@ -94,7 +125,14 @@ internal sealed class SettingsOverview
// erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher // erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher
// bleibt der Subtext bewusst beim DrawList-Overlay-Pattern. // bleibt der Subtext bewusst beim DrawList-Overlay-Pattern.
var subtextWrapWidth = w - 32f; var subtextWrapWidth = w - 32f;
draw.AddText(ImGui.GetFont(), ImGui.GetFontSize(), subtextPos, subtextColor, subtext, subtextWrapWidth); draw.AddText(
ImGui.GetFont(),
ImGui.GetFontSize(),
subtextPos,
subtextColor,
subtext,
subtextWrapWidth
);
ImGui.EndGroup(); ImGui.EndGroup();
+80 -19
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Util;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -21,6 +21,7 @@ internal sealed class Chat : ISettingsTab
public string Name => HellionStrings.Settings_Tab_Chat + "###tabs-chat"; public string Name => HellionStrings.Settings_Tab_Chat + "###tabs-chat";
private SearchSelector.SelectorPopupOptions WordPopupOptions; private SearchSelector.SelectorPopupOptions WordPopupOptions;
// Snapshot of EmoteCache.State for which we last built WordPopupOptions. // Snapshot of EmoteCache.State for which we last built WordPopupOptions.
// Without this, an empty FilteredSheet (e.g., the user blocked every emote) // Without this, an empty FilteredSheet (e.g., the user blocked every emote)
// would trigger a refill every frame the settings tab is open. // would trigger a refill every frame the settings tab is open.
@@ -39,7 +40,9 @@ internal sealed class Chat : ISettingsTab
{ {
return new SearchSelector.SelectorPopupOptions return new SearchSelector.SelectorPopupOptions
{ {
FilteredSheet = EmoteCache.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w)).ToArray() FilteredSheet = EmoteCache
.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w))
.ToArray(),
}; };
} }
@@ -64,7 +67,10 @@ internal sealed class Chat : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_Enable_Name, ref Mutable.EnableAutoTellTabs); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_Enable_Name,
ref Mutable.EnableAutoTellTabs
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Enable_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Enable_Description);
ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale); ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
@@ -75,13 +81,22 @@ internal sealed class Chat : ISettingsTab
} }
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Limit_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Limit_Description);
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_Compact_Name, ref Mutable.AutoTellTabsCompactDisplay); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_Compact_Name,
ref Mutable.AutoTellTabsCompactDisplay
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Compact_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Compact_Description);
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Name, ref Mutable.AutoTellTabsOpenAsPopout); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Name,
ref Mutable.AutoTellTabsOpenAsPopout
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Description);
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Name, ref Mutable.AutoTellTabsShowGreetedToggle); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Name,
ref Mutable.AutoTellTabsShowGreetedToggle
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -96,7 +111,14 @@ internal sealed class Chat : ISettingsTab
var preload = Mutable.AutoTellTabsHistoryPreload; var preload = Mutable.AutoTellTabsHistoryPreload;
ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale); ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
if (ImGui.SliderInt(HellionStrings.Privacy_AutoTellTabs_Preload_Name, ref preload, 0, 100)) if (
ImGui.SliderInt(
HellionStrings.Privacy_AutoTellTabs_Preload_Name,
ref preload,
0,
100
)
)
{ {
Mutable.AutoTellTabsHistoryPreload = preload; Mutable.AutoTellTabsHistoryPreload = preload;
} }
@@ -117,12 +139,18 @@ internal sealed class Chat : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_CollapseDuplicateMessages_Name, ref Mutable.CollapseDuplicateMessages); ImGui.Checkbox(
Language.Options_CollapseDuplicateMessages_Name,
ref Mutable.CollapseDuplicateMessages
);
ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMessages_Description); ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMessages_Description);
if (Mutable.CollapseDuplicateMessages) if (Mutable.CollapseDuplicateMessages)
{ {
ImGui.Checkbox(Language.Options_CollapseDuplicateMsgUniqueLink_Name, ref Mutable.CollapseKeepUniqueLinks); ImGui.Checkbox(
Language.Options_CollapseDuplicateMsgUniqueLink_Name,
ref Mutable.CollapseKeepUniqueLinks
);
ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description); ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description);
} }
} }
@@ -138,7 +166,12 @@ internal sealed class Chat : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Preview_Name, Mutable.PreviewPosition.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Preview_Name,
Mutable.PreviewPosition.Name()
)
)
{ {
if (combo) if (combo)
{ {
@@ -153,7 +186,13 @@ internal sealed class Chat : ISettingsTab
} }
ImGuiUtil.HelpMarker(Language.Options_Preview_Description); ImGuiUtil.HelpMarker(Language.Options_Preview_Description);
if (ImGuiUtil.InputIntVertical(Language.Options_PreviewMinimum_Name, Language.Options_PreviewMinimum_Description, ref Mutable.PreviewMinimum)) if (
ImGuiUtil.InputIntVertical(
Language.Options_PreviewMinimum_Name,
Language.Options_PreviewMinimum_Description,
ref Mutable.PreviewMinimum
)
)
{ {
Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250); Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250);
} }
@@ -180,9 +219,11 @@ internal sealed class Chat : ISettingsTab
ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes); ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes);
ImGui.Spacing(); ImGui.Spacing();
if (EmoteCache.State is EmoteCache.LoadingState.Done if (
EmoteCache.State is EmoteCache.LoadingState.Done
&& WordPopupOptions.FilteredSheet.Length == 0 && WordPopupOptions.FilteredSheet.Length == 0
&& WordPopupOptionsBuiltFor != EmoteCache.LoadingState.Done) && WordPopupOptionsBuiltFor != EmoteCache.LoadingState.Done
)
{ {
WordPopupOptions = RefillSheet(); WordPopupOptions = RefillSheet();
WordPopupOptionsBuiltFor = EmoteCache.LoadingState.Done; WordPopupOptionsBuiltFor = EmoteCache.LoadingState.Done;
@@ -204,7 +245,13 @@ internal sealed class Chat : ISettingsTab
Mutable.BlockedEmotes.Add(newWord); Mutable.BlockedEmotes.Add(newWord);
} }
using (var table = ImRaii.Table("##BlockedWords", 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner)) using (
var table = ImRaii.Table(
"##BlockedWords",
2,
ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner
)
)
{ {
if (table) if (table)
{ {
@@ -220,7 +267,13 @@ internal sealed class Chat : ISettingsTab
ImGui.TextUnformatted(word); ImGui.TextUnformatted(word);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if (ImGuiUtil.Button($"##{word}Del", FontAwesomeIcon.Trash, !ImGui.GetIO().KeyCtrl)) if (
ImGuiUtil.Button(
$"##{word}Del",
FontAwesomeIcon.Trash,
!ImGui.GetIO().KeyCtrl
)
)
{ {
Mutable.BlockedEmotes.Remove(word); Mutable.BlockedEmotes.Remove(word);
} }
@@ -244,8 +297,16 @@ internal sealed class Chat : ISettingsTab
ImGui.TextColored(ImGuiColors.DPSRed, Language.Options_Emote_NotReady); ImGui.TextColored(ImGuiColors.DPSRed, Language.Options_Emote_NotReady);
} }
ImGui.TextUnformatted($"{Language.Options_Emote_Loaded} {EmoteCache.SortedCodeArray.Length}"); ImGui.TextUnformatted(
using (var emoteTable = ImRaii.Table("##LoadedEmotes", 5, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner)) $"{Language.Options_Emote_Loaded} {EmoteCache.SortedCodeArray.Length}"
);
using (
var emoteTable = ImRaii.Table(
"##LoadedEmotes",
5,
ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner
)
)
{ {
if (emoteTable) if (emoteTable)
{ {
+428 -174
View File
@@ -1,16 +1,16 @@
using System.Diagnostics; using System.Diagnostics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Export;
using HellionChat.Privacy;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Export;
using HellionChat.Privacy;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -19,7 +19,8 @@ internal sealed class DataManagement : ISettingsTab
private Plugin Plugin { get; } private Plugin Plugin { get; }
private Configuration Mutable { get; } private Configuration Mutable { get; }
public string Name => HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement"; public string Name =>
HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement";
// Cleanup state (was in Privacy.cs) // Cleanup state (was in Privacy.cs)
private Dictionary<int, long>? CleanupCounts; private Dictionary<int, long>? CleanupCounts;
@@ -49,28 +50,90 @@ internal sealed class DataManagement : ISettingsTab
// call updates the labels immediately. 1:1 from Privacy.cs Groups. // call updates the labels immediately. 1:1 from Privacy.cs Groups.
private static readonly (Func<string> Heading, ChatType[] Types)[] Groups = private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
[ [
(() => HellionStrings.Privacy_Group_DirectMessages, [ChatType.TellIncoming, ChatType.TellOutgoing]), (
(() => HellionStrings.Privacy_Group_PartyAlliance, [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]), () => HellionStrings.Privacy_Group_DirectMessages,
(() => HellionStrings.Privacy_Group_FreeCompany, [ChatType.FreeCompany, ChatType.FreeCompanyAnnouncement, ChatType.FreeCompanyLoginLogout]), [ChatType.TellIncoming, ChatType.TellOutgoing]
(() => HellionStrings.Privacy_Group_Linkshells, [ ),
ChatType.Linkshell1, ChatType.Linkshell2, ChatType.Linkshell3, ChatType.Linkshell4, (
ChatType.Linkshell5, ChatType.Linkshell6, ChatType.Linkshell7, ChatType.Linkshell8, () => HellionStrings.Privacy_Group_PartyAlliance,
]), [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]
(() => HellionStrings.Privacy_Group_CrossLinkshells, [ ),
ChatType.CrossLinkshell1, ChatType.CrossLinkshell2, ChatType.CrossLinkshell3, ChatType.CrossLinkshell4, (
ChatType.CrossLinkshell5, ChatType.CrossLinkshell6, ChatType.CrossLinkshell7, ChatType.CrossLinkshell8, () => HellionStrings.Privacy_Group_FreeCompany,
]), [
(() => HellionStrings.Privacy_Group_ExtraChat, [ ChatType.FreeCompany,
ChatType.ExtraChatLinkshell1, ChatType.ExtraChatLinkshell2, ChatType.ExtraChatLinkshell3, ChatType.ExtraChatLinkshell4, ChatType.FreeCompanyAnnouncement,
ChatType.ExtraChatLinkshell5, ChatType.ExtraChatLinkshell6, ChatType.ExtraChatLinkshell7, ChatType.ExtraChatLinkshell8, ChatType.FreeCompanyLoginLogout,
]), ]
(() => HellionStrings.Privacy_Group_PublicChat, [ChatType.Say, ChatType.Shout, ChatType.Yell, ChatType.NoviceNetwork, ChatType.CustomEmote, ChatType.StandardEmote]), ),
(() => HellionStrings.Privacy_Group_SystemLogs, [ (
ChatType.System, ChatType.Notice, ChatType.Urgent, ChatType.Echo, () => HellionStrings.Privacy_Group_Linkshells,
ChatType.NpcDialogue, ChatType.NpcAnnouncement, [
ChatType.LootNotice, ChatType.LootRoll, ChatType.RetainerSale, ChatType.Linkshell1,
ChatType.Crafting, ChatType.Gathering, ChatType.Sign, ChatType.RandomNumber, ChatType.Linkshell2,
]), ChatType.Linkshell3,
ChatType.Linkshell4,
ChatType.Linkshell5,
ChatType.Linkshell6,
ChatType.Linkshell7,
ChatType.Linkshell8,
]
),
(
() => HellionStrings.Privacy_Group_CrossLinkshells,
[
ChatType.CrossLinkshell1,
ChatType.CrossLinkshell2,
ChatType.CrossLinkshell3,
ChatType.CrossLinkshell4,
ChatType.CrossLinkshell5,
ChatType.CrossLinkshell6,
ChatType.CrossLinkshell7,
ChatType.CrossLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_ExtraChat,
[
ChatType.ExtraChatLinkshell1,
ChatType.ExtraChatLinkshell2,
ChatType.ExtraChatLinkshell3,
ChatType.ExtraChatLinkshell4,
ChatType.ExtraChatLinkshell5,
ChatType.ExtraChatLinkshell6,
ChatType.ExtraChatLinkshell7,
ChatType.ExtraChatLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_PublicChat,
[
ChatType.Say,
ChatType.Shout,
ChatType.Yell,
ChatType.NoviceNetwork,
ChatType.CustomEmote,
ChatType.StandardEmote,
]
),
(
() => HellionStrings.Privacy_Group_SystemLogs,
[
ChatType.System,
ChatType.Notice,
ChatType.Urgent,
ChatType.Echo,
ChatType.NpcDialogue,
ChatType.NpcAnnouncement,
ChatType.LootNotice,
ChatType.LootRoll,
ChatType.RetainerSale,
ChatType.Crafting,
ChatType.Gathering,
ChatType.Sign,
ChatType.RandomNumber,
]
),
]; ];
internal DataManagement(Plugin plugin, Configuration mutable) internal DataManagement(Plugin plugin, Configuration mutable)
@@ -107,21 +170,36 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages); ImGui.Checkbox(
Language.Options_DatabaseBattleMessages_Name,
ref Mutable.DatabaseBattleMessages
);
ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description); ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession)) if (
ImGui.Checkbox(
Language.Options_LoadPreviousSession_Name,
ref Mutable.LoadPreviousSession
)
)
if (Mutable.LoadPreviousSession) if (Mutable.LoadPreviousSession)
Mutable.FilterIncludePreviousSessions = true; Mutable.FilterIncludePreviousSessions = true;
ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description); ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions)) if (
ImGui.Checkbox(
Language.Options_FilterIncludePreviousSessions_Name,
ref Mutable.FilterIncludePreviousSessions
)
)
if (!Mutable.FilterIncludePreviousSessions) if (!Mutable.FilterIncludePreviousSessions)
Mutable.LoadPreviousSession = false; Mutable.LoadPreviousSession = false;
ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description); ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db")); var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db")); var migratedOld = new FileInfo(
Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db")
);
if (old.Exists || migratedOld.Exists) if (old.Exists || migratedOld.Exists)
{ {
ImGui.Spacing(); ImGui.Spacing();
@@ -131,7 +209,12 @@ internal sealed class DataManagement : ISettingsTab
ImGui.TextUnformatted(Language.Options_Database_Old_Heading); ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
ImGui.Spacing(); ImGui.Spacing();
if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
Language.Options_Database_Old_Delete,
Language.Options_Database_Old_Delete_Tooltip
)
)
{ {
try try
{ {
@@ -139,12 +222,18 @@ internal sealed class DataManagement : ISettingsTab
old.Delete(); old.Delete();
if (migratedOld.Exists) if (migratedOld.Exists)
migratedOld.Delete(); migratedOld.Delete();
WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success); WrapperUtil.AddNotification(
Language.Options_Database_Old_Delete_Success,
NotificationType.Success
);
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Unable to delete old database"); Plugin.Log.Error(e, "Unable to delete old database");
WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error); WrapperUtil.AddNotification(
Language.Options_Database_Old_Delete_Error,
NotificationType.Error
);
} }
} }
} }
@@ -162,7 +251,8 @@ internal sealed class DataManagement : ISettingsTab
ImGuiUtil.OptionCheckbox( ImGuiUtil.OptionCheckbox(
ref Mutable.RetentionEnabled, ref Mutable.RetentionEnabled,
HellionStrings.Retention_Enabled_Name, HellionStrings.Retention_Enabled_Name,
HellionStrings.Retention_Enabled_Description); HellionStrings.Retention_Enabled_Description
);
using (ImRaii.Disabled(!Mutable.RetentionEnabled)) using (ImRaii.Disabled(!Mutable.RetentionEnabled))
{ {
@@ -191,39 +281,57 @@ internal sealed class DataManagement : ISettingsTab
if (perChannelTree.Success) if (perChannelTree.Success)
{ {
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
foreach (var (heading, types) in Groups) foreach (var (heading, types) in Groups)
{
using var subTree = ImRaii.TreeNode(heading());
if (!subTree.Success)
continue;
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
foreach (var type in types)
{ {
var hasOverride = Mutable.RetentionPerChannelDays.TryGetValue(type, out var days); using var subTree = ImRaii.TreeNode(heading());
var hasSpecDefault = PrivacyDefaults.DefaultRetentionDays.TryGetValue(type, out var specDays); if (!subTree.Success)
if (!hasOverride) continue;
days = hasSpecDefault ? specDays : Mutable.RetentionDefaultDays;
var tag = hasOverride using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
? HellionStrings.Retention_Tag_Override foreach (var type in types)
: hasSpecDefault {
? HellionStrings.Retention_Tag_Spec var hasOverride =
: HellionStrings.Retention_Tag_Global; Mutable.RetentionPerChannelDays.TryGetValue(
if (ImGui.InputInt($"{type} {tag}##retention-{(int)type}", ref days)) type,
{ out var days
days = Math.Max(0, days); );
Mutable.RetentionPerChannelDays[type] = days; var hasSpecDefault =
} PrivacyDefaults.DefaultRetentionDays.TryGetValue(
type,
out var specDays
);
if (!hasOverride)
days = hasSpecDefault
? specDays
: Mutable.RetentionDefaultDays;
if (hasOverride) var tag =
{ hasOverride ? HellionStrings.Retention_Tag_Override
ImGui.SameLine(); : hasSpecDefault ? HellionStrings.Retention_Tag_Spec
if (ImGui.Button($"{HellionStrings.Retention_Reset_Button}##retention-reset-{(int)type}")) : HellionStrings.Retention_Tag_Global;
Mutable.RetentionPerChannelDays.Remove(type); if (
} ImGui.InputInt(
$"{type} {tag}##retention-{(int)type}",
ref days
)
)
{
days = Math.Max(0, days);
Mutable.RetentionPerChannelDays[type] = days;
}
if (hasOverride)
{
ImGui.SameLine();
if (
ImGui.Button(
$"{HellionStrings.Retention_Reset_Button}##retention-reset-{(int)type}"
)
)
Mutable.RetentionPerChannelDays.Remove(type);
}
}
} }
}
} }
} }
@@ -234,7 +342,12 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.Disabled(RetentionRunning)) using (ImRaii.Disabled(RetentionRunning))
{ {
if (ImGuiUtil.CtrlShiftButton(HellionStrings.Retention_Apply_Label, HellionStrings.Retention_Apply_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
HellionStrings.Retention_Apply_Label,
HellionStrings.Retention_Apply_Tooltip
)
)
StartRetentionRun(); StartRetentionRun();
} }
@@ -243,9 +356,11 @@ internal sealed class DataManagement : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
var lastRun = Plugin.Config.RetentionLastRunAt; var lastRun = Plugin.Config.RetentionLastRunAt;
ImGuiUtil.HelpText(lastRun == DateTimeOffset.MinValue ImGuiUtil.HelpText(
? HellionStrings.Retention_LastRun_Never lastRun == DateTimeOffset.MinValue
: string.Format(HellionStrings.Retention_LastRun_At, lastRun.ToLocalTime())); ? HellionStrings.Retention_LastRun_Never
: string.Format(HellionStrings.Retention_LastRun_At, lastRun.ToLocalTime())
);
} }
} }
} }
@@ -259,14 +374,20 @@ internal sealed class DataManagement : ISettingsTab
Plugin.RetentionSweepRunning = true; Plugin.RetentionSweepRunning = true;
} }
var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(p => (int)(ushort)p.Key, p => p.Value); var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(
p => (int)(ushort)p.Key,
p => p.Value
);
var defaultDays = Plugin.Config.RetentionDefaultDays; var defaultDays = Plugin.Config.RetentionDefaultDays;
new Thread(() => new Thread(() =>
{ {
try try
{ {
var deleted = Plugin.MessageManager.Store.DeleteByRetentionPolicy(policy, defaultDays); var deleted = Plugin.MessageManager.Store.DeleteByRetentionPolicy(
policy,
defaultDays
);
Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow; Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
Plugin.SaveConfig(); Plugin.SaveConfig();
@@ -274,17 +395,26 @@ internal sealed class DataManagement : ISettingsTab
if (deleted > 0) if (deleted > 0)
{ {
if (!Plugin.Framework.Run(() => if (
{ !Plugin
Plugin.MessageManager.ClearAllTabs(); .Framework.Run(() =>
Plugin.MessageManager.FilterAllTabsAsync(); {
}).Wait(TimeSpan.FromSeconds(5))) Plugin.MessageManager.ClearAllTabs();
Plugin.MessageManager.FilterAllTabsAsync();
})
.Wait(TimeSpan.FromSeconds(5))
)
{ {
Plugin.Log.Warning("Retention sweep: framework refresh timed out after 5s."); Plugin.Log.Warning(
"Retention sweep: framework refresh timed out after 5s."
);
} }
} }
WrapperUtil.AddNotification(string.Format(HellionStrings.Retention_Success, deleted), NotificationType.Success); WrapperUtil.AddNotification(
string.Format(HellionStrings.Retention_Success, deleted),
NotificationType.Success
);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -296,7 +426,10 @@ internal sealed class DataManagement : ISettingsTab
lock (Plugin.RetentionSweepLock) lock (Plugin.RetentionSweepLock)
Plugin.RetentionSweepRunning = false; Plugin.RetentionSweepRunning = false;
} }
}) { IsBackground = true }.Start(); })
{
IsBackground = true,
}.Start();
} }
private void DrawCleanupSection() private void DrawCleanupSection()
@@ -312,15 +445,19 @@ internal sealed class DataManagement : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
if (CleanupPreviewSnapshot is not null if (
&& !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels)) CleanupPreviewSnapshot is not null
&& !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels)
)
{ {
CleanupPreviewStale = true; CleanupPreviewStale = true;
} }
using (var emphasis = CleanupPreviewStale using (
? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f }) var emphasis = CleanupPreviewStale
: null) ? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f })
: null
)
using (ImRaii.Disabled(CleanupRunning)) using (ImRaii.Disabled(CleanupRunning))
{ {
if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview)) if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview))
@@ -341,13 +478,24 @@ internal sealed class DataManagement : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
using (var staleColor = CleanupPreviewStale using (
? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey) var staleColor = CleanupPreviewStale
: null) ? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey)
: null
)
{ {
ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_TotalStored, CleanupKeepCount + CleanupDeleteCount)); ImGuiUtil.HelpText(
ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount)); string.Format(
ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount)); HellionStrings.Cleanup_TotalStored,
CleanupKeepCount + CleanupDeleteCount
)
);
ImGuiUtil.HelpText(
string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount)
);
ImGuiUtil.HelpText(
string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount)
);
} }
using (var breakdownTree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown)) using (var breakdownTree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown))
@@ -355,15 +503,19 @@ internal sealed class DataManagement : ISettingsTab
if (breakdownTree.Success) if (breakdownTree.Success)
{ {
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
foreach (var (chatType, count) in CleanupCounts.OrderByDescending(p => p.Value)) foreach (
{ var (chatType, count) in CleanupCounts.OrderByDescending(p => p.Value)
var name = Enum.IsDefined(typeof(ChatType), (ushort)chatType) )
? ((ChatType)(ushort)chatType).ToString() {
: $"Unknown({chatType})"; var name = Enum.IsDefined(typeof(ChatType), (ushort)chatType)
var keeps = WouldBeKept(chatType); ? ((ChatType)(ushort)chatType).ToString()
var marker = keeps ? HellionStrings.Cleanup_Marker_Keep : HellionStrings.Cleanup_Marker_Delete; : $"Unknown({chatType})";
ImGuiUtil.HelpText($"{marker} {name} — {count:N0}"); var keeps = WouldBeKept(chatType);
} var marker = keeps
? HellionStrings.Cleanup_Marker_Keep
: HellionStrings.Cleanup_Marker_Delete;
ImGuiUtil.HelpText($"{marker} {name} — {count:N0}");
}
} }
} }
@@ -371,8 +523,12 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.Disabled(CleanupRunning || CleanupDeleteCount == 0)) using (ImRaii.Disabled(CleanupRunning || CleanupDeleteCount == 0))
{ {
if (ImGuiUtil.CtrlShiftButton(HellionStrings.Cleanup_Apply_Label, if (
string.Format(HellionStrings.Cleanup_Apply_Tooltip, CleanupDeleteCount))) ImGuiUtil.CtrlShiftButton(
HellionStrings.Cleanup_Apply_Label,
string.Format(HellionStrings.Cleanup_Apply_Tooltip, CleanupDeleteCount)
)
)
StartCleanup(); StartCleanup();
} }
@@ -411,7 +567,10 @@ internal sealed class DataManagement : ISettingsTab
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Failed to compute cleanup preview"); Plugin.Log.Error(e, "Failed to compute cleanup preview");
WrapperUtil.AddNotification(HellionStrings.Cleanup_PreviewError, NotificationType.Error); WrapperUtil.AddNotification(
HellionStrings.Cleanup_PreviewError,
NotificationType.Error
);
} }
} }
@@ -430,16 +589,23 @@ internal sealed class DataManagement : ISettingsTab
var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed); var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages"); Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages");
if (!Plugin.Framework.Run(() => if (
{ !Plugin
Plugin.MessageManager.ClearAllTabs(); .Framework.Run(() =>
Plugin.MessageManager.FilterAllTabs(); {
}).Wait(TimeSpan.FromSeconds(5))) Plugin.MessageManager.ClearAllTabs();
Plugin.MessageManager.FilterAllTabs();
})
.Wait(TimeSpan.FromSeconds(5))
)
{ {
Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s."); Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s.");
} }
WrapperUtil.AddNotification(string.Format(HellionStrings.Cleanup_Success, deleted), NotificationType.Success); WrapperUtil.AddNotification(
string.Format(HellionStrings.Cleanup_Success, deleted),
NotificationType.Success
);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -482,22 +648,24 @@ internal sealed class DataManagement : ISettingsTab
ImGuiUtil.HelpText(HellionStrings.Export_Channels_AllOff); ImGuiUtil.HelpText(HellionStrings.Export_Channels_AllOff);
foreach (var (heading, types) in Groups) foreach (var (heading, types) in Groups)
{ {
using var subTree = ImRaii.TreeNode($"{heading()}##export-group-{heading()}"); using var subTree = ImRaii.TreeNode(
$"{heading()}##export-group-{heading()}"
);
if (!subTree.Success) if (!subTree.Success)
continue; continue;
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
foreach (var type in types) foreach (var type in types)
{
var enabled = ExportSelectedChannels.Contains(type);
if (ImGui.Checkbox($"{type}##export-{(int)type}", ref enabled))
{ {
if (enabled) var enabled = ExportSelectedChannels.Contains(type);
ExportSelectedChannels.Add(type); if (ImGui.Checkbox($"{type}##export-{(int)type}", ref enabled))
else {
ExportSelectedChannels.Remove(type); if (enabled)
ExportSelectedChannels.Add(type);
else
ExportSelectedChannels.Remove(type);
}
} }
}
} }
} }
} }
@@ -507,10 +675,22 @@ internal sealed class DataManagement : ISettingsTab
ImGui.TextUnformatted(HellionStrings.Export_Format_Label); ImGui.TextUnformatted(HellionStrings.Export_Format_Label);
ImGui.SameLine(); ImGui.SameLine();
var fmt = (int)ExportFormat; var fmt = (int)ExportFormat;
if (ImGui.RadioButton(HellionStrings.Export_Format_Markdown, ref fmt, (int)ExportFormat.Markdown)) if (
ImGui.RadioButton(
HellionStrings.Export_Format_Markdown,
ref fmt,
(int)ExportFormat.Markdown
)
)
ExportFormat = ExportFormat.Markdown; ExportFormat = ExportFormat.Markdown;
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.RadioButton(HellionStrings.Export_Format_Json, ref fmt, (int)ExportFormat.Json)) if (
ImGui.RadioButton(
HellionStrings.Export_Format_Json,
ref fmt,
(int)ExportFormat.Json
)
)
ExportFormat = ExportFormat.Json; ExportFormat = ExportFormat.Json;
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.RadioButton(HellionStrings.Export_Format_Csv, ref fmt, (int)ExportFormat.Csv)) if (ImGui.RadioButton(HellionStrings.Export_Format_Csv, ref fmt, (int)ExportFormat.Csv))
@@ -544,7 +724,8 @@ internal sealed class DataManagement : ISettingsTab
if (!success || string.IsNullOrWhiteSpace(path)) if (!success || string.IsNullOrWhiteSpace(path))
return; return;
StartExport(path); StartExport(path);
}); }
);
} }
private void StartExport(string path) private void StartExport(string path)
@@ -553,15 +734,17 @@ internal sealed class DataManagement : ISettingsTab
return; return;
ExportRunning = true; ExportRunning = true;
var types = ExportSelectedChannels.Count > 0 var types =
? ExportSelectedChannels.Select(t => (int)(ushort)t).ToList() ExportSelectedChannels.Count > 0
: null; ? ExportSelectedChannels.Select(t => (int)(ushort)t).ToList()
: null;
DateTimeOffset? from = ExportRangeDays > 0 DateTimeOffset? from =
? DateTimeOffset.UtcNow.AddDays(-ExportRangeDays) ExportRangeDays > 0 ? DateTimeOffset.UtcNow.AddDays(-ExportRangeDays) : null;
: null;
var senderSubstring = string.IsNullOrWhiteSpace(ExportSenderSubstring) ? null : ExportSenderSubstring.Trim(); var senderSubstring = string.IsNullOrWhiteSpace(ExportSenderSubstring)
? null
: ExportSenderSubstring.Trim();
var format = ExportFormat; var format = ExportFormat;
var filterDesc = new MessageExporter.FilterDescription(types, from, null, senderSubstring); var filterDesc = new MessageExporter.FilterDescription(types, from, null, senderSubstring);
@@ -569,11 +752,18 @@ internal sealed class DataManagement : ISettingsTab
{ {
try try
{ {
using var enumerator = Plugin.MessageManager.Store.StreamForExport(types, from, null); using var enumerator = Plugin.MessageManager.Store.StreamForExport(
types,
from,
null
);
var written = MessageExporter.ExportToFile(path, format, enumerator, filterDesc); var written = MessageExporter.ExportToFile(path, format, enumerator, filterDesc);
if (written > 0) if (written > 0)
WrapperUtil.AddNotification(string.Format(HellionStrings.Export_Success, written, path), NotificationType.Success); WrapperUtil.AddNotification(
string.Format(HellionStrings.Export_Success, written, path),
NotificationType.Success
);
else else
WrapperUtil.AddNotification(HellionStrings.Export_Empty, NotificationType.Info); WrapperUtil.AddNotification(HellionStrings.Export_Empty, NotificationType.Info);
} }
@@ -586,7 +776,10 @@ internal sealed class DataManagement : ISettingsTab
{ {
ExportRunning = false; ExportRunning = false;
} }
}) { IsBackground = true }.Start(); })
{
IsBackground = true,
}.Start();
} }
private void DrawDatabaseViewerSection() private void DrawDatabaseViewerSection()
@@ -605,12 +798,20 @@ internal sealed class DataManagement : ISettingsTab
DatabaseLastRefreshTicks = Environment.TickCount64; DatabaseLastRefreshTicks = Environment.TickCount64;
} }
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Path, MessageManager.DatabasePath())); ImGuiUtil.HelpText(
string.Format(
Language.Options_Database_Metadata_Path,
MessageManager.DatabasePath()
)
);
if (ImGui.IsItemClicked(ImGuiMouseButton.Left)) if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{ {
var path = Path.GetDirectoryName(MessageManager.DatabasePath()); var path = Path.GetDirectoryName(MessageManager.DatabasePath());
ImGui.SetClipboardText(path); ImGui.SetClipboardText(path);
WrapperUtil.AddNotification(Language.Options_Database_Metadata_CopyConfigPathNotification, NotificationType.Info); WrapperUtil.AddNotification(
Language.Options_Database_Metadata_CopyConfigPathNotification,
NotificationType.Info
);
} }
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
@@ -619,24 +820,44 @@ internal sealed class DataManagement : ISettingsTab
ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath); ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath);
} }
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Size, StringUtil.BytesToString(DatabaseSize))); ImGuiUtil.HelpText(
string.Format(
Language.Options_Database_Metadata_Size,
StringUtil.BytesToString(DatabaseSize)
)
);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize)); ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize));
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_LogSize, StringUtil.BytesToString(DatabaseLogSize))); ImGuiUtil.HelpText(
string.Format(
Language.Options_Database_Metadata_LogSize,
StringUtil.BytesToString(DatabaseLogSize)
)
);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize)); ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize));
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount)); ImGuiUtil.HelpText(
string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount)
);
if (ImGuiUtil.CtrlShiftButton(Language.Options_ClearDatabase_Button, Language.Options_ClearDatabase_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
Language.Options_ClearDatabase_Button,
Language.Options_ClearDatabase_Tooltip
)
)
{ {
Plugin.Log.Warning("Clearing messages from database"); Plugin.Log.Warning("Clearing messages from database");
Plugin.MessageManager.Store.ClearMessages(); Plugin.MessageManager.Store.ClearMessages();
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
DatabaseLastRefreshTicks = 0; DatabaseLastRefreshTicks = 0;
WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info); WrapperUtil.AddNotification(
Language.Options_ClearDatabase_Success,
NotificationType.Info
);
} }
} }
} }
@@ -655,16 +876,31 @@ internal sealed class DataManagement : ISettingsTab
using var wrap = ImRaii.TextWrapPos(0.0f); using var wrap = ImRaii.TextWrapPos(0.0f);
ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning); ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()")) if (
ImGuiUtil.CtrlShiftButton(
"Perform maintenance",
"Ctrl+Shift: MessageManager.Store.PerformMaintenance()"
)
)
Plugin.MessageManager.Store.PerformMaintenance(); Plugin.MessageManager.Store.PerformMaintenance();
if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()")) if (
ImGuiUtil.CtrlShiftButton(
"Reload messages from database",
"Ctrl+Shift: MessageManager.FilterAllTabs()"
)
)
{ {
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
Plugin.MessageManager.FilterAllTabsAsync(); Plugin.MessageManager.FilterAllTabsAsync();
} }
if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)")) if (
ImGuiUtil.CtrlShiftButton(
"Inject 10,000 messages",
"Ctrl+Shift: creates 10,000 unique messages (async)"
)
)
new Thread(() => InsertMessages(10_000)).Start(); new Thread(() => InsertMessages(10_000)).Start();
} }
} }
@@ -683,7 +919,9 @@ internal sealed class DataManagement : ISettingsTab
.Add(RawPayload.LinkTerminator) .Add(RawPayload.LinkTerminator)
.AddText(">: ") .AddText(">: ")
.Build(); .Build();
var senderChunks = ChunkUtil.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug).ToList(); var senderChunks = ChunkUtil
.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug)
.ToList();
var messages = new List<Message>(count); var messages = new List<Message>(count);
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
@@ -691,26 +929,32 @@ internal sealed class DataManagement : ISettingsTab
.AddText("Random message payload - ") .AddText("Random message payload - ")
.AddItalics(Guid.NewGuid().ToString()) .AddItalics(Guid.NewGuid().ToString())
.Build(); .Build();
var contentChunks = ChunkUtil.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug).ToList(); var contentChunks = ChunkUtil
.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug)
.ToList();
var chatCode = new ChatCode(XivChatType.Say, 0, 0); var chatCode = new ChatCode(XivChatType.Say, 0, 0);
messages.Add(new Message( messages.Add(
Guid.NewGuid(), new Message(
Plugin.MessageManager.CurrentContentId, Guid.NewGuid(),
Plugin.MessageManager.CurrentContentId, Plugin.MessageManager.CurrentContentId,
DateTimeOffset.UtcNow, Plugin.MessageManager.CurrentContentId,
chatCode, DateTimeOffset.UtcNow,
senderChunks, chatCode,
contentChunks, senderChunks,
senderSource, contentChunks,
contentSource, senderSource,
Guid.Empty contentSource,
)); Guid.Empty
)
);
} }
var elapsedTicks = stopwatch.ElapsedTicks; var elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info($"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); Plugin.Log.Info(
$"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
stopwatch = Stopwatch.StartNew(); stopwatch = Stopwatch.StartNew();
foreach (var message in messages) foreach (var message in messages)
@@ -718,24 +962,34 @@ internal sealed class DataManagement : ISettingsTab
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info($"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); Plugin.Log.Info(
$"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
Plugin.Framework.Run(() => Plugin
{ .Framework.Run(() =>
stopwatch = Stopwatch.StartNew(); {
Plugin.MessageManager.ClearAllTabs(); stopwatch = Stopwatch.StartNew();
elapsedTicks = stopwatch.ElapsedTicks; Plugin.MessageManager.ClearAllTabs();
stopwatch.Stop(); elapsedTicks = stopwatch.ElapsedTicks;
Plugin.Log.Info($"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); stopwatch.Stop();
}).Wait(); Plugin.Log.Info(
$"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
})
.Wait();
Plugin.Framework.Run(() => Plugin
{ .Framework.Run(() =>
stopwatch = Stopwatch.StartNew(); {
Plugin.MessageManager.FilterAllTabs(); stopwatch = Stopwatch.StartNew();
elapsedTicks = stopwatch.ElapsedTicks; Plugin.MessageManager.FilterAllTabs();
stopwatch.Stop(); elapsedTicks = stopwatch.ElapsedTicks;
Plugin.Log.Info($"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); stopwatch.Stop();
}).Wait(); Plugin.Log.Info(
$"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
})
.Wait();
} }
} }
+94 -24
View File
@@ -1,12 +1,12 @@
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud; using Dalamud;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.FontIdentifier; using Dalamud.Interface.FontIdentifier;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -15,7 +15,8 @@ internal sealed class FontsAndColours : ISettingsTab
private Plugin Plugin { get; } private Plugin Plugin { get; }
private Configuration Mutable { get; } private Configuration Mutable { get; }
public string Name => HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours"; public string Name =>
HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours";
internal FontsAndColours(Plugin plugin, Configuration mutable) internal FontsAndColours(Plugin plugin, Configuration mutable)
{ {
@@ -38,7 +39,9 @@ internal sealed class FontsAndColours : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
if (ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont)) if (
ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont)
)
{ {
if (Mutable.UseHellionFont) if (Mutable.UseHellionFont)
Mutable.FontsEnabled = false; Mutable.FontsEnabled = false;
@@ -51,7 +54,10 @@ internal sealed class FontsAndColours : ISettingsTab
ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2); ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2); ImGuiUtil.FontSizeCombo(
Language.Options_SymbolsFontSize_Name,
ref Mutable.SymbolsFontSizeV2
);
ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description); ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -68,7 +74,12 @@ internal sealed class FontsAndColours : ISettingsTab
} }
else else
{ {
var globalChooser = ImGuiUtil.FontChooser(Language.Options_Font_Name, Mutable.GlobalFontV2, false, ref unused); var globalChooser = ImGuiUtil.FontChooser(
Language.Options_Font_Name,
Mutable.GlobalFontV2,
false,
ref unused
);
globalChooser?.ResultTask.ContinueWith(r => globalChooser?.ResultTask.ContinueWith(r =>
{ {
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
@@ -79,14 +90,27 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button("Reset##global")) if (ImGui.Button("Reset##global"))
{ {
Mutable.GlobalFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f }; Mutable.GlobalFontV2 = new SingleFontSpec
{
FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
SizePt = 12.75f,
};
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_Font_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_Font_Description, Plugin.PluginName)
);
ImGuiUtil.WarningText(Language.Options_Font_Warning); ImGuiUtil.WarningText(Language.Options_Font_Warning);
ImGui.Spacing(); ImGui.Spacing();
var japaneseChooser = ImGuiUtil.FontChooser(Language.Options_JapaneseFont_Name, Mutable.JapaneseFontV2, false, ref unused, id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false, "いろはにほへと ちりぬるを"); var japaneseChooser = ImGuiUtil.FontChooser(
Language.Options_JapaneseFont_Name,
Mutable.JapaneseFontV2,
false,
ref unused,
id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false,
"いろはにほへと ちりぬるを"
);
japaneseChooser?.ResultTask.ContinueWith(r => japaneseChooser?.ResultTask.ContinueWith(r =>
{ {
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
@@ -97,13 +121,24 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button("Reset##japanese")) if (ImGui.Button("Reset##japanese"))
{ {
Mutable.JapaneseFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkMedium), SizePt = 12.75f }; Mutable.JapaneseFontV2 = new SingleFontSpec
{
FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkMedium),
SizePt = 12.75f,
};
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
var italicChooser = ImGuiUtil.FontChooser(Language.Options_ItalicFont_Name, Mutable.ItalicFontV2, true, ref Mutable.ItalicEnabled); var italicChooser = ImGuiUtil.FontChooser(
Language.Options_ItalicFont_Name,
Mutable.ItalicFontV2,
true,
ref Mutable.ItalicEnabled
);
italicChooser?.ResultTask.ContinueWith(r => italicChooser?.ResultTask.ContinueWith(r =>
{ {
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
@@ -115,15 +150,23 @@ internal sealed class FontsAndColours : ISettingsTab
if (ImGui.Button("Reset##italic")) if (ImGui.Button("Reset##italic"))
{ {
Mutable.ItalicEnabled = false; Mutable.ItalicEnabled = false;
Mutable.ItalicFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f }; Mutable.ItalicFontV2 = new SingleFontSpec
{
FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
SizePt = 12.75f,
};
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_Italic_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_Italic_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
if (ImGui.CollapsingHeader(Language.Options_ExtraGlyphs_Name)) if (ImGui.CollapsingHeader(Language.Options_ExtraGlyphs_Name))
{ {
ImGuiUtil.HelpMarker(string.Format(Language.Options_ExtraGlyphs_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_ExtraGlyphs_Description, Plugin.PluginName)
);
var range = (int)Mutable.ExtraGlyphRanges; var range = (int)Mutable.ExtraGlyphRanges;
foreach (var extra in Enum.GetValues<ExtraGlyphRanges>()) foreach (var extra in Enum.GetValues<ExtraGlyphRanges>())
@@ -137,7 +180,10 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
} }
ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2); ImGuiUtil.FontSizeCombo(
Language.Options_SymbolsFontSize_Name,
ref Mutable.SymbolsFontSizeV2
);
ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description); ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -158,7 +204,10 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
ImGui.Checkbox(Language.Options_ColorSelectedInputChannelButton_Name, ref Mutable.ColorSelectedInputChannelButton); ImGui.Checkbox(
Language.Options_ColorSelectedInputChannelButton_Name,
ref Mutable.ColorSelectedInputChannelButton
);
ImGuiUtil.HelpMarker(Language.Options_ColorSelectedInputChannelButton_Description); ImGuiUtil.HelpMarker(Language.Options_ColorSelectedInputChannelButton_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -166,14 +215,26 @@ internal sealed class FontsAndColours : ISettingsTab
{ {
foreach (var type in types) foreach (var type in types)
{ {
if (ImGuiUtil.IconButton(FontAwesomeIcon.UndoAlt, $"{type}", Language.Options_ChatColours_Reset)) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.UndoAlt,
$"{type}",
Language.Options_ChatColours_Reset
)
)
{ {
Mutable.ChatColours.Remove(type); Mutable.ChatColours.Remove(type);
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.LongArrowAltDown, $"{type}", Language.Options_ChatColours_Import)) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.LongArrowAltDown,
$"{type}",
Language.Options_ChatColours_Import
)
)
{ {
var gameColour = Plugin.Functions.Chat.GetChannelColor(type); var gameColour = Plugin.Functions.Chat.GetChannelColor(type);
Mutable.ChatColours[type] = gameColour ?? type.DefaultColor() ?? 0; Mutable.ChatColours[type] = gameColour ?? type.DefaultColor() ?? 0;
@@ -210,8 +271,14 @@ internal sealed class FontsAndColours : ISettingsTab
{ {
var border = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(255, 128, 200)); var border = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(255, 128, 200));
var btn = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(74, 42, 106)); var btn = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(74, 42, 106));
ImGui.PushStyleColor(ImGuiCol.Border, new System.Numerics.Vector4(border.X, border.Y, border.Z, 1f)); ImGui.PushStyleColor(
ImGui.PushStyleColor(ImGuiCol.Button, new System.Numerics.Vector4(btn.X, btn.Y, btn.Z, 1f)); ImGuiCol.Border,
new System.Numerics.Vector4(border.X, border.Y, border.Z, 1f)
);
ImGui.PushStyleColor(
ImGuiCol.Button,
new System.Numerics.Vector4(btn.X, btn.Y, btn.Z, 1f)
);
ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.5f); ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.5f);
} }
@@ -230,7 +297,10 @@ internal sealed class FontsAndColours : ISettingsTab
private static string GetPresetLabel(ChatColourPreset preset) private static string GetPresetLabel(ChatColourPreset preset)
{ {
var localized = HellionStrings.ResourceManager.GetString(preset.LocalizationKey, HellionStrings.Culture); var localized = HellionStrings.ResourceManager.GetString(
preset.LocalizationKey,
HellionStrings.Culture
);
return string.IsNullOrEmpty(localized) ? preset.DisplayName : localized; return string.IsNullOrEmpty(localized) ? preset.DisplayName : localized;
} }
+30 -9
View File
@@ -1,8 +1,8 @@
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Util;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -54,7 +54,12 @@ internal sealed class General : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_KeybindMode_Name,
Mutable.KeybindMode.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -72,7 +77,9 @@ internal sealed class General : ISettingsTab
} }
} }
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName)
);
} }
} }
@@ -123,7 +130,12 @@ internal sealed class General : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Language_Name, Mutable.LanguageOverride.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Language_Name,
Mutable.LanguageOverride.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -136,10 +148,17 @@ internal sealed class General : ISettingsTab
} }
} }
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_Language_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_Language_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_CommandHelpSide_Name, Mutable.CommandHelpSide.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_CommandHelpSide_Name,
Mutable.CommandHelpSide.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -152,7 +171,9 @@ internal sealed class General : ISettingsTab
} }
} }
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate); ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate);
+43 -16
View File
@@ -1,10 +1,10 @@
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Util;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -19,21 +19,41 @@ internal sealed class Information : ISettingsTab
private readonly List<string> Translators = private readonly List<string> Translators =
[ [
"q673135110", "Akizem", "d0tiKs", "q673135110",
"Moonlight_Everlit", "Dark32", "andreycout", "Akizem",
"Button_", "Cali666", "cassandra308", "d0tiKs",
"lokinmodar", "jtabox", "AkiraYorumoto", "Moonlight_Everlit",
"MKhayle", "elena.space", "imlisa", "Dark32",
"andrei5125", "ShivaMaheshvara", "aislinn87", "andreycout",
"nishinatsu051", "lichuyuan", "Risu64", "Button_",
"yummypillow", "witchymary", "Yuzumi", "Cali666",
"zomsakura", "Sirayuki" "cassandra308",
"lokinmodar",
"jtabox",
"AkiraYorumoto",
"MKhayle",
"elena.space",
"imlisa",
"andrei5125",
"ShivaMaheshvara",
"aislinn87",
"nishinatsu051",
"lichuyuan",
"Risu64",
"yummypillow",
"witchymary",
"Yuzumi",
"zomsakura",
"Sirayuki",
]; ];
internal Information(Configuration mutable) internal Information(Configuration mutable)
{ {
Mutable = mutable; Mutable = mutable;
Translators.Sort((a, b) => string.Compare(a.ToLowerInvariant(), b.ToLowerInvariant(), StringComparison.Ordinal)); Translators.Sort(
(a, b) =>
string.Compare(a.ToLowerInvariant(), b.ToLowerInvariant(), StringComparison.Ordinal)
);
} }
public void Draw(bool changed) public void Draw(bool changed)
@@ -69,14 +89,19 @@ internal sealed class Information : ISettingsTab
ImGui.TextUnformatted(Language.Options_About_Version); ImGui.TextUnformatted(Language.Options_About_Version);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextColored(ImGuiColors.ParsedOrange, Plugin.Interface.Manifest.AssemblyVersion.ToString(3)); ImGui.TextColored(
ImGuiColors.ParsedOrange,
Plugin.Interface.Manifest.AssemblyVersion.ToString(3)
);
ImGuiHelpers.ScaledDummy(10.0f); ImGuiHelpers.ScaledDummy(10.0f);
ImGui.TextUnformatted(Language.Options_About_Github_Issues); ImGui.TextUnformatted(Language.Options_About_Github_Issues);
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues")) if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues"))
Dalamud.Utility.Util.OpenLink("https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues"); Dalamud.Utility.Util.OpenLink(
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues"
);
} }
} }
@@ -169,7 +194,9 @@ internal sealed class Information : ISettingsTab
return; return;
ImGui.TextUnformatted(Language.Options_Changelog_Header); ImGui.TextUnformatted(Language.Options_Changelog_Header);
ImGui.TextUnformatted($"Version {Plugin.Interface.Manifest.AssemblyVersion.ToString(3)}"); ImGui.TextUnformatted(
$"Version {Plugin.Interface.Manifest.AssemblyVersion.ToString(3)}"
);
ImGui.Spacing(); ImGui.Spacing();
foreach (var sentence in changelog.Split("\n")) foreach (var sentence in changelog.Split("\n"))
{ {
+40 -16
View File
@@ -53,16 +53,24 @@ internal sealed class Integrations : ISettingsTab
// toggle when Honorific is missing would force the user to retoggle // toggle when Honorific is missing would force the user to retoggle
// it every time Honorific is reloaded, which is worse UX than the // it every time Honorific is reloaded, which is worse UX than the
// silent auto-hide. // silent auto-hide.
if (ImGui.Checkbox( if (
HellionStrings.Settings_Integrations_Honorific_Toggle, ImGui.Checkbox(
ref Mutable.ShowHonorificTitleInHeader)) HellionStrings.Settings_Integrations_Honorific_Toggle,
ref Mutable.ShowHonorificTitleInHeader
)
)
{ {
Plugin.SaveConfig(); Plugin.SaveConfig();
} }
using (ImRaii.PushIndent()) using (ImRaii.PushIndent())
{ {
using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(Plugin.ThemeRegistry.Active.Colors.TextMuted))) using (
ImRaii.PushColor(
ImGuiCol.Text,
ColourUtil.RgbaToAbgr(Plugin.ThemeRegistry.Active.Colors.TextMuted)
)
)
{ {
ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint); ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint);
} }
@@ -94,23 +102,34 @@ internal sealed class Integrations : ISettingsTab
{ {
DrawStatusGlyph('●', theme.Colors.StatusSuccess); DrawStatusGlyph('●', theme.Colors.StatusSuccess);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted(string.Format( ImGui.TextUnformatted(
HellionStrings.Settings_Integrations_Honorific_Status_Detected, string.Format(
version.Major, version.Minor)); HellionStrings.Settings_Integrations_Honorific_Status_Detected,
version.Major,
version.Minor
)
);
} }
else if (service.DetectedApiVersion is { } incompatibleVersion) else if (service.DetectedApiVersion is { } incompatibleVersion)
{ {
DrawStatusGlyph('⚠', theme.Colors.StatusWarning); DrawStatusGlyph('⚠', theme.Colors.StatusWarning);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted(string.Format( ImGui.TextUnformatted(
HellionStrings.Settings_Integrations_Honorific_Status_Incompatible, string.Format(
HonorificService.ExpectedApiMajor, incompatibleVersion.Major, incompatibleVersion.Minor)); HellionStrings.Settings_Integrations_Honorific_Status_Incompatible,
HonorificService.ExpectedApiMajor,
incompatibleVersion.Major,
incompatibleVersion.Minor
)
);
} }
else else
{ {
DrawStatusGlyph('○', theme.Colors.TextMuted); DrawStatusGlyph('○', theme.Colors.TextMuted);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted(HellionStrings.Settings_Integrations_Honorific_Status_NotInstalled); ImGui.TextUnformatted(
HellionStrings.Settings_Integrations_Honorific_Status_NotInstalled
);
} }
} }
@@ -133,19 +152,24 @@ internal sealed class Integrations : ISettingsTab
// full section above the Coming Soon block. // full section above the Coming Soon block.
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title, HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title,
HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description); HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_Notifications_Title, HellionStrings.Settings_Integrations_ComingSoon_Notifications_Title,
HellionStrings.Settings_Integrations_ComingSoon_Notifications_Description); HellionStrings.Settings_Integrations_ComingSoon_Notifications_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Title, HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Title,
HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Description); HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Title, HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Title,
HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Description); HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Title, HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Title,
HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Description); HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Description
);
} }
private void DrawComingSoonItem(string title, string description) private void DrawComingSoonItem(string title, string description)
+91 -27
View File
@@ -1,9 +1,9 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Privacy; using HellionChat.Privacy;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -24,28 +24,90 @@ internal sealed class Privacy : ISettingsTab
// a runtime LanguageChanged call updates the labels immediately. // a runtime LanguageChanged call updates the labels immediately.
private static readonly (Func<string> Heading, ChatType[] Types)[] Groups = private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
[ [
(() => HellionStrings.Privacy_Group_DirectMessages, [ChatType.TellIncoming, ChatType.TellOutgoing]), (
(() => HellionStrings.Privacy_Group_PartyAlliance, [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]), () => HellionStrings.Privacy_Group_DirectMessages,
(() => HellionStrings.Privacy_Group_FreeCompany, [ChatType.FreeCompany, ChatType.FreeCompanyAnnouncement, ChatType.FreeCompanyLoginLogout]), [ChatType.TellIncoming, ChatType.TellOutgoing]
(() => HellionStrings.Privacy_Group_Linkshells, [ ),
ChatType.Linkshell1, ChatType.Linkshell2, ChatType.Linkshell3, ChatType.Linkshell4, (
ChatType.Linkshell5, ChatType.Linkshell6, ChatType.Linkshell7, ChatType.Linkshell8, () => HellionStrings.Privacy_Group_PartyAlliance,
]), [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]
(() => HellionStrings.Privacy_Group_CrossLinkshells, [ ),
ChatType.CrossLinkshell1, ChatType.CrossLinkshell2, ChatType.CrossLinkshell3, ChatType.CrossLinkshell4, (
ChatType.CrossLinkshell5, ChatType.CrossLinkshell6, ChatType.CrossLinkshell7, ChatType.CrossLinkshell8, () => HellionStrings.Privacy_Group_FreeCompany,
]), [
(() => HellionStrings.Privacy_Group_ExtraChat, [ ChatType.FreeCompany,
ChatType.ExtraChatLinkshell1, ChatType.ExtraChatLinkshell2, ChatType.ExtraChatLinkshell3, ChatType.ExtraChatLinkshell4, ChatType.FreeCompanyAnnouncement,
ChatType.ExtraChatLinkshell5, ChatType.ExtraChatLinkshell6, ChatType.ExtraChatLinkshell7, ChatType.ExtraChatLinkshell8, ChatType.FreeCompanyLoginLogout,
]), ]
(() => HellionStrings.Privacy_Group_PublicChat, [ChatType.Say, ChatType.Shout, ChatType.Yell, ChatType.NoviceNetwork, ChatType.CustomEmote, ChatType.StandardEmote]), ),
(() => HellionStrings.Privacy_Group_SystemLogs, [ (
ChatType.System, ChatType.Notice, ChatType.Urgent, ChatType.Echo, () => HellionStrings.Privacy_Group_Linkshells,
ChatType.NpcDialogue, ChatType.NpcAnnouncement, [
ChatType.LootNotice, ChatType.LootRoll, ChatType.RetainerSale, ChatType.Linkshell1,
ChatType.Crafting, ChatType.Gathering, ChatType.Sign, ChatType.RandomNumber, ChatType.Linkshell2,
]), ChatType.Linkshell3,
ChatType.Linkshell4,
ChatType.Linkshell5,
ChatType.Linkshell6,
ChatType.Linkshell7,
ChatType.Linkshell8,
]
),
(
() => HellionStrings.Privacy_Group_CrossLinkshells,
[
ChatType.CrossLinkshell1,
ChatType.CrossLinkshell2,
ChatType.CrossLinkshell3,
ChatType.CrossLinkshell4,
ChatType.CrossLinkshell5,
ChatType.CrossLinkshell6,
ChatType.CrossLinkshell7,
ChatType.CrossLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_ExtraChat,
[
ChatType.ExtraChatLinkshell1,
ChatType.ExtraChatLinkshell2,
ChatType.ExtraChatLinkshell3,
ChatType.ExtraChatLinkshell4,
ChatType.ExtraChatLinkshell5,
ChatType.ExtraChatLinkshell6,
ChatType.ExtraChatLinkshell7,
ChatType.ExtraChatLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_PublicChat,
[
ChatType.Say,
ChatType.Shout,
ChatType.Yell,
ChatType.NoviceNetwork,
ChatType.CustomEmote,
ChatType.StandardEmote,
]
),
(
() => HellionStrings.Privacy_Group_SystemLogs,
[
ChatType.System,
ChatType.Notice,
ChatType.Urgent,
ChatType.Echo,
ChatType.NpcDialogue,
ChatType.NpcAnnouncement,
ChatType.LootNotice,
ChatType.LootRoll,
ChatType.RetainerSale,
ChatType.Crafting,
ChatType.Gathering,
ChatType.Sign,
ChatType.RandomNumber,
]
),
]; ];
public void Draw(bool changed) public void Draw(bool changed)
@@ -68,7 +130,8 @@ internal sealed class Privacy : ISettingsTab
ImGuiUtil.OptionCheckbox( ImGuiUtil.OptionCheckbox(
ref Mutable.PrivacyFilterEnabled, ref Mutable.PrivacyFilterEnabled,
HellionStrings.Privacy_FilterEnabled_Name, HellionStrings.Privacy_FilterEnabled_Name,
HellionStrings.Privacy_FilterEnabled_Description); HellionStrings.Privacy_FilterEnabled_Description
);
ImGuiUtil.HelpMarker(HellionStrings.Privacy_FilterEnabled_StorageOnly_Help); ImGuiUtil.HelpMarker(HellionStrings.Privacy_FilterEnabled_StorageOnly_Help);
ImGui.Spacing(); ImGui.Spacing();
@@ -82,7 +145,7 @@ internal sealed class Privacy : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
if (ImGui.Button(HellionStrings.Privacy_Preset_PrivacyFirst)) if (ImGui.Button(HellionStrings.Privacy_Preset_PrivacyFirst))
Mutable.PrivacyPersistChannels = [..PrivacyDefaults.PrivacyFirstWhitelist]; Mutable.PrivacyPersistChannels = [.. PrivacyDefaults.PrivacyFirstWhitelist];
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button(HellionStrings.Privacy_Preset_ClearAll)) if (ImGui.Button(HellionStrings.Privacy_Preset_ClearAll))
@@ -128,7 +191,8 @@ internal sealed class Privacy : ISettingsTab
ImGuiUtil.OptionCheckbox( ImGuiUtil.OptionCheckbox(
ref Mutable.PrivacyPersistUnknownChannels, ref Mutable.PrivacyPersistUnknownChannels,
HellionStrings.Privacy_PersistUnknown_Name, HellionStrings.Privacy_PersistUnknown_Name,
HellionStrings.Privacy_PersistUnknown_Description); HellionStrings.Privacy_PersistUnknown_Description
);
} }
} }
} }
+142 -34
View File
@@ -1,10 +1,10 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Interface;
using Dalamud.Interface.Utility.Raii;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Interface;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui;
using Dalamud.Game.ClientState.Objects.SubKinds;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -42,13 +42,25 @@ internal sealed class Tabs : ISettingsTab
ImGui.Separator(); ImGui.Separator();
if (ImGui.Selectable(string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_General))) if (
ImGui.Selectable(
string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_General)
)
)
Mutable.Tabs.Add(TabsUtil.VanillaGeneral); Mutable.Tabs.Add(TabsUtil.VanillaGeneral);
if (ImGui.Selectable(string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Event))) if (
ImGui.Selectable(
string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Event)
)
)
Mutable.Tabs.Add(TabsUtil.VanillaEvent); Mutable.Tabs.Add(TabsUtil.VanillaEvent);
if (ImGui.Selectable(string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Tell))) if (
ImGui.Selectable(
string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Tell)
)
)
Mutable.Tabs.Add(TabsUtil.VanillaTellExclusive); Mutable.Tabs.Add(TabsUtil.VanillaTellExclusive);
} }
} }
@@ -68,7 +80,12 @@ internal sealed class Tabs : ISettingsTab
using var pushedId = ImRaii.PushId($"tab-{i}"); using var pushedId = ImRaii.PushId($"tab-{i}");
if (ImGuiUtil.IconButton(FontAwesomeIcon.TrashAlt, tooltip: Language.Options_Tabs_Delete)) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.TrashAlt,
tooltip: Language.Options_Tabs_Delete
)
)
{ {
toRemove = i; toRemove = i;
ToOpen = -1; ToOpen = -1;
@@ -76,7 +93,10 @@ internal sealed class Tabs : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowUp, tooltip: Language.Options_Tabs_MoveUp) && i > 0) if (
ImGuiUtil.IconButton(FontAwesomeIcon.ArrowUp, tooltip: Language.Options_Tabs_MoveUp)
&& i > 0
)
{ {
(Mutable.Tabs[i - 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i - 1]); (Mutable.Tabs[i - 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i - 1]);
ToOpen = i - 1; ToOpen = i - 1;
@@ -84,13 +104,24 @@ internal sealed class Tabs : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowDown, tooltip: Language.Options_Tabs_MoveDown) && i < Mutable.Tabs.Count - 1) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.ArrowDown,
tooltip: Language.Options_Tabs_MoveDown
)
&& i < Mutable.Tabs.Count - 1
)
{ {
(Mutable.Tabs[i + 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i + 1]); (Mutable.Tabs[i + 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i + 1]);
ToOpen = i + 1; ToOpen = i + 1;
} }
ImGui.InputText(Language.Options_Tabs_Name, ref tab.Name, 512, ImGuiInputTextFlags.EnterReturnsTrue); ImGui.InputText(
Language.Options_Tabs_Name,
ref tab.Name,
512,
ImGuiInputTextFlags.EnterReturnsTrue
);
// v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt. // v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt.
ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label); ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label);
@@ -98,15 +129,19 @@ internal sealed class Tabs : ISettingsTab
ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker); ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker);
var iconCurrent = string.IsNullOrEmpty(tab.Icon) ? "" : tab.Icon; var iconCurrent = string.IsNullOrEmpty(tab.Icon) ? "" : tab.Icon;
var iconPreview = iconCurrent.Length == 0 var iconPreview =
? HellionStrings.Tabs_Icon_DefaultOption iconCurrent.Length == 0 ? HellionStrings.Tabs_Icon_DefaultOption : iconCurrent;
: iconCurrent;
using (var combo = ImRaii.Combo($"##icon-{i}", iconPreview)) using (var combo = ImRaii.Combo($"##icon-{i}", iconPreview))
{ {
if (combo.Success) if (combo.Success)
{ {
// Erste Option: Default (löscht Icon, lässt Mapping greifen). // Erste Option: Default (löscht Icon, lässt Mapping greifen).
if (ImGui.Selectable(HellionStrings.Tabs_Icon_DefaultOption, iconCurrent.Length == 0)) if (
ImGui.Selectable(
HellionStrings.Tabs_Icon_DefaultOption,
iconCurrent.Length == 0
)
)
{ {
tab.Icon = null; tab.Icon = null;
} }
@@ -116,7 +151,11 @@ internal sealed class Tabs : ISettingsTab
// Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth). // Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth).
foreach (var option in TabIconGlyphResolver.PickerOptions) foreach (var option in TabIconGlyphResolver.PickerOptions)
{ {
var isSelected = string.Equals(iconCurrent, option, StringComparison.OrdinalIgnoreCase); var isSelected = string.Equals(
iconCurrent,
option,
StringComparison.OrdinalIgnoreCase
);
if (ImGui.Selectable(option, isSelected)) if (ImGui.Selectable(option, isSelected))
{ {
tab.Icon = option; tab.Icon = option;
@@ -130,27 +169,53 @@ internal sealed class Tabs : ISettingsTab
if (tab.PopOut) if (tab.PopOut)
{ {
using var _ = ImRaii.PushIndent(10.0f); using var _ = ImRaii.PushIndent(10.0f);
ImGui.Checkbox(Language.Options_Tabs_IndependentOpacity, ref tab.IndependentOpacity); ImGui.Checkbox(
Language.Options_Tabs_IndependentOpacity,
ref tab.IndependentOpacity
);
if (tab.IndependentOpacity) if (tab.IndependentOpacity)
ImGuiUtil.DragFloatVertical(Language.Options_Tabs_Opacity, ref tab.Opacity, 0.25f, 0f, 100f, $"{tab.Opacity:N2}%%", ImGuiSliderFlags.AlwaysClamp); ImGuiUtil.DragFloatVertical(
Language.Options_Tabs_Opacity,
ref tab.Opacity,
0.25f,
0f,
100f,
$"{tab.Opacity:N2}%%",
ImGuiSliderFlags.AlwaysClamp
);
ImGui.Checkbox(Language.Options_Tabs_IndependentHide, ref tab.IndependentHide); ImGui.Checkbox(Language.Options_Tabs_IndependentHide, ref tab.IndependentHide);
if (tab.IndependentHide) if (tab.IndependentHide)
{ {
using var __ = ImRaii.PushIndent(10.0f); using var __ = ImRaii.PushIndent(10.0f);
ImGuiUtil.OptionCheckbox(ref tab.HideDuringCutscenes, Language.Options_HideDuringCutscenes_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideDuringCutscenes,
Language.Options_HideDuringCutscenes_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideWhenNotLoggedIn, Language.Options_HideWhenNotLoggedIn_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideWhenNotLoggedIn,
Language.Options_HideWhenNotLoggedIn_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideWhenUiHidden, Language.Options_HideWhenUiHidden_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideWhenUiHidden,
Language.Options_HideWhenUiHidden_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideInLoadingScreens, Language.Options_HideInLoadingScreens_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideInLoadingScreens,
Language.Options_HideInLoadingScreens_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideInBattle, Language.Options_HideInBattle_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideInBattle,
Language.Options_HideInBattle_Name
);
ImGui.Spacing(); ImGui.Spacing();
} }
@@ -161,7 +226,12 @@ internal sealed class Tabs : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
} }
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Tabs_UnreadMode, tab.UnreadMode.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Tabs_UnreadMode,
tab.UnreadMode.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -182,16 +252,32 @@ internal sealed class Tabs : ISettingsTab
ImGui.Checkbox(Language.Options_Tabs_NoInput, ref tab.InputDisabled); ImGui.Checkbox(Language.Options_Tabs_NoInput, ref tab.InputDisabled);
if (!tab.InputDisabled) if (!tab.InputDisabled)
{ {
var input = tab.Channel?.ToChatType().Name() ?? Language.Options_Tabs_NoInputChannel; var input =
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Tabs_InputChannel, input)) tab.Channel?.ToChatType().Name() ?? Language.Options_Tabs_NoInputChannel;
using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Tabs_InputChannel,
input
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
if (ImGui.Selectable(Language.Options_Tabs_NoInputChannel, tab.Channel == null)) if (
ImGui.Selectable(
Language.Options_Tabs_NoInputChannel,
tab.Channel == null
)
)
tab.Channel = null; tab.Channel = null;
foreach (var channel in Enum.GetValues<InputChannel>()) foreach (var channel in Enum.GetValues<InputChannel>())
if (ImGui.Selectable(channel.ToChatType().Name(), tab.Channel == channel)) if (
ImGui.Selectable(
channel.ToChatType().Name(),
tab.Channel == channel
)
)
tab.Channel = channel; tab.Channel = channel;
} }
} }
@@ -202,7 +288,11 @@ internal sealed class Tabs : ISettingsTab
ImGui.Checkbox(Language.Options_Tabs_SenderMessages, ref tab.AllSenderMessages); ImGui.Checkbox(Language.Options_Tabs_SenderMessages, ref tab.AllSenderMessages);
ImGuiUtil.HelpText(Language.Options_Help_SenderMessages); ImGuiUtil.HelpText(Language.Options_Help_SenderMessages);
var worlds = Sheets.WorldsOnDatacenter(player).OrderByDescending(world => world.DataCenter.RowId).ThenBy(world => world.Name.ToString()).ToList(); var worlds = Sheets
.WorldsOnDatacenter(player)
.OrderByDescending(world => world.DataCenter.RowId)
.ThenBy(world => world.Name.ToString())
.ToList();
using (ImRaii.ItemWidth(ImGui.GetWindowWidth() / 3f)) using (ImRaii.ItemWidth(ImGui.GetWindowWidth() / 3f))
{ {
@@ -225,18 +315,30 @@ internal sealed class Tabs : ISettingsTab
} }
else else
{ {
var selectedWorld = worlds.FindIndex(world => world.RowId == tab.TellTarget.World); var selectedWorld = worlds.FindIndex(world =>
world.RowId == tab.TellTarget.World
);
if (selectedWorld == -1) if (selectedWorld == -1)
selectedWorld = 0; selectedWorld = 0;
using (var combo = ImRaii.Combo("###player-world", worlds[selectedWorld].Name.ToString())) using (
var combo = ImRaii.Combo(
"###player-world",
worlds[selectedWorld].Name.ToString()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
var lastDc = worlds.First().DataCenter.RowId; var lastDc = worlds.First().DataCenter.RowId;
foreach (var (idx, world) in worlds.Index()) foreach (var (idx, world) in worlds.Index())
{ {
if (ImGui.Selectable(world.Name.ToString(), selectedWorld == idx)) if (
ImGui.Selectable(
world.Name.ToString(),
selectedWorld == idx
)
)
{ {
selectedWorld = idx; selectedWorld = idx;
tab.TellTarget.World = worlds[selectedWorld].RowId; tab.TellTarget.World = worlds[selectedWorld].RowId;
@@ -253,7 +355,9 @@ internal sealed class Tabs : ISettingsTab
} }
} }
var target = (Plugin.TargetManager.SoftTarget ?? Plugin.TargetManager.Target) as IPlayerCharacter; var target =
(Plugin.TargetManager.SoftTarget ?? Plugin.TargetManager.Target)
as IPlayerCharacter;
using (ImRaii.Disabled(target == null)) using (ImRaii.Disabled(target == null))
{ {
if (ImGui.Button("Set to target") && target != null) if (ImGui.Button("Set to target") && target != null)
@@ -263,7 +367,11 @@ internal sealed class Tabs : ISettingsTab
} }
ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, tab.SelectedChannels); ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, tab.SelectedChannels);
ImGuiUtil.ExtraChatSelector(Language.Options_Tabs_ExtraChatChannels, ref tab.ExtraChatAll, tab.ExtraChatChannels); ImGuiUtil.ExtraChatSelector(
Language.Options_Tabs_ExtraChatChannels,
ref tab.ExtraChatAll,
tab.ExtraChatChannels
);
} }
if (toRemove > -1) if (toRemove > -1)
+77 -25
View File
@@ -14,7 +14,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
private string? _applyDismissedFor; private string? _applyDismissedFor;
public string Name => HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout"; public string Name =>
HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout";
internal ThemeAndLayout(Plugin plugin, Configuration mutable) internal ThemeAndLayout(Plugin plugin, Configuration mutable)
{ {
@@ -42,7 +43,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
var registry = Plugin.ThemeRegistry; var registry = Plugin.ThemeRegistry;
var active = registry.Get(Mutable.Theme); var active = registry.Get(Mutable.Theme);
var activeLabelTemplate = HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}"; var activeLabelTemplate =
HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}";
ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name)); ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name));
using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u)) using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
ImGui.TextUnformatted(active.Author); ImGui.TextUnformatted(active.Author);
@@ -53,7 +55,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
var builtInsLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns") ?? "Built-in themes"; var builtInsLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns")
?? "Built-in themes";
ImGui.TextUnformatted(builtInsLabel); ImGui.TextUnformatted(builtInsLabel);
ImGui.Spacing(); ImGui.Spacing();
DrawThemeGrid(registry.AllBuiltIns(), active.Slug); DrawThemeGrid(registry.AllBuiltIns(), active.Slug);
@@ -64,7 +68,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
var customLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_Custom") ?? "Custom themes"; var customLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_Custom")
?? "Custom themes";
ImGui.TextUnformatted(customLabel); ImGui.TextUnformatted(customLabel);
ImGui.Spacing(); ImGui.Spacing();
DrawThemeGrid(customs, active.Slug); DrawThemeGrid(customs, active.Slug);
@@ -74,7 +80,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
var openFolderLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder") ?? "Open themes folder"; var openFolderLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder")
?? "Open themes folder";
if (ImGui.Button(openFolderLabel)) if (ImGui.Button(openFolderLabel))
{ {
var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes"); var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
@@ -83,7 +91,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
} }
ImGui.SameLine(); ImGui.SameLine();
var exportLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive") ?? "Export active..."; var exportLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive")
?? "Export active...";
if (ImGui.Button(exportLabel)) if (ImGui.Button(exportLabel))
{ {
var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes"); var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
@@ -130,12 +140,26 @@ internal sealed class ThemeAndLayout : ISettingsTab
if (isActive) if (isActive)
{ {
var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary); var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary);
draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 2f); draw.AddRect(
cursorBefore,
cursorBefore + new Vector2(w, h),
border,
4f,
ImDrawFlags.None,
2f
);
} }
else if (hovered) else if (hovered)
{ {
var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u); var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u);
draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 1f); draw.AddRect(
cursorBefore,
cursorBefore + new Vector2(w, h),
border,
4f,
ImDrawFlags.None,
1f
);
} }
var mockupOrigin = cursorBefore + new Vector2(12f, 12f); var mockupOrigin = cursorBefore + new Vector2(12f, 12f);
@@ -166,7 +190,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
return; return;
var alreadyMatching = themeChatColors.Channels.All(kvp => var alreadyMatching = themeChatColors.Channels.All(kvp =>
Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value); Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value
);
if (alreadyMatching) if (alreadyMatching)
return; return;
@@ -181,12 +206,15 @@ internal sealed class ThemeAndLayout : ISettingsTab
draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f); draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f);
draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f); draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f);
var hint = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint") var hint =
?? "This theme suggests its own chat channel colours."; HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint")
var applyLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply") ?? "This theme suggests its own chat channel colours.";
?? "Apply"; var applyLabel =
var keepLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep") HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply")
?? "Keep current"; ?? "Apply";
var keepLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep")
?? "Keep current";
var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary); var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary);
draw.AddText(origin + new Vector2(12f, 10f), textColor, hint); draw.AddText(origin + new Vector2(12f, 10f), textColor, hint);
@@ -217,7 +245,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
private void DrawWindowStyleSection() private void DrawWindowStyleSection()
{ {
using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_WindowStyle_Heading); using var tree = ImRaii.TreeNode(
HellionStrings.Settings_ThemeAndLayout_WindowStyle_Heading
);
if (!tree.Success) if (!tree.Success)
return; return;
@@ -225,13 +255,18 @@ internal sealed class ThemeAndLayout : ISettingsTab
{ {
ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar); ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar); ImGui.Checkbox(
Language.Options_ShowPopOutTitleBar_Name,
ref Mutable.ShowPopOutTitleBar
);
ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton); ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description); ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView); ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
ImGui.Separator(); ImGui.Separator();
@@ -241,14 +276,17 @@ internal sealed class ThemeAndLayout : ISettingsTab
// Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden // Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden
// des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0). // des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0).
var opacityPercent = Mutable.WindowOpacity * 100f; var opacityPercent = Mutable.WindowOpacity * 100f;
if (ImGuiUtil.DragFloatVertical( if (
ImGuiUtil.DragFloatVertical(
HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Name, HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Name,
ref opacityPercent, ref opacityPercent,
.25f, .25f,
50f, 50f,
100f, 100f,
$"{opacityPercent:N0}%%", $"{opacityPercent:N0}%%",
ImGuiSliderFlags.AlwaysClamp)) ImGuiSliderFlags.AlwaysClamp
)
)
{ {
Mutable.WindowOpacity = opacityPercent / 100f; Mutable.WindowOpacity = opacityPercent / 100f;
} }
@@ -258,24 +296,38 @@ internal sealed class ThemeAndLayout : ISettingsTab
private void DrawTimestampStyleSection() private void DrawTimestampStyleSection()
{ {
using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_TimestampStyle_Heading); using var tree = ImRaii.TreeNode(
HellionStrings.Settings_ThemeAndLayout_TimestampStyle_Heading
);
if (!tree.Success) if (!tree.Success)
return; return;
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps); ImGui.Checkbox(
Language.Options_PrettierTimestamps_Name,
ref Mutable.PrettierTimestamps
);
ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description); ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
if (Mutable.PrettierTimestamps) if (Mutable.PrettierTimestamps)
{ {
ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty); ImGui.Checkbox(
Language.Options_MoreCompactPretty_Name,
ref Mutable.MoreCompactPretty
);
ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description); ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
ImGui.Checkbox(HellionStrings.Appearance_UseCompactDensity_Name, ref Mutable.UseCompactDensity); ImGui.Checkbox(
HellionStrings.Appearance_UseCompactDensity_Name,
ref Mutable.UseCompactDensity
);
ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description); ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description);
ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps); ImGui.Checkbox(
Language.Options_HideSameTimestamps_Name,
ref Mutable.HideSameTimestamps
);
ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description); ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
} }

Some files were not shown because too many files have changed in this diff Show More