Skip to content

Commit 6dd7d31

Browse files
committed
Hopefully the last of the updates to make things build
Signed-off-by: KiriCattus <19393068+KiriCattus@users.noreply.github.com>
1 parent 7c5e512 commit 6dd7d31

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ext {
3737
group 'com.mcmoddev'
3838
version project.bot_version
3939

40-
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
40+
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
4141

4242
println "Bot Version: $version"
4343
println "Bots: ${String.join(" ", BOTS)}"

gradle/libs.versions.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
33
flyway = { id = "org.flywaydb.flyway", version.ref = "flyway" }
44
licenser = { id = "org.cadixdev.licenser", version = "0.6.1" }
5-
lombok = { id = "io.freefair.lombok", version = "8.1.0" }
6-
launch4j = { id = 'edu.sc.seis.launch4j', version = '3.0.4' }
5+
lombok = { id = "io.freefair.lombok", version = "9.2.0" }
76

87
[versions]
98
jda = "6.3.2"
109
chewtils = "39a83bd8"
1110
guava = "32.1.2-jre"
12-
gson = "2.10.1"
13-
logback = "1.4.9"
11+
gson = "2.11.0"
12+
logback = "1.5.6"
1413
nightconfig = "3.6.6"
1514
sqlite = "3.42.0.0"
1615
flyway = "9.21.1"
17-
annotations = "24.0.1"
18-
lombok = "1.18.28"
16+
annotations = "24.1.0"
17+
lombok = "1.18.44"
1918
graal = "25.0.2"
2019
reflections = "0.10.2"
2120
jdbi = "3.40.0"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/commander/java/com/mcmoddev/mmdbot/commander/commands/VersionCommand.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import com.jagrosh.jdautilities.command.SlashCommand;
2424
import com.mcmoddev.mmdbot.commander.annotation.RegisterSlashCommand;
2525
import com.mcmoddev.mmdbot.commander.updatenotifiers.fabric.FabricVersionHelper;
26-
import com.mcmoddev.mmdbot.commander.updatenotifiers.forge.ForgeVersionHelper;
27-
import com.mcmoddev.mmdbot.commander.updatenotifiers.forge.MinecraftForgeVersion;
2826
import com.mcmoddev.mmdbot.commander.updatenotifiers.minecraft.MinecraftVersionHelper;
2927
import com.mcmoddev.mmdbot.commander.updatenotifiers.quilt.QuiltVersionHelper;
3028
import com.mcmoddev.mmdbot.core.util.Constants;
@@ -59,18 +57,21 @@ public final class VersionCommand {
5957
.name("version")
6058
.help("Version-related commands.")
6159
.children(
60+
// TODO Fix this at a later date.
61+
// Disable the Forge version check command as the whole forge update check system has changed.
62+
/*
6263
SlashCommandBuilder.builder()
6364
.name("forge")
6465
.help("Get forge versions for latest Minecraft version.")
6566
.options(new OptionData(OptionType.STRING, "version", "The version of Minecraft to check for."))
6667
.executes(event -> {
67-
MinecraftForgeVersion latest;
68+
MinecraftForgeVersions latest;
6869
OptionMapping version = event.getOption("version");
6970
try {
7071
if (version != null) {
71-
latest = new MinecraftForgeVersion(version.getAsString(), ForgeVersionHelper.getForgeVersionsForMcVersion(version.getAsString()));
72+
latest = new MinecraftForgeVersions(version.getAsString(), ForgeVersionHelper.getForgeVersionsForMcVersion(version.getAsString()));
7273
} else {
73-
latest = ForgeVersionHelper.getLatestMcVersionForgeVersions();
74+
latest = ForgeVersionHelper.getForgeVersions().getLatestMcVersionForgeVersions();
7475
}
7576
} catch (Exception ex) {
7677
event.reply("Unable to get forge versions.").setEphemeral(true).queue();
@@ -100,6 +101,7 @@ public final class VersionCommand {
100101
event.reply("The given Minecraft version " + version.getAsString() + " is invalid.").setEphemeral(true).queue();
101102
}
102103
}),
104+
*/
103105

104106
SlashCommandBuilder.builder()
105107
.name("quilt")

0 commit comments

Comments
 (0)