Merge marc branch

.github/scripts/godot_ci_cache.py

@@ -0,0 +1,79 @@
+# 
+# Fixes https://github.com/godotengine/godot/issues/77508
+# original script source: https://gist.github.com/d6e/5ed21c37a8ac294db26532cc6af5c61c
+#
+
+import os
+import subprocess
+import time
+import re
+from pathlib import Path
+
+# Set the path to your Godot project and Godot executable
+GODOT_PROJECT_PATH = Path(".")
+GODOT_EXECUTABLE = "godot"  # or the path to your Godot executable
+GODOT_LOG_FILE = Path("artifacts") / "godot_output.log"  # Log file to store Godot output
+
+print("Building godot cache...", flush=True)
+start_time = time.time()
+
+# Step 1: Recursively find all '.import' files and collect the expected imported file paths
+expected_imported_files = set()
+for import_file in GODOT_PROJECT_PATH.rglob('*.import'):
+    content = import_file.read_text()
+    matches = re.findall(r'dest_files=\["(res://\.godot/imported/.+?)"\]', content)
+    expected_imported_files.update(matches)
+
+total_imports = len(expected_imported_files)
+print(f"Found {total_imports} references to imported files...", flush=True)
+
+# Step 2: Launch Godot in the background to start the import process
+print("Starting Godot to import files...", flush=True)
+GODOT_LOG_FILE.parent.mkdir(parents=True, exist_ok=True)
+with GODOT_LOG_FILE.open("w") as log_file:
+    try:
+        godot_process = subprocess.Popen(
+            [GODOT_EXECUTABLE, "--path", str(GODOT_PROJECT_PATH), "--editor", "--headless"],
+            stdout=log_file,
+            stderr=subprocess.STDOUT
+        )
+    except Exception as e:
+        print(f"Failed to start Godot: {e}")
+        exit(1)
+
+# Step 3: Continually check if the expected imported files exist
+imported_folder = GODOT_PROJECT_PATH / ".godot/imported"
+while expected_imported_files:
+     # Wait until the imported directory exists
+    if not imported_folder.exists():
+        print(f"Waiting for the imported directory to be created by Godot...")
+        time.sleep(1)
+        continue
+
+    for expected_path in list(expected_imported_files):
+        imported_file_path = GODOT_PROJECT_PATH / expected_path.replace("res://", "")
+        if imported_file_path.exists():
+            expected_imported_files.remove(expected_path)
+    imported_count = total_imports - len(expected_imported_files)
+    print(f"Imported {imported_count} / {total_imports} files...")
+    time.sleep(1)  # Wait for a second before checking again
+
+elapsed_time = time.time() - start_time
+print(f"Imported all files in {elapsed_time:.2f} seconds.", flush=True)
+
+# Step 4: Once all files have been imported, quit Godot
+try:
+    print("Quitting Godot...", flush=True)
+    start_time = time.time()
+    godot_process.terminate()
+    godot_process.wait(timeout=10)
+
+except subprocess.TimeoutExpired:
+    print("Godot did not terminate in a timely manner; killing the process.")
+    godot_process.kill()
+finally:
+    elapsed_time = time.time() - start_time
+    print(f"Godot has been closed in {elapsed_time:.2f} seconds.", flush=True)
+
+print("All files have been imported. Godot has been closed.")
+

.github/workflows/build.yml

@@ -14,18 +14,127 @@ jobs:
       fail-fast: false
       matrix:
         build: [macos, windows, linux]
+        include:
+          - build: linux
+            godot-bin: 'godot.linuxbsd.editor.x86_64.mono'
+            godot-template-bins: 'godot.linuxbsd.template_*'
+            godot-templates-dir: '/home/runner/.local/share/godot/export_templates/4.2.2.stable.mono'
+          - build: macos
+            godot-bin: 'godot.macos.editor.universal'
+            godot-template-bins: 'godot.macos.template_*'
+            godot-templates-dir: '/Users/runner/Library/Application Support/Godot/export_templates/4.2.2.stable'
+          # Windows build runs on Ubuntu
+          - build: windows
+            godot-bin: 'godot.linuxbsd.editor.x86_64.mono'
+            godot-template-bins: 'godot.windows.template_*'
+            godot-templates-dir: '/home/runner/.local/share/godot/export_templates/4.2.2.stable.mono'
 
     steps:
       - uses: actions/checkout@v3
 
       - uses: chickensoft-games/setup-godot@v1
         with:
-          version: 4.2.1
-          use-dotnet: false
+          version: 4.2.2
+          # When running on Linux, we have to use the .NET build, as this is
+          # the only custom build available from the CI
+          use-dotnet: ${{ matrix.build == 'linux' || matrix.build == 'windows' }}
           include-templates: true
 
+      - name: Download Godot w/Bitcoin module
+        uses: robinraju/[email protected]
+        with:
+          repository: LayerTwo-Labs/godot-bitcoin-module
+          tag: v4.2.2-bitcoin
+          filename: ${{ matrix.godot-bin }}
+
+      - name: Download Godot templates w/Bitcoin module
+        uses: robinraju/[email protected]
+        with:
+          repository: LayerTwo-Labs/godot-bitcoin-module
+          tag: v4.2.2-bitcoin
+          filename: ${{ matrix.godot-template-bins }}
+
+      # FIXME: remove
+      - name: show files (linux / windows)
+        if: ${{ matrix.build == 'linux' || matrix.build == 'windows' }}
+        run: |
+          ls
+          echo 'TEMPLATES'
+          ls ${{ matrix.godot-templates-dir }}
+          echo 'VERSION TXT'
+          cat "${{ matrix.godot-templates-dir }}/version.txt"
+          echo $GODOT
+
+      # FIXME: remove
+      - name: show files (macos)
+        if: ${{ matrix.build == 'macos' }}
+        run: |
+          ls
+          #echo 'TEMPLATES'
+          #ls '/Users/runner/Library/Application Support/Godot/export_templates/4.2.2.stable'
+          #echo 'MACOS TEMPLATES'
+          #zipinfo -1 '/Users/runner/Library/Application Support/Godot/export_templates/4.2.2.stable/macos.zip'
+          #echo 'VERSION TXT'
+          #cat '/Users/runner/Library/Application Support/Godot/export_templates/4.2.2.stable/version.txt'
+          echo $GODOT
+
+      - name: Replace default templates with custom templates (linux)
+        if: ${{ matrix.build == 'linux' }}
+        run: |
+          rm "${{ matrix.godot-templates-dir }}/linux_debug.x86_64"
+          mv godot.linuxbsd.template_debug.x86_64.mono "${{ matrix.godot-templates-dir }}/linux_debug.x86_64"
+          rm "${{ matrix.godot-templates-dir }}/linux_release.x86_64"
+          mv godot.linuxbsd.template_release.x86_64.mono "${{ matrix.godot-templates-dir }}/linux_release.x86_64"
+
+      - name: Replace default templates with custom templates (macos)
+        if: ${{ matrix.build == 'macos' }}
+        run: |
+          # Temporary directory used to construct the zip file
+          TMP_ZIP_DIR=$(mktemp -d)
+          mkdir -p "${TMP_ZIP_DIR}/macos_template.app/Contents/MacOS"
+          mv "godot.macos.template_debug.universal" "${TMP_ZIP_DIR}/macos_template.app/Contents/MacOS/godot_macos_debug.universal"
+          mv "godot.macos.template_release.universal" "${TMP_ZIP_DIR}/macos_template.app/Contents/MacOS/godot_macos_release.universal"
+          zip --delete "${{ matrix.godot-templates-dir }}/macos.zip" "macos_template.app/Contents/MacOS/godot_macos_debug.universal"
+          zip --delete "${{ matrix.godot-templates-dir }}/macos.zip" "macos_template.app/Contents/MacOS/godot_macos_release.universal"
+          pushd "${TMP_ZIP_DIR}"
+          zip "${{ matrix.godot-templates-dir }}/macos.zip" "macos_template.app/Contents/MacOS/godot_macos_debug.universal"
+          zip "${{ matrix.godot-templates-dir }}/macos.zip" "macos_template.app/Contents/MacOS/godot_macos_release.universal"
+          popd
+
+      - name: Replace default templates with custom templates (windows)
+        if: ${{ matrix.build == 'windows' }}
+        run: |
+          rm "${{ matrix.godot-templates-dir }}/windows_debug_x86_64.exe"
+          mv "godot.windows.template_debug.x86_64.exe" "${{ matrix.godot-templates-dir }}/windows_debug_x86_64.exe"
+          rm "${{ matrix.godot-templates-dir }}/windows_debug_x86_64_console.exe"
+          mv "godot.windows.template_debug.x86_64.console.exe" "${{ matrix.godot-templates-dir }}/windows_debug_x86_64_console.exe"
+          rm "${{ matrix.godot-templates-dir }}/windows_release_x86_64.exe"
+          mv "godot.windows.template_release.x86_64.exe" "${{ matrix.godot-templates-dir }}/windows_release_x86_64.exe"
+          rm "${{ matrix.godot-templates-dir }}/windows_release_x86_64_console.exe"
+          mv "godot.windows.template_release.x86_64.console.exe" "${{ matrix.godot-templates-dir }}/windows_release_x86_64_console.exe"
+
+      # FIXME: remove
+      - name: show files (linux / windows)
+        if: ${{ matrix.build == 'linux' || matrix.build == 'windows' }}
+        run: |
+          ls
+          echo 'TEMPLATES'
+          ls ${{ matrix.godot-templates-dir }}
+
+      # FIXME: remove
+      - name: show files (macos)
+        if: ${{ matrix.build == 'macos' }}
+        run: |
+          ls
+          echo 'TEMPLATES'
+          ls '/Users/runner/Library/Application Support/Godot/export_templates/4.2.2.stable'
+          echo 'MACOS TEMPLATES'
+          zipinfo -1 '/Users/runner/Library/Application Support/Godot/export_templates/4.2.2.stable/macos.zip'
+
       - name: Verify Setup
         run: |
+          chmod +x ${{ matrix.godot-bin }}
+          mv ${{ matrix.godot-bin }} $GODOT
           godot --version
 
       - name: Import certificate to Keychain
@@ -46,11 +155,14 @@ jobs:
         run: |
           echo ${{ secrets.GODOT_MACOS_NOTARIZATION_API_KEY }} | base64 --decode > notarization_api_key.p8
 
+      # MUST be run before build
+      - name: Initialize godot cache
+        run: python3 .github/scripts/godot_ci_cache.py
+
       - name: Export build
         run: |
           name="${{fromJSON('{"windows": "Windows Desktop", "macos": "macOS", "linux": "Linux/X11"}')[matrix.build] }}"
           godot --headless --export-debug "$name" --verbose 2>&1 | tee build.log
-
         env:
           GODOT_MACOS_NOTARIZATION_API_KEY_ID:
             ${{ secrets.GODOT_MACOS_NOTARIZATION_API_KEY_ID }}

.gitignore

@@ -3,3 +3,5 @@
 
 # Built artifacts go here
 build
+.DS_Store
+.DS_Store

assets/Mediamodifier-Design(2).svg.import → assets/Mediamodifier-Design.svg.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://5d2d4ed2y7p3"
-path="res://.godot/imported/Mediamodifier-Design(2).svg-1aef0d334e1742f214effe500d577b0e.ctex"
+path="res://.godot/imported/Mediamodifier-Design.svg-9d1e220925b1a876f5e5ee1468b72113.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/Mediamodifier-Design(2).svg"
-dest_files=["res://.godot/imported/Mediamodifier-Design(2).svg-1aef0d334e1742f214effe500d577b0e.ctex"]
+source_file="res://assets/Mediamodifier-Design.svg"
+dest_files=["res://.godot/imported/Mediamodifier-Design.svg-9d1e220925b1a876f5e5ee1468b72113.ctex"]
 
 [params]
 

assets/data/quotes.json

@@ -12,14 +12,6 @@
  "author": "Satoshi Nakamoto"
   },
   {
- "quote": "Inflation is taxation without legislation.",
- "author": "Milton Friedman"
-  },
-  {
- "quote": "Used to the conditions of a capitalistic environment, the average American takes it for granted that every year business makes something new and better accessible to him. Looking backward upon the years of his own life, he realizes that many implements that were totally unknown in the days of his youth and many others which at that time could be enjoyed only by a small minority are now standard equipment of almost every household.",
- "author": "Ludwig Von Mises"
-  },
-  {
  "quote": "Poorly paid labor is inefficient labor, the world over.",
  "author": "Henry George"
   },
@@ -32,23 +24,23 @@
  "author": "Henry Hazlitt"
   },
   {
- "quote": "Nobody ever saw a dog make a fair and deliberate exchange of one bone for another with another dog. Nobody ever saw one animal by its gestures and natural cries signify to another, this is mine, that yours; I am willing to give this for that.",
- "author": "Adam Smith"
+  "quote": "Ambition is common to all men; and those, who are unable to rise to distinction, are at least willing to reduce others to their own standard.",
+  "author": "William Godwin"
   },
   {
- "quote": "Ambition is common to all men; and those, who are unable to rise to distinction, are at least willing to reduce others to their own standard.",
- "author": "William Godwin"
+  "quote": "Organizations are permanently and randomly subject to decline and decay - no matter their institutional framework.",
+  "author": "Albert Hirschman"
   },
   {
- "quote": "Organizations are permanently and randomly subject to decline and decay — no matter their institutional framework.",
- "author": "Albert Hirschman"
+  "quote": "Monopolies don't innovate. The motto of any monopoly is: 'We don't care, because we don't have to'",
+  "author": "Marc Andreessen"
   },
   {
- "quote": "Monopolies don't innovate. The motto of any monopoly is: 'We don't care, because we don't have to.'",
- "author": "Marc Andreessen"
+  "quote": "It is self-deception to think that the status quo is going to be satisfactory for everyone forever. It's already not satisfactory for a lot of people",
+  "author": "David Deutsch"
   },
   {
- "quote": "It is self-deception to think that the status quo is going to be satisfactory for everyone forever. It's already not satisfactory for a lot of people.",
- "author": "David Deutsch"
-  }
- ]
+  "quote": "Ambition is common to all men; and those, who are unable to rise to distinction, are at least willing to reduce others to their own standard",
+  "author": "William Godwin"
+  },
+]

assets/fonts/Heartbit-Bold.otf.import

@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://4p264ejyt2im"
+path="res://.godot/imported/Heartbit-Bold.otf-db3a57664727bf928878560e13701921.fontdata"
+
+[deps]
+
+source_file="res://assets/fonts/Heartbit-Bold.otf"
+dest_files=["res://.godot/imported/Heartbit-Bold.otf-db3a57664727bf928878560e13701921.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}

assets/fonts/LEMONMILK-Regular.otf.import

@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://c33ier0iywrki"
+path="res://.godot/imported/LEMONMILK-Regular.otf-5b5c91141d93e3234211516e8b392368.fontdata"
+
+[deps]
+
+source_file="res://assets/fonts/LEMONMILK-Regular.otf"
+dest_files=["res://.godot/imported/LEMONMILK-Regular.otf-5b5c91141d93e3234211516e8b392368.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}