Final patching

Signed-off-by: cpw <[email protected]>
This commit is contained in:
Anthony Anderson authored and cpw committed 2020-06-25 17:55:54 -04:00
1 parent 80eb12e59d
commit ca2ed1ff7a
139 files changed
+1034 -4067

No files matched your search

@@ -111,7 +111,7 @@ public final class FMLWorldPersistenceHook implements WorldPersistenceHooks.Worl
if (tag.contains("ModItemData") || tag.contains("ItemData")) // Pre 1.7
{
StartupQuery.notify("This save predates 1.7.10, it can no longer be loaded here. Please load in 1.7.10 or 1.8 first");
StartupQuery.builder().text("This save predates 1.7.10, it can no longer be loaded here. Please load in 1.7.10 or 1.8 first").notification();
StartupQuery.abort();
}
else if (tag.contains("Registries")) // 1.8, genericed out the 'registries' list
@@ -138,7 +138,7 @@ public final class FMLWorldPersistenceHook implements WorldPersistenceHooks.Worl
entries.forEach(rl -> buf.append(" ").append(rl).append("\n"));
});
StartupQuery.notify(buf.toString());
StartupQuery.builder().text(buf.toString()).notification();
StartupQuery.abort();
}
}
@@ -99,20 +99,8 @@ public class StartupQuery {
return new QueryBuilder();
}
@Deprecated // TODO 1.16 remove
public static boolean confirm(String text)
{
return builder().text(text).confirm();
}
private InterruptedException exception;
@Deprecated // TODO 1.16 remove
public static void notify(String text)
{
builder().text(text).notification();
}
public static void abort()
{
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
@@ -66,10 +66,6 @@ public class GatherDataEvent extends ModLifecycleEvent
private final boolean flat;
private List<DataGenerator> generators = new ArrayList<>();
@Deprecated //Remove in 1.16
public DataGeneratorConfig(final Set<String> mods, final Path path, final Collection<Path> inputs, final boolean server, final boolean client, final boolean dev, final boolean reports, final boolean validate) {
this(mods, path, inputs, server, client, dev, reports, validate, false);
}
public DataGeneratorConfig(final Set<String> mods, final Path path, final Collection<Path> inputs, final boolean server, final boolean client, final boolean dev, final boolean reports, final boolean validate, final boolean flat) {
this.mods = mods;
this.path = path;