From ef6036a7d0cdb1da87e3f4882fd06acce2a2df43 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 4 Sep 2020 21:10:48 -0400 Subject: [PATCH] Commands & Settings --- .../com/volmit/iris/IrisHotloadManager.java | 21 +++++-- .../java/com/volmit/iris/IrisSettings.java | 11 +++- .../com/volmit/iris/command/CommandIris.java | 26 ++++++--- .../iris/command/CommandIrisObject.java | 7 +++ .../command/CommandIrisObjectContract.java | 7 +++ .../iris/command/CommandIrisObjectExpand.java | 7 +++ .../iris/command/CommandIrisObjectP1.java | 7 +++ .../iris/command/CommandIrisObjectP2.java | 7 +++ .../iris/command/CommandIrisObjectPaste.java | 7 +++ .../iris/command/CommandIrisObjectSave.java | 7 +++ .../iris/command/CommandIrisObjectShift.java | 7 +++ .../iris/command/CommandIrisObjectWand.java | 7 +++ .../iris/command/CommandIrisObjectXAY.java | 7 +++ .../iris/command/CommandIrisObjectXPY.java | 7 +++ .../volmit/iris/command/CommandIrisRetry.java | 55 ------------------- .../iris/command/CommandIrisStructure.java | 7 +++ .../command/CommandIrisStructureClose.java | 7 +++ .../command/CommandIrisStructureCreate.java | 7 +++ .../command/CommandIrisStructureExpand.java | 7 +++ .../command/CommandIrisStructureMore.java | 7 +++ .../command/CommandIrisStructureOpen.java | 7 +++ .../command/CommandIrisStructureSave.java | 7 +++ .../command/CommandIrisStructureVariants.java | 7 +++ .../iris/command/CommandIrisStudio.java | 32 ++++------- .../iris/command/CommandIrisStudioClose.java | 7 +++ .../iris/command/CommandIrisStudioCreate.java | 7 +++ .../command/CommandIrisStudioDownload.java | 7 +++ ...e.java => CommandIrisStudioEditBiome.java} | 11 +++- ...isGoto.java => CommandIrisStudioGoto.java} | 11 +++- ...oad.java => CommandIrisStudioHotload.java} | 28 +++++++--- .../iris/command/CommandIrisStudioList.java | 7 +++ ...isLoot.java => CommandIrisStudioLoot.java} | 11 +++- ...IrisMap.java => CommandIrisStudioMap.java} | 17 +++++- .../iris/command/CommandIrisStudioOpen.java | 7 +++ .../command/CommandIrisStudioPackage.java | 7 +++ .../iris/command/CommandIrisStudioUpdate.java | 22 ++++++-- .../iris/command/CommandIrisStudioVerify.java | 31 ++++++++--- .../volmit/iris/gen/IrisChunkGenerator.java | 2 +- .../iris/util/ObjectResourceLoader.java | 1 - .../com/volmit/iris/util/ResourceLoader.java | 1 - 40 files changed, 334 insertions(+), 121 deletions(-) delete mode 100644 src/main/java/com/volmit/iris/command/CommandIrisRetry.java rename src/main/java/com/volmit/iris/command/{CommandIrisEditBiome.java => CommandIrisStudioEditBiome.java} (77%) rename src/main/java/com/volmit/iris/command/{CommandIrisGoto.java => CommandIrisStudioGoto.java} (91%) rename src/main/java/com/volmit/iris/command/{CommandIrisHotload.java => CommandIrisStudioHotload.java} (61%) rename src/main/java/com/volmit/iris/command/{CommandIrisLoot.java => CommandIrisStudioLoot.java} (89%) rename src/main/java/com/volmit/iris/command/{CommandIrisMap.java => CommandIrisStudioMap.java} (59%) diff --git a/src/main/java/com/volmit/iris/IrisHotloadManager.java b/src/main/java/com/volmit/iris/IrisHotloadManager.java index 19e965ece..baa2a0311 100644 --- a/src/main/java/com/volmit/iris/IrisHotloadManager.java +++ b/src/main/java/com/volmit/iris/IrisHotloadManager.java @@ -17,12 +17,26 @@ public class IrisHotloadManager public IrisHotloadManager() { - w = new FolderWatcher(Iris.instance.getDataFolder("packs")); + if(!IrisSettings.get().studio) + { + w = null; + } + + else + { + w = new FolderWatcher(Iris.instance.getDataFolder("packs")); + } + latch = new ChronoLatch(3000); } public void check(IrisContext ch) { + if(!IrisSettings.get().isStudio()) + { + return; + } + if(!latch.flip()) { return; @@ -155,9 +169,4 @@ public class IrisHotloadManager } }); } - - public void track(File file) - { - - } } diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 6799dbc54..930bc16ae 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -10,6 +10,9 @@ import com.volmit.iris.util.IO; import com.volmit.iris.util.JSONException; import com.volmit.iris.util.JSONObject; +import lombok.Data; + +@Data public class IrisSettings { public static transient IrisSettings settings; @@ -35,8 +38,12 @@ public class IrisSettings public boolean sharedCaching = true; @DontObfuscate - @Desc("Allows configs to be changed and hotloaded without reloading.") - public boolean hotloading = true; + @Desc("Allows Iris to use studio commands & design worlds.") + public boolean studio = false; + + @DontObfuscate + @Desc("Allows iris to launch guis through the server process. Useful for local development.") + public boolean useServerLaunchedGuis = true; @DontObfuscate @Desc("When using studio open or create, open the codeworkspace automatically.") diff --git a/src/main/java/com/volmit/iris/command/CommandIris.java b/src/main/java/com/volmit/iris/command/CommandIris.java index 77bbfb9c8..e0c31555d 100644 --- a/src/main/java/com/volmit/iris/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/command/CommandIris.java @@ -7,20 +7,32 @@ import com.volmit.iris.util.MortarSender; public class CommandIris extends MortarCommand { + @Command + private CommandIrisCreate create; + @Command private CommandIrisStudio studio; - @Command - private CommandIrisWhat what; - - @Command - private CommandIrisObject object; - @Command private CommandIrisStructure structure; @Command - private CommandIrisCreate create; + private CommandIrisObject object; + + @Command + private CommandIrisWhat what; + + @Command + private CommandIrisMetrics metrics; + + @Command + private CommandIrisCTC ctc; + + @Command + private CommandIrisLMM lmm; + + @Command + private CommandIrisPregen pregen; public CommandIris() { diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObject.java b/src/main/java/com/volmit/iris/command/CommandIrisObject.java index 3036cd82e..1928aec05 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObject.java @@ -1,6 +1,7 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.Command; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -48,6 +49,12 @@ public class CommandIrisObject extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + sender.sendMessage("Iris Object Commands"); printHelp(sender); return true; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java index bcf0cc0ff..4c111dff2 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java @@ -5,6 +5,7 @@ import org.bukkit.Sound; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.Direction; @@ -24,6 +25,12 @@ public class CommandIrisObjectContract extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java index 3f5aa0bcb..b48e78e68 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java @@ -5,6 +5,7 @@ import org.bukkit.Sound; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.Direction; @@ -24,6 +25,12 @@ public class CommandIrisObjectExpand extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java index 4c5284c45..fccb852f6 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java @@ -8,6 +8,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -26,6 +27,12 @@ public class CommandIrisObjectP1 extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java index 7c4b466fd..6592a58e6 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java @@ -8,6 +8,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -26,6 +27,12 @@ public class CommandIrisObjectP2 extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java index 408ee212b..da54bef7a 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.MortarCommand; @@ -28,6 +29,12 @@ public class CommandIrisObjectPaste extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java index 20361da94..a28a2879c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.MortarCommand; @@ -25,6 +26,12 @@ public class CommandIrisObjectSave extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java index 07c8ae9d9..7ddb64262 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java @@ -5,6 +5,7 @@ import org.bukkit.Sound; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.Direction; @@ -24,6 +25,12 @@ public class CommandIrisObjectShift extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java index 87cae2cd4..4cb208d8b 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.Sound; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -20,6 +21,12 @@ public class CommandIrisObjectWand extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have an inventory"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java index 7f316f688..ba95b21bb 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.MortarCommand; @@ -26,6 +27,12 @@ public class CommandIrisObjectXAY extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java index 5346df2f1..b759c6d6a 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.MortarCommand; @@ -26,6 +27,12 @@ public class CommandIrisObjectXPY extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisRetry.java b/src/main/java/com/volmit/iris/command/CommandIrisRetry.java deleted file mode 100644 index 6805ce8c5..000000000 --- a/src/main/java/com/volmit/iris/command/CommandIrisRetry.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.volmit.iris.command; - -import org.bukkit.World; -import org.bukkit.entity.Player; - -import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisChunkGenerator; -import com.volmit.iris.util.MortarCommand; -import com.volmit.iris.util.MortarSender; - -public class CommandIrisRetry extends MortarCommand { - public CommandIrisRetry() { - super("retry", "again", "rt"); - setDescription("Retry generating in a failed state"); - requiresPermission(Iris.perm.studio); - setCategory("World"); - } - - @Override - public boolean handle(MortarSender sender, String[] args) { - if (sender.isPlayer()) { - Player p = sender.player(); - World world = p.getWorld(); - - if (!(world.getGenerator() instanceof IrisChunkGenerator)) { - sender.sendMessage("You must be in an iris world."); - return true; - } - - IrisChunkGenerator g = (IrisChunkGenerator) world.getGenerator(); - - if (g.isFailing()) { - sender.sendMessage("Retrying. If the server is unresponsive, you may need to restart the server."); - g.retry(); - } - - else { - sender.sendMessage("This generator is not failing."); - } - - return true; - } - - else { - sender.sendMessage("Players only."); - } - - return true; - } - - @Override - protected String getArgsUsage() { - return ""; - } -} diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructure.java b/src/main/java/com/volmit/iris/command/CommandIrisStructure.java index 0c72205fe..f6c627a7c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructure.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructure.java @@ -1,6 +1,7 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.Command; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -39,6 +40,12 @@ public class CommandIrisStructure extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + sender.sendMessage("Iris Structure Commands"); printHelp(sender); return true; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java index fdc9eaec1..74404c1ec 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.StructureTemplate; @@ -20,6 +21,12 @@ public class CommandIrisStructureClose extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java index 4cf1ff86f..5797ce6c8 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.StructureTemplate; @@ -20,6 +21,12 @@ public class CommandIrisStructureCreate extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java index 8705542c0..109514bbe 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.StructureTemplate; @@ -20,6 +21,12 @@ public class CommandIrisStructureExpand extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureMore.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureMore.java index cd65cced5..9a18452cd 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureMore.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureMore.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.StructureTemplate; @@ -20,6 +21,12 @@ public class CommandIrisStructureMore extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java index 723d9bc97..008584d6c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.object.IrisStructure; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -21,6 +22,12 @@ public class CommandIrisStructureOpen extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java index 8dbd39e2a..ace333495 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.StructureTemplate; @@ -20,6 +21,12 @@ public class CommandIrisStructureSave extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java index 43b6d0dc7..bd9d8bbe3 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -19,6 +20,12 @@ public class CommandIrisStructureVariants extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { + if(!IrisSettings.get().isStudio()) + { + sender.sendMessage("To use Iris Studio Structures, please enable studio in Iris/settings.json"); + return true; + } + if(!sender.isPlayer()) { sender.sendMessage("You don't have a wand"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java index 86d97b1b2..b5f4291fb 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudio.java @@ -1,6 +1,7 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.Command; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -29,37 +30,22 @@ public class CommandIrisStudio extends MortarCommand private CommandIrisStudioUpdate update; @Command - private CommandIrisMap map; + private CommandIrisStudioMap map; @Command private CommandIrisStudioList list; @Command - private CommandIrisGoto got0; + private CommandIrisStudioGoto got0; @Command - private CommandIrisEditBiome ebiome; + private CommandIrisStudioEditBiome ebiome; @Command - private CommandIrisMetrics metrics; + private CommandIrisStudioHotload hotload; @Command - private CommandIrisPregen pregen; - - @Command - private CommandIrisPregen world; - - @Command - private CommandIrisHotload hotload; - - @Command - private CommandIrisCTC ctc; - - @Command - private CommandIrisLMM lmm; - - @Command - private CommandIrisLoot loot; + private CommandIrisStudioLoot loot; public CommandIrisStudio() { @@ -71,6 +57,12 @@ public class CommandIrisStudio extends MortarCommand @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; + } + sender.sendMessage("Iris Studio Commands"); printHelp(sender); return true; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java index bdfcde69d..6659287f1 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java @@ -5,6 +5,7 @@ import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -21,6 +22,12 @@ public class CommandIrisStudioClose extends MortarCommand @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("No open projects."); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java index 0cba9d236..b96dfb128 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java @@ -1,6 +1,7 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.C; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -18,6 +19,12 @@ public class CommandIrisStudioCreate extends MortarCommand @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(args.length != 1) { sender.sendMessage("Please use a lowercase name with hyphens (-) for spaces."); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java index 02af88026..0173ba162 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioDownload.java @@ -1,6 +1,7 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.C; import com.volmit.iris.util.J; import com.volmit.iris.util.MortarCommand; @@ -19,6 +20,12 @@ public class CommandIrisStudioDownload extends MortarCommand @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(args.length < 1) { sender.sendMessage("/iris std dl " + C.BOLD + ""); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioEditBiome.java similarity index 77% rename from src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java rename to src/main/java/com/volmit/iris/command/CommandIrisStudioEditBiome.java index 5869c051d..d916a108d 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisEditBiome.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioEditBiome.java @@ -6,12 +6,13 @@ import java.io.File; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -public class CommandIrisEditBiome extends MortarCommand +public class CommandIrisStudioEditBiome extends MortarCommand { - public CommandIrisEditBiome() + public CommandIrisStudioEditBiome() { super("editbiome", "ebiome", "eb"); setDescription("Open this biome file in vscode"); @@ -22,6 +23,12 @@ public class CommandIrisEditBiome extends MortarCommand @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(sender.isPlayer()) { Player p = sender.player(); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisGoto.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java similarity index 91% rename from src/main/java/com/volmit/iris/command/CommandIrisGoto.java rename to src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java index dba8b9d3a..3779a5151 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisGoto.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java @@ -5,15 +5,16 @@ import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.gen.IrisChunkGenerator; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.RNG; -public class CommandIrisGoto extends MortarCommand +public class CommandIrisStudioGoto extends MortarCommand { - public CommandIrisGoto() + public CommandIrisStudioGoto() { super("goto", "find"); setDescription("Find any biome or a biome border"); @@ -24,6 +25,12 @@ public class CommandIrisGoto extends MortarCommand @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(args.length < 1) { sender.sendMessage("/iris world goto " + getArgsUsage()); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisHotload.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java similarity index 61% rename from src/main/java/com/volmit/iris/command/CommandIrisHotload.java rename to src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java index 786181d39..cbf9996fd 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisHotload.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java @@ -4,12 +4,15 @@ import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.gen.IrisChunkGenerator; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -public class CommandIrisHotload extends MortarCommand { - public CommandIrisHotload() { +public class CommandIrisStudioHotload extends MortarCommand +{ + public CommandIrisStudioHotload() + { super("hotload", "hot", "h", "reload"); setDescription("Force a hotload"); requiresPermission(Iris.perm.studio); @@ -17,12 +20,21 @@ public class CommandIrisHotload extends MortarCommand { } @Override - public boolean handle(MortarSender sender, String[] args) { - if (sender.isPlayer()) { + 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(sender.isPlayer()) + { Player p = sender.player(); World world = p.getWorld(); - if (!(world.getGenerator() instanceof IrisChunkGenerator)) { + if(!(world.getGenerator() instanceof IrisChunkGenerator)) + { sender.sendMessage("You must be in an iris world."); return true; } @@ -33,7 +45,8 @@ public class CommandIrisHotload extends MortarCommand { return true; } - else { + else + { sender.sendMessage("Players only."); } @@ -41,7 +54,8 @@ public class CommandIrisHotload extends MortarCommand { } @Override - protected String getArgsUsage() { + protected String getArgsUsage() + { return ""; } } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioList.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioList.java index 83ad32fed..c25193182 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioList.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioList.java @@ -3,6 +3,7 @@ package com.volmit.iris.command; import java.io.File; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -20,6 +21,12 @@ public class CommandIrisStudioList extends MortarCommand @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; + } + int m = 0; for(File i : Iris.globaldata.getDimensionLoader().getFolders()) { diff --git a/src/main/java/com/volmit/iris/command/CommandIrisLoot.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioLoot.java similarity index 89% rename from src/main/java/com/volmit/iris/command/CommandIrisLoot.java rename to src/main/java/com/volmit/iris/command/CommandIrisStudioLoot.java index 32a6acec9..8d2f0aabc 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisLoot.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioLoot.java @@ -6,6 +6,7 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.object.InventorySlotType; import com.volmit.iris.object.IrisLootTable; import com.volmit.iris.util.KList; @@ -14,9 +15,9 @@ import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.O; import com.volmit.iris.util.RNG; -public class CommandIrisLoot extends MortarCommand +public class CommandIrisStudioLoot extends MortarCommand { - public CommandIrisLoot() + public CommandIrisStudioLoot() { super("loot"); setDescription("Show loot if a chest were right here"); @@ -27,6 +28,12 @@ public class CommandIrisLoot extends MortarCommand @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(sender.isPlayer()) { Player p = sender.player(); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisMap.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java similarity index 59% rename from src/main/java/com/volmit/iris/command/CommandIrisMap.java rename to src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java index 8abf28763..3ac1d0103 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisMap.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java @@ -1,14 +1,15 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.gen.IrisChunkGenerator; import com.volmit.iris.gui.IrisVision; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -public class CommandIrisMap extends MortarCommand +public class CommandIrisStudioMap extends MortarCommand { - public CommandIrisMap() + public CommandIrisStudioMap() { super("map", "render"); setDescription("Render a map (gui outside of mc)"); @@ -19,6 +20,18 @@ public class CommandIrisMap extends MortarCommand @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(!IrisSettings.get().isUseServerLaunchedGuis()) + { + sender.sendMessage("To use Iris Guis, please enable serverLaunchedGuis in Iris/settings.json"); + return true; + } + IrisChunkGenerator g = Iris.proj.getCurrentProject(); IrisVision.launch(g); sender.sendMessage("Opening Map!"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java index 81a6ec779..82005f301 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java @@ -1,6 +1,7 @@ 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; @@ -17,6 +18,12 @@ public class CommandIrisStudioOpen extends MortarCommand @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(args.length != 1) { sender.sendMessage("/iris std open (file name without .json)"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java index 5f7a4ea03..6b2312c47 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java @@ -1,6 +1,7 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.J; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -18,6 +19,12 @@ public class CommandIrisStudioPackage extends MortarCommand @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(args.length == 0) { sender.sendMessage("/iris std package [-o]"); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java index 6cb13643e..b56b4c6b2 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java @@ -1,11 +1,14 @@ 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 CommandIrisStudioUpdate extends MortarCommand { - public CommandIrisStudioUpdate() { +public class CommandIrisStudioUpdate extends MortarCommand +{ + public CommandIrisStudioUpdate() + { super("update", "upd"); requiresPermission(Iris.perm.studio); setDescription("Update your dimension project."); @@ -13,8 +16,16 @@ public class CommandIrisStudioUpdate extends MortarCommand { } @Override - public boolean handle(MortarSender sender, String[] args) { - if (args.length == 0) { + 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(args.length == 0) + { sender.sendMessage("/iris std package "); return true; } @@ -25,7 +36,8 @@ public class CommandIrisStudioUpdate extends MortarCommand { } @Override - protected String getArgsUsage() { + protected String getArgsUsage() + { return "[dimension]"; } } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioVerify.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioVerify.java index df3fe500d..8fb35cf63 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioVerify.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioVerify.java @@ -1,12 +1,15 @@ package com.volmit.iris.command; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -public class CommandIrisStudioVerify extends MortarCommand { - public CommandIrisStudioVerify() { +public class CommandIrisStudioVerify extends MortarCommand +{ + public CommandIrisStudioVerify() + { super("verify", "check", "v"); requiresPermission(Iris.perm.studio); setDescription("Check project for warnings and issues"); @@ -14,8 +17,16 @@ public class CommandIrisStudioVerify extends MortarCommand { } @Override - public boolean handle(MortarSender sender, String[] args) { - if (args.length != 1) { + 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(args.length != 1) + { sender.sendMessage("/iris std verify (file name without .json)"); } @@ -25,12 +36,15 @@ public class CommandIrisStudioVerify extends MortarCommand { int e = 0; int w = 0; - for (String i : mm) { - if (i.contains("ERROR")) { + for(String i : mm) + { + if(i.contains("ERROR")) + { e++; } - if (i.contains("WARN")) { + if(i.contains("WARN")) + { w++; } } @@ -42,7 +56,8 @@ public class CommandIrisStudioVerify extends MortarCommand { } @Override - protected String getArgsUsage() { + protected String getArgsUsage() + { return "[dimension]"; } } diff --git a/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java b/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java index c99161c0b..80605f76e 100644 --- a/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java @@ -196,7 +196,7 @@ public class IrisChunkGenerator extends PostBlockChunkGenerator implements IrisC @Override public void onHotloaded() { - if(!IrisSettings.get().hotloading) + if(!IrisSettings.get().isStudio()) { return; } diff --git a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java index 7963f0221..ef7780534 100644 --- a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java @@ -85,7 +85,6 @@ public class ObjectResourceLoader extends ResourceLoader IrisObject t = new IrisObject(0, 0, 0); t.read(j); loadCache.put(key, t); - Iris.hotloader.track(j); J.a(() -> Iris.verbose("Loading " + resourceTypeName + ": " + j.getPath())); t.setLoadKey(name); lock.unlock(); diff --git a/src/main/java/com/volmit/iris/util/ResourceLoader.java b/src/main/java/com/volmit/iris/util/ResourceLoader.java index d1bb32788..2968f6415 100644 --- a/src/main/java/com/volmit/iris/util/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ResourceLoader.java @@ -83,7 +83,6 @@ public class ResourceLoader { T t = new Gson().fromJson(IO.readAll(j), objectClass); loadCache.put(key, t); - Iris.hotloader.track(j); J.a(() -> Iris.verbose("Loading " + resourceTypeName + ": " + j.getPath())); t.setLoadKey(name); t.setLoadFile(j);