mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix command and sync parallax

Browse Source
This commit is contained in:
Daniel Mills 2021-01-05 13:57:11 -05:00
parent c6aad25ef2
commit 18e203f007
5 changed files with 123 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/volmit/iris/manager/command/CommandIris.java
View File

@ -11,6 +11,9 @@ public class CommandIris extends MortarCommand
@Command
private CommandIrisCreate create;
@Command
private CommandIrisFix fix;
@Command
private CommandIrisStudio studio;

69
src/main/java/com/volmit/iris/manager/command/CommandIrisFix.java Normal file
View File

@ -0,0 +1,69 @@
package com.volmit.iris.manager.command;
import com.volmit.iris.Iris;
import com.volmit.iris.scaffold.IrisWorlds;
import com.volmit.iris.scaffold.engine.IrisAccess;
import com.volmit.iris.util.*;
import java.util.concurrent.atomic.AtomicInteger;
public class CommandIrisFix extends MortarCommand
{
public CommandIrisFix()
{
super("fix");
requiresPermission(Iris.perm.studio);
setDescription("Fix nearby chunks");
setCategory("Studio");
}
@Override
public void addTabOptions(MortarSender sender, String[] args, KList<String> list) {
}
@Override
public boolean handle(MortarSender sender, String[] args)
{
try
{
IrisAccess a = IrisWorlds.access(sender.player().getWorld());
if(a.getCompound().getSize() > 1)
{
sender.sendMessage("Cant fix engine composite worlds!");
return true;
}
int viewDistance = args.length > 0 ? Integer.valueOf(args[0]) : -1;
if(viewDistance <=1)
{
J.a(() -> {
int fixed = a.getCompound().getDefaultEngine().getFramework().getEngineParallax().repairChunk(sender.player().getLocation().getChunk());
sender.sendMessage("Fixed " + Form.f(fixed) + " blocks!");
});
}
else
{
AtomicInteger v = new AtomicInteger();
J.a(() -> {
new Spiraler(viewDistance, viewDistance, (x,z) -> v.set(v.get() + a.getCompound().getDefaultEngine().getFramework().getEngineParallax().repairChunk(sender.player().getWorld().getChunkAt(x, z)))).drain();
sender.sendMessage("Fixed " + Form.f(v.get()) + " blocks in " + (viewDistance * viewDistance) + " chunks!");
});
}
}
catch(Throwable e)
{
sender.sendMessage("Not a valid Iris World (or bad argument)");
}
return true;
}
@Override
protected String getArgsUsage()
{
return "[view-distance]";
}
}

3
src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java
View File

@ -12,9 +12,6 @@ public class CommandIrisStudio extends MortarCommand
@Command
private CommandIrisStudioCreate create;
@Command
private CommandIrisStudioFix fix;
@Command
private CommandIrisStudioOpen open;

65
src/main/java/com/volmit/iris/manager/command/CommandIrisStudioFix.java
View File

@ -1,65 +0,0 @@
package com.volmit.iris.manager.command;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.scaffold.hunk.Hunk;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
import org.bukkit.Chunk;
import org.bukkit.block.data.BlockData;
public class CommandIrisStudioFix extends MortarCommand
{
public CommandIrisStudioFix()
{
super("fix");
requiresPermission(Iris.perm.studio);
setDescription("Go to the spawn of the currently open studio world.");
setCategory("Studio");
}
@Override
public void addTabOptions(MortarSender sender, String[] args, KList<String> list) {
}
@Override
public boolean handle(MortarSender sender, String[] args)
{
if(!IrisSettings.get().isStudio())
{
sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json");
return true;
}
if(!Iris.proj.isProjectOpen())
{
sender.sendMessage("There is not a studio currently loaded.");
return true;
}
try
{
Chunk c = sender.player().getLocation().getChunk();
int cx = c.getX() * 16;
int cz = c.getZ() * 16;
Hunk<BlockData> bd = Hunk.viewBlocks(c);
Iris.proj.getActiveProject().getActiveProvider().getCompound().getDefaultEngine().getFramework().getEngineParallax().insertParallax(cx, cz, bd);
sender.sendMessage("Done!");
}
catch(Throwable e)
{
sender.sendMessage("Failed to teleport to the studio world. Try re-opening the project.");
}
return true;
}
@Override
protected String getArgsUsage()
{
return "";
}
}

60
src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
View File

@ -12,6 +12,8 @@ import com.volmit.iris.scaffold.parallax.ParallaxChunkMeta;
import com.volmit.iris.scaffold.parallel.BurstExecutor;
import com.volmit.iris.scaffold.parallel.MultiBurst;
import com.volmit.iris.util.*;
import org.bukkit.Chunk;
import org.bukkit.ChunkSnapshot;
import org.bukkit.block.data.BlockData;
import org.bukkit.util.BlockVector;
import org.bukkit.util.Consumer;
@ -72,6 +74,51 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
return r;
}
/**
* Verifies the chunk correctly has all the parallax objects it should.
* This method should not have to be written but why not.
* Thread Safe, Designed to run async
* @param c the bukkit chunk
*/
default int repairChunk(Chunk c)
{
ParallaxChunkMeta m = getParallaxAccess().getMetaR(c.getX(), c.getZ());
Hunk<String> o = getParallaxAccess().getObjectsR(c.getX(), c.getZ());
Hunk<BlockData> b = getParallaxAccess().getBlocksR(c.getX(), c.getZ());
ChunkSnapshot snapshot = c.getChunkSnapshot(false, false, false);
KList<Runnable> queue = new KList<>();
o.iterateSync((x,y,z,s) -> {
if(s != null)
{
BlockData bd = b.get(x,y,z);
if(bd != null)
{
BlockData bdx = snapshot.getBlockData(x,y,z);
if(!bdx.getMaterial().equals(bd.getMaterial()))
{
queue.add(() -> c.getBlock(x,y,z).setBlockData(bd, false));
}
}
}
});
AtomicBoolean bx = new AtomicBoolean(false);
J.s(() -> {
queue.forEach(Runnable::run);
bx.set(true);
});
while(!bx.get())
{
J.sleep(50);
}
return queue.size();
}
default void insertParallax(int x, int z, Hunk<BlockData> data) {
try {
PrecisionStopwatch p = PrecisionStopwatch.start();
@ -113,7 +160,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
}
}
default void generateParallaxAreaFeatures(int x, int z, BurstExecutor b) {
default void generateParallaxAreaFeatures(int x, int z) {
try {
PrecisionStopwatch p = PrecisionStopwatch.start();
int s = (int) Math.ceil(getParallaxSize() / 2D);
@ -133,13 +180,12 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
RNG rng = new RNG(Cache.key(xx, zz)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed());
IrisRegion region = getComplex().getRegionStream().get(xxx, zzz);
IrisBiome biome = getComplex().getTrueBiomeStream().get(xxx, zzz);
b.queue(() -> generateParallaxFeatures(rng, xx, zz, region, biome));
generateParallaxFeatures(rng, xx, zz, region, biome);
getParallaxAccess().setFeatureGenerated(xx, zz);
}
}
}
b.complete();
p.end();
getEngine().getMetrics().getParallax().put(p.getMilliseconds());
} catch (Throwable e) {
@ -189,9 +235,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
PrecisionStopwatch p = PrecisionStopwatch.start();
int s = (int) Math.ceil(getParallaxSize() / 2D);
int i,j;
BurstExecutor b = MultiBurst.burst.burst(((s * 2) * (s * 2)));
BurstExecutor b2 = MultiBurst.burst.burst(((s * 2) * (s * 2)));
generateParallaxAreaFeatures(x, z, b2);
generateParallaxAreaFeatures(x, z);
for(i = -s; i <= s; i++)
{
@ -199,12 +243,10 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
for(j = -s; j <= s; j++)
{
int jj = j;
b.queue(() -> generateParallaxLayer((ii*16)+x, (jj*16)+z));
generateParallaxLayer((ii*16)+x, (jj*16)+z);
}
}
b2.complete();
b.complete();
getParallaxAccess().setChunkGenerated(x>>4, z>>4);
p.end();
getEngine().getMetrics().getParallax().put(p.getMilliseconds());