Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00
Code Issues Releases Activity

Fix Parallax & update settings

Browse Source
This commit is contained in:
Daniel Mills
2021-01-01 22:54:17 -05:00
parent fcf8a80b0a
commit 9d634ba4d7
15 changed files with 42 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/manager/EditManager.java
View File

@@ -96,7 +96,7 @@ public class EditManager implements Listener
BlockEditor e = null;
if(Bukkit.getPluginManager().isPluginEnabled("WorldEdit") && !PaperLib.isPaper() && !IrisSettings.get().isIgnoreWorldEdit())
if(Bukkit.getPluginManager().isPluginEnabled("WorldEdit") && !PaperLib.isPaper() && !IrisSettings.get().getGeneral().isIgnoreWorldEdit())
{
try
{

2
src/main/java/com/volmit/iris/manager/IrisProject.java
View File

@@ -81,7 +81,7 @@ public class IrisProject
sender.sendMessage("Workspace Updated");
});
if(IrisSettings.get().openVSCode)
if(IrisSettings.get().getStudio().isOpenVSCode())
{
Desktop.getDesktop().open(i);
}

4
src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java
View File

@@ -3,6 +3,7 @@ package com.volmit.iris.manager.command;
import com.volmit.iris.Iris;
import com.volmit.iris.nms.INMS;
import com.volmit.iris.object.IrisDimension;
import com.volmit.iris.pregen.Pregenerator;
import com.volmit.iris.scaffold.IrisWorldCreator;
import com.volmit.iris.scaffold.engine.IrisAccess;
import com.volmit.iris.util.*;
@@ -105,7 +106,7 @@ public class CommandIrisCreate extends MortarCommand
sender.sendMessage("Pregenerating " + worldName + " " + pregen + " x " + pregen);
sender.sendMessage("Expect Extreme server lag during this time. Use '/iris world pregen stop' to cancel");
new PregenJob(world, pregen, sender, () ->
new Pregenerator(world, pregen, () ->
{
b.set(true);
});
@@ -130,7 +131,6 @@ public class CommandIrisCreate extends MortarCommand
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
{
world.save();
sender.sendMessage("All Done!");
});
});

71
src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java
View File

@@ -2,11 +2,9 @@ package com.volmit.iris.manager.command;
import com.volmit.iris.Iris;
import com.volmit.iris.pregen.Pregenerator;
import com.volmit.iris.scaffold.IrisWorlds;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
import com.volmit.iris.util.PregenJob;
import org.bukkit.World;
import org.bukkit.entity.Player;
@@ -46,51 +44,21 @@ public class CommandIrisPregen extends MortarCommand
if(args[0].equalsIgnoreCase("stop") || args[0].equalsIgnoreCase("x"))
{
if(PregenJob.task == -1) {
if (Pregenerator.shutdownInstance()) {
sender.sendMessage("Stopped Pregen.");
} else
{
sender.sendMessage("No Active Pregens.");
}
}
else
{
if (Pregenerator.shutdownInstance()) {
sender.sendMessage("Stopped Pregen.");
PregenJob.stop();
} else
{
sender.sendMessage("No Active Pregens.");
}
return true;
}
else if(args[0].equalsIgnoreCase("pause") || args[0].equalsIgnoreCase("resume"))
{
if(PregenJob.task == -1)
if(Pregenerator.getInstance() != null)
{
if(Pregenerator.getInstance() != null)
{
Pregenerator.pauseResume();
Pregenerator.pauseResume();
if(Pregenerator.isPaused())
{
sender.sendMessage("Pregen Paused");
}
else
{
sender.sendMessage("Pregen Resumed");
}
}
else
{
sender.sendMessage("No Active Pregens");
}
}
else
{
PregenJob.pauseResume();
if(PregenJob.isPaused())
if(Pregenerator.isPaused())
{
sender.sendMessage("Pregen Paused");
}
@@ -101,6 +69,11 @@ public class CommandIrisPregen extends MortarCommand
}
}
else
{
sender.sendMessage("No Active Pregens");
}
return true;
}
@@ -109,17 +82,7 @@ public class CommandIrisPregen extends MortarCommand
Player p = sender.player();
World world = p.getWorld();
try {
if(Iris.instance.isMCA() && IrisWorlds.access(world) != null)
{
new Pregenerator(world, getVal(args[0]), 0, 0);
}
else
{
new PregenJob(world, getVal(args[0]), sender, () ->
{
});
}
new Pregenerator(world, getVal(args[0]));
} catch (NumberFormatException e){
sender.sendMessage("Invalid argument in command");
return true;
@@ -140,20 +103,20 @@ public class CommandIrisPregen extends MortarCommand
if(arg.toLowerCase().endsWith("c") || arg.toLowerCase().endsWith("chunks"))
{
return Integer.valueOf(arg.toLowerCase().replaceAll("\\Qc\\E", "").replaceAll("\\Qchunks\\E", "")) * 16;
return Integer.parseInt(arg.toLowerCase().replaceAll("\\Qc\\E", "").replaceAll("\\Qchunks\\E", "")) * 16;
}
if(arg.toLowerCase().endsWith("r") || arg.toLowerCase().endsWith("regions"))
{
return Integer.valueOf(arg.toLowerCase().replaceAll("\\Qr\\E", "").replaceAll("\\Qregions\\E", "")) * 512;
return Integer.parseInt(arg.toLowerCase().replaceAll("\\Qr\\E", "").replaceAll("\\Qregions\\E", "")) * 512;
}
if(arg.toLowerCase().endsWith("k"))
{
return Integer.valueOf(arg.toLowerCase().replaceAll("\\Qk\\E", "")) * 1000;
return Integer.parseInt(arg.toLowerCase().replaceAll("\\Qk\\E", "")) * 1000;
}
return Integer.valueOf(arg.toLowerCase());
return Integer.parseInt(arg.toLowerCase());
}
@Override