mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 18:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

VolmitSender

Browse Source
This commit is contained in:
Daniel Mills 2021-07-16 04:59:51 -04:00
parent 985979ab14
commit e5cc9a3cbf
61 changed files with 190 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/volmit/iris/core/ConversionManager.java
View File

@ -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<String, IrisJigsawPool> pools = new KMap<>();
KList<File> 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");

10
src/main/java/com/volmit/iris/core/IrisProject.java
View File

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

22
src/main/java/com/volmit/iris/core/ProjectManager.java
View File

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

4
src/main/java/com/volmit/iris/core/WandManager.java
View File

@ -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()));
}
}

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

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
}

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

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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 + "<NAME>");
return true;

6
src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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();

6
src/main/java/com/volmit/iris/core/command/CommandIrisReload.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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");

6
src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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 + "<PROJECT>");
return true;

6
src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

8
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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()) {

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
}
@Override
public boolean handle(MortarSender sender, String[] args) {
public boolean handle(VolmitSender sender, String[] args) {
if (args.length != 0) {
printHelp(sender);
} else {

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

6
src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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();

6
src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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();

6
src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
}
@Override
public boolean handle(MortarSender sender, String[] args) {
public boolean handle(VolmitSender sender, String[] args) {
if (sender.isPlayer()) {
Player p = sender.player();
try {

6
src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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();

6
src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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 <NAME> [type=overworld] [seed=1337] [pregen=5000]");
return true;

6
src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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) {

6
src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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 <blocks-wide|stop>");
return true;

6
src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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

6
src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> 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 + "<WORLD> <PROJECT>");
return true;

6
src/main/java/com/volmit/iris/core/command/world/CommandLocate.java
View File

@ -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<String> list) {
public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
}

4
src/main/java/com/volmit/iris/core/edit/DustRevealer.java
View File

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

4
src/main/java/com/volmit/iris/engine/IrisWorlds.java
View File

@ -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());
}

4
src/main/java/com/volmit/iris/util/plugin/ICommand.java
View File

@ -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<String> handleTab(MortarSender sender, String[] args);
KList<String> handleTab(VolmitSender sender, String[] args);
}

8
src/main/java/com/volmit/iris/util/plugin/MortarCommand.java
View File

@ -57,7 +57,7 @@ public abstract class MortarCommand implements ICommand {
}
@Override
public KList<String> handleTab(MortarSender sender, String[] args) {
public KList<String> handleTab(VolmitSender sender, String[] args) {
KList<String> 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<String> list);
public abstract void addTabOptions(VolmitSender sender, String[] args, KList<String> 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;

4
src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java
View File

@ -83,7 +83,7 @@ public class VirtualCommand {
}
public boolean hit(CommandSender sender, KList<String> 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<String> hitTab(CommandSender sender, KList<String> chain, String label) {
MortarSender vs = new MortarSender(sender);
VolmitSender vs = new VolmitSender(sender);
vs.setTag(tag);
if (label != null)

6
src/main/java/com/volmit/iris/util/plugin/MortarSender.java → src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
View File

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