From 79ab452ec81e873926114f83f5ab928f2d6e36b2 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Fri, 5 Apr 2019 14:55:59 -0300 Subject: [PATCH] Dump client-sided version --- build.gradle.kts | 4 ++-- .../creeper123123321/viafabric/platform/VRPlatform.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 346ad55..796dcb0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ tasks.named("processResources") { )) } -val shade by configurations.creating +val shade: Configuration by configurations.creating configurations.getByName("compile").extendsFrom(shade) dependencies { @@ -88,6 +88,6 @@ minecraft { // If you remove this task, sources will not be generated. tasks.register("sourcesJar") { dependsOn(tasks.getByName("classes")) - classifier = "sources" + archiveClassifier.set("sources") from(sourceSets.getByName("main").allSource) } \ No newline at end of file diff --git a/src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java b/src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java index 22c7517..98d945f 100644 --- a/src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java +++ b/src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java @@ -28,6 +28,7 @@ import com.github.creeper123123321.viafabric.ViaFabric; import com.github.creeper123123321.viafabric.commands.NMSCommandSender; import com.github.creeper123123321.viafabric.commands.UserCommandSender; import com.github.creeper123123321.viafabric.protocol.ClientSideReference; +import com.github.creeper123123321.viafabric.providers.VRVersionProvider; import com.github.creeper123123321.viafabric.util.FutureTaskId; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -51,6 +52,7 @@ import us.myles.ViaVersion.api.platform.ViaPlatform; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.dump.PluginInfo; import us.myles.ViaVersion.exception.CancelException; +import us.myles.ViaVersion.protocols.base.VersionProvider; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; import us.myles.ViaVersion.sponge.VersionInfo; import us.myles.ViaVersion.util.GsonUtil; @@ -281,6 +283,7 @@ public class VRPlatform implements ViaPlatform { } platformSpecific.add("mods", GsonUtil.getGson().toJsonTree(mods)); + platformSpecific.addProperty("client-sided-version", ((VRVersionProvider) Via.getManager().getProviders().get(VersionProvider.class)).clientSideModeVersion); return platformSpecific; }