refactor: upgrade to Godot 4.1

.clang-format

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 AccessModifierOffset: -1
 AlignAfterOpenBracket: AlwaysBreak

.codespellrc

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 [codespell]
 skip = assets/**,addons/**

.gitattributes

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 # Normalize EOL for all files that Git considers text files.
 * text=auto eol=lf

.github/actions/export-game/action.yml

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-
 name: Export Godot game
 description: Export Godot game.
 inputs:
@@ -31,12 +27,22 @@ runs:
     - name: Setup Godot Templates
       shell: bash
       run: |
-        mkdir -v -p ~/.local/share/godot/templates
-        mv /root/.local/share/godot/templates/${{ inputs.godot_version }}.stable ~/.local/share/godot/templates/${{ inputs.godot_version }}.stable
+        mkdir -v -p ~/.local/share/godot/export_templates
+        mv /root/.local/share/godot/export_templates/${{ inputs.godot_version }}.stable ~/.local/share/godot/export_templates/${{ inputs.godot_version }}.stable
+
+    - name: Install Addons
+      shell: bash
+      run: |
+        [ -f plug.gd ] && godot --headless -s plug.gd install || true
+
+    - name: Import Assets
+      shell: bash
+      run: |
+        godot --editor --quit --headless
 
     - name: Build ${{ inputs.preset }}
       shell: bash
       run: |
         [ -d build ] && rm -r build
         mkdir -v -p build/${{ matrix.platform }}
-        godot --export "${{ inputs.preset }}" --headless ./build/${{ matrix.platform }}/${{ inputs.output }}
+        godot --export-release "${{ inputs.preset }}" --headless ./build/${{ matrix.platform }}/${{ inputs.output }}

.github/actions/upload-artifact/action.yml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 name: Upload artifact
 description: Upload artifact.

.github/dependabot.yml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 version: 2
 updates:

.github/renovate.json

@@ -0,0 +1,24 @@
+{
+    "regexManagers": [
+      {
+        "fileMatch": ["^plug\\.gd$"],
+        "matchStrings": [
+            "\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"commit\":\\ \"(?<currentValue>)(?<currentDigest>.*?)\""
+        ],
+        "depNameTemplate": "{{{gitUrl}}}",
+        "packageNameTemplate": "https://github.com/{{{gitUrl}}}",
+        "versioningTemplate": "git",
+        "datasourceTemplate": "git-refs"
+      },
+      {
+        "fileMatch": ["^plug\\.gd$"],
+        "matchStrings": [
+            "\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"tag\":\\ \"(?<currentValue>)(?<currentDigest>.*?)\""
+        ],
+        "depNameTemplate": "{{{gitUrl}}}",
+        "packageNameTemplate": "https://github.com/{{{gitUrl}}}",
+        "versioningTemplate": "git",
+        "datasourceTemplate": "git-tags"
+      }
+    ]
+  }

.github/workflows/flatpak-build.yml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 name: Flatpack Build
 

.github/workflows/pre-commit.yaml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 name: Pre-commit
 
@@ -18,6 +15,6 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
       - name: Install GDScript Toolkit
-        run: pip3 install 'gdtoolkit==3.*'
+        run: pip3 install 'gdtoolkit==4.*'
       - name: Run pre-commit hooks
         uses: pre-commit/[email protected]

.github/workflows/release-packaging.yml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 name: Release Packaging
 
@@ -10,14 +7,14 @@ on:
   workflow_dispatch:
 
 env:
-  version: 0.1.0
-  godot_version: 3.5
+  version: 1.4.0
+  godot_version: 4.1.1
 
 jobs:
   release-packaging:
     runs-on: ubuntu-20.04
     container:
-      image: barichello/godot-ci:3.5
+      image: barichello/godot-ci:4.1.1
 
     strategy:
       fail-fast: false

.github/workflows/reuse.yaml

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-
 name: REUSE Compliance Check
 
 on:

.github/workflows/snapcraft-build.yaml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
 
 name: "Snapcraft build"
 

.gitignore

@@ -1,10 +1,7 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-
 # Godot-specific ignores
+.godot/
 .import/
-export.cfg
+gfxrecon_capture_*
 
 # Imported translations (automatically generated from CSV files)
 *.translation
@@ -13,12 +10,10 @@ export.cfg
 .mono/
 data_*/
 
-# Flatpack-specific ignors
-.flatpak-builder/
-
-# Snap-specific ignores
-build-dir/
-*.snap
+# gd-plug
+.plugged/
+addons/*
+!addons/gd-plug/
 
-.vscode/
-build/
+# Python-specific ignores
+venv/

.pre-commit-config.yaml

@@ -1,10 +1,6 @@
-# SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: fix-byte-order-marker   # Prevents weird UTF-8 encoding edge cases
   - id: check-case-conflict     # Check if case-insensitive filesystems would bork
@@ -18,21 +14,55 @@ repos:
   - id: mixed-line-ending       # Consistent LF or CRLF
   - id: trailing-whitespace     # No trailing whitespace
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.4
+  rev: v2.2.5
   hooks:
   - id: codespell
 - repo: https://github.com/fsfe/reuse-tool
   rev: v2.0.0
   hooks:
   - id: reuse
+- repo: https://github.com/PyCQA/isort
+  rev: 5.12.0
+  hooks:
+  - id: isort
+- repo: https://github.com/PyCQA/bandit
+  rev: 1.7.5
+  hooks:
+  - id: bandit
+- repo: https://github.com/PyCQA/flake8
+  rev: 6.0.0
+  hooks:
+  - id: flake8
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.4.1
+  hooks:
+  - id: mypy
 - repo: local
   hooks:
+  - id: lower-case-only
+    name: lower case only
+    entry: filenames must be lower-case or lower_case only
+    language: fail
+    files: '[^a-z0-9._/-]'
+    exclude: |
+      (?x)^(
+          LICENSES/|
+          public/|
+          CONTRIBUTING.md|
+          CREDITS.md|
+          LICENSE.md|
+          README.md
+      )
   - id: check-gdscript
     name: check gdscript
     entry: gdformat
     language: system
     files: \.gd$
-    exclude: ^addons/
+    exclude: |
+      (?x)^(
+          addons/|
+          plug.gd
+      )
   - id: check-shaders
     name: check shaders
     entry: clang-format
@@ -47,4 +77,8 @@ repos:
     entry: gdlint
     language: system
     files: \.gd$
-    exclude: ^addons/
+    exclude: |
+      (?x)^(
+          addons/|
+          plug.gd
+      )

.reuse/dep5

@@ -3,8 +3,54 @@ Upstream-Name: Marble
 Upstream-Contact: Florian Vazelle <[email protected]>
 Source: https://github.com/MechanicalFlower/Marble
 
-# Sample paragraph, commented out:
-#
-# Files: src/*
-# Copyright: $YEAR $NAME <$CONTACT>
-# License: ...
+Files: *
+Copyright: 2022-present Florian Vazelle
+License: MIT
+
+# Addons
+
+Files: addons/flexible_toon_shader/*
+Copyright: 2021 John Wigg
+License: MIT
+Source: https://github.com/CaptainProton42/FlexibleToonShaderGD
+
+Files: addons/fps_graph_overlay/*
+Copyright: 2023 Sander Vanhove
+License: MIT
+Source: https://github.com/SanderVanhove/godot-fps-graph-overlay
+
+Files: addons/kanban_tasks/*
+Copyright: 2022-2023 HolonProduction
+License: MIT
+Source: https://github.com/HolonProduction/godot_kanban_tasks
+
+Files: addons/lod/*
+Copyright: 2020 Hugo Locurcio and contributors
+License: MIT
+Source: https://github.com/godot-extended-libraries/godot-lod
+
+# Models
+
+Files: assets/blocks/*
+Copyright: 2019 Zylann
+License: MIT
+Source: https://github.com/Zylann/marbles
+
+# Textures
+
+Files: assets/icons/*
+Copyright: 2023 Icons8
+License: LicenseRef-linksware
+Source: https://icons8.com/
+
+Files: assets/marble/*
+Copyright: 2017-2023 Lennart Demes
+License: CC0-1.0
+Source: https://ambientcg.com/view?id=Ground037
+
+# Fonts
+
+Files: assets/fonts/box_pixies.ttf
+Copyright: 2020 Heaven Castro
+License: CC0-1.0
+Source: https://www.fontspace.com/boxpixies-font-f27657

CONTRIBUTING.md

@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-
-SPDX-License-Identifier: MIT
--->
 
 # Contributing
 

CREDITS.md

@@ -0,0 +1,13 @@
+# Credits
+
+## Addons
+- "[addons/flexible_toon_shader/*](https://github.com/CaptainProton42/FlexibleToonShaderGD)" by **John Wigg** licensed under [MIT](https://spdx.org/licenses/MIT.html)
+- "[addons/fps_graph_overlay/*](https://github.com/SanderVanhove/godot-fps-graph-overlay)" by **Sander Vanhove** licensed under [MIT](https://spdx.org/licenses/MIT.html)
+- "[addons/kanban_tasks/*](https://github.com/HolonProduction/godot_kanban_tasks)" by **HolonProduction** licensed under [MIT](https://spdx.org/licenses/MIT.html)
+- "[addons/lod/*](https://github.com/godot-extended-libraries/godot-lod)" by **Hugo Locurcio and contributors** licensed under [MIT](https://spdx.org/licenses/MIT.html)
+- "[assets/blocks/*](https://github.com/Zylann/marbles)" by **Zylann** licensed under [MIT](https://spdx.org/licenses/MIT.html)
+## Assets
+### Textures
+- "[assets/icons/*](https://icons8.com/)" by **Icons8** licensed under [LicenseRef-linksware](https://spdx.org/licenses/LicenseRef-linksware.html)
+### Fonts
+- "[assets/fonts/box_pixies.ttf](https://www.fontspace.com/boxpixies-font-f27657)" by **Heaven Castro** licensed under [CC0-1.0](https://spdx.org/licenses/CC0-1.0.html)

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2022 Florian Vazelle
+Copyright © 2022-present Florian Vazelle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -1,14 +1,9 @@
-<!--
-SPDX-FileCopyrightText: 2023 Florian Vazelle <[email protected]>
-
-SPDX-License-Identifier: MIT
--->
 
 <div align="center">
 
 # ⚽ Marble
 
-![Godot Badge](https://img.shields.io/badge/godot-3.5-blue?logo=Godot-Engine&logoColor=white) ![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white) ![license](https://img.shields.io/badge/license-MIT-green?logo=open-source-initiative&logoColor=white)
+![Godot Badge](https://img.shields.io/badge/godot-4.1-blue?logo=Godot-Engine&logoColor=white) ![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white) ![license](https://img.shields.io/badge/license-MIT-green?logo=open-source-initiative&logoColor=white)
 
 A marble race minigame, made with [Godot Engine](https://godotengine.org/).