From 0a0617c5fce56b7bc4844ccf52c40124790028a7 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Wed, 21 Oct 2020 10:02:36 -0400
Subject: [PATCH] Command fixes

---
 .../iris/command/CommandIrisCreate.java       |  1 +
 .../volmit/iris/command/CommandIrisRegen.java |  1 +
 .../iris/command/CommandIrisStudio.java       |  3 ++
 .../iris/command/CommandIrisStudioTP.java     | 52 +++++++++++++++++++
 .../iris/command/CommandIrisStudioUpdate.java | 10 +++-
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java

diff --git a/src/main/java/com/volmit/iris/command/CommandIrisCreate.java b/src/main/java/com/volmit/iris/command/CommandIrisCreate.java
index 3ce7e8ddc..2c4ba2964 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisCreate.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisCreate.java
@@ -37,6 +37,7 @@ public class CommandIrisCreate extends MortarCommand
 		if(args.length == 0)
 		{
 			sender.sendMessage("/iris create <NAME> [type=overworld] [seed=1337] [pregen=5000] [-zip]");
+			return true;
 		}
 
 		String worldName = args[0];
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisRegen.java b/src/main/java/com/volmit/iris/command/CommandIrisRegen.java
index 1cd464211..29e06f92d 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisRegen.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisRegen.java
@@ -61,6 +61,7 @@ public class CommandIrisRegen extends MortarCommand
 			{
 				sender.sendMessage("/iris regen [SIZE]");
 			}
+
 			return true;
 		}
 
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java
index 63243605b..c3b7b32f1 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java
@@ -47,6 +47,9 @@ public class CommandIrisStudio extends MortarCommand
 	@Command
 	private CommandIrisStudioLoot loot;
 
+	@Command
+	private CommandIrisStudioTP tp;
+
 	public CommandIrisStudio()
 	{
 		super("studio", "std");
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java
new file mode 100644
index 000000000..43725d8f5
--- /dev/null
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java
@@ -0,0 +1,52 @@
+package com.volmit.iris.command;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.IrisSettings;
+import com.volmit.iris.util.MortarCommand;
+import com.volmit.iris.util.MortarSender;
+
+public class CommandIrisStudioTP extends MortarCommand
+{
+	public CommandIrisStudioTP()
+	{
+		super("tp");
+		requiresPermission(Iris.perm.studio);
+		setDescription("Go to the spawn of the currently open studio world.");
+		setCategory("Studio");
+	}
+
+	@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
+		{
+			sender.sendMessage("Teleporting you to the active studio world.");
+			sender.player().teleport(Iris.proj.getActiveProject().getActiveProvider().getTarget().getRealWorld().getSpawnLocation());
+		}
+
+		catch(Throwable e)
+		{
+			sender.sendMessage("Failed to teleport to the studio world. Try re-opening the project.");
+		}
+
+		return true;
+	}
+
+	@Override
+	protected String getArgsUsage()
+	{
+		return "";
+	}
+}
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java
index c08af922b..1c2ac6a39 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java
@@ -31,7 +31,15 @@ public class CommandIrisStudioUpdate extends MortarCommand
 			return true;
 		}
 
-		new IrisProject(Iris.proj.getWorkspaceFolder(args[0])).updateWorkspace();
+		if(new IrisProject(Iris.proj.getWorkspaceFolder(args[0])).updateWorkspace())
+		{
+			sender.sendMessage("Updated Code Workspace for " + args[0]);
+		}
+
+		else
+		{
+			sender.sendMessage("Invalid project: " + args[0] + ". Try deleting the code-workspace file and try again.");
+		}
 
 		return true;
 	}