diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java index 0ea74fa14..af81b2c43 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java @@ -56,7 +56,7 @@ public class CommandIrisObjectPaste extends MortarCommand if(file == null || !file.exists()) { - sender.sendMessage("Can't find " + args[0] + " in the " + ProjectManager.workspaceName + " folder"); + sender.sendMessage("Can't find " + args[0] + " in the " + ProjectManager.WORKSPACE_NAME + " folder"); } ItemStack wand = sender.player().getInventory().getItemInMainHand(); diff --git a/src/main/java/com/volmit/iris/manager/IrisDataManager.java b/src/main/java/com/volmit/iris/manager/IrisDataManager.java index 4aac856f9..3d7829b3e 100644 --- a/src/main/java/com/volmit/iris/manager/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisDataManager.java @@ -43,7 +43,7 @@ public class IrisDataManager public IrisDataManager(File dataFolder) { this.dataFolder = dataFolder; - this.packs = new File(dataFolder, ProjectManager.workspaceName); + this.packs = new File(dataFolder, ProjectManager.WORKSPACE_NAME); boolean pr = false; if(!packs.exists()) { @@ -65,7 +65,7 @@ public class IrisDataManager return; } - File packs = this.packs.getName().equals(ProjectManager.workspaceName) ? this.packs : dataFolder; + File packs = this.packs.getName().equals(ProjectManager.WORKSPACE_NAME) ? this.packs : dataFolder; packs.mkdirs(); this.lootLoader = new ResourceLoader<>(packs, "loot", "Loot", IrisLootTable.class); this.entityLoader = new ResourceLoader<>(packs, "entities", "Entity", IrisEntity.class); @@ -77,7 +77,7 @@ public class IrisDataManager this.blockLoader = new ResourceLoader<>(packs, "blocks", "Block", IrisBlockData.class); this.objectLoader = new ObjectResourceLoader(packs, "objects", "Object"); - if(packs.getName().equals(ProjectManager.workspaceName)) + if(packs.getName().equals(ProjectManager.WORKSPACE_NAME)) { writeExamples(); } diff --git a/src/main/java/com/volmit/iris/manager/ProjectManager.java b/src/main/java/com/volmit/iris/manager/ProjectManager.java index ae94405f3..6850c6037 100644 --- a/src/main/java/com/volmit/iris/manager/ProjectManager.java +++ b/src/main/java/com/volmit/iris/manager/ProjectManager.java @@ -27,7 +27,8 @@ import lombok.Data; @Data public class ProjectManager { - public static final String workspaceName = "packs"; + public static final String LISTING = "https://raw.githubusercontent.com/IrisDimensions/_listing/main/listing.json"; + public static final String WORKSPACE_NAME = "packs"; private KMap cacheListing = null; private IrisProject activeProject; @@ -71,7 +72,7 @@ public class ProjectManager { if(i.isFile() && i.getName().equals(type + ".iris")) { - sender.sendMessage("Found " + type + ".iris in " + ProjectManager.workspaceName + " folder"); + sender.sendMessage("Found " + type + ".iris in " + ProjectManager.WORKSPACE_NAME + " folder"); ZipUtil.unpack(i, iris); break; } @@ -80,7 +81,7 @@ public class ProjectManager else { - sender.sendMessage("Found " + type + " dimension in " + ProjectManager.workspaceName + " folder. Repackaging"); + sender.sendMessage("Found " + type + " dimension in " + ProjectManager.WORKSPACE_NAME + " folder. Repackaging"); File f = new IrisProject(new File(getWorkspaceFolder(), type)).getPath(); try @@ -277,12 +278,12 @@ public class ProjectManager if(cached) { - a = new JSONArray(Iris.getCached("cachedlisting", "https://raw.githubusercontent.com/VolmitSoftware/Iris/master/listing.json")); + a = new JSONArray(Iris.getCached("cachedlisting", LISTING)); } else { - a = new JSONArray(Iris.getNonCached(!cached + "listing", "https://raw.githubusercontent.com/VolmitSoftware/Iris/master/listing.json")); + a = new JSONArray(Iris.getNonCached(!cached + "listing", LISTING)); } KMap l = new KMap<>(); @@ -331,12 +332,12 @@ public class ProjectManager public File getWorkspaceFolder(String... sub) { - return Iris.instance.getDataFolderList(workspaceName, sub); + return Iris.instance.getDataFolderList(WORKSPACE_NAME, sub); } public File getWorkspaceFile(String... sub) { - return Iris.instance.getDataFileList(workspaceName, sub); + return Iris.instance.getDataFileList(WORKSPACE_NAME, sub); } public void close()