diff --git a/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java index 3fd136382..f1d764975 100644 --- a/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java +++ b/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java @@ -41,7 +41,10 @@ public class BiomeConfigType implements ConfigType public Supplier> registrySupplier() { return () -> pack.getRegistryFactory().create(registry -> (TypeLoader) (t, c, loader) -> { 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; }); } } diff --git a/common/addons/palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java b/common/addons/palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java index c3afe53cf..0ccdbcf60 100644 --- a/common/addons/palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java +++ b/common/addons/palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java @@ -44,7 +44,10 @@ public class PaletteConfigType implements ConfigType { return () -> pack.getRegistryFactory().create(registry -> (TypeLoader) (t, c, loader) -> { if(((String) c).startsWith("BLOCK:")) 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; }); } }