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 <[email protected]>
This commit is contained in:
cpw committed 2020-07-21 20:12:33 -04:00
1 parent 9e8c4c3a58
commit daa85d3c5b
5 files changed
+16 -3

No files matched your search

@@ -154,4 +154,8 @@ public abstract class FMLCommonLaunchHandler
public boolean isProduction() {
return false;
}
public boolean isData() {
return false;
};
}
@@ -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"));
@@ -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();
}
@@ -64,4 +64,8 @@ public class FMLDevDataLaunchProvider extends FMLDevServerLaunchProvider impleme
return "mcp";
}
@Override
public boolean isData() {
return true;
}
}
@@ -58,4 +58,9 @@ public class FMLUserdevDataLaunchProvider extends FMLUserdevLaunchProvider imple
{
return Dist.CLIENT;
}
@Override
public boolean isData() {
return true;
}
}