From cfc52ed90940d89f45b8668822d89419559e3e52 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:21:57 +0200
Subject: [PATCH] Tuning + Fixed server distro reading for 1.20.6+

---
 .../iris/core/safeguard/ServerBootSFG.java    | 21 ++++++++++++-------
 .../object/IrisJigsawStructurePlacement.java  |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
index f26ab913e..a86d3e649 100644
--- a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
+++ b/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,17 +65,22 @@ public class ServerBootSFG {
                 joiner.add(entry.getKey());
             }
         }
+        // Legacy ServerInfo
+        String distro = org.bukkit.Bukkit.getName().toLowerCase();
         if (
-                !instance.getServer().getVersion().contains("Purpur") &&
-                        !instance.getServer().getVersion().contains("Paper") &&
-                        !instance.getServer().getVersion().contains("Spigot") &&
-                        !instance.getServer().getVersion().contains("Pufferfish") &&
-                        !instance.getServer().getVersion().contains("Bukkit")) {
+                !distro.contains("purpur") &&
+                        !distro.contains("paper") &&
+                        !distro.contains("spigot") &&
+                        !distro.contains("pufferfish") &&
+                        !distro.contains("bukkit")) {
+
+
             passedserversoftware = false;
             joiner.add("Server Software");
-            severityHigh++;
+            severityMedium++;
         }
 
+
         if (INMS.get() instanceof NMSBinding1X) {
             unsuportedversion = true;
             joiner.add("Unsupported Minecraft Version");
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
index e816cfa78..b65a7d2c5 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
+++ b/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);
         }
     }