wait for pregens

Signed-off-by: Devan-Kerman <[email protected]>
Trinsdar · Mar 3, 2022 · 2b44b80 · 2b44b80
1 parent 6e03d34
commit 2b44b80
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/net/devtech/arrp/ARRP.java b/src/main/java/net/devtech/arrp/ARRP.java
@@ -1,5 +1,10 @@
 package net.devtech.arrp;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
 import net.devtech.arrp.api.RRPPreGenEntrypoint;
 import net.devtech.arrp.impl.RuntimeResourcePackImpl;
 import org.apache.logging.log4j.LogManager;
@@ -10,13 +15,25 @@
 
 public class ARRP implements PreLaunchEntrypoint {
 	private static final Logger LOGGER = LogManager.getLogger("ARRP");
+	private static List<Future<?>> futures;
 
 	@Override
 	public void onPreLaunch() {
 		LOGGER.info("I used the json to destroy the json");
 		FabricLoader loader = FabricLoader.getInstance();
+		List<Future<?>> futures = new ArrayList<>();
 		for (RRPPreGenEntrypoint entrypoint : loader.getEntrypoints("rrp:pregen", RRPPreGenEntrypoint.class)) {
-			RuntimeResourcePackImpl.EXECUTOR_SERVICE.submit(entrypoint::pregen);
+			futures.add(RuntimeResourcePackImpl.EXECUTOR_SERVICE.submit(entrypoint::pregen));
+		}
+		ARRP.futures = futures;
+	}
+
+	public static void waitForPregen() throws ExecutionException, InterruptedException {
+		if(futures != null) {
+			for(Future<?> future : futures) {
+				future.get();
+			}
+			futures = null;
 		}
 	}
 }
diff --git a/src/main/java/net/devtech/arrp/mixin/ReloadableResourceManagerImplMixin.java b/src/main/java/net/devtech/arrp/mixin/ReloadableResourceManagerImplMixin.java
@@ -3,8 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 
+import net.devtech.arrp.ARRP;
 import net.devtech.arrp.api.RRPCallback;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -25,7 +27,9 @@ public abstract class ReloadableResourceManagerImplMixin {
 	private List<ResourcePack> registerARRPs(List<ResourcePack> packs, Executor prepareExecutor,
 			Executor applyExecutor,
 			CompletableFuture<Unit> initialStage,
-			List<ResourcePack> packs0) {
+			List<ResourcePack> packs0) throws ExecutionException, InterruptedException {
+		ARRP.waitForPregen();
+
 		ARRP_LOGGER.info("ARRP register - before vanilla");
 		List<ResourcePack> before = new ArrayList<>();
 		RRPCallback.BEFORE_VANILLA.invoker().insert(before);
@@ -38,6 +42,7 @@ private List<ResourcePack> registerARRPs(List<ResourcePack> packs, Executor prep
 
 		before.addAll(after);
 
+
 		return before;
 	}
 }