Skip to content

Commit 83225b3

Browse files
committed
Update to stonecutter 0.7
1 parent 53021d5 commit 83225b3

File tree

7 files changed

+21
-74
lines changed

7 files changed

+21
-74
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ jobs:
2626
with:
2727
cache-read-only: false
2828

29-
- name: Setup chiseled build # Required to set up access wideners properly
30-
run: ./gradlew setupChiseledBuild
31-
3229
- name: Build
33-
run: ./gradlew chiseledBuild
30+
run: ./gradlew build
3431

3532
- name: Upload Build Artifacts
3633
uses: actions/upload-artifact@v4

.github/workflows/validate-wrapper.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,13 @@ or [CurseForge](https://www.curseforge.com/minecraft/mc-mods/resourcify) page.
1313

1414
# Building
1515

16-
Resourcify uses stonecutter to compile against multiple Minecraft versions and loaders at once, this changes a bit about
17-
how the mod is built. For more info about stonecutter, see their [wiki](https://stonecutter.kikugie.dev/).
16+
Resourcify uses stonecutter to compile against multiple Minecraft versions and loaders at once. For more info about
17+
stonecutter, see their [wiki](https://stonecutter.kikugie.dev/).
1818

19-
Before your first build you need to run the following command to put the access wideners in the correct places, you will
20-
need to run this every time you update an access widener.
19+
To build the mod run the following command, the mod jars will be in the `jars` folder after the build has finished.
2120

2221
```shell
23-
./gradlew setupChiseledBuild
24-
```
25-
26-
Then to build the mod run the following command, the mod jars will be in the `jars` folder after the build has finished.
27-
28-
```shell
29-
./gradlew chiseledBuild
22+
./gradlew build
3023
```
3124

3225
------------------------------------

build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ repositories {
5050
}
5151

5252
stonecutter {
53-
const("fabric", mcPlatform.isFabric)
54-
const("forge", mcPlatform.isForge)
55-
const("neoforge", mcPlatform.isNeoForge)
56-
const("forgelike", mcPlatform.isForgeLike)
57-
58-
swap("mod_name", "\"$mod_name\"")
59-
swap("mod_id", "\"$mod_id\"")
60-
swap("mod_version", "\"$mod_version\"")
53+
constants["fabric"] = mcPlatform.isFabric
54+
constants["forge"] = mcPlatform.isForge
55+
constants["neoforge"] = mcPlatform.isNeoForge
56+
constants["forgelike"] = mcPlatform.isForgeLike
57+
58+
swaps["mod_name"] = "\"$mod_name\""
59+
swaps["mod_id"] = "\"$mod_id\""
60+
swaps["mod_version"] = "\"$mod_version\""
6161
}
6262

6363
val shade: Configuration by configurations.creating {

publish.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pluginManagement {
2727
}
2828

2929
plugins {
30-
id("dev.kikugie.stonecutter") version "0.6.1"
30+
id("dev.kikugie.stonecutter") version "0.7"
3131
}
3232

3333
val platforms = listOf(

stonecutter.gradle.kts

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,12 @@ plugins {
2121
}
2222
stonecutter active "1.21.6-fabric" /* [SC] DO NOT EDIT */
2323

24-
stonecutter registerChiseled tasks.register("chiseledBuild", stonecutter.chiseled) {
25-
group = "project"
26-
ofTask("build")
27-
}
28-
29-
stonecutter registerChiseled tasks.register("chiseledPublishMods", stonecutter.chiseled) {
30-
group = "project"
31-
ofTask("publishMods")
32-
}
33-
34-
for (ver in stonecutter.versions) {
35-
stonecutter registerChiseled tasks.register("build-${ver.project}", stonecutter.chiseled) {
36-
versions { _, it -> it == ver }
37-
group = "project"
38-
ofTask("build")
39-
}
40-
stonecutter registerChiseled tasks.register("publish-${ver.project}", stonecutter.chiseled) {
41-
versions { _, it -> it == ver }
42-
group = "project"
43-
ofTask("publishMods")
24+
stonecutter tasks {
25+
val ordering = versionComparator.thenComparingInt {
26+
if (it.metadata.project.endsWith("fabric")) 2
27+
else if (it.metadata.project.endsWith("neoforge")) 1
28+
else 0
4429
}
30+
order("publishModrinth", ordering)
31+
order("publishCurseforge", ordering)
4532
}

0 commit comments

Comments
 (0)