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

refactor some stuff to use new errors

Browse Source
This commit is contained in:
dfsek
2025-12-29 22:47:59 -07:00
parent c4a366112e
commit bdcd93f164
7 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@@ -17,6 +17,8 @@
package com.dfsek.terra.bukkit;
import com.dfsek.terra.api.error.Invalid;
import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
import org.bukkit.Bukkit;
@@ -185,7 +187,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
ConfigPack pack = platform.getConfigRegistry().getByID(id).collectThrow(
left -> new IllegalArgumentException("No such config pack \"" + id + "\": " + left));
return pack.getGeneratorProvider().newInstance(pack);
}), platform.getRawConfigRegistry().getByID(id).collectThrow(RuntimeException::new), platform.getWorldHandle().air());
}), platform.getRawConfigRegistry().getByID(id).collectThrow(Invalid::toIllegal), platform.getWorldHandle().air());
}
public AsyncScheduler getAsyncScheduler() {

5
platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java
View File

@@ -1,6 +1,9 @@
package com.dfsek.terra.cli;
import com.dfsek.seismic.type.vector.Vector2Int;
import com.dfsek.terra.api.error.Invalid;
import net.querz.mca.MCAUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +54,7 @@ public final class TerraCLI implements Callable<Integer> {
CLIPlatform platform = new CLIPlatform();
platform.getEventManager().callEvent(new PlatformInitializationEvent());
ConfigPack generate = platform.getConfigRegistry().getByID(pack).collectThrow(RuntimeException::new);
ConfigPack generate = platform.getConfigRegistry().getByID(pack).collectThrow(Invalid::toIllegal);
CLIWorld world = new CLIWorld(size, seed, maxHeight, minHeight, generate, noSave);

4
platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/TerraMinestomWorldBuilder.java
View File

@@ -1,5 +1,7 @@
package com.dfsek.terra.minestom.api;
import com.dfsek.terra.api.error.Invalid;
import net.minestom.server.instance.Instance;
import net.minestom.server.registry.RegistryKey;
import net.minestom.server.world.DimensionType;
@@ -39,7 +41,7 @@ public class TerraMinestomWorldBuilder {
}
public TerraMinestomWorldBuilder packById(String id) {
this.pack = platform.getConfigRegistry().getByID(id).collectThrow(RuntimeException::new);
this.pack = platform.getConfigRegistry().getByID(id).collectThrow(Invalid::toIllegal);
return this;
}