mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-07 16:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

move compat options to compat.yml

Browse Source
This commit is contained in:
dfsek
2021-06-01 01:16:52 -07:00
parent bb2601252a
commit 1bd5cf31fa
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java
View File

@@ -1,5 +1,6 @@
package com.dfsek.terra.config.fileloaders;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
@@ -20,7 +21,7 @@ public class ZIPLoader extends Loader {
ZipEntry entry = entries.nextElement();
if(!entry.isDirectory() && entry.getName().equals(singleFile)) return file.getInputStream(entry);
}
throw new IllegalArgumentException("No such file: " + singleFile);
throw new FileNotFoundException("No such file: " + singleFile);
}
@Override

30
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
View File

@@ -1,7 +1,9 @@
package com.dfsek.terra.fabric;
import com.dfsek.tectonic.config.Configuration;
import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeRegistry;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.addons.TerraAddon;
@@ -71,6 +73,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@@ -307,8 +310,13 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
private final Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> templates = new HashMap<>();
private final Map<ConfigPack, Configuration> compatConfigs = new HashMap<>();
private final ConfigLoader compatLoader = new ConfigLoader();
private FabricAddon(TerraPlugin main) {
this.main = main;
main.register(compatLoader);
}
@Override
@@ -340,9 +348,24 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
injectTree(treeRegistry, "CRIMSON_FUNGUS", ConfiguredFeatures.CRIMSON_FUNGI);
injectTree(treeRegistry, "WARPED_FUNGUS", ConfiguredFeatures.WARPED_FUNGI);
PreLoadCompatibilityOptions template = new PreLoadCompatibilityOptions();
Configuration compat;
try {
event.loadTemplate(template);
compat = new Configuration(event.getLoader().get("compat.yml"));
main.logger().info("Loading compatibility options from compat.yml.");
} catch(FileNotFoundException e) {
compat = new Configuration(new HashMap<>()); // blank config
main.logger().info("No compat.yml found, not loading compatibility options.");
} catch(IOException e) {
throw new RuntimeException("Failed to load compatibility config", e); // Something went wrong.
}
compatConfigs.put(event.getPack(), compat);
PreLoadCompatibilityOptions template = new PreLoadCompatibilityOptions();
try {
compatLoader.load(template, compat);
} catch(ConfigException e) {
e.printStackTrace();
}
@@ -359,6 +382,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
});
}
templates.put(event.getPack(), Pair.of(template, null));
}
@Priority(Priority.HIGHEST)
@@ -367,7 +391,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
PostLoadCompatibilityOptions template = new PostLoadCompatibilityOptions();
try {
event.loadTemplate(template);
compatLoader.load(template, compatConfigs.get(event.getPack()));
} catch(ConfigException e) {
e.printStackTrace();
}