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

Support creation of studio worlds through tk

Browse Source
This commit is contained in:
Daniel Mills 2021-07-24 09:41:39 -04:00
parent f360fadd3f
commit 970a5ec763
4 changed files with 107 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/main/java/com/volmit/iris/core/IrisProject.java
View File

@ -21,15 +21,19 @@ package com.volmit.iris.core;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.core.pregenerator.PregenTask;
import com.volmit.iris.core.report.Report; import com.volmit.iris.core.report.Report;
import com.volmit.iris.core.report.ReportType; import com.volmit.iris.core.report.ReportType;
import com.volmit.iris.core.tools.IrisToolbelt;
import com.volmit.iris.core.tools.IrisWorldCreator; import com.volmit.iris.core.tools.IrisWorldCreator;
import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.framework.IrisAccess;
import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.parallel.MultiBurst;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.exceptions.IrisException;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
import com.volmit.iris.util.format.Form; import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.IO;
@ -171,13 +175,13 @@ public class IrisProject {
return collectFiles(path, json); return collectFiles(path, json);
} }
public void open(VolmitSender sender) { public void open(VolmitSender sender) throws IrisException {
open(sender, () -> open(sender, () ->
{ {
}); });
} }
public void open(VolmitSender sender, Runnable onDone) { public void open(VolmitSender sender, Runnable onDone) throws IrisException {
if (isOpen()) { if (isOpen()) {
close(); close();
} }
@ -186,8 +190,6 @@ public class IrisProject {
if (d == null) { if (d == null) {
sender.sendMessage("Can't find dimension: " + getName()); sender.sendMessage("Can't find dimension: " + getName());
return; return;
} else if (sender.isPlayer()) {
sender.player().setGameMode(GameMode.SPECTATOR);
} }
J.attemptAsync(() -> J.attemptAsync(() ->
@ -237,73 +239,50 @@ public class IrisProject {
} }
}); });
String wfp = "iris/" + UUID.randomUUID(); MultiBurst.burst.lazy(() -> {
try {
IrisAccess a = IrisToolbelt.createWorld()
.studio(true)
.sender(sender)
.name("iris/" + UUID.randomUUID())
.dimension(d.getLoadKey())
.seed(1337)
.headless(!IrisSettings.get().getGenerator().isDisableMCA())
.pregen(PregenTask.builder()
.radius(1)
.build())
.create();
World world = a.getCompound().getWorld().realWorld();
WorldCreator c = new IrisWorldCreator().dimension(getName()) J.s(() -> {
.seed(1337) activeProvider = a;
.name(wfp) if (IrisSettings.get().getStudio().isDisableTimeAndWeather()) {
.studioMode() world.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
.create(); world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
world.setTime(6000);
}
Iris.linkMultiverseCore.removeFromConfig(world);
IrisAccess gx = ((IrisAccess) c.generator()); if (sender.isPlayer()) {
O<Boolean> done = new O<>(); assert world != null;
done.set(false); sender.player().teleport(world.getSpawnLocation());
activeProvider = gx; } else {
sender.sendMessage(C.WHITE + "Generating Complete!");
}
J.a(() -> Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{ {
double last = 0; if (sender.isPlayer()) {
int req = 400; sender.player().setGameMode(GameMode.SPECTATOR);
}
while (gx.getGenerated() < req) { onDone.run();
assert gx != null; }, 0);
double v = (double) gx.getGenerated() / (double) req; });
} catch (IrisException e) {
if (sender.isPlayer()) { e.printStackTrace();
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - gx.getGenerated()) + " Left)"))));
J.sleep(50);
} else {
sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - gx.getGenerated()) + " Left)")));
J.sleep(1000);
}
if (gx.isFailing()) {
sender.sendMessage("Generation Failed!");
break;
}
}
if (sender.isPlayer()) {
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generation Complete"));
} }
}); });
//@builder
World world = INMS.get().createWorld(c);
if (IrisSettings.get().getStudio().isDisableTimeAndWeather()) {
world.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
world.setTime(6000);
}
Iris.linkMultiverseCore.removeFromConfig(world);
done.set(true);
if (sender.isPlayer()) {
assert world != null;
sender.player().teleport(world.getSpawnLocation());
} else {
sender.sendMessage(C.WHITE + "Generating Complete!");
}
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{
if (sender.isPlayer()) {
sender.player().setGameMode(GameMode.SPECTATOR);
}
onDone.run();
}, 0);
} }
public void close() { public void close() {

3
src/main/java/com/volmit/iris/core/ProjectManager.java
View File

@ -24,6 +24,7 @@ import com.volmit.iris.Iris;
import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.cache.AtomicCache;
import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.exceptions.IrisException;
import com.volmit.iris.util.format.Form; import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.IO;
import com.volmit.iris.util.json.JSONException; import com.volmit.iris.util.json.JSONException;
@ -333,7 +334,7 @@ public class ProjectManager {
} }
} }
public void open(VolmitSender sender, String dimm, Runnable onDone) { public void open(VolmitSender sender, String dimm, Runnable onDone) throws IrisException {
if (isProjectOpen()) { if (isProjectOpen()) {
close(); close();
} }

94
src/main/java/com/volmit/iris/core/tools/IrisCreator.java
View File

@ -37,6 +37,8 @@ import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.WorldCreator; import org.bukkit.WorldCreator;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer; import java.util.function.Consumer;
/** /**
@ -166,53 +168,61 @@ public class IrisCreator {
throw new IrisException("Access is null. Something bad happened."); throw new IrisException("Access is null. Something bad happened.");
} }
IrisAccess finalAccess = access; CompletableFuture<Boolean> ff = new CompletableFuture<>();
Runnable loadup = () -> {
if (pregen != null) {
IrisToolbelt.pregenerate(pregen, access)
.onProgress(prog)
.whenDone(() -> ff.complete(true));
try { try {
J.sfut(() -> { ff.get();
if (headless) {
O<Boolean> done = new O<>();
done.set(false);
J.a(() ->
{
int req = 400;
while (finalAccess.getGenerated() < req && !done.get()) {
double v = (double) finalAccess.getGenerated() / (double) req;
v = (v / 2) + 0.5;
if (sender.isPlayer()) {
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - finalAccess.getGenerated()) + " Left)"))));
J.sleep(50);
} else {
sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - finalAccess.getGenerated()) + " Left)")));
J.sleep(1000);
}
if (finalAccess.isFailing()) {
sender.sendMessage("Generation Failed!");
break;
}
}
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generation Complete"));
});
finalAccess.getHeadlessGenerator().getWorld().load();
done.set(true);
}
}).get();
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
} }
}; }
if (pregen != null) { try {
IrisToolbelt.pregenerate(pregen, access).onProgress(prog).whenDone(loadup);
} else { IrisAccess finalAccess = access;
loadup.run(); J.sfut(() -> {
if (headless) {
O<Boolean> done = new O<>();
done.set(false);
J.a(() ->
{
int req = 400;
while (finalAccess.getGenerated() < req && !done.get()) {
double v = (double) finalAccess.getGenerated() / (double) req;
v = (v / 2) + 0.5;
if (sender.isPlayer()) {
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - finalAccess.getGenerated()) + " Left)"))));
J.sleep(50);
} else {
sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - finalAccess.getGenerated()) + " Left)")));
J.sleep(1000);
}
if (finalAccess.isFailing()) {
sender.sendMessage("Generation Failed!");
break;
}
}
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generation Complete"));
});
finalAccess.getHeadlessGenerator().getWorld().load();
done.set(true);
}
}).get();
} catch (Throwable e) {
e.printStackTrace();
} }
return access; return access;

9
src/main/java/com/volmit/iris/util/scheduling/J.java
View File

@ -219,6 +219,15 @@ public class J {
return f; return f;
} }
public static CompletableFuture afut(Runnable r) {
CompletableFuture f = new CompletableFuture();
J.a(() -> {
r.run();
f.complete(null);
});
return f;
}
/** /**
* Queue a sync task * Queue a sync task
* *