imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only set startFirstThread on versions using LWJGL 3 (#1076)

Browse Source 
* Only set startFirstThread on versions using LWJGL 3

* Lazily evaluate RunConfig
This commit is contained in:
modmuss
2024-03-19 20:08:35 +00:00
committed by GitHub
parent 3670ccb959
commit 455b9d6aed
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
View File

@@ -43,6 +43,7 @@ import java.util.stream.Collectors;
import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import org.gradle.api.JavaVersion;
import org.gradle.api.Project;
import org.gradle.api.artifacts.ModuleVersionIdentifier;
import org.gradle.api.artifacts.ResolvedArtifact;
@@ -58,6 +59,7 @@ import net.fabricmc.loom.configuration.InstallerData;
import net.fabricmc.loom.configuration.ide.idea.IdeaSyncTask;
import net.fabricmc.loom.configuration.ide.idea.IdeaUtils;
import net.fabricmc.loom.configuration.providers.BundleMetadata;
import net.fabricmc.loom.configuration.providers.minecraft.library.LibraryContext;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.gradle.SourceSetReference;
@@ -135,6 +137,12 @@ public class RunConfig {
public static RunConfig runConfig(Project project, RunConfigSettings settings) {
LoomGradleExtension extension = LoomGradleExtension.get(project);
LibraryContext context = new LibraryContext(extension.getMinecraftProvider().getVersionInfo(), JavaVersion.current());
if (settings.getEnvironment().equals("client") && context.usesLWJGL3()) {
settings.startFirstThread();
}
String name = settings.getName();
String configName = settings.getConfigName();

1
src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
View File

@@ -321,7 +321,6 @@ public class RunConfigSettings implements Named {
* Configure run config with the default client options.
*/
public void client() {
startFirstThread();
environment("client");
defaultMainClass(Constants.Knot.KNOT_CLIENT);

22
src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
View File

@@ -40,6 +40,7 @@ import org.gradle.api.Project;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.file.FileCollection;
import org.gradle.api.provider.Property;
import org.gradle.api.provider.Provider;
import org.gradle.api.services.ServiceReference;
import org.gradle.api.specs.Spec;
import org.gradle.api.tasks.JavaExec;
@@ -52,7 +53,7 @@ import net.fabricmc.loom.util.gradle.SyncTaskBuildService;
public abstract class AbstractRunTask extends JavaExec {
private static final CharsetEncoder ASCII_ENCODER = StandardCharsets.US_ASCII.newEncoder();
private final RunConfig config;
private final Provider<RunConfig> config;
// We control the classpath, as we use a ArgFile to pass it over the command line: https://docs.oracle.com/javase/7/docs/technotes/tools/windows/javac.html#commandlineargfile
private final ConfigurableFileCollection classpath = getProject().getObjects().fileCollection();
@@ -63,13 +64,12 @@ public abstract class AbstractRunTask extends JavaExec {
public AbstractRunTask(Function<Project, RunConfig> configProvider) {
super();
setGroup(Constants.TaskGroup.FABRIC);
this.config = configProvider.apply(getProject());
setClasspath(config.sourceSet.getRuntimeClasspath().filter(File::exists).filter(new LibraryFilter()));
args(config.programArgs);
getMainClass().set(config.mainClass);
this.config = getProject().provider(() -> configProvider.apply(getProject()));
classpath.from(config.map(runConfig -> runConfig.sourceSet.getRuntimeClasspath().filter(File::exists).filter(new LibraryFilter())));
getArgumentProviders().add(() -> config.get().programArgs);
getMainClass().set(config.map(runConfig -> runConfig.mainClass));
getJvmArguments().addAll(getProject().provider(this::getGameJvmArgs));
}
@@ -100,8 +100,8 @@ public abstract class AbstractRunTask extends JavaExec {
super.setClasspath(classpath);
}
setWorkingDir(new File(getProject().getProjectDir(), config.runDir));
environment(config.environmentVariables);
setWorkingDir(new File(getProject().getProjectDir(), config.get().runDir));
environment(config.get().environmentVariables);
super.exec();
}
@@ -133,7 +133,7 @@ public abstract class AbstractRunTask extends JavaExec {
}
}
args.addAll(config.vmArgs);
args.addAll(config.get().vmArgs);
return args;
}
@@ -204,11 +204,11 @@ public abstract class AbstractRunTask extends JavaExec {
@Override
public boolean isSatisfiedBy(File element) {
if (excludedLibraryPaths == null) {
excludedLibraryPaths = config.getExcludedLibraryPaths(getProject());
excludedLibraryPaths = config.get().getExcludedLibraryPaths(getProject());
}
if (excludedLibraryPaths.contains(element.getAbsolutePath())) {
getProject().getLogger().debug("Excluding library {} from {} run config", element.getName(), config.configName);
getProject().getLogger().debug("Excluding library {} from {} run config", element.getName(), config.get().configName);
return false;
}

4
src/test/resources/projects/runconfigs/build.gradle
View File

@@ -49,4 +49,8 @@ dependencies {
base {
archivesName = "fabric-example-mod"
}
runClient {
// Realise this task to ensure that the runConfig is lazily evaluated
}