Skip to content

Commit df62dce

Browse files
spiralhalospiralhalo
committed
Gruntle update
1 parent 722c594 commit df62dce

8 files changed

+30
-29
lines changed

‎fabric/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
plugins {
11-
id 'fabric-loom' version '1.0.9'
11+
id 'fabric-loom' version '1.2.5'
1212
id 'maven-publish'
1313
id 'org.cadixdev.licenser' version '0.6.1'
1414
id 'org.ajoberstar.grgit' version '4.1.1'
@@ -18,8 +18,8 @@ plugins {
1818
}
1919

2020
ext.platform_name = 'fabric'
21-
ext.loader_version = '0.14.11'
22-
ext.fabric_version = '0.68.0+1.19.2'
21+
ext.loader_version = '0.14.19'
22+
ext.fabric_version = '0.76.0+1.19.2'
2323

2424
apply from: '../project_common.gradle'
2525
apply from: 'project.gradle'
@@ -130,8 +130,8 @@ task github(dependsOn: build) {
130130
def github = GitHub.connectUsingOAuth(project.github_releases_token)
131131
def repository = github.getRepository("${project.github_repository_owner}/${project.github_repository}")
132132

133-
def releaseBuilder = new GHReleaseBuilder(repository, project.platform_name + '-' + project.mc_tag + '-' + project.version)
134-
releaseBuilder.name(project.platform_name + '-' + project.mc_tag + '-' + project.version)
133+
def releaseBuilder = new GHReleaseBuilder(repository, project.platform_name + '-' + project.version)
134+
releaseBuilder.name(project.platform_name + '-' + project.version)
135135
releaseBuilder.commitish(grgit.branch.current().name)
136136

137137
def ghRelease = releaseBuilder.create()
@@ -147,12 +147,12 @@ modrinth {
147147
if (project.hasProperty("modrinth_token") && project.hasProperty("modrinth_id")) {
148148
token = project.modrinth_token
149149
projectId = project.modrinth_id
150-
versionName = project.platform_name + '-' + project.mc_tag + '-' + project.version
151-
versionNumber = project.platform_name + '-' + project.mc_tag + '-' + project.version // Will fail if Modrinth has this version already
150+
versionName = project.platform_name + '-' + project.version
151+
versionNumber = project.platform_name + '-' + project.version // Will fail if Modrinth has this version already
152152
versionType = project.release_type
153153
// On fabric, use 'remapJar' instead of 'jar'
154154
uploadFile = remapJar // This is the java jar task. If it can't find the jar, try 'jar.outputs.getFiles().asPath' in place of 'jar'
155155
gameVersions = ["${project.minecraft_version}"]
156-
loaders = ["${project.platform_name}"] // Must also be an array - no need to specify this if you're using Loom
156+
loaders = ["fabric", "quilt"] // Must also be an array - no need to specify this if you're using Loom
157157
}
158158
}

‎fabric/project.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,14 @@ dependencies {
2222
modIncludeImplementation("io.vram:bitraster:1.5.53")
2323
modIncludeImplementation("io.vram:dtklib:1.0.6")
2424

25-
// Included via FREX/JMX
26-
// modIncludeImplementation("io.vram:bitkit:1.0.4")
25+
modIncludeImplementation("io.vram:bitkit:1.0.4")
2726
modIncludeImplementation("io.vram:special-circumstances:1.10.7")
2827

29-
// Included via JMX
30-
// modIncludeImplementation("io.vram:frex-fabric-mc118:6.0.258")
31-
modImplementation("io.vram:jmx-fabric-mc119:1.22.262")
32-
include("io.vram:jmx-fabric-mc119:1.22.262:fat")
28+
modIncludeImplementation("io.vram:frex-fabric:19.2.307")
29+
modIncludeImplementation("io.vram:jmx-fabric:19.2.264")
3330

34-
modCompileOnly "com.terraformersmc:modmenu:4.0.6"
35-
modRuntimeOnly "com.terraformersmc:modmenu:4.0.6"
31+
modCompileOnly "com.terraformersmc:modmenu:4.1.1"
32+
modRuntimeOnly "com.terraformersmc:modmenu:4.1.1"
3633
}
3734

3835
sourceSets {

‎fabric/src/main/resources/fabric.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"mixins.canvas.fabric.json"
3838
],
3939
"depends": {
40-
"fabricloader": ">=0.14.11",
40+
"fabricloader": ">=0.14.19",
4141
"minecraft": ">=1.19.2",
4242
"java": ">=17"
4343
},

‎forge/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
plugins {
11-
id 'dev.architectury.loom' version '0.12.0-SNAPSHOT'
11+
id 'dev.architectury.loom' version '1.1.335'
1212
id 'maven-publish'
1313
id 'org.cadixdev.licenser' version '0.6.1'
1414
id 'org.ajoberstar.grgit' version '4.1.1'
@@ -19,7 +19,7 @@ plugins {
1919
}
2020

2121
ext.platform_name = 'forge'
22-
ext.forge_version = '43.1.24'
22+
ext.forge_version = '45.0.49'
2323

2424
configurations {
2525
bundle { transitive = false }
@@ -127,8 +127,8 @@ task github(dependsOn: build) {
127127
def github = GitHub.connectUsingOAuth(project.github_releases_token)
128128
def repository = github.getRepository("${project.github_repository_owner}/${project.github_repository}")
129129

130-
def releaseBuilder = new GHReleaseBuilder(repository, project.platform_name + '-' + project.mc_tag + '-' + project.version)
131-
releaseBuilder.name(project.platform_name + '-' + project.mc_tag + '-' + project.version)
130+
def releaseBuilder = new GHReleaseBuilder(repository, project.platform_name + '-' + project.version)
131+
releaseBuilder.name(project.platform_name + '-' + project.version)
132132
releaseBuilder.commitish(grgit.branch.current().name)
133133

134134
def ghRelease = releaseBuilder.create()
@@ -144,12 +144,12 @@ modrinth {
144144
if (project.hasProperty("modrinth_token") && project.hasProperty("modrinth_id")) {
145145
token = project.modrinth_token
146146
projectId = project.modrinth_id
147-
versionName = project.platform_name + '-' + project.mc_tag + '-' + project.version
148-
versionNumber = project.platform_name + '-' + project.mc_tag + '-' + project.version // Will fail if Modrinth has this version already
147+
versionName = project.platform_name + '-' + project.version
148+
versionNumber = project.platform_name + '-' + project.version // Will fail if Modrinth has this version already
149149
versionType = project.release_type
150150
// On fabric, use 'remapJar' instead of 'jar'
151151
uploadFile = remapJar // This is the java jar task. If it can't find the jar, try 'jar.outputs.getFiles().asPath' in place of 'jar'
152152
gameVersions = ["${project.minecraft_version}"]
153-
loaders = ["${project.platform_name}"] // Must also be an array - no need to specify this if you're using Loom
153+
loaders = ["forge"] // Must also be an array - no need to specify this if you're using Loom
154154
}
155155
}

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gruntle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ unzip -q gruntle-${MC_VERSION}
2828

2929
# copy content for our branch and then remove bundle
3030
# this handles simple, file-based updates: checkstyle, standard gradle configs, etc.
31-
cp -R gruntle-${MC_VERSION}/bundle/ .
31+
cp -R gruntle-${MC_VERSION}/bundle/* .
3232
rm -rf gruntle-${MC_VERSION}
3333
rm gruntle-${MC_VERSION}.zip
3434

‎gruntle_common.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
ext.mc_tag = 'mc119'
21
ext.minecraft_version = '1.19.2'
32
ext.release_version = '1.19.2'
43

5-
project.archivesBaseName = project.mod_name + "-" + project.platform_name + "-" + project.mc_tag
4+
project.archivesBaseName = project.mod_name + "-" + project.platform_name
65

76
sourceCompatibility = JavaVersion.VERSION_17
87
targetCompatibility = JavaVersion.VERSION_17
@@ -90,6 +89,11 @@ curseforge {
9089
releaseType = project.release_type
9190
addGameVersion project.release_version
9291
addGameVersion project.platform_name.capitalize()
92+
93+
if (project.platform_name.equals("fabric")) {
94+
addGameVersion "Quilt"
95+
}
96+
9397
changelog = "A changelog can be found at https://github.com/${github_repository_owner}/${github_repository}/commits"
9498

9599
mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))

‎project_common.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project.group = 'io.vram'
33
ext.author = 'Grondag'
44
ext.title = 'Canvas Renderer'
55
ext.mod_name = 'canvas'
6-
ext.mod_version = '1.0'
6+
ext.mod_version = '19.2'
77

88
ext.github_repository_owner = 'vram-guild'
99
ext.github_repository = 'canvas'

0 commit comments

Comments
 (0)