Skip to content

Commit cad550f

Browse files
EpyonProjectsEpyonProjects
committed
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapacks into scuba-enchants
2 parents 02250b4 + 8bd0a8c commit cad550f

File tree

1,600 files changed

+36058
-6490
lines changed

Some content is hidden

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

1,600 files changed

+36058
-6490
lines changed

‎.github/workflows/main.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ jobs:
3030
run: git fetch origin ${{ github.base_ref }}
3131

3232
- name: Set up uv
33-
uses: astral-sh/setup-uv@v3
34-
with:
35-
version: '0.5.4'
36-
enable-cache: true
33+
uses: astral-sh/setup-uv@v7
3734

3835
- name: Build and publish all modules
3936
if: github.event_name != 'pull_request'
@@ -93,16 +90,25 @@ jobs:
9390
fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.5/0.16.13/1.0.3/server/jar
9491
fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/FZ4q3wQK/fabric-api-0.119.9%2B1.21.5.jar
9592
packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Swh7th09/packtest-2.1-mc1.21.5.jar
93+
- version: '1.21.7'
94+
fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.7/0.16.14/1.0.3/server/jar
95+
fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/sLmbxWpX/fabric-api-0.128.1%2B1.21.7.jar
96+
packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/PAYctH3X/packtest-2.2-mc1.21.7.jar
97+
- version: '1.21.10'
98+
fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.10/0.18.1/1.1.0/server/jar
99+
fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/dQ3p80zK/fabric-api-0.138.3%2B1.21.10.jar
100+
packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/11yGLsYO/packtest-2.3-beta1-mc1.21.10.jar
101+
- version: '1.21.11'
102+
fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.11-rc2/0.18.1/1.1.0/server/jar
103+
fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/RDb9rvBm/fabric-api-0.139.4%2B1.21.11.jar
104+
packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/GN6fvTsW/packtest-2.4-beta2-mc1.21.11.jar
96105
name: 'test-${{ matrix.version }}'
97106
runs-on: ubuntu-24.04
98107
steps:
99108
- uses: actions/checkout@v4
100109

101110
- name: Set up uv
102-
uses: astral-sh/setup-uv@v3
103-
with:
104-
version: '0.5.4'
105-
enable-cache: true
111+
uses: astral-sh/setup-uv@v7
106112

107113
- name: Build all modules for tests
108114
run: uv run beet -p beet-test.yaml -l ${{ env.LOG_LEVEL }} build

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
__pycache__/
1111
*.py[cod]
1212
*$py.class
13-
.python-version
1413
*.egg-info/
1514

1615
### Beet ###

‎.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.14

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
## Contributing
1010
Contributions are welcome! We use [Beet](https://mcbeet.dev) to build our modules. See [our documentation on how to get started](./docs/getting-started.md).
1111

12-
Found a bug with one of our modules? You can [create an issue on GitHub](https://github.com/Gamemode4Dev/GM4_data packs/issues)!
12+
Found a bug with one of our modules? You can [create an issue on GitHub](https://github.com/Gamemode4Dev/GM4_Datapacks/issues)!

‎base/assets/minecraft/atlases/blocks.json‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,3 @@
11
{
2-
"sources": [
3-
{
4-
"type": "directory",
5-
"source": "gui",
6-
"prefix": "gui/"
7-
},
8-
{
9-
"type": "directory",
10-
"source": "entity",
11-
"prefix": "entity/"
12-
},
13-
{
14-
"type": "filter",
15-
"pattern":{
16-
"namespace": "^((?!gm4).)*$",
17-
"path": "gui"
18-
}
19-
},
20-
{
21-
"type": "filter",
22-
"pattern": {
23-
"namespace": "gm4_*",
24-
"path": "gui/container"
25-
}
26-
},
27-
{
28-
"type": "filter",
29-
"pattern": {
30-
"namespace": "minecraft",
31-
"path": "entity/fishing_hook"
32-
}
33-
},
34-
{
35-
"type": "filter",
36-
"pattern": {
37-
"namespace": "gm4_guidebook",
38-
"path": "gui/"
39-
}
40-
}
41-
]
2+
"sources": []
423
}

‎base/assets/minecraft/atlases/items.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"sources": [
3+
{
4+
"type": "directory",
5+
"source": "gui",
6+
"prefix": "gui/"
7+
},
8+
{
9+
"type": "filter",
10+
"pattern":{
11+
"namespace": "^((?!gm4).)*$",
12+
"path": "gui"
13+
}
14+
},
15+
{
16+
"type": "filter",
17+
"pattern": {
18+
"namespace": "gm4_*",
19+
"path": "gui/container"
20+
}
21+
},
22+
{
23+
"type": "filter",
24+
"pattern": {
25+
"namespace": "gm4_guidebook",
26+
"path": "gui/"
27+
}
28+
}
29+
]
30+
}

‎base/assets/translations.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
key,en_us
2-
advancement.gm4.root.title,"Gamemode 4",
3-
advancement.gm4.root.description,"Semi-funny blurb about GM4",
2+
advancement.gm4.root.title,Gamemode 4
3+
advancement.gm4.root.description,Semi-funny blurb about GM4

‎base/backport_72/assets/minecraft/atlases/blocks.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"sources": [
3+
{
4+
"type": "directory",
5+
"source": "gui",
6+
"prefix": "gui/"
7+
},
8+
{
9+
"type": "filter",
10+
"pattern":{
11+
"namespace": "^((?!gm4).)*$",
12+
"path": "gui"
13+
}
14+
},
15+
{
16+
"type": "filter",
17+
"pattern": {
18+
"namespace": "gm4_*",
19+
"path": "gui/container"
20+
}
21+
},
22+
{
23+
"type": "filter",
24+
"pattern": {
25+
"namespace": "gm4_guidebook",
26+
"path": "gui/"
27+
}
28+
}
29+
]
30+
}

‎base/beet.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ version: 1.8.0
22
id: gm4
33

44
data_pack:
5-
load:
5+
load:
66
data: data
77

8-
resource_pack:
8+
resource_pack:
99
load:
1010
assets: assets
11+
backport_72: backport_72
1112

1213
require:
1314
- gm4.plugins.resource_pack
@@ -30,3 +31,4 @@ meta:
3031
babelbox:
3132
load: assets/translations.csv
3233
namespace: gm4_translations
34+
dialect: excel

‎base/data/gm4/tags/block/no_collision.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"minecraft:cave_vines_plant",
2828
"minecraft:cherry_sapling",
2929
"minecraft:cobweb",
30+
{"id": "minecraft:copper_torch", "required": false},
3031
"minecraft:crimson_fungus",
3132
"minecraft:crimson_roots",
3233
"minecraft:dark_oak_sapling",

0 commit comments

Comments
 (0)