diff --git a/build.gradle b/build.gradle index 5f26400..f961dff 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } base { - java.toolchain.languageVersion = JavaLanguageVersion.of(8) + java.toolchain.languageVersion = JavaLanguageVersion.of(17) compileJava.options.encoding = compileTestJava.options.encoding = javadoc.options.encoding = "UTF-8" group = project.maven_group ?: rootProject.maven_group @@ -38,12 +38,12 @@ repositories { } dependencies { - compileOnly "com.viaversion:viaversion-common:4.10.2" - compileOnly "com.viaversion:viabackwards-common:4.10.2" - compileOnly "com.viaversion:viarewind-common:3.1.2" - compileOnly "net.raphimc:ViaLegacy:2.2.22" - compileOnly "net.raphimc:ViaAprilFools:2.0.12" - compileOnly "net.raphimc:ViaBedrock:0.0.7-SNAPSHOT" + compileOnly "com.viaversion:viaversion-common:5.0.0-SNAPSHOT" + compileOnly "com.viaversion:viabackwards-common:5.0.0-SNAPSHOT" + compileOnly "com.viaversion:viarewind-common:4.0.0-SNAPSHOT" + compileOnly "net.raphimc:ViaLegacy:3.0.0-SNAPSHOT" + compileOnly "net.raphimc:ViaAprilFools:3.0.0-SNAPSHOT" + compileOnly "net.raphimc:ViaBedrock:0.0.8-SNAPSHOT" compileOnly "org.cloudburstmc.netty:netty-transport-raknet:1.0.0.CR3-SNAPSHOT" api "com.google.guava:guava:33.2.0-jre" @@ -61,7 +61,6 @@ sourceSets { java { withSourcesJar() - withJavadocJar() } jar { diff --git a/gradle.properties b/gradle.properties index 4589deb..0cfcf39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.configureondemand=true maven_group=net.raphimc maven_name=ViaLoader -maven_version=2.2.14-SNAPSHOT +maven_version=3.0.0-SNAPSHOT diff --git a/src/main/java/net/raphimc/vialoader/commands/subs/ConnectionsSubCommand.java b/src/main/java/net/raphimc/vialoader/commands/subs/ConnectionsSubCommand.java index b747ec6..f184335 100644 --- a/src/main/java/net/raphimc/vialoader/commands/subs/ConnectionsSubCommand.java +++ b/src/main/java/net/raphimc/vialoader/commands/subs/ConnectionsSubCommand.java @@ -24,7 +24,7 @@ import com.viaversion.viaversion.api.connection.UserConnection; import java.util.Set; -public class ConnectionsSubCommand extends ViaSubCommand { +public class ConnectionsSubCommand implements ViaSubCommand { @Override public String name() { diff --git a/src/main/java/net/raphimc/vialoader/commands/subs/LeakDetectSubCommand.java b/src/main/java/net/raphimc/vialoader/commands/subs/LeakDetectSubCommand.java index 4b7ab70..cdba8b2 100644 --- a/src/main/java/net/raphimc/vialoader/commands/subs/LeakDetectSubCommand.java +++ b/src/main/java/net/raphimc/vialoader/commands/subs/LeakDetectSubCommand.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -public class LeakDetectSubCommand extends ViaSubCommand { +public class LeakDetectSubCommand implements ViaSubCommand { @Override public String name() { @@ -61,7 +61,7 @@ public class LeakDetectSubCommand extends ViaSubCommand { .filter(it -> it.startsWith(args[0])) .collect(Collectors.toList()); } - return super.onTabComplete(sender, args); + return ViaSubCommand.super.onTabComplete(sender, args); } } diff --git a/src/main/java/net/raphimc/vialoader/impl/platform/ViaVersionPlatformImpl.java b/src/main/java/net/raphimc/vialoader/impl/platform/ViaVersionPlatformImpl.java index 2a0e0c7..54c3a58 100644 --- a/src/main/java/net/raphimc/vialoader/impl/platform/ViaVersionPlatformImpl.java +++ b/src/main/java/net/raphimc/vialoader/impl/platform/ViaVersionPlatformImpl.java @@ -157,7 +157,7 @@ public class ViaVersionPlatformImpl implements ViaPlatform { } protected AbstractViaConfig createConfig() { - return new VLViaConfig(new File(this.dataFolder, "viaversion.yml")); + return new VLViaConfig(new File(this.dataFolder, "viaversion.yml"), this.getLogger()); } protected ViaAPI createApi() { diff --git a/src/main/java/net/raphimc/vialoader/impl/viaversion/VLViaConfig.java b/src/main/java/net/raphimc/vialoader/impl/viaversion/VLViaConfig.java index df41e2d..76b99ee 100644 --- a/src/main/java/net/raphimc/vialoader/impl/viaversion/VLViaConfig.java +++ b/src/main/java/net/raphimc/vialoader/impl/viaversion/VLViaConfig.java @@ -25,6 +25,7 @@ import java.io.File; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.logging.Logger; public class VLViaConfig extends AbstractViaConfig { @@ -37,8 +38,8 @@ public class VLViaConfig extends AbstractViaConfig { "use-new-deathmessages", "nms-player-ticking" ); - public VLViaConfig(final File configFile) { - super(configFile); + public VLViaConfig(final File configFile, final Logger logger) { + super(configFile, logger); } @Override diff --git a/src/main/java/net/raphimc/vialoader/util/VLTask.java b/src/main/java/net/raphimc/vialoader/util/VLTask.java index 7ebd047..ee9924f 100644 --- a/src/main/java/net/raphimc/vialoader/util/VLTask.java +++ b/src/main/java/net/raphimc/vialoader/util/VLTask.java @@ -29,11 +29,6 @@ public class VLTask implements PlatformTask { this.task = task; } - @Override - public Task getObject() { - return this.task; - } - @Override public void cancel() { this.task.cancel();