Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into mca

# Conflicts:
#	core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java

build.gradle

@@ -215,7 +215,7 @@ shadowJar {
         from("${project(":nms:${it.key}").layout.buildDirectory.asFile.get()}/libs/${it.key}.jar")
     }
     NMS_BINDINGS.each {dependsOn(":nms:${it.key}:build")}
-    dependsOn(':com.volmit.gui:build')
+    //dependsOn(':com.volmit.gui:build')
 
     //minimize()
     append("plugin.yml")

core/src/main/java/com/volmit/iris/Iris.java

@@ -878,6 +878,7 @@ public class Iris extends VolmitPlugin implements Listener {
             Iris.warn("6GB+ Ram is recommended");
             Iris.warn("Process Memory: " + getHardware.getProcessMemory() + " MB");
         }
+        Iris.info("Bukkit distro: " + Bukkit.getName());
         Iris.info("Custom Biomes: " + INMS.get().countCustomBiomes());
         printPacks();
 

core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java

@@ -5,7 +5,7 @@ import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
-
+import org.bukkit.plugin.PluginManager;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
 import java.io.File;
@@ -40,7 +40,7 @@ public class ServerBootSFG {
 
     public static void BootCheck() {
         Iris.info("Checking for possible conflicts..");
-        org.bukkit.plugin.PluginManager pluginManager = Bukkit.getPluginManager();
+        PluginManager pluginManager = Bukkit.getPluginManager();
         Plugin[] plugins = pluginManager.getPlugins();
 
         incompatibilities.clear();
@@ -65,6 +65,7 @@ public class ServerBootSFG {
                 joiner.add(entry.getKey());
             }
         }
+        // Legacy ServerInfo
         String distro = Bukkit.getName().toLowerCase();
         if (
                 !distro.contains("purpur") &&
@@ -79,6 +80,7 @@ public class ServerBootSFG {
             severityMedium++;
         }
 
+
         if (INMS.get() instanceof NMSBinding1X) {
             unsuportedversion = true;
             joiner.add("Unsupported Minecraft Version");

core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java

@@ -95,7 +95,7 @@ public class IrisJigsawStructurePlacement implements IRare {
         }
 
         if (separation == -1 || spacing == -1) {
-            separation = (int) Math.round(rarity / 20d);
+            separation = (int) Math.round(rarity / 15d);
             spacing = new RNG(seed).nextInt(separation, separation * 2);
         }
     }

settings.gradle

@@ -23,7 +23,7 @@ pluginManagement {
     }
 }
 rootProject.name = 'Iris'
-include 'app', 'com.volmit.gui'
+//include 'app', 'com.volmit.gui'
 include(':core')
 include(
         ':nms:v1_20_R4',