From e5cc9a3cbfe87cebbee094958d633929cde02999 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 16 Jul 2021 04:59:51 -0400 Subject: [PATCH] VolmitSender --- .../volmit/iris/core/ConversionManager.java | 6 ++--- .../com/volmit/iris/core/IrisProject.java | 10 ++++----- .../com/volmit/iris/core/ProjectManager.java | 22 +++++++++---------- .../com/volmit/iris/core/WandManager.java | 4 ++-- .../volmit/iris/core/command/CommandIris.java | 6 ++--- .../core/command/CommandIrisDownload.java | 6 ++--- .../iris/core/command/CommandIrisMetrics.java | 6 ++--- .../iris/core/command/CommandIrisReload.java | 6 ++--- .../command/CommandIrisUpdateProject.java | 6 ++--- .../command/jigsaw/CommandIrisJigsaw.java | 6 ++--- .../command/jigsaw/CommandIrisJigsawEdit.java | 6 ++--- .../command/jigsaw/CommandIrisJigsawExit.java | 6 ++--- .../command/jigsaw/CommandIrisJigsawNew.java | 6 ++--- .../jigsaw/CommandIrisJigsawPlace.java | 6 ++--- .../command/jigsaw/CommandIrisJigsawSave.java | 6 ++--- .../command/object/CommandIrisObject.java | 6 ++--- .../object/CommandIrisObjectContract.java | 6 ++--- .../command/object/CommandIrisObjectDust.java | 6 ++--- .../object/CommandIrisObjectExpand.java | 6 ++--- .../command/object/CommandIrisObjectP1.java | 6 ++--- .../command/object/CommandIrisObjectP2.java | 6 ++--- .../object/CommandIrisObjectPaste.java | 6 ++--- .../command/object/CommandIrisObjectSave.java | 6 ++--- .../object/CommandIrisObjectShift.java | 6 ++--- .../command/object/CommandIrisObjectWand.java | 6 ++--- .../command/object/CommandIrisObjectXAY.java | 6 ++--- .../command/object/CommandIrisObjectXPY.java | 6 ++--- .../command/studio/CommandIrisStudio.java | 6 ++--- .../studio/CommandIrisStudioBeautify.java | 8 +++---- .../studio/CommandIrisStudioClose.java | 6 ++--- .../studio/CommandIrisStudioConvert.java | 6 ++--- .../studio/CommandIrisStudioCreate.java | 6 ++--- .../studio/CommandIrisStudioEditBiome.java | 6 ++--- .../studio/CommandIrisStudioExplorer.java | 6 ++--- .../CommandIrisStudioExplorerGenerator.java | 6 ++--- .../studio/CommandIrisStudioHotload.java | 6 ++--- .../command/studio/CommandIrisStudioLoot.java | 6 ++--- .../command/studio/CommandIrisStudioMap.java | 6 ++--- .../command/studio/CommandIrisStudioOpen.java | 6 ++--- .../studio/CommandIrisStudioPackage.java | 6 ++--- .../studio/CommandIrisStudioProfile.java | 6 ++--- .../studio/CommandIrisStudioSummon.java | 6 ++--- .../studio/CommandIrisStudioTPStudio.java | 6 ++--- .../studio/CommandIrisStudioUpdate.java | 6 ++--- .../core/command/what/CommandIrisWhat.java | 6 ++--- .../command/what/CommandIrisWhatBiome.java | 6 ++--- .../command/what/CommandIrisWhatBlock.java | 6 ++--- .../command/what/CommandIrisWhatHand.java | 6 ++--- .../command/what/CommandIrisWhatObjects.java | 6 ++--- .../core/command/world/CommandIrisCreate.java | 6 ++--- .../core/command/world/CommandIrisFix.java | 6 ++--- .../core/command/world/CommandIrisPregen.java | 6 ++--- .../core/command/world/CommandIrisRegen.java | 6 ++--- .../command/world/CommandIrisUpdateWorld.java | 6 ++--- .../core/command/world/CommandLocate.java | 6 ++--- .../volmit/iris/core/edit/DustRevealer.java | 4 ++-- .../com/volmit/iris/engine/IrisWorlds.java | 4 ++-- .../com/volmit/iris/util/plugin/ICommand.java | 4 ++-- .../iris/util/plugin/MortarCommand.java | 8 +++---- .../iris/util/plugin/VirtualCommand.java | 4 ++-- .../{MortarSender.java => VolmitSender.java} | 6 ++--- 61 files changed, 190 insertions(+), 190 deletions(-) rename src/main/java/com/volmit/iris/util/plugin/{MortarSender.java => VolmitSender.java} (97%) diff --git a/src/main/java/com/volmit/iris/core/ConversionManager.java b/src/main/java/com/volmit/iris/core/ConversionManager.java index 4fee078f8..e2b2c291e 100644 --- a/src/main/java/com/volmit/iris/core/ConversionManager.java +++ b/src/main/java/com/volmit/iris/core/ConversionManager.java @@ -35,7 +35,7 @@ import com.volmit.iris.util.io.Converter; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.SKConversion; import com.volmit.iris.util.json.JSONObject; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -99,7 +99,7 @@ public class ConversionManager { return poolReference.split("\\Q:\\E")[1]; } - public void convertStructures(File in, File out, MortarSender s) { + public void convertStructures(File in, File out, VolmitSender s) { KMap pools = new KMap<>(); KList roots = new KList<>(); AtomicInteger total = new AtomicInteger(0); @@ -240,7 +240,7 @@ public class ConversionManager { } } - public void check(MortarSender s) { + public void check(VolmitSender s) { int m = 0; Iris.instance.getDataFolder("convert"); diff --git a/src/main/java/com/volmit/iris/core/IrisProject.java b/src/main/java/com/volmit/iris/core/IrisProject.java index 525bbdf51..e300dd604 100644 --- a/src/main/java/com/volmit/iris/core/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/IrisProject.java @@ -36,7 +36,7 @@ import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.M; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.O; @@ -171,13 +171,13 @@ public class IrisProject { return collectFiles(path, json); } - public void open(MortarSender sender) { + public void open(VolmitSender sender) { open(sender, () -> { }); } - public void open(MortarSender sender, Runnable onDone) { + public void open(VolmitSender sender, Runnable onDone) { if (isOpen()) { close(); } @@ -253,7 +253,7 @@ public class IrisProject { J.a(() -> { double last = 0; - int req = 900; + int req = 400; while (gx.getGenerated() < req) { assert gx != null; @@ -402,7 +402,7 @@ public class IrisProject { return o; } - public File compilePackage(MortarSender sender, boolean obfuscate, boolean minify) { + public File compilePackage(VolmitSender sender, boolean obfuscate, boolean minify) { String dimm = getName(); IrisDataManager dm = new IrisDataManager(path); IrisDimension dimension = dm.getDimensionLoader().load(dimm); diff --git a/src/main/java/com/volmit/iris/core/ProjectManager.java b/src/main/java/com/volmit/iris/core/ProjectManager.java index f121986d3..fe7c45638 100644 --- a/src/main/java/com/volmit/iris/core/ProjectManager.java +++ b/src/main/java/com/volmit/iris/core/ProjectManager.java @@ -28,7 +28,7 @@ import com.volmit.iris.util.format.Form; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONException; import com.volmit.iris.util.json.JSONObject; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import lombok.Data; import org.zeroturnaround.zip.ZipUtil; @@ -89,7 +89,7 @@ public class ProjectManager { }); } - public IrisDimension installIntoWorld(MortarSender sender, String type, File folder) { + public IrisDimension installIntoWorld(VolmitSender sender, String type, File folder) { sender.sendMessage("Looking for Package: " + type); File iris = new File(folder, "iris"); File irispack = new File(folder, "iris/pack"); @@ -158,11 +158,11 @@ public class ProjectManager { return dim; } - public void downloadSearch(MortarSender sender, String key, boolean trim) { + public void downloadSearch(VolmitSender sender, String key, boolean trim) { downloadSearch(sender, key, trim, false); } - public void downloadSearch(MortarSender sender, String key, boolean trim, boolean forceOverwrite) { + public void downloadSearch(VolmitSender sender, String key, boolean trim, boolean forceOverwrite) { String url = "?"; try { @@ -181,11 +181,11 @@ public class ProjectManager { } } - public void download(MortarSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException { + public void download(VolmitSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException { download(sender, repo, branch, trim, false); } - public void download(MortarSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException { + public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException { String url = "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch; sender.sendMessage("Downloading " + url); File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url); @@ -309,7 +309,7 @@ public class ProjectManager { return activeProject != null && activeProject.isOpen(); } - public void open(MortarSender sender, String dimm) { + public void open(VolmitSender sender, String dimm) { try { open(sender, dimm, () -> { @@ -323,7 +323,7 @@ public class ProjectManager { } } - public void open(MortarSender sender, String dimm, Runnable onDone) { + public void open(VolmitSender sender, String dimm, Runnable onDone) { if (isProjectOpen()) { close(); } @@ -348,7 +348,7 @@ public class ProjectManager { } } - public File compilePackage(MortarSender sender, String d, boolean obfuscate, boolean minify) { + public File compilePackage(VolmitSender sender, String d, boolean obfuscate, boolean minify) { return new IrisProject(new File(getWorkspaceFolder(), d)).compilePackage(sender, obfuscate, minify); } @@ -403,7 +403,7 @@ public class ProjectManager { } } - public void create(MortarSender sender, String s, String downloadable) { + public void create(VolmitSender sender, String s, String downloadable) { boolean shouldDelete = false; File importPack = getWorkspaceFolder(downloadable); @@ -435,7 +435,7 @@ public class ProjectManager { open(sender, s); } - public void create(MortarSender sender, String s) { + public void create(VolmitSender sender, String s) { create(sender, s, "example"); } diff --git a/src/main/java/com/volmit/iris/core/WandManager.java b/src/main/java/com/volmit/iris/core/WandManager.java index f891a5d5f..dbcdfb43a 100644 --- a/src/main/java/com/volmit/iris/core/WandManager.java +++ b/src/main/java/com/volmit/iris/core/WandManager.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.M; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; @@ -164,7 +164,7 @@ public class WandManager implements Listener { if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) { e.setCancelled(true); e.getPlayer().playSound(Objects.requireNonNull(e.getClickedBlock()).getLocation(), Sound.ENTITY_ENDER_EYE_DEATH, 2f, 1.97f); - DustRevealer.spawn(e.getClickedBlock(), new MortarSender(e.getPlayer(), Iris.instance.getTag())); + DustRevealer.spawn(e.getClickedBlock(), new VolmitSender(e.getPlayer(), Iris.instance.getTag())); } } diff --git a/src/main/java/com/volmit/iris/core/command/CommandIris.java b/src/main/java/com/volmit/iris/core/command/CommandIris.java index 4110a63d2..16bde75eb 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIris.java @@ -27,7 +27,7 @@ import com.volmit.iris.core.command.world.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIris extends MortarCommand { @Command @@ -75,14 +75,14 @@ public class CommandIris extends MortarCommand { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { sender.sendMessage("Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software"); printHelp(sender); return true; } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java b/src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java index 745812cac..d73edd739 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; public class CommandIrisDownload extends MortarCommand { @@ -35,12 +35,12 @@ public class CommandIrisDownload extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (args.length < 1) { sender.sendMessage("/iris dl " + C.BOLD + ""); return true; diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java b/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java index bc28d5930..df8604d65 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java @@ -23,7 +23,7 @@ import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.World; import org.bukkit.entity.Player; @@ -37,12 +37,12 @@ public class CommandIrisMetrics extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (sender.isPlayer()) { Player p = sender.player(); World world = p.getWorld(); diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java b/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java index 2f5f52c16..50c6a1f49 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisReload extends MortarCommand { public CommandIrisReload() { @@ -33,12 +33,12 @@ public class CommandIrisReload extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { IrisSettings.invalidate(); IrisSettings.get(); sender.sendMessage("settings.json Reloaded"); diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java b/src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java index bf5260312..6b72f80b6 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; public class CommandIrisUpdateProject extends MortarCommand { @@ -34,12 +34,12 @@ public class CommandIrisUpdateProject extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (args.length < 1) { sender.sendMessage("/iris update-project " + C.BOLD + ""); return true; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java index 9a7942a62..fce3ce457 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisJigsaw extends MortarCommand { @Command @@ -46,12 +46,12 @@ public class CommandIrisJigsaw extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Jigsaw, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java index dff8b7d22..471da36e2 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java @@ -25,7 +25,7 @@ import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.engine.object.IrisJigsawPiece; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import java.io.File; @@ -38,12 +38,12 @@ public class CommandIrisJigsawEdit extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Jigsaw, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java index 6b3c18c9c..abefeba4c 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisJigsawExit extends MortarCommand { public CommandIrisJigsawExit() { @@ -34,12 +34,12 @@ public class CommandIrisJigsawExit extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Jigsaw, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java index 797cdcdd6..136719da4 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java @@ -25,7 +25,7 @@ import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import java.io.File; @@ -38,12 +38,12 @@ public class CommandIrisJigsawNew extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Jigsaw, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java index e63bb4591..c9e216a50 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java @@ -28,7 +28,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.PrecisionStopwatch; public class CommandIrisJigsawPlace extends MortarCommand { @@ -40,12 +40,12 @@ public class CommandIrisJigsawPlace extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Jigsaw, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java index 052c64441..2a4be24a2 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisJigsawSave extends MortarCommand { public CommandIrisJigsawSave() { @@ -34,12 +34,12 @@ public class CommandIrisJigsawSave extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Jigsaw, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java index 9e7e53048..58750306f 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisObject extends MortarCommand { @Command @@ -67,12 +67,12 @@ public class CommandIrisObject extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java index dd4925021..70d876d8f 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.math.Direction; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -40,12 +40,12 @@ public class CommandIrisObjectContract extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java index ea58a5025..fccd5b92f 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.WandManager; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Sound; public class CommandIrisObjectDust extends MortarCommand { @@ -35,12 +35,12 @@ public class CommandIrisObjectDust extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java index a0e3947c2..232283154 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.math.Direction; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -40,12 +40,12 @@ public class CommandIrisObjectExpand extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java index a19c4d494..a84c73acd 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.WandManager; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -38,13 +38,13 @@ public class CommandIrisObjectP1 extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @SuppressWarnings("deprecation") @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java index a7611df55..f3f3c183a 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.WandManager; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -38,13 +38,13 @@ public class CommandIrisObjectP2 extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @SuppressWarnings("deprecation") @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java index fabc9bc60..65507966e 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java @@ -26,7 +26,7 @@ import com.volmit.iris.core.WandManager; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -43,12 +43,12 @@ public class CommandIrisObjectPaste extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java index 62ac57899..65a9d224c 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java @@ -24,7 +24,7 @@ import com.volmit.iris.core.WandManager; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -41,12 +41,12 @@ public class CommandIrisObjectSave extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java index 3efa746cd..5a31120fd 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.math.Direction; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -40,12 +40,12 @@ public class CommandIrisObjectShift extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java index af500ab7c..e71914784 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.WandManager; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Sound; public class CommandIrisObjectWand extends MortarCommand { @@ -36,12 +36,12 @@ public class CommandIrisObjectWand extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java index 286767a13..7a4d41a0f 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.data.Cuboid.CuboidDirection; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; @@ -42,12 +42,12 @@ public class CommandIrisObjectXAY extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java index c130237f1..caed13059 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.data.Cuboid.CuboidDirection; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; @@ -41,12 +41,12 @@ public class CommandIrisObjectXPY extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio Objects, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java index 5bb736beb..198c5cae6 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudio extends MortarCommand { @Command @@ -84,12 +84,12 @@ public class CommandIrisStudio extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java index dafa7fd51..1046053bb 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.format.Form; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import java.io.File; @@ -38,12 +38,12 @@ public class CommandIrisStudioBeautify extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; @@ -72,7 +72,7 @@ public class CommandIrisStudioBeautify extends MortarCommand { return true; } - private int clean(MortarSender s, File clean) { + private int clean(VolmitSender s, File clean) { int c = 0; if (clean.isDirectory()) { for (File i : clean.listFiles()) { diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java index f1e817e2e..6be720bbc 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; @@ -36,12 +36,12 @@ public class CommandIrisStudioClose extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java index af566661c..a850a94df 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioConvert extends MortarCommand { public CommandIrisStudioConvert() { @@ -33,12 +33,12 @@ public class CommandIrisStudioConvert extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java index 898362403..2498d17a9 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioCreate extends MortarCommand { public CommandIrisStudioCreate() { @@ -34,12 +34,12 @@ public class CommandIrisStudioCreate extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java index 019c47989..ddcaf70fb 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.entity.Player; import java.awt.*; @@ -37,12 +37,12 @@ public class CommandIrisStudioEditBiome extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java index 3e1e6dc9d..f03483047 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java @@ -24,7 +24,7 @@ import com.volmit.iris.core.gui.IrisExplorer; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioExplorer extends MortarCommand { @Command @@ -38,12 +38,12 @@ public class CommandIrisStudioExplorer extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (args.length != 0) { printHelp(sender); } else { diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java index 154f8e203..7fe029d98 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java @@ -26,7 +26,7 @@ import com.volmit.iris.engine.object.IrisGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioExplorerGenerator extends MortarCommand { public CommandIrisStudioExplorerGenerator() { @@ -37,12 +37,12 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java index d4756b700..cbac87405 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.World; import org.bukkit.entity.Player; @@ -37,12 +37,12 @@ public class CommandIrisStudioHotload extends MortarCommand { @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java index c33de13de..b66dd685d 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java @@ -27,7 +27,7 @@ import com.volmit.iris.engine.object.IrisLootTable; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.O; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -43,12 +43,12 @@ public class CommandIrisStudioLoot extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java index b6c7c9e6d..94b0b3036 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java @@ -26,7 +26,7 @@ import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioMap extends MortarCommand { public CommandIrisStudioMap() { @@ -37,12 +37,12 @@ public class CommandIrisStudioMap extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java index cbbbf705d..13cee14b2 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioOpen extends MortarCommand { public CommandIrisStudioOpen() { @@ -33,12 +33,12 @@ public class CommandIrisStudioOpen extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java index a658b6ced..5d222f2bd 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; public class CommandIrisStudioPackage extends MortarCommand { @@ -34,12 +34,12 @@ public class CommandIrisStudioPackage extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java index 8a6c3fd5b..e3b885510 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java @@ -32,7 +32,7 @@ import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; @@ -48,12 +48,12 @@ public class CommandIrisStudioProfile extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java index 9793dd218..6239eecdc 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java @@ -26,7 +26,7 @@ import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.IrisEntity; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; @@ -40,12 +40,12 @@ public class CommandIrisStudioSummon extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java index 5536709b5..63d0af4bd 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.GameMode; public class CommandIrisStudioTPStudio extends MortarCommand { @@ -34,12 +34,12 @@ public class CommandIrisStudioTPStudio extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java index c24f8d1ad..1b443239e 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisProject; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisStudioUpdate extends MortarCommand { public CommandIrisStudioUpdate() { @@ -34,12 +34,12 @@ public class CommandIrisStudioUpdate extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java index 8ae9181f1..877b312a7 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisWhat extends MortarCommand { @Command @@ -46,12 +46,12 @@ public class CommandIrisWhat extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { sender.sendMessage("Iris 'What' Commands:"); printHelp(sender); return true; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java index d5d063037..39b6727ca 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java @@ -25,7 +25,7 @@ import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.entity.Player; @@ -40,12 +40,12 @@ public class CommandIrisWhatBiome extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (sender.isPlayer()) { Player p = sender.player(); World w = p.getWorld(); diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java index 6446cbc48..71a9015df 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java @@ -23,7 +23,7 @@ import com.volmit.iris.engine.data.B; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.FluidCollisionMode; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; @@ -38,12 +38,12 @@ public class CommandIrisWhatBlock extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (sender.isPlayer()) { BlockData bd; Player p = sender.player(); diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java index 8e7d1e16b..b5ad52fa5 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; @@ -37,12 +37,12 @@ public class CommandIrisWhatHand extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (sender.isPlayer()) { Player p = sender.player(); try { diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java index 70da26d02..b86d8939d 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java @@ -31,7 +31,7 @@ import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import io.papermc.lib.PaperLib; import org.bukkit.*; import org.bukkit.entity.Player; @@ -57,13 +57,13 @@ public class CommandIrisWhatObjects extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (sender.isPlayer()) { Player p = sender.player(); World world = p.getWorld(); diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java index 5cde775ce..10131a150 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java @@ -30,7 +30,7 @@ import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.O; import org.bukkit.Bukkit; @@ -51,7 +51,7 @@ public class CommandIrisCreate extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { if (args.length == 0 || args[args.length - 1].equals("")) { //They are about to type a new argument list.addAll(getBase(args)); return; @@ -109,7 +109,7 @@ public class CommandIrisCreate extends MortarCommand { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (args.length < 1) { sender.sendMessage("/iris create [type=overworld] [seed=1337] [pregen=5000]"); return true; diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java index 73c78d1f7..97d46bbac 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java @@ -25,7 +25,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import java.util.concurrent.atomic.AtomicInteger; @@ -39,12 +39,12 @@ public class CommandIrisFix extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { try { IrisAccess a = IrisWorlds.access(sender.player().getWorld()); if (a.getCompound().getSize() > 1) { diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java index 4db2e1475..66adeeca2 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.gui.Pregenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; @@ -44,7 +44,7 @@ public class CommandIrisPregen extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { list.add("stop"); list.add("pause"); list.add("resume"); @@ -62,7 +62,7 @@ public class CommandIrisPregen extends MortarCommand { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (args.length == 0) { sender.sendMessage("/iris pregen "); return true; diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java index 737d44730..f90c6ac55 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java @@ -21,7 +21,7 @@ package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; public class CommandIrisRegen extends MortarCommand { public CommandIrisRegen() { @@ -32,12 +32,12 @@ public class CommandIrisRegen extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { sender.sendMessage("Iris' /regen command is currently disabled due to maintenance. Apologies."); return true; /* This is commented yes diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java index 0ee1be8e7..24b2ee5fd 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import java.io.File; @@ -36,12 +36,12 @@ public class CommandIrisUpdateWorld extends MortarCommand { } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { if (args.length < 2) { sender.sendMessage("/iris update-world " + C.BOLD + " "); return true; diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandLocate.java b/src/main/java/com/volmit/iris/core/command/world/CommandLocate.java index 20a84e074..7f6b02a0b 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandLocate.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandLocate.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -56,13 +56,13 @@ public class CommandLocate extends MortarCommand implements Listener { } @Override - public boolean handle(MortarSender sender, String[] args) { + public boolean handle(VolmitSender sender, String[] args) { Bukkit.dispatchCommand(sender, "/ir std goto " + Arrays.toString(args)); return true; } @Override - public void addTabOptions(MortarSender sender, String[] args, KList list) { + public void addTabOptions(VolmitSender sender, String[] args, KList list) { } diff --git a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java index c22c91f39..750e975c3 100644 --- a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java +++ b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java @@ -25,7 +25,7 @@ import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import lombok.Data; import org.bukkit.World; @@ -40,7 +40,7 @@ public class DustRevealer { private final String key; private final KList hits; - public static void spawn(Block block, MortarSender sender) { + public static void spawn(Block block, VolmitSender sender) { World world = block.getWorld(); IrisAccess access = IrisWorlds.access(world); diff --git a/src/main/java/com/volmit/iris/engine/IrisWorlds.java b/src/main/java/com/volmit/iris/engine/IrisWorlds.java index ab4f962b1..8876062ec 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorlds.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorlds.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.framework.IrisAccessProvider; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; @@ -63,7 +63,7 @@ public class IrisWorlds { for (World i : Bukkit.getWorlds()) { if (!i.getName().equals(world.getName())) { for (Player j : world.getPlayers()) { - new MortarSender(j, Iris.instance.getTag()).sendMessage("You have been evacuated from this world."); + new VolmitSender(j, Iris.instance.getTag()).sendMessage("You have been evacuated from this world."); j.teleport(i.getSpawnLocation()); } diff --git a/src/main/java/com/volmit/iris/util/plugin/ICommand.java b/src/main/java/com/volmit/iris/util/plugin/ICommand.java index 645afca35..988292568 100644 --- a/src/main/java/com/volmit/iris/util/plugin/ICommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/ICommand.java @@ -64,7 +64,7 @@ public interface ICommand { * @param args the arguments after this command node * @return return true to mark it as handled */ - boolean handle(MortarSender sender, String[] args); + boolean handle(VolmitSender sender, String[] args); - KList handleTab(MortarSender sender, String[] args); + KList handleTab(VolmitSender sender, String[] args); } diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java index d73e5069d..741b75892 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java @@ -57,7 +57,7 @@ public abstract class MortarCommand implements ICommand { } @Override - public KList handleTab(MortarSender sender, String[] args) { + public KList handleTab(VolmitSender sender, String[] args) { KList v = new KList<>(); if (args.length == 0) { for (MortarCommand i : getChildren()) { @@ -78,9 +78,9 @@ public abstract class MortarCommand implements ICommand { return v; } - public abstract void addTabOptions(MortarSender sender, String[] args, KList list); + public abstract void addTabOptions(VolmitSender sender, String[] args, KList list); - public void printHelp(MortarSender sender) { + public void printHelp(VolmitSender sender) { boolean b = false; for (MortarCommand i : getChildren()) { @@ -130,7 +130,7 @@ public abstract class MortarCommand implements ICommand { requiredPermissions.add(node); } - public void rejectAny(int past, MortarSender sender, String[] a) { + public void rejectAny(int past, VolmitSender sender, String[] a) { if (a.length > past) { int p = past; diff --git a/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java b/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java index d27b24bd8..ac70b185e 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java @@ -83,7 +83,7 @@ public class VirtualCommand { } public boolean hit(CommandSender sender, KList chain, String label) { - MortarSender vs = new MortarSender(sender); + VolmitSender vs = new VolmitSender(sender); vs.setTag(tag); if (label != null) { @@ -126,7 +126,7 @@ public class VirtualCommand { } public KList hitTab(CommandSender sender, KList chain, String label) { - MortarSender vs = new MortarSender(sender); + VolmitSender vs = new VolmitSender(sender); vs.setTag(tag); if (label != null) diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java similarity index 97% rename from src/main/java/com/volmit/iris/util/plugin/MortarSender.java rename to src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 962c71eb9..4be159935 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -39,7 +39,7 @@ import java.util.UUID; * * @author cyberpwn */ -public class MortarSender implements CommandSender { +public class VolmitSender implements CommandSender { private final CommandSender s; private String tag; @@ -52,12 +52,12 @@ public class MortarSender implements CommandSender { * * @param s the command sender */ - public MortarSender(CommandSender s) { + public VolmitSender(CommandSender s) { tag = ""; this.s = s; } - public MortarSender(CommandSender s, String tag) { + public VolmitSender(CommandSender s, String tag) { this.tag = tag; this.s = s; }