From daa85d3c5b7b51b2b315fc950eb340b458ab096e Mon Sep 17 00:00:00 2001 From: cpw Date: Tue, 21 Jul 2020 20:12:33 -0400 Subject: [PATCH] Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds. Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge. Signed-off-by: cpw --- .../minecraftforge/fml/loading/FMLCommonLaunchHandler.java | 4 ++++ .../java/net/minecraftforge/fml/loading/FMLLoader.java | 2 +- .../fml/loading/progress/EarlyProgressVisualization.java | 4 ++-- .../net/minecraftforge/userdev/FMLDevDataLaunchProvider.java | 4 ++++ .../minecraftforge/userdev/FMLUserdevDataLaunchProvider.java | 5 +++++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLCommonLaunchHandler.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLCommonLaunchHandler.java index 69a4a21181..cf889439c6 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLCommonLaunchHandler.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLCommonLaunchHandler.java @@ -154,4 +154,8 @@ public abstract class FMLCommonLaunchHandler public boolean isProduction() { return false; } + + public boolean isData() { + return false; + }; } diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java index 95b839f9ba..e85e9563e6 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java @@ -183,7 +183,7 @@ public class FMLLoader naming = commonLaunchHandler.getNaming(); dist = commonLaunchHandler.getDist(); production = commonLaunchHandler.isProduction(); - progressWindowTick = EarlyProgressVisualization.INSTANCE.accept(dist); + progressWindowTick = EarlyProgressVisualization.INSTANCE.accept(dist, commonLaunchHandler.isData()); StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Early Loading!")); accessTransformer.getExtension().accept(Pair.of(naming, "srg")); diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/EarlyProgressVisualization.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/EarlyProgressVisualization.java index 213d684698..b7d7e610ce 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/EarlyProgressVisualization.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/EarlyProgressVisualization.java @@ -31,8 +31,8 @@ public enum EarlyProgressVisualization { private Visualization visualization; - public Runnable accept(final Dist dist) { - visualization = dist.isClient() && Boolean.parseBoolean(System.getProperty("fml.earlyprogresswindow", "true")) ? new ClientVisualization() : new NoVisualization(); + public Runnable accept(final Dist dist, final boolean isData) { + visualization = !isData && dist.isClient() && Boolean.parseBoolean(System.getProperty("fml.earlyprogresswindow", "true")) ? new ClientVisualization() : new NoVisualization(); return visualization.start(); } diff --git a/src/userdev/java/net/minecraftforge/userdev/FMLDevDataLaunchProvider.java b/src/userdev/java/net/minecraftforge/userdev/FMLDevDataLaunchProvider.java index 61f4c4550c..57def31399 100644 --- a/src/userdev/java/net/minecraftforge/userdev/FMLDevDataLaunchProvider.java +++ b/src/userdev/java/net/minecraftforge/userdev/FMLDevDataLaunchProvider.java @@ -64,4 +64,8 @@ public class FMLDevDataLaunchProvider extends FMLDevServerLaunchProvider impleme return "mcp"; } + @Override + public boolean isData() { + return true; + } } diff --git a/src/userdev/java/net/minecraftforge/userdev/FMLUserdevDataLaunchProvider.java b/src/userdev/java/net/minecraftforge/userdev/FMLUserdevDataLaunchProvider.java index 01190bc354..3c32b29564 100644 --- a/src/userdev/java/net/minecraftforge/userdev/FMLUserdevDataLaunchProvider.java +++ b/src/userdev/java/net/minecraftforge/userdev/FMLUserdevDataLaunchProvider.java @@ -58,4 +58,9 @@ public class FMLUserdevDataLaunchProvider extends FMLUserdevLaunchProvider imple { return Dist.CLIENT; } + + @Override + public boolean isData() { + return true; + } }