Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-28 19:49:06 +00:00
Code Issues Releases Activity

tweaks

Browse Source
This commit is contained in:
DanLT
2021-06-23 20:09:33 -08:00
parent fa201d21e2
commit a48400535f
5 changed files with 161 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
src/main/java/com/volmit/iris/manager/IrisProject.java
View File

@@ -134,86 +134,85 @@ public class IrisProject
.seed(1337)
.name(wfp)
.studioMode()
.asyncPrepare()
.create();
IrisAccess gx = ((IrisAccess)c.generator());
sender.sendMessage("Generating with " + Iris.getThreadCount() + " threads per chunk");
O<Boolean> done = new O<>();
done.set(false);
activeProvider = gx;
J.a(() ->
{
double last = 0;
int req = 300;
double lpc = 0;
boolean fc;
IrisAccess gx = ((IrisAccess)c.generator());
sender.sendMessage("Generating with " + Iris.getThreadCount() + " threads per chunk");
O<Boolean> done = new O<>();
done.set(false);
activeProvider = gx;
while(!done.get())
{
boolean derp = false;
J.a(() ->
{
double last = 0;
int req = 300;
double lpc = 0;
boolean fc;
assert gx != null;
double v = (double) gx.getGenerated() / (double) req;
fc = lpc != v;
lpc = v;
while(!done.get())
{
boolean derp = false;
if(last > v || v > 1)
{
derp = true;
v = last;
}
assert gx != null;
double v = (double) gx.getGenerated() / (double) req;
fc = lpc != v;
lpc = v;
else
{
last = v;
}
if(last > v || v > 1)
{
derp = true;
v = last;
}
if(fc)
{
sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + (derp ? (C.GRAY + " (Waiting on Server...)") : (C.GRAY + " (" + (req - gx.getGenerated()) + " Left)")));
}
else
{
last = v;
}
if (sender.isPlayer()){
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.BLUE + "Creating studio world. Please wait..."));
}
if(fc)
{
sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + (derp ? (C.GRAY + " (Waiting on Server...)") : (C.GRAY + " (" + (req - gx.getGenerated()) + " Left)")));
}
J.sleep(1500);
if (sender.isPlayer()){
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.BLUE + "Creating studio world. Please wait..."));
}
if(gx.isFailing())
{
J.sleep(1500);
sender.sendMessage("Generation Failed!");
return;
}
}
});
if(gx.isFailing())
{
//@builder
World world = c.createWorld();
Iris.linkMultiverseCore.removeFromConfig(world);
sender.sendMessage("Generation Failed!");
return;
}
}
});
done.set(true);
sender.sendMessage(C.WHITE + "Generating Complete!");
//@builder
World world = c.createWorld();
Iris.linkMultiverseCore.removeFromConfig(world);
if(sender.isPlayer())
{
assert world != null;
sender.player().teleport(world.getSpawnLocation());
}
done.set(true);
sender.sendMessage(C.WHITE + "Generating Complete!");
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{
sender.sendMessage("Hotloading Active! Change any files and watch your changes appear as you load new chunks!");
if(sender.isPlayer())
{
assert world != null;
sender.player().teleport(world.getSpawnLocation());
}
if(sender.isPlayer())
{
sender.player().setGameMode(GameMode.SPECTATOR);
}
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{
sender.sendMessage("Hotloading Active! Change any files and watch your changes appear as you load new chunks!");
onDone.run();
}, 0);
if(sender.isPlayer())
{
sender.player().setGameMode(GameMode.SPECTATOR);
}
onDone.run();
}, 0);
}
public void close()

177
src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java
View File

@@ -14,6 +14,9 @@ import org.bukkit.World;
import org.bukkit.WorldCreator;
import java.io.File;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReferenceArray;
public class CommandIrisCreate extends MortarCommand
{
@@ -42,20 +45,80 @@ public class CommandIrisCreate extends MortarCommand
String worldName = args[0];
String type = IrisSettings.get().getGenerator().getDefaultWorldType();
long seed = 1337;
int pregen = 0;
AtomicInteger pregen = new AtomicInteger(0);
boolean multiverse = Iris.linkMultiverseCore.supported();
for(String i : args)
{
type = i.startsWith("type=") ? i.split("\\Q=\\E")[1] : type;
seed = i.startsWith("seed=") ? Long.valueOf(i.split("\\Q=\\E")[1]) : seed;
pregen = i.startsWith("pregen=") ? getVal(i.split("\\Q=\\E")[1]) : pregen;
pregen.set(i.startsWith("pregen=") ? getVal(i.split("\\Q=\\E")[1]) : pregen.get());
}
Iris.linkMultiverseCore.assignWorldType(worldName, type);
World world = null;
final AtomicReference<World> world = new AtomicReference<>();
IrisDimension dim;
File folder = new File(worldName);
Runnable onDone = () -> {
sender.sendMessage(worldName + " Spawn Area generated.");
sender.sendMessage("You must remember to either have multiverse installed or use the Bukkit method, otherwise the world will go corrupt!");
sender.sendMessage("Wiki: https://volmitsoftware.gitbook.io/iris/getting-started");
O<Boolean> b = new O<Boolean>();
b.set(true);
if(sender.isPlayer())
{
try
{
sender.player().teleport(world.get().getSpawnLocation());
}
catch(Throwable e)
{
}
}
if(pregen.get() > 0)
{
b.set(false);
sender.sendMessage("Pregenerating " + worldName + " " + pregen + " x " + pregen);
sender.sendMessage("Expect server lag during this time. Use '/iris pregen stop' to cancel");
new Pregenerator(world.get(), pregen.get(), () ->
{
b.set(true);
});
}
World ww = world.get();
if (ww == null){
sender.sendMessage("World not created, can not finish");
return;
}
J.a(() ->
{
while(!b.get())
{
J.sleep(1000);
}
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{
ww.save();
sender.sendMessage("All Done!");
});
});
};
if(multiverse)
{
dim = IrisDataManager.loadAnyDimension(type);
@@ -81,7 +144,8 @@ public class CommandIrisCreate extends MortarCommand
command += " -g Iris:" + dim.getLoadKey();
sender.sendMessage("Delegating " + command);
Bukkit.dispatchCommand(sender, command);
world= Bukkit.getWorld(worldName);
world.set(Bukkit.getWorld(worldName));
onDone.run();
}
else
@@ -99,92 +163,43 @@ public class CommandIrisCreate extends MortarCommand
WorldCreator wc = new IrisWorldCreator().dimension(dim).name(worldName)
.productionMode().seed(seed).create();
sender.sendMessage("Generating with " + Iris.getThreadCount() + " threads per chunk");
O<Boolean> done = new O<Boolean>();
done.set(false);
J.a(() ->
{
double last = 0;
int req = 800;
while(!done.get())
J.s(() -> {
sender.sendMessage("Generating with " + Iris.getThreadCount() + " threads per chunk");
O<Boolean> done = new O<>();
done.set(false);
J.a(() ->
{
boolean derp = false;
double v = (double) ((IrisAccess) wc.generator()).getGenerated() / (double) req;
if(last > v || v > 1)
double last = 0;
int req = 800;
while(!done.get())
{
derp = true;
v = last;
boolean derp = false;
double v = (double) ((IrisAccess) wc.generator()).getGenerated() / (double) req;
if(last > v || v > 1)
{
derp = true;
v = last;
}
else
{
last = v;
}
sender.sendMessage("Generating " + Form.pc(v) + (derp ? " (Waiting on Server...)" : ""));
J.sleep(3000);
}
});
else
{
last = v;
}
world.set(wc.createWorld());
sender.sendMessage("Generating " + Form.pc(v) + (derp ? " (Waiting on Server...)" : ""));
J.sleep(3000);
}
});
world = wc.createWorld();
done.set(true);
}
sender.sendMessage(worldName + " Spawn Area generated.");
sender.sendMessage("You must remember to either have multiverse installed or use the Bukkit method, otherwise the world will go corrupt!");
sender.sendMessage("Wiki: https://volmitsoftware.gitbook.io/iris/getting-started");
O<Boolean> b = new O<Boolean>();
b.set(true);
if(sender.isPlayer())
{
try
{
sender.player().teleport(world.getSpawnLocation());
}
catch(Throwable e)
{
}
}
if(pregen > 0)
{
b.set(false);
sender.sendMessage("Pregenerating " + worldName + " " + pregen + " x " + pregen);
sender.sendMessage("Expect server lag during this time. Use '/iris pregen stop' to cancel");
new Pregenerator(world, pregen, () ->
{
b.set(true);
done.set(true);
});
}
World ww = world;
if (ww == null){
sender.sendMessage("World not created, can not finish");
return true;
}
J.a(() ->
{
while(!b.get())
{
J.sleep(1000);
}
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{
ww.save();
sender.sendMessage("All Done!");
});
});
return true;
}