diff --git a/fabric-resource-loader-v0/build.gradle b/fabric-resource-loader-v0/build.gradle index fdc87ee1a..c933f0fe0 100644 --- a/fabric-resource-loader-v0/build.gradle +++ b/fabric-resource-loader-v0/build.gradle @@ -1,2 +1,2 @@ archivesBaseName = "fabric-resource-loader-v0" -version = getSubprojectVersion(project, "0.1.0") +version = getSubprojectVersion(project, "0.1.1") diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resources/DeferredNioExecutionHandler.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resources/DeferredNioExecutionHandler.java index ce5a4e372..c3c0a9eba 100644 --- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resources/DeferredNioExecutionHandler.java +++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resources/DeferredNioExecutionHandler.java @@ -22,11 +22,13 @@ import java.io.IOException; import java.util.concurrent.*; class DeferredNioExecutionHandler { - private static final ThreadLocal<Boolean> DEFERRED_REQUIRED = new ThreadLocal<>(); + // private static final ThreadLocal<Boolean> DEFERRED_REQUIRED = new ThreadLocal<>(); + private static final boolean DEFER_REQUESTED = System.getProperty("fabric.resource-loader.deferFilesystemOperations", "false").equalsIgnoreCase("true"); private static ExecutorService EXECUTOR_SERVICE; public static boolean shouldDefer() { - Boolean deferRequired = DEFERRED_REQUIRED.get(); + return DEFER_REQUESTED; + /* Boolean deferRequired = DEFERRED_REQUIRED.get(); if (deferRequired == null) { deferRequired = false; @@ -41,7 +43,7 @@ class DeferredNioExecutionHandler { DEFERRED_REQUIRED.set(deferRequired); } - return deferRequired; + return deferRequired; */ } public static <V> V submit(Callable<V> callable, boolean cond) throws IOException {