Merge branch 'main' into 'feat/fo-dir'

.github/workflows/ci.yml

@@ -66,13 +66,13 @@ jobs:
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: pipx run poetry install --no-interaction --no-root
       - name: Shorten commit SHA
-        uses: benjlevesque/short-sha@v2.1
+        uses: benjlevesque/short-sha@v2.2
         id: short-sha
       - name: Build
         run: |
           source .venv/bin/activate
           pip install pyside6
-          pyside6-rcc vanilla_installer/assets/fonts.qrc -o vanilla_installer/fonts.py
+          pyside6-rcc vanilla_installer/assets/fonts/fonts.qrc -o vanilla_installer/fonts.py
           pipx run poetry build --no-interaction
       - name: Get normalized branch name
         run: |
@@ -94,14 +94,13 @@ jobs:
         shell: pwsh
     steps:
       - uses: actions/checkout@v3
-      # nuitka currently only supports Python <=3.10 right now
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         id: setup-python
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Shorten commit SHA
-        uses: benjlevesque/short-sha@v2.1
+        uses: benjlevesque/short-sha@v2.2
         id: short-sha
       - name: Cache
         uses: actions/cache@v3
@@ -127,7 +126,7 @@ jobs:
           ./.venv/Scripts/activate.ps1
           # pip install nuitka minecraft_launcher_lib PySide6 click tomli darkdetect
           echo '__version__ = "${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}"' | Out-File vanilla_installer/__init__.py
-          pyside6-rcc vanilla_installer/assets/fonts.qrc -o vanilla_installer/fonts.py
+          pyside6-rcc vanilla_installer/assets/fonts/fonts.qrc -o vanilla_installer/fonts.py
           python -m nuitka --standalone --onefile --windows-icon-from-ico=media/icon.ico --output-dir=build --include-package=minecraft_launcher_lib,PySide6,click,tomli,darkdetect -o "Vanilla Installer-GUI ${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}.exe" --enable-plugin=pyside6 --include-data-dir=vanilla_installer/assets=assets/ --disable-console --nofollow-import-to=PySide6.examples vanilla_installer/gui.py --assume-yes-for-downloads
       - name: Upload built executable
         uses: actions/upload-artifact@v3
@@ -145,12 +144,12 @@ jobs:
         shell: pwsh
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Shorten commit SHA
-        uses: benjlevesque/short-sha@v2.1
+        uses: benjlevesque/short-sha@v2.2
         id: short-sha
       - name: Cache
         uses: actions/cache@v3
@@ -161,7 +160,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .venv
-          key: ci-build-venv-cli-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}
+          key: ci-build-venv-cli-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-1
       - name: Get normalized branch name
         shell: bash
         run: |

.github/workflows/git-repo-sync.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync-bitbucket:
+    if: github.repository_owner == 'Fabulously-Optimized'
     runs-on: ubuntu-22.04
     name: Git Repo Sync - BitBucket
     steps:

README.md

@@ -35,7 +35,7 @@ However, you have to manually install updates.
 
 **Requirements**: Ability to download a file and double-click it.
 
-**Downsides**: No easy updating
+**Downsides**: No easy updating.
 
 **Recommended for**: People that aren't too well versed in technology, and probably don't care about updating VI.
 
@@ -110,5 +110,3 @@ See [here](https://github.com/Fabulously-Optimized/vanilla-installer/graphs/cont
 <!-- prettier-ignore-end -->
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
-
-![Contribution Overview](https://orbit.onlix.me/contribview/Fabulously-Optimized/vanilla-installer#15/11/2022)

pyproject.toml

@@ -1,10 +1,11 @@
 [tool.poetry]
 name = "vanilla-installer"
-version = "0.2.1"
+version = "0.2.2"
 description = "An installer of Fabulously Optimized for the vanilla launcher."
 authors = [
     "osfanbuff63 <[email protected]>",
-    "nsde <[email protected]>"
+    "nsde <[email protected]>",
+    "Kichura <blobfox.coffee/@Kichura>"
 ]
 documentation = "https://fabulously-optimized.gitbook.io/vanilla-installer"
 homepage = "https://fabulously-optimized.gitbook.io/vanilla-installer"
@@ -22,26 +23,24 @@ requests = "^2.28.2"
 tomli = "^2.0.1"
 darkdetect = {version = "^0.8.0", optional = true}
 minecraft-launcher-lib = "^5.3"
-pyside6 = {version = "^6.4.3", optional = true}
+pyside6 = {version = "^6.5.0", optional = true}
 asyncclick = "^8.1.3.4"
 anyio = "^3.6.2" # asyncclick seems to bug without anyio, despite being a dep
-tomlkit = "^0.11.6"
+tomlkit = "^0.11.7"
 
 [tool.poetry.group.dev.dependencies]
-pylint = "^2.17.1"
-black = "^23.1.0"
-isort = "^5.11.4"
-
+pylint = "^2.17.2"
+black = "^23.3.0"
+isort = "^5.12.0"
 
 [tool.poetry.group.ci.dependencies]
 flake8 = "^6.0.0"
 
-
 [tool.poetry.group.compile.dependencies]
 nuitka = "^1.5"
 ordered-set = "^4.1.0"
 zstandard = "^0.20.0"
-imageio = "^2.26.0"
+imageio = "^2.27.0"
 # pyproject-appimage = {version = "^2.0", python = ">=3.9,<3.12"}
 
 [tool.poetry.scripts]
@@ -58,7 +57,7 @@ gui = ["pyside6", "darkdetect"]
 
 # [tool.pyproject-appimage]
 # script = "vanilla-installer"
-# output = "VanillaInstaller-v0.2.0.AppImage"
+# output = "VanillaInstaller-v0.2.2.AppImage"
 
 [tool.isort]
 profile = "black"

vanilla_installer/__init__.py

@@ -1,5 +1,8 @@
-# Copyright (C) Fabulously Optimized 2022
+# Copyright (C) Fabulously Optimized 2023
 # Licensed under the MIT License. The full license text can be found at https://github.com/Fabulously-Optimized/vanilla-installer/blob/main/LICENSE.md.
-"""An installer of Fabulously Optimized for the vanilla launcher."""
-__version__ = "0.2.1"
+"""
+An installer of Fabulously Optimized for the vanilla launcher.
+"""
+
+__version__ = "0.2.2"
 __license__ = "MIT License"

vanilla_installer/__main__.py

@@ -1,6 +1,9 @@
-# Copyright (C) Fabulously Optimized 2022
+# Copyright (C) Fabulously Optimized 2023
 # Licensed under the MIT License. The full license text can be found at https://github.com/Fabulously-Optimized/vanilla-installer/blob/main/LICENSE.md.
-"""This module allows the Vanilla Installer CLI to be run with python -m."""
+"""
+This module allows the Vanilla Installer CLI to be run with python -m.
+"""
+
 from vanilla_installer import cli
 
 cli.vanilla_installer()

vanilla_installer/assets/fonts/LICENSE-Inter.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2016-2020 The Inter Project Authors.
+"Inter" is trademark of Rasmus Andersson.
+https://github.com/rsms/inter
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

vanilla_installer/assets/fonts/LICENSE-OpenDyslexic.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|[email protected]),
+with Reserved Font Name OpenDyslexic.
+Copyright (c) 12/2012 - 2019
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

vanilla_installer/assets/lang/en_us.json

@@ -0,0 +1,9 @@
+{
+  "vanilla_installer.gui.subtitle": "Vanilla Installer",
+  "vanilla_installer.gui.install_button": "Install",
+  "vanilla_installer.gui.mc_version": "Minecraft version:",
+  "vanilla_installer.gui.location": "Location:",
+  "vanilla_installer.gui.issues_button": "Report bugs",
+  "vanilla_installer.gui.theme_toggle": "Toggle theme",
+  "vanilla_installer.gui.settings": "Settings"
+}

vanilla_installer/assets/versions.json

@@ -1,7 +1,6 @@
 {
-  "1.19.3": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.19.3/pack.toml",
+  "1.19.4": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.19.4/pack.toml",
   "1.18.2": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.18.2/pack.toml",
   "1.17.1": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.17.1/pack.toml",
-  "1.16.5": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.16.5/pack.toml",
-  "1.19.4 (alpha)": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.19.4/pack.toml"
+  "1.16.5": "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.16.5/pack.toml"
 }