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

resolve merge conflicts

Browse Source
This commit is contained in:
dfsek
2021-05-09 16:23:13 -07:00
parent 8f9fc3e08f
commit 69ae803074
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
View File

@@ -24,6 +24,7 @@ import com.dfsek.terra.api.platform.world.Tree;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.task.TaskScheduler;
import com.dfsek.terra.api.transform.NotNullValidator;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.api.util.JarUtil;
@@ -311,6 +312,11 @@ public class TerraForgePlugin implements TerraPlugin {
return JarUtil.getJarFile();
}
@Override
public TaskScheduler getScheduler() {
return null;
}
public TerraWorld getWorld(long seed) {
TerraWorld world = worldMap.get(seed);
if(world == null) throw new IllegalArgumentException("No world exists with seed " + seed);