Merge pull request #650 from CocoTheOwner/betterHotloadCMD

Better hotloading command (allows console)
This commit is contained in:
Dan 2021-09-22 06:37:08 -04:00 committed by GitHub
commit 5ce479b1af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -62,6 +62,7 @@ import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.math.Spiraler;
import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.noise.CNG;
import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.parallel.MultiBurst;
import com.volmit.iris.util.plugin.IrisService;
import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.util.scheduling.O; import com.volmit.iris.util.scheduling.O;
import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.scheduling.PrecisionStopwatch;
@ -364,11 +365,13 @@ public class CommandStudio implements DecreeExecutor {
NoiseExplorerGUI.launch(l, "Custom Generator"); NoiseExplorerGUI.launch(l, "Custom Generator");
} }
@Decree(description = "Hotload a studio", aliases = "reload", origin = DecreeOrigin.PLAYER) @Decree(description = "Hotload a studio", aliases = "reload")
public void hotload() { public void hotload() {
if (noStudio()) return; if (!Iris.service(StudioSVC.class).isProjectOpen()){
sender().sendMessage(C.RED + "No studio world open!");
access().hotload(); return;
}
Iris.service(StudioSVC.class).getActiveProject().getActiveProvider().getEngine().hotload();
sender().sendMessage(C.GREEN + "Hotloaded"); sender().sendMessage(C.GREEN + "Hotloaded");
} }
@ -847,7 +850,7 @@ public class CommandStudio implements DecreeExecutor {
*/ */
private boolean noStudio() { private boolean noStudio() {
if (!sender().isPlayer()) { if (!sender().isPlayer()) {
sender().sendMessage(C.RED + "Players only (this is a config error. Ask support to add DecreeOrigin.PLAYER to the command you tried to run)"); sender().sendMessage(C.RED + "Players only!");
return true; return true;
} }
if (!Iris.service(StudioSVC.class).isProjectOpen()) { if (!Iris.service(StudioSVC.class).isProjectOpen()) {