From 34dda892ba71df4123d217543bc5e660b65b082b Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Tue, 14 Jul 2020 21:02:31 +0100 Subject: [PATCH] Fix client assets in development environment --- build.gradle.kts | 11 ++++++++++- .../spongepowered/common/util/SpongeTransform.java | 11 ++++++----- .../modlauncher/bootstrap/ClientDevLaunchHandler.java | 1 - .../modlauncher/bootstrap/ServerDevLaunchHandler.java | 1 - 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e6236d6b199..3c7749d1954 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -359,7 +359,16 @@ project("SpongeVanilla") { create("client") { environment("target", "client") workingDirectory(vanillaProject.file("./run")) - args.addAll(listOf("--launchTarget", "sponge_client_dev", "--version", "1.14.4", "--accessToken", "0")) + args.addAll(listOf( + "--launchTarget", "sponge_client_dev", + "--version", "1.14.4", + "--accessToken", "0", + "--assetIndex", "1.14", + "--assetsDir", (tasks.findByName("downloadAssets") as net.minecraftforge.gradle.common.task.DownloadAssets).output.absolutePath + )) + jvmArgs.addAll(listOf( + "-Djava.library.path=" + (tasks.findByName("extractNatives") as net.minecraftforge.gradle.common.task.ExtractNatives).output.absolutePath + )) main = "org.spongepowered.vanilla.modlauncher.Main" } } diff --git a/src/main/java/org/spongepowered/common/util/SpongeTransform.java b/src/main/java/org/spongepowered/common/util/SpongeTransform.java index 16f3b6ca8f8..65251ec27b7 100644 --- a/src/main/java/org/spongepowered/common/util/SpongeTransform.java +++ b/src/main/java/org/spongepowered/common/util/SpongeTransform.java @@ -24,6 +24,7 @@ */ package org.spongepowered.common.util; +import com.google.common.base.MoreObjects; import org.spongepowered.api.util.Transform; import org.spongepowered.math.imaginary.Quaterniond; import org.spongepowered.math.matrix.Matrix4d; @@ -169,11 +170,11 @@ public int hashCode() { @Override public String toString() { - return "SpongeTransform{" + - "position=" + this.position + - ", rotation=" + this.rotation + - ", scale=" + this.scale + - '}'; + return MoreObjects.toStringHelper(this) + .add("position", this.position) + .add("rotation", this.rotation) + .add("scale", this.scale) + .toString(); } private static Vector3d toAxesAngles(final Quaterniond quaternion) { diff --git a/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ClientDevLaunchHandler.java b/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ClientDevLaunchHandler.java index 6c40e873734..308130ad0a7 100644 --- a/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ClientDevLaunchHandler.java +++ b/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ClientDevLaunchHandler.java @@ -72,7 +72,6 @@ public void configureTransformationClassLoader(final ITransformingClassLoaderBui @Override public Callable launchService(final String[] arguments, final ITransformingClassLoader launchClassLoader) { - this.logger.info("Transitioning to Sponge launcher, please wait..."); return () -> { diff --git a/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ServerDevLaunchHandler.java b/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ServerDevLaunchHandler.java index 58181621c56..fcdc298e57e 100644 --- a/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ServerDevLaunchHandler.java +++ b/vanilla/src/modlauncher/java/org/spongepowered/vanilla/modlauncher/bootstrap/ServerDevLaunchHandler.java @@ -72,7 +72,6 @@ public void configureTransformationClassLoader(final ITransformingClassLoaderBui @Override public Callable launchService(final String[] arguments, final ITransformingClassLoader launchClassLoader) { - this.logger.info("Transitioning to Sponge launcher, please wait..."); return () -> {