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

Merge branch 'master' of https://github.com/cyberpwnn/Iris into citizens

Browse Source
This commit is contained in:
Andrew Baker
2020-10-21 18:05:51 -07:00
parent dc6c38cf24 6199256058
commit 3ec70f9fb3
77 changed files with 6298 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/volmit/iris/Iris.java
View File

@@ -20,8 +20,10 @@ import org.bukkit.plugin.Plugin;
import com.volmit.iris.command.CommandIris;
import com.volmit.iris.command.PermissionIris;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.nms.INMS;
import com.volmit.iris.gen.provisions.ProvisionBukkit;
import com.volmit.iris.gen.scaffold.IrisGenConfiguration;
import com.volmit.iris.gen.scaffold.IrisWorlds;
import com.volmit.iris.gen.scaffold.TerrainTarget;
import com.volmit.iris.link.MultiverseCoreLink;
import com.volmit.iris.link.MythicMobsLink;
@@ -61,7 +63,6 @@ public class Iris extends MortarPlugin
public static StructureManager struct;
public static EditManager edit;
public static IrisBoardManager board;
public static String nmsTag = findNMSTag();
public static MultiverseCoreLink linkMultiverseCore;
public static MythicMobsLink linkMythicMobs;
public static CitizensLink linkCitizens;
@@ -81,6 +82,7 @@ public class Iris extends MortarPlugin
public Iris()
{
INMS.get();
IO.delete(new File("iris"));
lowMemoryMode = Runtime.getRuntime().maxMemory() < 4000000000L; // 4 * 1000 * 1000 * 1000 // 4gb
}
@@ -99,22 +101,6 @@ public class Iris extends MortarPlugin
return tc;
}
private static String findNMSTag()
{
try
{
return Bukkit.getServer().getClass().getCanonicalName().split("\\Q.\\E")[3];
}
catch(Throwable e)
{
Iris.error("Failed to determine server nms version!");
e.printStackTrace();
}
return "UNKNOWN NMS VERSION";
}
public ProvisionBukkit createProvisionBukkit(IrisGenConfiguration config)
{
return new ProvisionBukkit(createIrisProvider(config));
@@ -240,7 +226,7 @@ public class Iris extends MortarPlugin
{
if(i.getGenerator() instanceof ProvisionBukkit)
{
((IrisTerrainProvider) ((ProvisionBukkit) i.getGenerator()).getProvider()).close();
IrisWorlds.getProvider(i).close();
}
}
@@ -279,6 +265,13 @@ public class Iris extends MortarPlugin
public static void msg(String string)
{
lock.lock();
if(instance == null)
{
System.out.println("[Iris]: " + string);
lock.unlock();
return;
}
String msg = C.GREEN + "[Iris]: " + C.GRAY + string;
Bukkit.getConsoleSender().sendMessage(msg);
lock.unlock();
@@ -440,11 +433,6 @@ public class Iris extends MortarPlugin
}
}
public static String nmsTag()
{
return nmsTag;
}
@SuppressWarnings("deprecation")
public static void later(NastyRunnable object)
{