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

Add support for 1.21 #31

Merged
merged 3 commits into from
Jul 24, 2024
Merged

Add support for 1.21 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b22f2e
Compile against 1.21, bump version to 2.9.1-SNAPSHOT
md5sha256 Jun 21, 2024
5dd42e4
Enforce min version to 1.21
md5sha256 Jun 21, 2024
a619050
Update cloud to beta.9
md5sha256 Jul 24, 2024
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
4 changes: 2 additions & 2 deletions AreaShop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
api("com.google.inject.extensions:guice-assistedinject:7.0.0") {
exclude("com.google.guava")
}
implementation("org.incendo:cloud-paper:2.0.0-beta.8") {
implementation("org.incendo:cloud-paper:2.0.0-beta.9") {
exclude("com.google.guava")
}
implementation("org.incendo:cloud-processors-confirmation:1.0.0-beta.3") {
Expand Down Expand Up @@ -130,7 +130,7 @@ tasks {
// Configure the Minecraft version for our task.
// This is the only required configuration besides applying the plugin.
// Your plugin's jar (or shadowJar if present) will be used automatically.
minecraftVersion("1.20.6")
minecraftVersion("1.21")

downloadPlugins {
github("EssentialsX", "essentials", "2.20.1", "EssentialsX-2.20.1.jar")
Expand Down
4 changes: 2 additions & 2 deletions AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ public void onEnable() {

// Setup NMS Impl
Version currentServerVersion = VersionUtil.parseMinecraftVersion(Bukkit.getBukkitVersion());
if (currentServerVersion.versionData().isOlderThan(VersionUtil.MC_1_20_6)) {
error("Unsupported minecraft version: " + currentServerVersion + "! Minimum is 1.20.6");
if (currentServerVersion.versionData().isOlderThan(VersionUtil.MC_1_21)) {
error("Unsupported minecraft version: " + currentServerVersion + "! Minimum is 1.21");
shutdownOnError();
return;
}
Expand Down
2 changes: 1 addition & 1 deletion AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

public class VersionUtil {

public static final VersionData MC_1_20_6 = new VersionData(1, 20, 6);
public static final VersionData MC_1_21 = new VersionData(1, 21);

@Nonnull
public static String padTrailingZero(@Nonnull String minecraftVersion) {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
}

group = "me.wiefferink"
version = "2.9.0"
version = "2.9.1-SNAPSHOT"

val targetJavaVersion = 21
val encoding = Charsets.UTF_8
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# Platforms
minecraft = "1.20.6-R0.1-SNAPSHOT"
minecraft = "1.21-R0.1-SNAPSHOT"

# Minecraft Plugins
worldedit = "7.3.3"
Expand Down
Loading