From 3e48066021f7028a4c55333bdaeabd038b415131 Mon Sep 17 00:00:00 2001 From: cpw Date: Fri, 20 Mar 2020 17:34:42 -0400 Subject: [PATCH] Add a progress message for atlas textures. Fills a big time gap on bigger packs. Signed-off-by: cpw --- .../fml/loading/progress/StartupMessageManager.java | 2 +- src/main/java/net/minecraftforge/client/ForgeHooksClient.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/StartupMessageManager.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/StartupMessageManager.java index dfbebb4a0..62b8ab86b 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/StartupMessageManager.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/StartupMessageManager.java @@ -102,7 +102,7 @@ public class StartupMessageManager { return Optional.of(s -> messages.get(MessageType.LOC).add(new Message(s, MessageType.LOC))); } - static Optional> mcLoaderConsumer() { + public static Optional> mcLoaderConsumer() { return Optional.of(s-> messages.get(MessageType.MC).add(new Message(s, MessageType.MC))); } } diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 06c329c54..dbaa20db1 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -54,6 +54,7 @@ import net.minecraft.client.renderer.*; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.model.pipeline.LightUtil; +import net.minecraftforge.fml.loading.progress.StartupMessageManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.async.ThreadNameCachingStrategy; @@ -190,6 +191,7 @@ public class ForgeHooksClient public static void onTextureStitchedPre(AtlasTexture map, Set resourceLocations) { + StartupMessageManager.mcLoaderConsumer().ifPresent(c->c.accept("Atlas Stitching : "+map.getTextureLocation().toString())); ModLoader.get().postEvent(new TextureStitchEvent.Pre(map, resourceLocations)); // ModelLoader.White.INSTANCE.register(map); // TODO Custom TAS }