Skip to content

Commit 8df3302

Browse files
committed
add 1.21.9 neoforge target
1 parent 03860f3 commit 8df3302

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

build.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,7 @@ dependencies {
187187
modDependency("fabricLangKotlin", { "net.fabricmc:fabric-language-kotlin:${it}" })
188188
}
189189
if (isNeoforge) {
190-
modstitchModRuntimeOnly("thedarkcolour:kotlinforforge-neoforge:${findProperty("deps.kotlinForForge")}")
191-
}
192-
if (isForge) {
193-
modstitchModRuntimeOnly("thedarkcolour:kotlinforforge:${findProperty("deps.kotlinForForge")}")
194-
195-
compileOnly("org.jetbrains:annotations:20.1.0")
190+
//modstitchModRuntimeOnly("thedarkcolour:kotlinforforge-neoforge:${findProperty("deps.kotlinForForge")}")
196191
}
197192

198193
listOf(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Apr 05 20:43:25 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

src/main/java/dev/isxander/yacl3/platform/YACLPlatform.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ public static Env getEnvironment() {
3737
case SERVER -> Env.SERVER;
3838
};
3939
/*?} elif forgelike {*/
40-
/*return switch (FMLEnvironment.dist) {
40+
/*//? if >=1.21.9 {
41+
var dist = FMLEnvironment.getDist();
42+
//?} else {
43+
/^var dist = FMLEnvironment.dist;
44+
^///?}
45+
return switch (dist) {
4146
case CLIENT -> Env.CLIENT;
4247
case DEDICATED_SERVER -> Env.SERVER;
4348
};
@@ -53,10 +58,14 @@ public static Path getConfigDir() {
5358
}
5459

5560
public static boolean isDevelopmentEnv() {
56-
/*? if fabric {*/
61+
//? if fabric {
5762
return FabricLoader.getInstance().isDevelopmentEnvironment();
58-
/*?} elif forgelike {*/
59-
/*return !FMLEnvironment.production;
60-
*//*?}*/
63+
//?} elif forgelike {
64+
/*//? if >=1.21.9 {
65+
return !FMLEnvironment.isProduction();
66+
//?} else {
67+
/^return !FMLEnvironment.production;
68+
^///?}
69+
*///?}
6170
}
6271
}

stonecutter.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
id("dev.kikugie.stonecutter")
66

7-
val modstitchVersion = "0.6.3-unstable"
7+
val modstitchVersion = "0.7.1-unstable"
88
id("dev.isxander.modstitch.base") version modstitchVersion apply false
99

1010
id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false

0 commit comments

Comments
 (0)