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

resolve conflicts

Browse Source
This commit is contained in:
dfsek
2021-09-26 22:49:47 -07:00
parent 0a6a3268da
commit 10f62b75b6
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
View File

@@ -23,7 +23,6 @@ public final class LangUtil {
private LangUtil() { }
public static void load(String langID, Platform platform) {
Logger logger = platform.logger();
File file = new File(platform.getDataFolder(), "lang");
try {
File file1 = new File(file, langID + ".yml");

6
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@@ -137,7 +137,7 @@ public class ConfigPackImpl implements ConfigPack {
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, configuration);
seededBiomeProvider = packPostTemplate.getProviderBuilder();
checkDeadEntries(platform);
checkDeadEntries();
} catch(FileNotFoundException e) {
throw new LoadException("No pack.yml file found in " + folder.getAbsolutePath(), e);
}
@@ -189,7 +189,7 @@ public class ConfigPackImpl implements ConfigPack {
selfLoader.load(packPostTemplate, configuration);
seededBiomeProvider = packPostTemplate.getProviderBuilder();
checkDeadEntries(platform);
checkDeadEntries();
} catch(IOException e) {
throw new LoadException("Unable to load pack.yml from ZIP file", e);
}
@@ -362,7 +362,7 @@ public class ConfigPackImpl implements ConfigPack {
});
}
private void checkDeadEntries(TerraPlugin main) {
private void checkDeadEntries() {
registryMap.forEach((clazz, pair) -> ((OpenRegistryImpl<?>) pair.getLeft())
.getDeadEntries()
.forEach((id, value) -> logger.warn("Dead entry in '{}' registry: '{}'", ReflectionUtil.typeToString(clazz), id)));