Skip to content

Commit 2a40fcd

Browse files
committed
feat: 1.21.11 support
1 parent 4b85c2c commit 2a40fcd

File tree

15 files changed

+580
-18
lines changed

15 files changed

+580
-18
lines changed

build.gradle.kts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("com.mineinabyss.conventions.autoversion")
99
id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing
1010
id("net.minecrell.plugin-yml.paper") version "0.6.0"
11-
id("io.papermc.paperweight.userdev") version "2.0.0-beta.18"
11+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
1212
}
1313

1414
paperweight.reobfArtifactConfiguration.set(ReobfArtifactConfiguration.MOJANG_PRODUCTION)
@@ -44,22 +44,19 @@ dependencies {
4444
compileOnly(idofrontLibs.minecraft.mccoroutine)
4545

4646
// Shaded
47-
paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT") //NMS
47+
paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT") //NMS
4848
implementation(project(path = ":core"))
4949
implementation(project(path = ":v1_21_R1"))
5050
implementation(project(path = ":v1_21_R2"))
5151
implementation(project(path = ":v1_21_R3"))
5252
implementation(project(path = ":v1_21_R4"))
5353
implementation(project(path = ":v1_21_R6"))
5454
implementation(project(path = ":v1_21_R8"))
55+
implementation(project(path = ":v1_21_R10"))
5556
}
5657

5758
tasks {
5859

59-
assemble {
60-
dependsOn(reobfJar)
61-
}
62-
6360
compileJava {
6461
options.encoding = Charsets.UTF_8.name()
6562
options.release.set(21)
@@ -79,8 +76,6 @@ tasks {
7976
}
8077

8178
shadowJar {
82-
dependsOn(":v1_21_R1:reobfJar")
83-
8479
archiveFileName.set("Emojy.jar")
8580
}
8681

core/src/main/kotlin/com/mineinabyss/emojy/nms/EmojyNMSHandlers.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ object EmojyNMSHandlers {
1313
"1.21.5" -> "v1_21_R4"
1414
"1.21.6", "1.21.7", "1.21.8" -> "v1_21_R6"
1515
"1.21.9", "1.21.10" -> "v1_21_R8"
16+
"1.21.11" -> "v1_21_R10"
1617
else -> throw IllegalStateException("Unsupported server version")
1718
}
1819
runCatching {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group=com.mineinabyss
22
version=0.10
3-
idofrontVersion=1.0.3
3+
idofrontVersion=1.1.0
Lines changed: 1 addition & 1 deletion
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-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ dependencyResolutionManagement {
3535
}
3636
}
3737

38-
include("core", "v1_21_R1", "v1_21_R2", "v1_21_R3", "v1_21_R4", "v1_21_R6", "v1_21_R8")
38+
include("core", "v1_21_R1", "v1_21_R2", "v1_21_R3", "v1_21_R4", "v1_21_R6", "v1_21_R8", "v1_21_R10")

v1_21_R1/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
33
plugins {
44
id("com.mineinabyss.conventions.kotlin.jvm")
55
id("com.mineinabyss.conventions.autoversion")
6-
id("io.papermc.paperweight.userdev") version "2.0.0-beta.18"
6+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
77
}
88

99
repositories {

v1_21_R10/build.gradle.kts

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
2+
3+
plugins {
4+
id("com.mineinabyss.conventions.kotlin.jvm")
5+
id("com.mineinabyss.conventions.autoversion")
6+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
7+
}
8+
9+
repositories {
10+
gradlePluginPortal()
11+
maven("https://repo.mineinabyss.com/releases")
12+
maven("https://repo.mineinabyss.com/snapshots")
13+
maven("https://repo.papermc.io/repository/maven-public/")
14+
google()
15+
}
16+
17+
paperweight.reobfArtifactConfiguration.set(ReobfArtifactConfiguration.MOJANG_PRODUCTION)
18+
19+
dependencies {
20+
// MineInAbyss platform
21+
compileOnly(idofrontLibs.kotlinx.serialization.json)
22+
compileOnly(idofrontLibs.kotlinx.serialization.kaml)
23+
compileOnly(idofrontLibs.kotlinx.coroutines)
24+
compileOnly(idofrontLibs.minecraft.mccoroutine)
25+
26+
// Shaded
27+
implementation(idofrontLibs.bundles.idofront.core)
28+
implementation(project(":core"))
29+
paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT") //NMS
30+
}
31+
32+
tasks {
33+
34+
compileJava {
35+
options.encoding = Charsets.UTF_8.name()
36+
options.release.set(21)
37+
}
38+
javadoc {
39+
options.encoding = Charsets.UTF_8.name()
40+
}
41+
processResources {
42+
filteringCharset = Charsets.UTF_8.name()
43+
}
44+
}

0 commit comments

Comments
 (0)