Merge pull request #66 from Thekinghim/63-refactoring

63 refactoring and fixes

Keystone-Companion.toc

@@ -7,6 +7,7 @@
 ## SavedVariables: KeystoneCompanionDB, KeystoneCompanionDebug
 ## DefaultState: enabled
 ## OptionalDeps: MythicDungeonTools
+## X-Build-Type: Alpha
 ## X-Curse-Project-ID: 984971
 ## X-WoWI-ID: 26711
 ## X-Wago-ID: 96do4ENO

Locales/deDE.lua

@@ -0,0 +1,73 @@
+local _, Private = ...
+Private.Locales = Private.Locales or {}
+
+Private.Locales["deDE"] = {
+    --isEditing = true,
+    -- ui/bestDungeons.lua
+    ["WEEKLY BEST"] = "TOP DER WOCHE",
+
+    -- ui/dungeonTimer.lua
+    ["M+ Count"] = "M+ Count",
+
+    -- ui/main.lua
+    ["Player name"] = "Spieler Name",
+    ["Food"] = "Essen",
+    ["Runes"] = "Runen",
+    ["Potions"] = "Tränke",
+    ["Flasks"] = "Phiole",
+    ["Weapon"] = "Waffe",
+    ["Join us on Discord"] = "Komm auf unseren Discord",
+    ["Copy below URL into your browser."] = "Kopiere die folgende URL in deinen Browser.",
+    ["Mythic+ score"] = "Mythic+ Wertung",
+    ["Item level"] = "Gegenstandsstufe",
+    ["Item level in bags"] = "Gegenstandsstufe in den Taschen",
+    ["You do not have this teleport"] = "Du hast diesen Teleport nicht",
+    ["Teleport not usable"] = "Teleport ist nicht nutzbar",
+    ["Click to teleport"] = "Klicken zum teleportieren",
+
+    -- ui/scoreCalculator.lua
+    ["Target Score"] = "Ziel Wertung",
+    ["Max. Key Level"] = "Max. Stufe",
+    ["Only this Week"] = "Nur diese Woche",
+    ["Calculate"] = "Berechnen",
+    ["NAME"] = "NAME",
+    ["LEVEL"] = "STUFE",
+    ["AFFIX"] = "AFFIX",
+    ["NEEDED"] = "BENÖTIGT",
+    ["LIMIT"] = "LIMIT",
+    ["GAIN"] = "GEWINN",
+    ["Not Possible!"] = "Nicht möglich!",
+
+    -- ui/settings.lua
+    ["Show UI button on minimap"] = "Minimap Knopf anzeigen",
+    ["Activate M+ Timer"] = "M+ Timer aktivieren",
+    ["Movable M+ Timer"] = "M+ Timer bewegen",
+    ["M+ Timer Scale"] = "M+ Timer Skalierung",
+    ["M+ Timer Alpha"] = "M+ Timer Deckkraft",
+
+    -- ui/talentCheck.lua
+    ["Talent Check"] = "Talent Check",
+    ["Hover over Icons for more Info."] = "Gehe über die Icosn für mehr Informationen.",
+    ["Reason for Recommendation:"] = "Grund der Empfehlung:",
+    ["Affix for Recommendation:"] = "Affix für die Empfehlung:",
+    ["Recommendation Specs:"] = "Specs für die Empfehlung:",
+    ["Is talented:"] = "Ist vorhanden:",
+    ["It appears that there are no talent recommendations for this affix yet. You might want to submit something through the Discord."] =
+    "Es scheint, als gäbe es noch keine Talentempfehlungen für diesen Affix. Du könntest etwas über den Discord einreichen.",
+
+    -- main.lua
+    ["Click to open an overview of your party's keystones and dungeon items."] =
+    "Klicken, um eine Übersicht über die Schlüsselsteine und Dungeon Items eurer Gruppe zu öffnen.",
+    ["enabled"] = "aktiviert",
+    ["disabled"] = "deaktiviert",
+    ["Developer mode"] = "Entwicklermodus",
+    ["Minimap button"] = "Minimap-Symbol",
+    ["You're running an"] = "Sie benutzen eine",
+    ["build of the addon. Features may be broken or only half finished in alpha versions!"] =
+    "Version des Addons. Funktionen können in Alphaversionen fehlerhaft oder nur halbfertig sein!",
+    ["version of the addon. Thank you for helping test, and please report any issues on the Github so they can be fixed before release. :)"] =
+    "Version des Addons. Vielen Dank für Ihre Hilfe beim Testen, und bitte melden Sie alle Probleme auf Github, damit sie vor der Veröffentlichung behoben werden können :)",
+    ["type"] = "gib",
+    ["to open the KeystoneCompanion UI, or click the minimap button."] =
+    "ein um die KeystoneCompanion UI anzuzeigen, oder klick das minimap Symbol.",
+}

Locales/embeds.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.blizzard.com/wow/ui/" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+    <Script file="enUS.lua"/>
+    <Script file="deDE.lua"/>
+    <Script file="itIT.lua"/>
+    <Script file="frFR.lua"/>
+</Ui>

Locales/enUS.lua

@@ -0,0 +1,73 @@
+local _, Private = ...
+Private.Locales = Private.Locales or {}
+
+Private.Locales["enUS"] = {
+    --isEditing = true,
+    -- ui/bestDungeons.lua
+    ["WEEKLY BEST"] = "WEEKLY BEST",
+
+    -- ui/dungeonTimer.lua
+    ["M+ Count"] = "M+ Count",
+
+    -- ui/main.lua
+    ["Player name"] = "Player name",
+    ["Food"] = "Food",
+    ["Runes"] = "Runes",
+    ["Potions"] = "Potions",
+    ["Flasks"] = "Flasks",
+    ["Weapon"] = "Weapon",
+    ["Join us on Discord"] = "Join us on Discord",
+    ["Copy below URL into your browser."] = "Copy below URL into your browser.",
+    ["Mythic+ score"] = "Mythic+ score",
+    ["Item level"] = "Item level",
+    ["Item level in bags"] = "Item level in bags",
+    ["You do not have this teleport"] = "You do not have this teleport",
+    ["Teleport not usable"] = "Teleport not usable",
+    ["Click to teleport"] = "Click to teleport",
+
+    -- ui/scoreCalculator.lua
+    ["Target Score"] = "Target Score",
+    ["Max. Key Level"] = "Max. Key Level",
+    ["Only this Week"] = "Only this Week",
+    ["Calculate"] = "Calculate",
+    ["NAME"] = "NAME",
+    ["LEVEL"] = "LEVEL",
+    ["AFFIX"] = "AFFIX",
+    ["NEEDED"] = "NEEDED",
+    ["LIMIT"] = "LIMIT",
+    ["GAIN"] = "GAIN",
+    ["Not Possible!"] = "Not Possible!",
+
+    -- ui/settings.lua
+    ["Show UI button on minimap"] = "Show UI button on minimap",
+    ["Activate M+ Timer"] = "Activate M+ Timer",
+    ["Movable M+ Timer"] = "Movable M+ Timer",
+    ["M+ Timer Scale"] = "M+ Timer Scale",
+    ["M+ Timer Alpha"] = "M+ Timer Alpha",
+
+    -- ui/talentCheck.lua
+    ["Talent Check"] = "Talent Check",
+    ["Hover over Icons for more Info."] = "Hover over Icons for more Info.",
+    ["Reason for Recommendation:"] = "Reason for Recommendation:",
+    ["Affix for Recommendation:"] = "Affix for Recommendation:",
+    ["Recommendation Specs:"] = "Recommendation Specs:",
+    ["Is talented:"] = "Is talented:",
+    ["It appears that there are no talent recommendations for this affix yet. You might want to submit something through the Discord."] =
+    "It appears that there are no talent recommendations for this affix yet. You might want to submit something through the Discord.",
+
+    -- main.lua
+    ["Click to open an overview of your party's keystones and dungeon items."] =
+    "Click to open an overview of your party's keystones and dungeon items.",
+    ["enabled"] = "enabled",
+    ["disabled"] = "disabled",
+    ["Developer mode"] = "Developer mode",
+    ["Minimap button"] = "Minimap button",
+    ["You're running an"] = "You're running an",
+    ["build of the addon. Features may be broken or only half finished in alpha versions!"] =
+    "build of the addon. Features may be broken or only half finished in alpha versions!",
+    ["version of the addon. Thank you for helping test, and please report any issues on the Github so they can be fixed before release. :)"] =
+    "version of the addon. Thank you for helping test, and please report any issues on the Github so they can be fixed before release. :)",
+    ["type"] = "type",
+    ["to open the KeystoneCompanion UI, or click the minimap button."] =
+    "to open the KeystoneCompanion UI, or click the minimap button.",
+}

Locales/frFR.lua

@@ -0,0 +1,73 @@
+local _, Private = ...
+Private.Locales = Private.Locales or {}
+
+Private.Locales["frFR"] = {
+    --isEditing = true,
+    -- ui/bestDungeons.lua
+    ["WEEKLY BEST"] = "WEEKLY BEST",
+
+    -- ui/dungeonTimer.lua
+    ["M+ Count"] = "M+ Count",
+
+    -- ui/main.lua
+    ["Player name"] = "Player name",
+    ["Food"] = "Food",
+    ["Runes"] = "Runes",
+    ["Potions"] = "Potions",
+    ["Flasks"] = "Flasks",
+    ["Weapon"] = "Weapon",
+    ["Join us on Discord"] = "Join us on Discord",
+    ["Copy below URL into your browser."] = "Copy below URL into your browser.",
+    ["Mythic+ score"] = "Mythic+ score",
+    ["Item level"] = "Item level",
+    ["Item level in bags"] = "Item level in bags",
+    ["You do not have this teleport"] = "You do not have this teleport",
+    ["Teleport not usable"] = "Teleport not usable",
+    ["Click to teleport"] = "Click to teleport",
+
+    -- ui/scoreCalculator.lua
+    ["Target Score"] = "Target Score",
+    ["Max. Key Level"] = "Max. Key Level",
+    ["Only this Week"] = "Only this Week",
+    ["Calculate"] = "Calculate",
+    ["NAME"] = "NAME",
+    ["LEVEL"] = "LEVEL",
+    ["AFFIX"] = "AFFIX",
+    ["NEEDED"] = "NEEDED",
+    ["LIMIT"] = "LIMIT",
+    ["GAIN"] = "GAIN",
+    ["Not Possible!"] = "Not Possible!",
+
+    -- ui/settings.lua
+    ["Show UI button on minimap"] = "Show UI button on minimap",
+    ["Activate M+ Timer"] = "Activate M+ Timer",
+    ["Movable M+ Timer"] = "Movable M+ Timer",
+    ["M+ Timer Scale"] = "M+ Timer Scale",
+    ["M+ Timer Alpha"] = "M+ Timer Alpha",
+
+    -- ui/talentCheck.lua
+    ["Talent Check"] = "Talent Check",
+    ["Hover over Icons for more Info."] = "Hover over Icons for more Info.",
+    ["Reason for Recommendation:"] = "Reason for Recommendation:",
+    ["Affix for Recommendation:"] = "Affix for Recommendation:",
+    ["Recommendation Specs:"] = "Recommendation Specs:",
+    ["Is talented:"] = "Is talented:",
+    ["It appears that there are no talent recommendations for this affix yet. You might want to submit something through the Discord."] =
+    "It appears that there are no talent recommendations for this affix yet. You might want to submit something through the Discord.",
+
+    -- main.lua
+    ["Click to open an overview of your party's keystones and dungeon items."] =
+    "Click to open an overview of your party's keystones and dungeon items.",
+    ["enabled"] = "enabled",
+    ["disabled"] = "disabled",
+    ["Developer mode"] = "Developer mode",
+    ["Minimap button"] = "Minimap button",
+    ["You're running an"] = "You're running an",
+    ["build of the addon. Features may be broken or only half finished in alpha versions!"] =
+    "build of the addon. Features may be broken or only half finished in alpha versions!",
+    ["version of the addon. Thank you for helping test, and please report any issues on the Github so they can be fixed before release. :)"] =
+    "version of the addon. Thank you for helping test, and please report any issues on the Github so they can be fixed before release. :)",
+    ["type"] = "type",
+    ["to open the KeystoneCompanion UI, or click the minimap button."] =
+    "to open the KeystoneCompanion UI, or click the minimap button.",
+}

Locales/itIT.lua

@@ -0,0 +1,73 @@
+local _, Private = ...
+Private.Locales = Private.Locales or {}
+
+Private.Locales["itIT"] = {
+    --isEditing = true,
+    -- ui/bestDungeons.lua
+    ["WEEKLY BEST"] = "TOP SETTIMANA",
+
+    -- ui/dungeonTimer.lua
+    ["M+ Count"] = "Conteggio M+",
+
+    -- ui/main.lua
+    ["Player name"] = "Nome Giocatore",
+    ["Food"] = "Cibo",
+    ["Runes"] = "Rune",
+    ["Potions"] = "Pozioni",
+    ["Flasks"] = "Flasche",
+    ["Weapon"] = "Arma",
+    ["Join us on Discord"] = "Unisciti a noi su Discord",
+    ["Copy below URL into your browser."] = "Copia l'URL seguente nel tuo browser.",
+    ["Mythic+ score"] = "Punteggio M+",
+    ["Item level"] = "Livello Oggetto",
+    ["Item level in bags"] = "Livello Oggetto nelle borse",
+    ["You do not have this teleport"] = "Non hai questo teletrasporto",
+    ["Teleport not usable"] = "Teletrasporto non utilizzabile",
+    ["Click to teleport"] = "Clic per teletrasportarsi",
+
+    -- ui/scoreCalculator.lua
+    ["Target Score"] = "Punteggio obiettivo",
+    ["Max. Key Level"] = "Max. Livello Chiave",
+    ["Only this Week"] = "Solo questa settimana",
+    ["Calculate"] = "Calcolare",
+    ["NAME"] = "NOME",
+    ["LEVEL"] = "LIVELLO",
+    ["AFFIX"] = "AFFIX",
+    ["NEEDED"] = "NECESSARIO",
+    ["LIMIT"] = "LIMITE",
+    ["GAIN"] = "GUADAGNO",
+    ["Not Possible!"] = "Non Possibile!",
+
+    -- ui/settings.lua
+    ["Show UI button on minimap"] = "Mostra il pulsante UI sulla minimappa",
+    ["Activate M+ Timer"] = "Attiva M+ Timer",
+    ["Movable M+ Timer"] = "Muovi M+ Timer",
+    ["M+ Timer Scale"] = "M+ Timer Scala",
+    ["M+ Timer Alpha"] = "M+ Timer Alpha",
+
+    -- ui/talentCheck.lua
+    ["Talent Check"] = "Controllo Talenti",
+    ["Hover over Icons for more Info."] = "Passa il mouse sopra le icone per maggiori informazioni.",
+    ["Reason for Recommendation:"] = "Motivo della raccomandazione:",
+    ["Affix for Recommendation:"] = "Raccomandazione Affix",
+    ["Recommendation Specs:"] = "Raccomandazione Specs:",
+    ["Is talented:"] = "è talentata:",
+    ["It appears that there are no talent recommendations for this affix yet. You might want to submit something through the Discord."] =
+    "Sembra che non ci siano ancora consigli sui talenti per questo affisso. Potresti voler inviare qualcosa tramite Discord.",
+
+    -- main.lua
+    ["Click to open an overview of your party's keystones and dungeon items."] =
+    "Fai clic per aprire una panoramica delle chiavi di volta e degli oggetti del dungeon del tuo gruppo.",
+    ["enabled"] = "abilitato",
+    ["disabled"] = "disabilitato",
+    ["Developer mode"] = "Modalità sviluppatore",
+    ["Minimap button"] = "Pulsante Minimap",
+    ["You're running an"] = "Stai eseguendo un",
+    ["build of the addon. Features may be broken or only half finished in alpha versions!"] =
+    "build del addon. Le funzionalità potrebbero essere interrotte o completate solo a metà nelle versioni alpha",
+    ["version of the addon. Thank you for helping test, and please report any issues on the Github so they can be fixed before release. :)"] =
+    "versione del addon. Grazie per aver aiutato il test e segnala eventuali problemi su Github in modo che possano essere risolti prima del rilascio. :) :)",
+    ["type"] = "type",
+    ["to open the KeystoneCompanion UI, or click the minimap button."] =
+    "per aprire l'interfaccia utente di KeystoneCompanion o fare clic sul pulsante della minimappa.",
+}

autoSocket.lua

@@ -1,6 +1,7 @@
-local f = CreateFrame("Frame")
-f:RegisterEvent("CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN")
-f:SetScript("OnEvent", function()
+local _, Private = ...
+local addon = Private.Addon
+
+addon:RegisterEvent("CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN", "autoSocket.lua", function()
    for bagIndex = 0, NUM_BAG_SLOTS do
       for slotIndex = 1, C_Container.GetContainerNumSlots(bagIndex) do
          local itemID = C_Container.GetContainerItemID(bagIndex, slotIndex)