Skip to content

Commit 2936317

Browse files
NotRykenNotRyken
committed
Update to mc1.21.9 (fabric only)
1 parent d77b797 commit 2936317

14 files changed

Lines changed: 315 additions & 57 deletions

File tree

‎.github/workflows/check-build.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Builds the project on Linux and Windows as a partial defense against bad commits
1+
# Builds the project on Linux and Windows, as a first line of defense against bad commits.
22
name: Check Build
33

44
on:
@@ -18,8 +18,13 @@ jobs:
1818
build:
1919
strategy:
2020
matrix:
21-
java: [21]
22-
os: [ubuntu-latest, windows-latest]
21+
java: [
22+
21
23+
]
24+
os: [
25+
ubuntu-latest,
26+
windows-latest
27+
]
2328
runs-on: ${{ matrix.os }}
2429
steps:
2530
- name: Checkout repository

‎.github/workflows/release-platform-curseforge.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# A CurseForge-only version of the normal release workflow.
2+
name: Release-Platform-CurseForge
3+
4+
on:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
release:
12+
strategy:
13+
matrix:
14+
java: [
15+
21
16+
]
17+
os: [
18+
ubuntu-latest
19+
]
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
- name: Validate Gradle wrapper
27+
uses: gradle/wrapper-validation-action@v3
28+
- name: Setup JDK ${{ matrix.java }}
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: zulu
32+
java-version: ${{ matrix.java }}
33+
- name: Make Gradle wrapper executable
34+
if: ${{ runner.os != 'Windows' }}
35+
run: chmod +x ./gradlew
36+
- name: Build
37+
run: ./gradlew build publishCurseforge --stacktrace
38+
env:
39+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
40+
- name: Capture build artifacts
41+
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: artifacts
45+
path: |
46+
**/build/libs/

‎.github/workflows/release-platform-github.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# A GitHub-only version of the normal release workflow.
2+
name: Release-Platform-GitHub
3+
4+
on:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
release:
12+
strategy:
13+
matrix:
14+
java: [
15+
21
16+
]
17+
os: [
18+
ubuntu-latest
19+
]
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
- name: Validate Gradle wrapper
27+
uses: gradle/wrapper-validation-action@v3
28+
- name: Setup JDK ${{ matrix.java }}
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: zulu
32+
java-version: ${{ matrix.java }}
33+
- name: Make Gradle wrapper executable
34+
if: ${{ runner.os != 'Windows' }}
35+
run: chmod +x ./gradlew
36+
- name: Build
37+
run: ./gradlew build publishGithub --stacktrace
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
- name: Capture build artifacts
41+
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: artifacts
45+
path: |
46+
**/build/libs/

‎.github/workflows/release-platform-modrinth.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# A Modrinth-only version of the normal release workflow.
2+
name: Release-Platform-Modrinth
3+
4+
on:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
release:
12+
strategy:
13+
matrix:
14+
java: [
15+
21
16+
]
17+
os: [
18+
ubuntu-latest
19+
]
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
- name: Validate Gradle wrapper
27+
uses: gradle/wrapper-validation-action@v3
28+
- name: Setup JDK ${{ matrix.java }}
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: zulu
32+
java-version: ${{ matrix.java }}
33+
- name: Make Gradle wrapper executable
34+
if: ${{ runner.os != 'Windows' }}
35+
run: chmod +x ./gradlew
36+
- name: Build
37+
run: ./gradlew build publishModrinth --stacktrace
38+
env:
39+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
40+
- name: Capture build artifacts
41+
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: artifacts
45+
path: |
46+
**/build/libs/

‎.github/workflows/release-subproject-fabric.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# A Fabric-only version of the normal release workflow.
2+
name: Release-Subproject-Fabric
3+
4+
on:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
release:
12+
strategy:
13+
matrix:
14+
java: [
15+
21
16+
]
17+
os: [
18+
ubuntu-latest
19+
]
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
- name: Validate Gradle wrapper
27+
uses: gradle/wrapper-validation-action@v3
28+
- name: Setup JDK ${{ matrix.java }}
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: zulu
32+
java-version: ${{ matrix.java }}
33+
- name: Make Gradle wrapper executable
34+
if: ${{ runner.os != 'Windows' }}
35+
run: chmod +x ./gradlew
36+
- name: Build
37+
run: ./gradlew build fabric:publishMods --stacktrace
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
41+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
42+
- name: Capture build artifacts
43+
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
44+
uses: actions/upload-artifact@v4
45+
with:
46+
name: artifacts
47+
path: |
48+
**/build/libs/

‎.github/workflows/release-subproject-neoforge.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# A NeoForge-only version of the normal release workflow.
2+
name: Release-Subproject-NeoForge
3+
4+
on:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
release:
12+
strategy:
13+
matrix:
14+
java: [
15+
21
16+
]
17+
os: [
18+
ubuntu-latest
19+
]
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
- name: Validate Gradle wrapper
27+
uses: gradle/wrapper-validation-action@v3
28+
- name: Setup JDK ${{ matrix.java }}
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: zulu
32+
java-version: ${{ matrix.java }}
33+
- name: Make Gradle wrapper executable
34+
if: ${{ runner.os != 'Windows' }}
35+
run: chmod +x ./gradlew
36+
- name: Build
37+
run: ./gradlew build neoforge:publishMods --stacktrace
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
41+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
42+
- name: Capture build artifacts
43+
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
44+
uses: actions/upload-artifact@v4
45+
with:
46+
name: artifacts
47+
path: |
48+
**/build/libs/

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# Builds the project and publishes the artifacts to GitHub, Modrinth and CurseForge
2-
# Modrinth publishing requires a Modrinth PAT MODRINTH_TOKEN
3-
# Will skip without error if not present
4-
# CurseForge publishing requires a CurseForge API token CURSEFORGE_TOKEN
5-
# Will skip without error if not present
1+
# Builds the project and publishes the artifacts to GitHub, Modrinth and CurseForge.
2+
# Modrinth publishing requires a Modrinth PAT `MODRINTH_TOKEN`
3+
# Will skip without error if not present.
4+
# CurseForge publishing requires a CurseForge API token `CURSEFORGE_TOKEN`
5+
# Will skip without error if not present.
6+
# Preference using the root gradle.properties file to configure releases.
67
name: Release
78

89
on:
@@ -15,8 +16,12 @@ jobs:
1516
release:
1617
strategy:
1718
matrix:
18-
java: [21]
19-
os: [ubuntu-latest]
19+
java: [
20+
21
21+
]
22+
os: [
23+
ubuntu-latest
24+
]
2025
runs-on: ${{ matrix.os }}
2126
steps:
2227
- name: Checkout repository
@@ -34,11 +39,7 @@ jobs:
3439
if: ${{ runner.os != 'Windows' }}
3540
run: chmod +x ./gradlew
3641
- name: Build
37-
# run: ./gradlew build neoforge:publishGithub fabric:publishGithub --stacktrace
38-
# run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth fabric:publishGithub fabric:publishModrinth --stacktrace
39-
# run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth neoforge:publishCurseforge fabric:publishGithub fabric:publishModrinth fabric:publishCurseforge --stacktrace
40-
# run: ./gradlew build fabric:publishGithub fabric:publishModrinth fabric:publishCurseforge --stacktrace
41-
run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth neoforge:publishCurseforge --stacktrace
42+
run: ./gradlew build neoforge:publishModrinth neoforge:publishCurseforge neoforge:publishGithub fabric:publishModrinth fabric:publishCurseforge fabric:publishGithub --stacktrace
4243
env:
4344
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4445
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
@@ -49,4 +50,4 @@ jobs:
4950
with:
5051
name: artifacts
5152
path: |
52-
**/build/libs/
53+
**/build/libs/

‎.github/workflows/sync-labels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Synchronizes the repo's labels with a centralized labels.yml
2-
# Requires GITHUB_TOKEN to have write permissions; if not, replace it with a custom token
1+
# Synchronizes the repo's labels with a centralized `labels.yml` file.
2+
# Requires `GITHUB_TOKEN` to have write permissions; if not, replace it with a custom token.
33
name: Sync Labels
44

55
on:

‎common/build.gradle‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("multiloader-common")
3-
id("net.neoforged.moddev")
3+
id("fabric-loom")
44
}
55

66
// Vanilla depends on ASM 9.3, MDG makes that a 'strict' version constraint,
@@ -20,7 +20,16 @@ dependencies {
2020
compileOnly "org.ow2.asm:asm-commons:${asm_version}"
2121
compileOnly "org.ow2.asm:asm-tree:${asm_version}"
2222
compileOnly "org.ow2.asm:asm-util:${asm_version}"
23-
23+
24+
// Minecraft
25+
minecraft("com.mojang:minecraft:${minecraft_version}")
26+
27+
// Mappings
28+
mappings(loom.layered {
29+
officialMojangMappings()
30+
parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip")
31+
})
32+
2433
// Mixin and MixinExtras
2534
compileOnly("org.spongepowered:mixin:${mixin_version}")
2635
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
@@ -29,14 +38,18 @@ dependencies {
2938
api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}")
3039
}
3140

32-
neoForge {
33-
neoFormVersion = neoform_version
34-
// Automatically enable AccessTransformers if the file exists
35-
def at = file("src/main/resources/META-INF/accesstransformer.cfg")
36-
if (at.exists()) accessTransformers.from(at.absolutePath)
37-
parchment {
38-
minecraftVersion = parchment_minecraft_version
39-
mappingsVersion = parchment_version
41+
loom {
42+
// Apply common AccessWidener if it exists
43+
def aw = project(":common").file("src/main/resources/${mod_id}.accesswidener")
44+
if (aw.exists()) accessWidenerPath.set(aw)
45+
if (aw.exists()) {
46+
validateAccessWidener { accessWidener = aw }
47+
afterEvaluate {
48+
validateAccessWidener.run()
49+
}
50+
}
51+
mixin {
52+
defaultRefmapName.set("${mod_id}.refmap.json")
4053
}
4154
}
4255

0 commit comments

Comments
 (0)