mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 06:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve logging

Browse Source
This commit is contained in:
dfsek
2021-02-14 22:15:09 -07:00
parent 76a2d08906
commit 7ca779f845
1 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
+69 -56
View File
@@ -104,69 +104,82 @@ public class ConfigPack implements LoaderRegistrar {
public ConfigPack(File folder, TerraPlugin main) throws ConfigException { public ConfigPack(File folder, TerraPlugin main) throws ConfigException {
this.loader = new FolderLoader(folder.toPath());
this.main = main;
long l = System.nanoTime();
this.samplerCache = new SamplerCache(main);
floraRegistry = new FloraRegistry(main);
paletteRegistry = new PaletteRegistry(main);
treeRegistry = new TreeRegistry(main);
register(abstractConfigLoader);
register(selfLoader);
main.register(selfLoader);
main.register(abstractConfigLoader);
File pack = new File(folder, "pack.yml");
try { try {
selfLoader.load(template, new FileInputStream(pack)); this.loader = new FolderLoader(folder.toPath());
load(l, main); this.main = main;
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate(); long l = System.nanoTime();
selfLoader.load(packPostTemplate, new FileInputStream(pack)); this.samplerCache = new SamplerCache(main);
biomeProviderBuilder = packPostTemplate.getProviderBuilder(); floraRegistry = new FloraRegistry(main);
biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time. paletteRegistry = new PaletteRegistry(main);
} catch(FileNotFoundException e) { treeRegistry = new TreeRegistry(main);
throw new FileMissingException("No pack.yml file found in " + folder.getAbsolutePath(), e); register(abstractConfigLoader);
register(selfLoader);
main.register(selfLoader);
main.register(abstractConfigLoader);
File pack = new File(folder, "pack.yml");
try {
selfLoader.load(template, new FileInputStream(pack));
main.getLogger().info("Loading config pack \"" + template.getID() + "\"");
load(l, main);
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, new FileInputStream(pack));
biomeProviderBuilder = packPostTemplate.getProviderBuilder();
biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
} catch(FileNotFoundException e) {
throw new FileMissingException("No pack.yml file found in " + folder.getAbsolutePath(), e);
}
} catch(Exception e) {
main.getLogger().severe("Failed to load config pack from folder \"" + folder.getAbsolutePath() + "\"");
throw e;
} }
} }
public ConfigPack(ZipFile file, TerraPlugin main) throws ConfigException { public ConfigPack(ZipFile file, TerraPlugin main) throws ConfigException {
this.loader = new ZIPLoader(file);
this.main = main;
long l = System.nanoTime();
this.samplerCache = new SamplerCache(main);
floraRegistry = new FloraRegistry(main);
paletteRegistry = new PaletteRegistry(main);
treeRegistry = new TreeRegistry(main);
register(abstractConfigLoader);
register(selfLoader);
main.register(selfLoader);
main.register(abstractConfigLoader);
try { try {
ZipEntry pack = null; this.loader = new ZIPLoader(file);
Enumeration<? extends ZipEntry> entries = file.entries(); this.main = main;
while(entries.hasMoreElements()) { long l = System.nanoTime();
ZipEntry entry = entries.nextElement(); this.samplerCache = new SamplerCache(main);
if(entry.getName().equals("pack.yml")) pack = entry; floraRegistry = new FloraRegistry(main);
paletteRegistry = new PaletteRegistry(main);
treeRegistry = new TreeRegistry(main);
register(abstractConfigLoader);
register(selfLoader);
main.register(selfLoader);
main.register(abstractConfigLoader);
try {
ZipEntry pack = null;
Enumeration<? extends ZipEntry> entries = file.entries();
while(entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
if(entry.getName().equals("pack.yml")) pack = entry;
}
if(pack == null) throw new FileMissingException("No pack.yml file found in " + file.getName());
selfLoader.load(template, file.getInputStream(pack));
main.getLogger().info("Loading config pack \"" + template.getID() + "\"");
load(l, main);
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, file.getInputStream(pack));
biomeProviderBuilder = packPostTemplate.getProviderBuilder();
biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
} catch(IOException e) {
throw new LoadException("Unable to load pack.yml from ZIP file", e);
} }
} catch(Exception e) {
if(pack == null) throw new FileMissingException("No pack.yml file found in " + file.getName()); main.getLogger().severe("Failed to load config pack from ZIP archive \"" + file.getName() + "\"");
throw e;
selfLoader.load(template, file.getInputStream(pack));
load(l, main);
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, file.getInputStream(pack));
biomeProviderBuilder = packPostTemplate.getProviderBuilder();
biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
} catch(IOException e) {
throw new LoadException("Unable to load pack.yml from ZIP file", e);
} }
} }