Skip to content

Commit 76b51da

Browse files
committed
bquの新フォーマットに対応
1 parent 5f920f5 commit 76b51da

File tree

739 files changed

+32714
-32641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

739 files changed

+32714
-32641
lines changed

.github/actions/build_setup/action.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,13 @@ runs:
1111
using: 'composite'
1212

1313
steps:
14-
- name: Setup Python
15-
uses: actions/setup-python@v5
16-
with:
17-
python-version: '3.12'
18-
1914
- name: Install uv
20-
shell: bash
21-
run: pip install uv
22-
23-
- name: Setup Python Cache
24-
uses: actions/cache@v4
15+
uses: astral-sh/setup-uv@v6
2516
with:
26-
path: ~/.cache/uv
27-
key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
28-
restore-keys: |
29-
${{ runner.os }}-uv-
17+
enable-cache: true
18+
python-version-file: ./buildtools/pyproject.toml
3019

3120
- name: Install dependencies
3221
shell: bash
33-
run: uv pip install --system -r ./buildtools/requirements.txt
22+
working-directory: ./buildtools
23+
run: uv sync

.github/workflows/preview.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,18 @@ env:
2525

2626
jobs:
2727
build:
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-slim
2929
strategy:
3030
matrix:
3131
buildType: [standard, lwjgl3]
3232

3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636
with:
3737
ref: ${{ github.event.inputs.target_branch || github.ref }}
3838
fetch-depth: 0
3939

40-
- name: Cache dependencies
41-
uses: actions/cache@v4
42-
with:
43-
path: |
44-
~/.m2/repository
45-
~/.cache/pip
46-
key: ${{ runner.os }}-deps-${{ matrix.buildType }}-${{ hashFiles('**/pom.xml') }}
47-
4840
- name: Download Resource Packs zip
4941
run: |
5042
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
@@ -72,13 +64,13 @@ jobs:
7264
- name: Adjust for LWJGL3
7365
if: matrix.buildType == 'lwjgl3'
7466
run: |
75-
python buildtools/gen-lwjgl3-manifest.py
67+
uv run --directory ./buildtools python ./gen-lwjgl3-manifest.py
7668
cp -vf cmmc/manifest.json manifest.json
7769
7870
- name: Install Mods
7971
env:
8072
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
81-
run: python buildtools/mod-install.py
73+
run: uv run --directory ./buildtools python ./mod-install.py
8274

8375
- name: Clean up placeholder files
8476
run: find . -name ".gitkeep" -delete
@@ -119,27 +111,27 @@ jobs:
119111
fi
120112
121113
- name: Upload Artifacts
122-
uses: actions/upload-artifact@v4
114+
uses: actions/upload-artifact@v5
123115
with:
124116
name: ${{ matrix.buildType }}-artifacts
125117
path: artifacts/
126118
retention-days: 1
127119

128120
release:
129121
needs: build
130-
runs-on: ubuntu-latest
122+
runs-on: ubuntu-slim
131123
permissions:
132124
contents: write
133125

134126
steps:
135127
- name: Checkout repository
136-
uses: actions/checkout@v4
128+
uses: actions/checkout@v5
137129
with:
138130
ref: ${{ github.event.inputs.target_branch || github.ref }}
139131
fetch-depth: 0
140132

141133
- name: Download All Artifacts
142-
uses: actions/download-artifact@v4
134+
uses: actions/download-artifact@v6
143135
with:
144136
path: downloads
145137

.github/workflows/release.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,17 @@ env:
2323

2424
jobs:
2525
build:
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-slim
2727
strategy:
2828
matrix:
2929
buildType: [standard, lwjgl3]
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
with:
3535
fetch-depth: 0
3636

37-
- name: Restore cache
38-
uses: actions/cache@v4
39-
with:
40-
path: |
41-
~/.m2/repository
42-
~/.cache/pip
43-
key: ${{ runner.os }}-deps-${{ matrix.buildType }}-${{ hashFiles('**/pom.xml') }}
44-
4537
- name: Download Resource Packs zip
4638
run: |
4739
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
@@ -69,13 +61,13 @@ jobs:
6961
- name: Adjust for LWJGL3
7062
if: matrix.buildType == 'lwjgl3'
7163
run: |
72-
python buildtools/gen-lwjgl3-manifest.py
64+
uv run --directory ./buildtools python ./gen-lwjgl3-manifest.py
7365
cp -vf cmmc/manifest.json manifest.json
7466
7567
- name: Install Mods
7668
env:
7769
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
78-
run: python buildtools/mod-install.py
70+
run: uv run --directory ./buildtools python ./mod-install.py
7971

8072
- name: Clean up placeholder files
8173
run: find . -name ".gitkeep" -delete
@@ -116,26 +108,26 @@ jobs:
116108
fi
117109
118110
- name: Upload Artifacts
119-
uses: actions/upload-artifact@v4
111+
uses: actions/upload-artifact@v5
120112
with:
121113
name: ${{ matrix.buildType }}-artifacts
122114
path: artifacts/
123115
retention-days: 1
124116

125117
release:
126118
needs: build
127-
runs-on: ubuntu-latest
119+
runs-on: ubuntu-slim
128120
permissions:
129121
contents: write
130122

131123
steps:
132124
- name: Checkout repository
133-
uses: actions/checkout@v4
125+
uses: actions/checkout@v5
134126
with:
135127
fetch-depth: 0
136128

137129
- name: Download All Artifacts
138-
uses: actions/download-artifact@v4
130+
uses: actions/download-artifact@v6
139131
with:
140132
path: downloads
141133

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ overrides/config/nutrition/effects/example.json
2121
overrides/config/nutrition/nutrients/example.json
2222
overrides/config/activity.json
2323
overrides/config/AdvancedBackups-client.properties
24+
buildtools/uv.lock

buildtools/README.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
2+
# Development Environment
3+
4+
This project uses [uv](https://docs.astral.sh/uv/) for Python dependency management with Python 3.12.
5+
6+
## Setup
7+
8+
1. Install uv if you haven't already:
9+
10+
```bash
11+
# macOS/Linux
12+
curl -LsSf https://astral.sh/uv/install.sh | sh
13+
14+
# Windows
15+
powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
16+
```
17+
18+
2. Install dependencies:
19+
20+
```bash
21+
cd buildtools
22+
uv sync
23+
```
24+
25+
## Activating the Virtual Environment
26+
27+
```bash
28+
# Windows (PowerShell)
29+
.venv\Scripts\Activate.ps1
30+
31+
# Windows (Command Prompt)
32+
.venv\Scripts\activate.bat
33+
34+
# macOS/Linux
35+
source .venv/bin/activate
36+
```
37+
38+
## Deactivating the Virtual Environment
39+
40+
```bash
41+
deactivate
42+
```

buildtools/pyproject.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[project]
2+
name = "gte2-buildtools"
3+
version = "1.0.0"
4+
description = "Build tools for GTE2 Modpack"
5+
requires-python = ">=3.12"
6+
dependencies = [
7+
"deepl>=2.32.5",
8+
]
9+
10+
[tool.uv]
11+
package = false

buildtools/requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

overrides/config/betterquesting.cfg

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ general {
1111
B:"DefaultQuests saves using Names"=false
1212

1313
# If true, locks the quest chapter list and opens it initially [default: false]
14-
B:"Lock Tray"=false
14+
B:"Lock Tray"=true
1515

1616
# Clamps the max UI height (-1 to disable) [range: -1 ~ 2147483647, default: -1]
1717
I:"Max GUI Height"=-1
@@ -26,7 +26,7 @@ general {
2626
S:"Scroll Speed Multiplier"=1.0
2727

2828
# If true, skip the home GUI and open quests at startup. This property will be changed by the mod itself. [default: false]
29-
B:"Skip Home"=false
29+
B:"Skip Home"=true
3030

3131
# If true, then the player will spawn with a Quest Book when they first join the world [default: true]
3232
B:"Spawn with Quest Book"=true
@@ -38,7 +38,7 @@ general {
3838
B:"Use Quest Bookmark"=true
3939

4040
# If view mode enabled, User can view all quests [default: false]
41-
B:"View mode"=false
41+
B:"View mode"=true
4242

4343
# Zoom in on cursor. If false, zooms in on center of screen. [default: true]
4444
B:"Zoom In on Cursor"=true
@@ -52,5 +52,3 @@ general {
5252
# Zoom Speed [range: 1.05 ~ 3.0, default: 1.25]
5353
S:"Zoom Speed"=1.25
5454
}
55-
56-

0 commit comments

Comments
 (0)