use FailThrough when available

This commit is contained in:
dfsek 2021-07-21 22:20:20 -07:00
parent deb1063592
commit ba53923e8c
14 changed files with 32 additions and 16 deletions

View File

@ -44,6 +44,7 @@ public class NoiseChunkGenerator3DAddon extends TerraAddon {
if(event.is(TerraBiome.class)) {
event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomePaletteTemplate()).get());
}
});
})
.failThrough();
}
}

View File

@ -26,6 +26,7 @@ public class BiomeAddon extends TerraAddon {
.then(event -> {
event.getPack().registerConfigType(new BiomeConfigType(event.getPack()), "BIOME", 5);
event.getPack().applyLoader(PaletteHolder.class, new PaletteHolderLoader());
});
})
.failThrough();
}
}

View File

@ -39,6 +39,7 @@ public class DistributorAddon extends TerraAddon {
event.getPack()
.applyLoader(Point.class, PointTemplate::new);
});
})
.failThrough();
}
}

View File

@ -21,6 +21,7 @@ public class FeatureAddon extends TerraAddon {
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 2));
.then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 2))
.failThrough();
}
}

View File

@ -26,6 +26,7 @@ public class FloraAddon extends TerraAddon {
.then(event -> {
event.getPack().registerConfigType(new FloraConfigType(), "FLORA", 2);
event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new);
});
})
.failThrough();
}
}

View File

@ -35,6 +35,7 @@ public class LocatorAddon extends TerraAddon {
CheckedRegistry<Supplier<ObjectTemplate<Locator>>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN);
locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(main));
locatorRegistry.register("RANDOM", RandomLocatorTemplate::new);
});
})
.failThrough();
}
}

View File

@ -100,6 +100,7 @@ public class NoiseAddon extends TerraAddon {
NoiseConfigPackTemplate template = new NoiseConfigPackTemplate();
event.loadTemplate(template);
packFunctions.putAll(template.getNoiseBuilderMap());
});
})
.failThrough();
}
}

View File

@ -26,6 +26,7 @@ public class OreAddon extends TerraAddon {
.then(event -> {
event.getPack().registerConfigType(new OreConfigType(), "ORE", 1);
event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("ORE", pack -> new OrePopulator(main));
});
})
.failThrough();
}
}

View File

@ -26,6 +26,7 @@ public class PaletteAddon extends TerraAddon {
.then(event -> {
event.getPack().registerConfigType(new PaletteConfigType(main), "PALETTE", 2);
event.getPack().applyLoader(PaletteLayerHolder.class, new PaletteLayerLoader());
});
})
.failThrough();
}
}

View File

@ -22,6 +22,7 @@ public class StructureAddon extends TerraAddon {
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> event.getPack().applyLoader(ConfiguredStructure.class, (t, o, l) -> null));
.then(event -> event.getPack().applyLoader(ConfiguredStructure.class, (t, o, l) -> null))
.failThrough();
}
}

View File

@ -25,7 +25,8 @@ public class FeatureGenerationAddon extends TerraAddon {
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("FEATURE", pack -> new FeatureGenerationStage(main)));
.then(event -> event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("FEATURE", pack -> new FeatureGenerationStage(main)))
.failThrough();
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
@ -34,6 +35,7 @@ public class FeatureGenerationAddon extends TerraAddon {
if(event.is(TerraBiome.class)) {
event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomeFeaturesTemplate()).get());
}
});
})
.failThrough();
}
}

View File

@ -28,7 +28,8 @@ public class FloraGenerationAddon extends TerraAddon {
.then(event -> {
event.getPack().applyLoader(FloraLayer.class, FloraLayerLoader::new);
event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("FLORA", pack -> new FloraGenerationStage(main));
});
})
.failThrough();
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
@ -37,6 +38,7 @@ public class FloraGenerationAddon extends TerraAddon {
if(event.is(TerraBiome.class)) {
event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomeFloraTemplate()).get());
}
});
})
.failThrough();
}
}

View File

@ -25,6 +25,7 @@ public class YamlAddon extends TerraAddon {
.then(event -> event.getLoader().open("", ".yml").thenEntries(entries -> entries.forEach(entry -> {
main.getDebugLogger().info("Discovered config " + entry.getKey());
event.register(entry.getKey(), new YamlConfiguration(entry.getValue(), entry.getKey()));
})));
})))
.failThrough();
}
}

View File

@ -43,6 +43,7 @@ public class TerraScriptAddon extends TerraAddon {
}
}
}).close();
});
})
.failThrough();
}
}