From a27bb66fef30159e0951336d75da72488bc96f06 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 4 Sep 2020 21:13:39 -0400
Subject: [PATCH] Fixes

---
 .../java/com/volmit/iris/ProjectManager.java  | 29 ++++++++++---------
 .../com/volmit/iris/command/CommandIris.java  |  5 +++-
 ...Download.java => CommandIrisDownload.java} |  6 ++--
 .../iris/command/CommandIrisStudio.java       |  3 --
 4 files changed, 23 insertions(+), 20 deletions(-)
 rename src/main/java/com/volmit/iris/command/{CommandIrisStudioDownload.java => CommandIrisDownload.java} (91%)

diff --git a/src/main/java/com/volmit/iris/ProjectManager.java b/src/main/java/com/volmit/iris/ProjectManager.java
index 90c0f11f0..c34770cad 100644
--- a/src/main/java/com/volmit/iris/ProjectManager.java
+++ b/src/main/java/com/volmit/iris/ProjectManager.java
@@ -89,27 +89,30 @@ public class ProjectManager
 
 	public ProjectManager()
 	{
-		J.a(() ->
+		if(IrisSettings.get().isStudio())
 		{
-			File ignore = Iris.instance.getDataFile("packs", ".gitignore");
-
-			if(!ignore.exists())
+			J.a(() ->
 			{
-				File m = Iris.getCached("Pack Ignore (.gitignore)", "https://raw.githubusercontent.com/VolmitSoftware/Iris/master/packignore.ignore");
-				if(m != null)
+				File ignore = Iris.instance.getDataFile("packs", ".gitignore");
+
+				if(!ignore.exists())
 				{
-					try
+					File m = Iris.getCached("Pack Ignore (.gitignore)", "https://raw.githubusercontent.com/VolmitSoftware/Iris/master/packignore.ignore");
+					if(m != null)
 					{
-						IO.copyFile(m, ignore);
-					}
+						try
+						{
+							IO.copyFile(m, ignore);
+						}
 
-					catch(IOException e)
-					{
+						catch(IOException e)
+						{
 
+						}
 					}
 				}
-			}
-		});
+			});
+		}
 	}
 
 	public void downloadSearch(MortarSender sender, String key, boolean trim)
diff --git a/src/main/java/com/volmit/iris/command/CommandIris.java b/src/main/java/com/volmit/iris/command/CommandIris.java
index e0c31555d..d3290e55b 100644
--- a/src/main/java/com/volmit/iris/command/CommandIris.java
+++ b/src/main/java/com/volmit/iris/command/CommandIris.java
@@ -9,7 +9,7 @@ public class CommandIris extends MortarCommand
 {
 	@Command
 	private CommandIrisCreate create;
-	
+
 	@Command
 	private CommandIrisStudio studio;
 
@@ -19,6 +19,9 @@ public class CommandIris extends MortarCommand
 	@Command
 	private CommandIrisObject object;
 
+	@Command
+	private CommandIrisDownload download;
+	
 	@Command
 	private CommandIrisWhat what;
 
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java b/src/main/java/com/volmit/iris/command/CommandIrisDownload.java
similarity index 91%
rename from src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java
rename to src/main/java/com/volmit/iris/command/CommandIrisDownload.java
index 0173ba162..61e81408b 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisDownload.java
@@ -7,9 +7,9 @@ import com.volmit.iris.util.J;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
 
-public class CommandIrisStudioDownload extends MortarCommand
+public class CommandIrisDownload extends MortarCommand
 {
-	public CommandIrisStudioDownload()
+	public CommandIrisDownload()
 	{
 		super("download", "down", "dl");
 		requiresPermission(Iris.perm.studio);
@@ -25,7 +25,7 @@ public class CommandIrisStudioDownload extends MortarCommand
 			sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json");
 			return true;
 		}
-		
+
 		if(args.length < 1)
 		{
 			sender.sendMessage("/iris std dl " + C.BOLD + "<NAME>");
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java
index b5f4291fb..1a07eb79a 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java
@@ -17,9 +17,6 @@ public class CommandIrisStudio extends MortarCommand
 	@Command
 	private CommandIrisStudioClose close;
 
-	@Command
-	private CommandIrisStudioDownload download;
-
 	@Command
 	private CommandIrisStudioPackage pkg;