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

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-09-04 21:13:39 -04:00
parent ef6036a7d0
commit a27bb66fef
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/volmit/iris/ProjectManager.java
View File

@ -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)

5
src/main/java/com/volmit/iris/command/CommandIris.java
View File

@ -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;

6
src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java → src/main/java/com/volmit/iris/command/CommandIrisDownload.java
View File

@ -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>");

3
src/main/java/com/volmit/iris/command/CommandIrisStudio.java
View File

@ -17,9 +17,6 @@ public class CommandIrisStudio extends MortarCommand
@Command
private CommandIrisStudioClose close;
@Command
private CommandIrisStudioDownload download;
@Command
private CommandIrisStudioPackage pkg;