More Settings

This commit is contained in:
Daniel Mills 2020-10-12 20:04:32 -04:00
parent ac2dcee6c3
commit c45044b5c2
5 changed files with 41 additions and 3 deletions

View File

@ -440,9 +440,9 @@ public class Iris extends MortarPlugin
}, RNG.r.i(100, 1200)); }, RNG.r.i(100, 1200));
} }
public static String jobCount() public static int jobCount()
{ {
return syncJobs.size() + "S"; return syncJobs.size();
} }
public static void clearQueues() public static void clearQueues()

View File

@ -41,6 +41,18 @@ public class IrisSettings
@DontObfuscate @DontObfuscate
@Desc("Useful information when creating iris worlds. Shows object loads & more.") @Desc("Useful information when creating iris worlds. Shows object loads & more.")
public boolean verbose = false; public boolean verbose = false;
@DontObfuscate
@Desc("System Effects")
public boolean systemEffects = true;
@DontObfuscate
@Desc("System Spawn Overrides")
public boolean systemEntitySpawnOverrides = true;
@DontObfuscate
@Desc("System Spawn Initials")
public boolean systemEntityInitialSpawns = true;
@DontObfuscate @DontObfuscate
@Desc("Compression level (0-9) lower is faster, but is not as good compression. Best results around 3-5") @Desc("Compression level (0-9) lower is faster, but is not as good compression. Best results around 3-5")

View File

@ -133,6 +133,16 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte
{ {
spawnable = true; spawnable = true;
super.onTick(ticks); super.onTick(ticks);
tickEffects();
}
protected void tickEffects()
{
if(!IrisSettings.get().isSystemEffects())
{
return;
}
for(Player i : getTarget().getPlayers()) for(Player i : getTarget().getPlayers())
{ {
Location l = i.getLocation(); Location l = i.getLocation();
@ -475,6 +485,11 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte
{ {
if(isSpawnable()) if(isSpawnable())
{ {
if(!IrisSettings.get().isSystemEntitySpawnOverrides())
{
return;
}
int x = e.getEntity().getLocation().getBlockX(); int x = e.getEntity().getLocation().getBlockX();
int y = e.getEntity().getLocation().getBlockY(); int y = e.getEntity().getLocation().getBlockY();
int z = e.getEntity().getLocation().getBlockZ(); int z = e.getEntity().getLocation().getBlockZ();

View File

@ -12,6 +12,7 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.IrisTerrainProvider; import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.ParallaxTerrainProvider; import com.volmit.iris.gen.ParallaxTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicSliverMap; import com.volmit.iris.gen.atomics.AtomicSliverMap;
@ -57,6 +58,11 @@ public class GenLayerUpdate extends BlockPopulator
public void spawnInitials(Chunk c, RNG rx) public void spawnInitials(Chunk c, RNG rx)
{ {
if(!IrisSettings.get().isSystemEntityInitialSpawns())
{
return;
}
PrecisionStopwatch p = PrecisionStopwatch.start(); PrecisionStopwatch p = PrecisionStopwatch.start();
((IrisTerrainProvider) gen).spawnInitials(c, rx); ((IrisTerrainProvider) gen).spawnInitials(c, rx);
p.end(); p.end();

View File

@ -110,7 +110,12 @@ public class IrisBoardManager implements BoardProvider, Listener
v.add(C.GREEN + "Parallax" + C.GRAY + ": " + Form.f((int) g.getParallaxMap().getLoadedChunks().size())); v.add(C.GREEN + "Parallax" + C.GRAY + ": " + Form.f((int) g.getParallaxMap().getLoadedChunks().size()));
v.add(C.GREEN + "Objects" + C.GRAY + ": " + Form.f(g.getData().getObjectLoader().count())); v.add(C.GREEN + "Objects" + C.GRAY + ": " + Form.f(g.getData().getObjectLoader().count()));
v.add(C.GREEN + "Memory" + C.GRAY + ": " + mem); v.add(C.GREEN + "Memory" + C.GRAY + ": " + mem);
v.add(C.GREEN + "Jobs" + C.GRAY + ": " + Iris.jobCount());
if(Iris.jobCount() > 0)
{
v.add(C.GREEN + "Tasks" + C.GRAY + ": " + Iris.jobCount());
}
v.add("&7&m------------------"); v.add("&7&m------------------");
v.add(C.GREEN + "Heightmap" + C.GRAY + ": " + (int) g.getTerrainHeight(x, z)); v.add(C.GREEN + "Heightmap" + C.GRAY + ": " + (int) g.getTerrainHeight(x, z));