Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21.1 #6

Merged
merged 1 commit into from
Oct 4, 2024
Merged

1.21.1 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/net/infumia/gradle/nms.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private val supportedVersions =
"v1.18.2",
"v1.19.4",
"v1.20.6",
"v1.21",
"v1.21.1",
)

fun Project.applyNms() {
Expand Down
22 changes: 1 addition & 21 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ minecraft-one-seventeen-one = "1.17.1-R0.1-SNAPSHOT"
minecraft-one-eighteen-two = "1.18.2-R0.1-SNAPSHOT"
minecraft-one-nineteen-four = "1.19.4-R0.1-SNAPSHOT"
minecraft-one-twenty-six = "1.20.6-R0.1-SNAPSHOT"
minecraft-one-twentyone = "1.21-R0.1-SNAPSHOT"
minecraft-one-twentyone-one = "1.21.1-R0.1-SNAPSHOT"

[libraries]
nexus-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.29.0" }
Expand Down Expand Up @@ -44,25 +44,5 @@ minecraft-one-fifteen-two-nms = { module = "org.spigotmc:spigot", version.ref =

minecraft-one-sixteen-five-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-sixteen-five" }

minecraft-one-seventeen-one = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-seventeen-one" }
minecraft-one-seventeen-one-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-seventeen-one" }
minecraft-one-seventeen-one-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-seventeen-one" }

minecraft-one-eighteen-two = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-eighteen-two" }
minecraft-one-eighteen-two-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-eighteen-two" }
minecraft-one-eighteen-two-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-eighteen-two" }

minecraft-one-nineteen-four = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-nineteen-four" }
minecraft-one-nineteen-four-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-nineteen-four" }
minecraft-one-nineteen-four-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-nineteen-four" }

minecraft-one-twenty-six = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-twenty-six" }
minecraft-one-twenty-six-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-twenty-six" }
minecraft-one-twenty-six-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-twenty-six" }

minecraft-one-twentyone = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-twentyone" }
minecraft-one-twentyone-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-twentyone" }
minecraft-one-twentyone-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-twentyone" }

[plugins]
paperweight = { id = "io.papermc.paperweight.userdev", version = "1.7.1" }
2 changes: 1 addition & 1 deletion nms/v1.21/build.gradle.kts → nms/v1.21.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins { alias(libs.plugins.paperweight) }
dependencies {
compileOnly(project(":nms-common"))

paperweight { paperDevBundle(libs.versions.minecraft.one.twentyone) }
paperweight { paperDevBundle(libs.versions.minecraft.one.twentyone.one) }
}

tasks {
Expand Down
6 changes: 3 additions & 3 deletions ...fumia/titleupdater/versions/NmsV1_21.java → ...mia/titleupdater/versions/NmsV1_21_1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;

public final class NmsV1_21 implements Nms {
public final class NmsV1_21_1 implements Nms {

private static final HolderLookup.Provider EMPTY_REGISTRY_ACCESS = HolderLookup.Provider.create(
Stream.empty()
);

public static final Nms INSTANCE = new NmsV1_21();
public static final Nms INSTANCE = new NmsV1_21_1();

@Override
public void updateTitle(final Player player, final Object title) {
Expand Down Expand Up @@ -55,7 +55,7 @@ private Component toComponent(final Object text) {
} else {
component = Component.Serializer.fromJson(
(JsonElement) text,
NmsV1_21.EMPTY_REGISTRY_ACCESS
NmsV1_21_1.EMPTY_REGISTRY_ACCESS
);
}
return component;
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ registerNmsModules(
"v1.18.2",
"v1.19.4",
"v1.20.6",
"v1.21"
"v1.21.1"
)

private fun registerNmsModules(vararg modules: String) {
Expand Down