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

fix addon registry stack overflow

Browse Source
This commit is contained in:
dfsek 2021-07-05 19:47:02 -07:00
parent 27a54101e7
commit fe28fcedd1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java
View File

@ -41,7 +41,10 @@ public class BiomeConfigType implements ConfigType<BiomeTemplate, BiomeBuilder>
public Supplier<OpenRegistry<BiomeBuilder>> registrySupplier() { public Supplier<OpenRegistry<BiomeBuilder>> registrySupplier() {
return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<BiomeBuilder>) (t, c, loader) -> { return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<BiomeBuilder>) (t, c, loader) -> {
if(c.equals("SELF")) return null; if(c.equals("SELF")) return null;
return registry.load(t, c, loader); BiomeBuilder obj = registry.get((String) c);
if(obj == null)
throw new LoadException("No such " + t.getTypeName() + " matching \"" + c + "\" was found in this registry.");
return obj;
}); });
} }
} }

5
common/addons/palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
View File

@ -44,7 +44,10 @@ public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<Palette>) (t, c, loader) -> { return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<Palette>) (t, c, loader) -> {
if(((String) c).startsWith("BLOCK:")) if(((String) c).startsWith("BLOCK:"))
return new PaletteImpl.Singleton(main.getWorldHandle().createBlockData(((String) c).substring(6))); // Return single palette for BLOCK: shortcut. return new PaletteImpl.Singleton(main.getWorldHandle().createBlockData(((String) c).substring(6))); // Return single palette for BLOCK: shortcut.
return registry.load(t, c, loader); Palette obj = registry.get((String) c);
if(obj == null)
throw new LoadException("No such " + t.getTypeName() + " matching \"" + c + "\" was found in this registry.");
return obj;
}); });
} }
} }