Skip to content

Commit b4ab88a

Browse files
committed
Fix allay reload
1 parent ef1c9c1 commit b4ab88a

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java

+12-19
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,20 @@ public AllayPlatform() {
3838
@Override
3939
public boolean reload() {
4040
getTerraConfig().load(this);
41-
getRawConfigRegistry().clear();
42-
try {
43-
getRawConfigRegistry().loadAll(this);
44-
45-
GENERATOR_WRAPPERS.forEach(wrapper -> {
46-
getConfigRegistry().get(wrapper.getConfigPack().getRegistryKey()).ifPresent(pack -> {
47-
wrapper.setConfigPack(pack);
48-
var dimension = wrapper.getAllayWorldGenerator().getDimension();
49-
TerraAllayPlugin.INSTANCE.getPluginLogger().info(
50-
"Replaced pack in chunk generator for world {}",
51-
dimension.getWorld().getWorldData().getName() + ":" + dimension.getDimensionInfo().dimensionId()
52-
);
53-
});
41+
boolean succeed = loadConfigPacks();
42+
43+
GENERATOR_WRAPPERS.forEach(wrapper -> {
44+
getConfigRegistry().get(wrapper.getConfigPack().getRegistryKey()).ifPresent(pack -> {
45+
wrapper.setConfigPack(pack);
46+
var dimension = wrapper.getAllayWorldGenerator().getDimension();
47+
TerraAllayPlugin.INSTANCE.getPluginLogger().info(
48+
"Replaced pack in chunk generator for world {}",
49+
dimension.getWorld().getWorldData().getName() + ":" + dimension.getDimensionInfo().dimensionId()
50+
);
5451
});
55-
} catch(Exception e) {
56-
TerraAllayPlugin.INSTANCE.getPluginLogger().error("Failed to reload Terra", e);
57-
return false;
58-
}
52+
});
5953

60-
61-
return true;
54+
return succeed;
6255
}
6356

6457
@Override

0 commit comments

Comments
 (0)