Merge remote-tracking branch 'origin/master' into dev/repeat-script

# Conflicts:
#	common/src/main/java/com/dfsek/terra/api/TerraPlugin.java
#	common/src/test/java/biome/DistributionTest.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
This commit is contained in:
dfsek committed 2021-05-09 15:20:57 -07:00
commit 8f9fc3e08f
191 files changed
+4588 -1581

No files matched your search

@@ -22,6 +22,8 @@ import com.dfsek.terra.config.lang.Language;
import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.platform.RawBiome;
import com.dfsek.terra.platform.RawWorldHandle;
import com.dfsek.terra.profiler.Profiler;
import com.dfsek.terra.profiler.ProfilerImpl;
import com.dfsek.terra.registry.master.AddonRegistry;
import com.dfsek.terra.registry.master.ConfigRegistry;
import com.dfsek.terra.world.TerraWorld;
@@ -40,6 +42,8 @@ public class StandalonePlugin implements TerraPlugin {
private final RawWorldHandle worldHandle = new RawWorldHandle();
private final EventManager eventManager = new TerraEventManager(this);
private final Profiler profiler = new ProfilerImpl();
@Override
public WorldHandle getWorldHandle() {
return worldHandle;
@@ -149,6 +153,11 @@ public class StandalonePlugin implements TerraPlugin {
return eventManager;
}
@Override
public Profiler getProfiler() {
return profiler;
}
@Override
public TaskScheduler getScheduler() {
return null;
@@ -19,7 +19,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class DirectWorld implements World {
private final long seed;
@@ -46,21 +45,6 @@ public class DirectWorld implements World {
return generator;
}
@Override
public String getName() {
return null;
}
@Override
public UUID getUID() {
return null;
}
@Override
public boolean isChunkGenerated(int x, int z) {
return false;
}
@Override
public Chunk getChunkAt(int x, int z) {
MCAFile file = compute(x, z);
@@ -72,11 +56,6 @@ public class DirectWorld implements World {
return new DirectChunkData(chunk, this, x, z);
}
@Override
public File getWorldFolder() {
return null;
}
@Override
public Block getBlockAt(int x, int y, int z) {
return new DirectBlock(this, new Vector3(x, y, z));