Skip to content

Commit 9d6be4b

Browse files
committed
cheese'les
1 parent 4e4c4d3 commit 9d6be4b

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

build.gradle

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.fabricmc.fabric-loom' version "${loom_version}"
2+
id 'fabric-loom' version "${loom_version}"
33
id 'maven-publish'
44
}
55
def INCLUDE_OTHER_ARCHS = "true".equalsIgnoreCase(project.findProperty("includeOtherArchs"))
@@ -83,6 +83,7 @@ def gitCommitHash = { ->
8383

8484
def buildtime = {System.currentTimeSeconds()}
8585

86+
8687
processResources {
8788
def time = buildtime()
8889
def hash = gitCommitHash()
@@ -110,69 +111,69 @@ loom {
110111
accessWidenerPath = file("src/main/resources/voxy.accesswidener")
111112
}
112113

113-
def runtimeOnlyMsk = {arg->}
114+
def modRuntimeOnlyMsk = {arg->}
114115
if (!isInGHA) {
115-
runtimeOnlyMsk = { arg ->
116+
modRuntimeOnlyMsk = { arg ->
116117
dependencies {
117-
runtimeOnly(arg)
118+
modRuntimeOnly(arg)
118119
}
119120
}
120121
}
121122

122123
dependencies {
123124
// To change the versions see the gradle.properties file
124125
minecraft "com.mojang:minecraft:${project.minecraft_version}"
125-
//mappings loom.officialMojangMappings()
126-
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
126+
mappings loom.officialMojangMappings()
127+
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
127128

128129

129-
runtimeOnlyMsk(fabricApi.module("fabric-api-base", project.fabric_api_version))
130-
runtimeOnlyMsk(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_api_version))
131-
runtimeOnlyMsk(fabricApi.module("fabric-resource-loader-v0", project.fabric_api_version))
132-
runtimeOnlyMsk(fabricApi.module("fabric-command-api-v2", project.fabric_api_version))
130+
modRuntimeOnlyMsk(fabricApi.module("fabric-api-base", project.fabric_api_version))
131+
modRuntimeOnlyMsk(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_api_version))
132+
modRuntimeOnlyMsk(fabricApi.module("fabric-resource-loader-v0", project.fabric_api_version))
133+
modRuntimeOnlyMsk(fabricApi.module("fabric-command-api-v2", project.fabric_api_version))
133134

134-
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
135+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
135136

136137
if (true) {
137-
implementation "maven.modrinth:sodium:${project.sodium_version_modrinth}"
138+
modImplementation "maven.modrinth:sodium:${project.sodium_version_modrinth}"
138139
} else {
139-
implementation "net.caffeinemc:sodium-fabric:${project.sodium_version}"
140+
modImplementation "net.caffeinemc:sodium-fabric:0.8.4-SNAPSHOT+mc1.21.11+"
140141
}
141142

142-
implementation("maven.modrinth:lithium:mc26.1.2-0.24.2-fabric")
143+
modImplementation("maven.modrinth:lithium:mc1.21.11-0.21.0-fabric")
143144

144145
//modRuntimeOnlyMsk "drouarb:nvidium:0.4.1-beta4:1.21.6@jar"
145-
compileOnly("drouarb:nvidium:0.4.1-beta4:1.21.6@jar")
146+
modCompileOnly "drouarb:nvidium:0.4.1-beta4:1.21.6@jar"
146147

147-
compileOnly("maven.modrinth:modmenu:18.0.0-alpha.8")
148-
runtimeOnlyMsk("maven.modrinth:modmenu:18.0.0-alpha.8")
148+
modCompileOnly("maven.modrinth:modmenu:17.0.0-alpha.1")
149+
modRuntimeOnlyMsk("maven.modrinth:modmenu:17.0.0-alpha.1")
149150

150-
compileOnly("maven.modrinth:iris:1.10.9+26.1-fabric")
151-
runtimeOnlyMsk("maven.modrinth:iris:1.10.9+26.1-fabric")
151+
modCompileOnly("maven.modrinth:iris:1.10.7+1.21.11-fabric")
152+
modRuntimeOnlyMsk("maven.modrinth:iris:1.10.7+1.21.11-fabric")
152153

153154
//modCompileOnly("maven.modrinth:starlight:1.1.3+1.20.4")
154155

155156
//modCompileOnly("maven.modrinth:immersiveportals:v5.1.7-mc1.20.4")
156157

157-
compileOnly("maven.modrinth:chunky:DCgX52a5")
158+
modCompileOnly("maven.modrinth:chunky:1.4.54-fabric")
158159
//modRuntimeOnlyMsk("maven.modrinth:chunky:1.4.40-fabric")
159160

160-
//modRuntimeOnlyMsk("maven.modrinth:spark:1.10.152-fabric")
161-
//modRuntimeOnlyMsk("maven.modrinth:fabric-permissions-api:0.3.3")
161+
modRuntimeOnlyMsk("maven.modrinth:spark:1.10.152-fabric")
162+
modRuntimeOnlyMsk("maven.modrinth:fabric-permissions-api:0.3.3")
162163
//modRuntimeOnly("maven.modrinth:nsight-loader:1.2.0")
163164

164165
//modImplementation('io.github.douira:glsl-transformer:2.0.1')
165166

166-
compileOnly("maven.modrinth:vivecraft:26.1.1-1.3.7-b2-fabric")
167+
modCompileOnly("maven.modrinth:vivecraft:1.21.9-1.3.2-fabric")
167168

168-
compileOnly("maven.modrinth:flashback:VaqZB1DF")
169+
modCompileOnly("maven.modrinth:flashback:rNCr1Rbs")
169170
}
170171

171172

172-
def targetJavaVersion = 25
173+
def targetJavaVersion = 21
173174
tasks.withType(JavaCompile).configureEach {
174175
it.options.encoding = "UTF-8"
175-
it.options.release = targetJavaVersion
176+
it.options.release = 25
176177
it.options.deprecation = true
177178
}
178179

@@ -208,7 +209,7 @@ tasks.register('makeExcludedRocksDB', Zip) {
208209
def files = configurations.includeInternal.incoming.getArtifacts().getArtifactFiles().filter {
209210
it.name.startsWith('rocksdb')
210211
}
211-
212+
212213
from {->zipTree(files.first())}
213214
archiveFileName.set(providers.provider{files.first().name})
214215

@@ -236,7 +237,7 @@ processIncludeJars {
236237
}
237238
}
238239

239-
jar {
240+
remapJar {
240241
doFirst {
241242
delete fileTree(getDestinationDirectory().get())
242243
}
@@ -249,7 +250,7 @@ jar {
249250
}
250251
}
251252

252-
project.ext.lwjglVersion = "3.4.1"
253+
project.ext.lwjglVersion = "3.3.3"
253254
project.ext.lwjglNatives = "natives-windows"
254255

255256
repositories {
@@ -292,7 +293,6 @@ dependencies {
292293
//implementation 'redis.clients:jedis:5.1.0'
293294
}
294295

295-
/*
296296
if (!isInGHA) {
297297
repositories {
298298
maven {
@@ -305,4 +305,4 @@ if (!isInGHA) {
305305
exclude group: 'net.fabricmc', module: 'fabric-loader'
306306
}
307307
}
308-
}*/
308+
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ org.gradle.daemon = false
99
# check these on https://modmuss50.me/fabric.html
1010
minecraft_version=1.21.11
1111
loader_version=0.18.4
12-
loom_version=1.14-SNAPSHOT
12+
loom_version=1.16-SNAPSHOT
1313

1414
# Fabric API
1515
fabric_api_version=0.140.2+1.21.11
16-
sodium_version_modrinth=mc26.1.2-0.8.12-fabric
16+
sodium_version_modrinth=mc1.21.11-0.8.12-fabric
1717
sodium_extra_allows=0.8.9 0.8.10 0.8.11
1818

1919

0 commit comments

Comments
 (0)