🚀 Updated version to 1.4.1

Updated the version in package.json from 1.3.13 to 1.4.1, enhancing the gaming experience on autodarts.io.
creazy231 · Jun 17, 2024 · 6fb3780 · 6fb3780
1 parent 56312ab
commit 6fb3780
Show file tree

Hide file tree

Showing 47 changed files with 578 additions and 376 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/thiele.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/thiele.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AD Tools/Shared (App)/Base.lproj/Main.html b/AD Tools/Shared (App)/Base.lproj/Main.html
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Autodarts Tools
+# Tools for Autodarts
 
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/creazy231/autodarts-tools/release.yml)
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/creazy231/autodarts-tools)
@@ -11,7 +11,7 @@
 )](https://apps.apple.com/de/app/autodarts-tools/id6479754594)
 
 > [!CAUTION]
-> **Autodarts Tools** is developed by the community and is not an integral part of the actual Autodarts
+> **Tools for Autodarts** is developed by the community and is not an integral part of the actual Autodarts
 
 ## Features
 

diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ts/AppIcon.appiconset/mac-icon-128@1x.png → ...ts/AppIcon.appiconset/mac-icon-128@1x.png b/...ts/AppIcon.appiconset/mac-icon-128@1x.png → ...ts/AppIcon.appiconset/mac-icon-128@1x.png
diff --git a/...ts/AppIcon.appiconset/mac-icon-128@2x.png → ...ts/AppIcon.appiconset/mac-icon-128@2x.png b/...ts/AppIcon.appiconset/mac-icon-128@2x.png → ...ts/AppIcon.appiconset/mac-icon-128@2x.png
diff --git a/...ets/AppIcon.appiconset/mac-icon-16@1x.png → ...ets/AppIcon.appiconset/mac-icon-16@1x.png b/...ets/AppIcon.appiconset/mac-icon-16@1x.png → ...ets/AppIcon.appiconset/mac-icon-16@1x.png
diff --git a/...ets/AppIcon.appiconset/mac-icon-16@2x.png → ...ets/AppIcon.appiconset/mac-icon-16@2x.png b/...ets/AppIcon.appiconset/mac-icon-16@2x.png → ...ets/AppIcon.appiconset/mac-icon-16@2x.png
diff --git a/...ts/AppIcon.appiconset/mac-icon-256@1x.png → ...ts/AppIcon.appiconset/mac-icon-256@1x.png b/...ts/AppIcon.appiconset/mac-icon-256@1x.png → ...ts/AppIcon.appiconset/mac-icon-256@1x.png
diff --git a/...ts/AppIcon.appiconset/mac-icon-256@2x.png → ...ts/AppIcon.appiconset/mac-icon-256@2x.png b/...ts/AppIcon.appiconset/mac-icon-256@2x.png → ...ts/AppIcon.appiconset/mac-icon-256@2x.png
diff --git a/...ets/AppIcon.appiconset/mac-icon-32@1x.png → ...ets/AppIcon.appiconset/mac-icon-32@1x.png b/...ets/AppIcon.appiconset/mac-icon-32@1x.png → ...ets/AppIcon.appiconset/mac-icon-32@1x.png
diff --git a/...ets/AppIcon.appiconset/mac-icon-32@2x.png → ...ets/AppIcon.appiconset/mac-icon-32@2x.png b/...ets/AppIcon.appiconset/mac-icon-32@2x.png → ...ets/AppIcon.appiconset/mac-icon-32@2x.png
diff --git a/...ts/AppIcon.appiconset/mac-icon-512@1x.png → ...ts/AppIcon.appiconset/mac-icon-512@1x.png b/...ts/AppIcon.appiconset/mac-icon-512@1x.png → ...ts/AppIcon.appiconset/mac-icon-512@1x.png
diff --git a/...ts/AppIcon.appiconset/mac-icon-512@2x.png → ...ts/AppIcon.appiconset/mac-icon-512@2x.png b/...ts/AppIcon.appiconset/mac-icon-512@2x.png → ...ts/AppIcon.appiconset/mac-icon-512@2x.png
diff --git a/...con.appiconset/universal-icon-1024@1x.png → ...con.appiconset/universal-icon-1024@1x.png b/...con.appiconset/universal-icon-1024@1x.png → ...con.appiconset/universal-icon-1024@1x.png
diff --git a/...hared (App)/Assets.xcassets/Contents.json → ...hared (App)/Assets.xcassets/Contents.json b/...hared (App)/Assets.xcassets/Contents.json → ...hared (App)/Assets.xcassets/Contents.json
diff --git a/...ssets.xcassets/LargeIcon.imageset/128.png → ...ssets.xcassets/LargeIcon.imageset/128.png b/...ssets.xcassets/LargeIcon.imageset/128.png → ...ssets.xcassets/LargeIcon.imageset/128.png
diff --git a/...xcassets/LargeIcon.imageset/Contents.json → ...xcassets/LargeIcon.imageset/Contents.json b/...xcassets/LargeIcon.imageset/Contents.json → ...xcassets/LargeIcon.imageset/Contents.json
diff --git a/Tools for Autodarts/Shared (App)/Base.lproj/Main.html b/Tools for Autodarts/Shared (App)/Base.lproj/Main.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'">
+
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+
+    <link rel="stylesheet" href="../Style.css">
+    <script src="../Script.js" defer></script>
+</head>
+<body>
+    <img src="../Icon.png" width="128" height="128" alt="Tools for Autodarts Icon">
+    <p class="platform-ios">You can turn on Tools for Autodarts Safari extension in Settings.</p>
+    <p class="platform-mac state-unknown">You can turn on Tools for Autodarts extension in Safari Extensions preferences.</p>
+    <p class="platform-mac state-on">Tools for Autodarts extension is currently on. You can turn it off in Safari Extensions preferences.</p>
+    <p class="platform-mac state-off">Tools for Autodarts extension is currently off. You can turn it on in Safari Extensions preferences.</p>
+    <button class="platform-mac open-preferences">Quit and Open Safari Extensions Preferences…</button>
+</body>
+</html>
diff --git a/AD Tools/Shared (App)/Resources/Icon.png → ...Autodarts/Shared (App)/Resources/Icon.png b/AD Tools/Shared (App)/Resources/Icon.png → ...Autodarts/Shared (App)/Resources/Icon.png
diff --git a/AD Tools/Shared (App)/Resources/Script.js → ...utodarts/Shared (App)/Resources/Script.js b/AD Tools/Shared (App)/Resources/Script.js → ...utodarts/Shared (App)/Resources/Script.js
@@ -2,9 +2,9 @@ function show(platform, enabled, useSettingsInsteadOfPreferences) {
     document.body.classList.add(`platform-${platform}`);
 
     if (useSettingsInsteadOfPreferences) {
-        document.getElementsByClassName('platform-mac state-on')[0].innerText = "AD Tools extension is currently on. You can turn it off in the Extensions section of Safari Settings.";
-        document.getElementsByClassName('platform-mac state-off')[0].innerText = "AD Tools extension is currently off. You can turn it on in the Extensions section of Safari Settings.";
-        document.getElementsByClassName('platform-mac state-unknown')[0].innerText = "You can turn on AD Tools extension in the Extensions section of Safari Settings.";
+        document.getElementsByClassName('platform-mac state-on')[0].innerText = "Tools for Autodarts extension is currently on. You can turn it off in the Extensions section of Safari Settings.";
+        document.getElementsByClassName('platform-mac state-off')[0].innerText = "Tools for Autodarts extension is currently off. You can turn it on in the Extensions section of Safari Settings.";
+        document.getElementsByClassName('platform-mac state-unknown')[0].innerText = "You can turn on Tools for Autodarts extension in the Extensions section of Safari Settings.";
         document.getElementsByClassName('platform-mac open-preferences')[0].innerText = "Quit and Open Safari Settings…";
     }
 

diff --git a/AD Tools/Shared (App)/Resources/Style.css → ...utodarts/Shared (App)/Resources/Style.css b/AD Tools/Shared (App)/Resources/Style.css → ...utodarts/Shared (App)/Resources/Style.css
diff --git a/AD Tools/Shared (App)/ViewController.swift → ...todarts/Shared (App)/ViewController.swift b/AD Tools/Shared (App)/ViewController.swift → ...todarts/Shared (App)/ViewController.swift
diff --git a/...xtension)/SafariWebExtensionHandler.swift → ...xtension)/SafariWebExtensionHandler.swift b/...xtension)/SafariWebExtensionHandler.swift → ...xtension)/SafariWebExtensionHandler.swift
diff --git a/AD Tools/AD Tools.xcodeproj/project.pbxproj → ...s for Autodarts.xcodeproj/project.pbxproj b/AD Tools/AD Tools.xcodeproj/project.pbxproj → ...s for Autodarts.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...codeproj/project.xcworkspace/xcuserdata/thiele.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/thiele.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist b/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
@@ -4,15 +4,15 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>AD Tools (iOS).xcscheme_^#shared#^_</key>
+		<key>Tools for Autodarts (iOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
-		<key>AD Tools (macOS).xcscheme_^#shared#^_</key>
+		<key>Tools for Autodarts (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/AD Tools/iOS (App)/AppDelegate.swift → ...for Autodarts/iOS (App)/AppDelegate.swift b/AD Tools/iOS (App)/AppDelegate.swift → ...for Autodarts/iOS (App)/AppDelegate.swift
diff --git a/... (App)/Base.lproj/LaunchScreen.storyboard → ... (App)/Base.lproj/LaunchScreen.storyboard b/... (App)/Base.lproj/LaunchScreen.storyboard → ... (App)/Base.lproj/LaunchScreen.storyboard
diff --git a/...ools/iOS (App)/Base.lproj/Main.storyboard → ...arts/iOS (App)/Base.lproj/Main.storyboard b/...ools/iOS (App)/Base.lproj/Main.storyboard → ...arts/iOS (App)/Base.lproj/Main.storyboard
diff --git a/AD Tools/iOS (App)/Info.plist → Tools for Autodarts/iOS (App)/Info.plist b/AD Tools/iOS (App)/Info.plist → Tools for Autodarts/iOS (App)/Info.plist
diff --git a/AD Tools/iOS (App)/SceneDelegate.swift → ...r Autodarts/iOS (App)/SceneDelegate.swift b/AD Tools/iOS (App)/SceneDelegate.swift → ...r Autodarts/iOS (App)/SceneDelegate.swift
diff --git a/AD Tools/iOS (Extension)/Info.plist → ... for Autodarts/iOS (Extension)/Info.plist b/AD Tools/iOS (Extension)/Info.plist → ... for Autodarts/iOS (Extension)/Info.plist
diff --git a/AD Tools/macOS (App)/AppDelegate.swift → ...r Autodarts/macOS (App)/AppDelegate.swift b/AD Tools/macOS (App)/AppDelegate.swift → ...r Autodarts/macOS (App)/AppDelegate.swift
diff --git a/...ls/macOS (App)/Base.lproj/Main.storyboard → ...ts/macOS (App)/Base.lproj/Main.storyboard b/...ls/macOS (App)/Base.lproj/Main.storyboard → ...ts/macOS (App)/Base.lproj/Main.storyboard
@@ -12,18 +12,18 @@
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
-                            <menuItem title="AD Tools" id="1Xt-HY-uBw">
+                            <menuItem title="Tools for Autodarts" id="1Xt-HY-uBw">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="AD Tools" systemMenu="apple" id="uQy-DD-JDr">
+                                <menu key="submenu" title="Tools for Autodarts" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
-                                        <menuItem title="About AD Tools" id="5kV-Vb-QxS">
+                                        <menuItem title="About Tools for Autodarts" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                                        <menuItem title="Hide AD Tools" keyEquivalent="h" id="Olw-nP-bQN">
+                                        <menuItem title="Hide Tools for Autodarts" keyEquivalent="h" id="Olw-nP-bQN">
                                             <connections>
                                                 <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
                                             </connections>
@@ -41,7 +41,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                                        <menuItem title="Quit AD Tools" keyEquivalent="q" id="4sb-4s-VLi">
+                                        <menuItem title="Quit Tools for Autodarts" keyEquivalent="q" id="4sb-4s-VLi">
                                             <connections>
                                                 <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
                                             </connections>
@@ -53,7 +53,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                                     <items>
-                                        <menuItem title="AD Tools Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                        <menuItem title="Tools for Autodarts Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                             <connections>
                                                 <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
                                             </connections>
@@ -77,7 +77,7 @@
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController showSeguePresentationStyle="single" id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="AD Tools" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" animationBehavior="default" id="IQv-IB-iLA">
+                    <window key="window" title="Tools for Autodarts" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
                         <windowCollectionBehavior key="collectionBehavior" fullScreenNone="YES"/>
                         <rect key="contentRect" x="196" y="240" width="425" height="325"/>

diff --git a/AD Tools/macOS (App)/Info.plist → Tools for Autodarts/macOS (App)/Info.plist b/AD Tools/macOS (App)/Info.plist → Tools for Autodarts/macOS (App)/Info.plist
diff --git a/AD Tools/macOS (App)/AD Tools.entitlements → ...OS (App)/Tools for Autodarts.entitlements b/AD Tools/macOS (App)/AD Tools.entitlements → ...OS (App)/Tools for Autodarts.entitlements
diff --git a/AD Tools/macOS (Extension)/Info.plist → ...or Autodarts/macOS (Extension)/Info.plist b/AD Tools/macOS (Extension)/Info.plist → ...or Autodarts/macOS (Extension)/Info.plist
diff --git a/...s/macOS (Extension)/AD Tools.entitlements → ...tension)/Tools for Autodarts.entitlements b/...s/macOS (Extension)/AD Tools.entitlements → ...tension)/Tools for Autodarts.entitlements
diff --git a/entrypoints/match.content/StreamingMode.vue b/entrypoints/match.content/StreamingMode.vue
@@ -319,7 +319,7 @@ async function setGameData(matchStatus: IMatchStatus) {
   try {
     game.players = matchStatus.playerInfo;
     game.throws = matchStatus.throws;
-    game.turnPoints = matchStatus.turnPoints;
+    game.turnPoints = matchStatus.turnPoints || "🎯";
 
     const gameSettingsContainerElement = document.querySelector("#ad-ext-game-variant")?.parentElement;
 

diff --git a/entrypoints/match.content/setPlayerInfo.ts b/entrypoints/match.content/setPlayerInfo.ts
@@ -21,6 +21,19 @@ export async function setPlayerInfo() {
       const matchhasLegs = playerStatsEl.children[0].children.length > 0;
       const matchhasSets = playerStatsEl.children[0].children.length > 1;
 
+      let playerLegs, playerSets;
+
+      const playerPTags = playerCardEl.querySelectorAll("p");
+
+      try {
+        playerLegs = playerPTags[playerPTags.length >= 4 ? 2 : 1].textContent?.trim();
+        if (playerPTags.length >= 4) {
+          playerSets = playerPTags[1].textContent?.trim();
+        }
+      } catch (e) {
+        console.error("Autodarts Tools: Set Player Info - Error: ", e);
+      }
+
       return {
         name: playerCardEl.querySelector(".ad-ext-player-name")?.textContent || "",
         score: playerCardEl.querySelector(".ad-ext-player-score")?.textContent?.trim() ?? "0",
@@ -29,9 +42,13 @@ export async function setPlayerInfo() {
         ...(matchhasSets && { sets: playerStatsEl?.children[0]?.children[0]?.textContent?.trim() }),
         darts: getDartsThrown(playerCardEl as HTMLElement),
         stats: getStats(playerCardEl as HTMLElement),
+        legs: playerLegs && Number.parseInt(playerLegs) ? Number.parseInt(playerLegs) : 0,
+        sets: playerSets && Number.parseInt(playerSets) ? Number.parseInt(playerSets) : undefined,
       };
     });
 
+    console.log(playerInfo);
+
     await AutodartsToolsMatchStatus.setValue({
       ...matchStatus,
       playerCount,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "autodarts-tools",
   "description": "Autodarts Tools enhances the gaming experience on autodarts.io",
-  "version": "1.3.13",
+  "version": "1.4.1",
   "type": "module",
   "author": {
     "name": "Tobias Thiele",

diff --git a/wxt.config.ts b/wxt.config.ts
@@ -22,8 +22,8 @@ export default defineConfig({
       "storage",
       "*://discord.com/api/webhooks/*",
     ],
-    name: "Autodarts Tools",
-    description: "Autodarts Tools enhances the gaming experience on autodarts.io",
+    name: "Tools for Autodarts",
+    description: "Tools for Autodarts enhances the gaming experience on autodarts.io",
   },
   dev: {
     reloadCommand: "Alt+T",