mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 14:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
This commit is contained in:
RePixelatedMC
2024-06-05 09:53:46 +02:00
parent dae3de8982 dc3487583d
commit 3cb74ac922
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -215,7 +215,7 @@ shadowJar {
from("${project(":nms:${it.key}").layout.buildDirectory.asFile.get()}/libs/${it.key}.jar") from("${project(":nms:${it.key}").layout.buildDirectory.asFile.get()}/libs/${it.key}.jar")
} }
NMS_BINDINGS.each {dependsOn(":nms:${it.key}:build")} NMS_BINDINGS.each {dependsOn(":nms:${it.key}:build")}
dependsOn(':com.volmit.gui:build') //dependsOn(':com.volmit.gui:build')
//minimize() //minimize()
append("plugin.yml") append("plugin.yml")
core/src/main/java/com/volmit/iris/Iris.java
+1
View File
@@ -878,6 +878,7 @@ public class Iris extends VolmitPlugin implements Listener {
Iris.warn("6GB+ Ram is recommended"); Iris.warn("6GB+ Ram is recommended");
Iris.warn("Process Memory: " + getHardware.getProcessMemory() + " MB"); Iris.warn("Process Memory: " + getHardware.getProcessMemory() + " MB");
} }
Iris.info("Bukkit distro: " + Bukkit.getName());
Iris.info("Custom Biomes: " + INMS.get().countCustomBiomes()); Iris.info("Custom Biomes: " + INMS.get().countCustomBiomes());
printPacks(); printPacks();
core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
+4 -2
View File
@@ -5,7 +5,7 @@ import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.core.nms.v1X.NMSBinding1X; import com.volmit.iris.core.nms.v1X.NMSBinding1X;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import javax.tools.JavaCompiler; import javax.tools.JavaCompiler;
import javax.tools.ToolProvider; import javax.tools.ToolProvider;
import java.io.File; import java.io.File;
@@ -40,7 +40,7 @@ public class ServerBootSFG {
public static void BootCheck() { public static void BootCheck() {
Iris.info("Checking for possible conflicts.."); Iris.info("Checking for possible conflicts..");
org.bukkit.plugin.PluginManager pluginManager = Bukkit.getPluginManager(); PluginManager pluginManager = Bukkit.getPluginManager();
Plugin[] plugins = pluginManager.getPlugins(); Plugin[] plugins = pluginManager.getPlugins();
incompatibilities.clear(); incompatibilities.clear();
@@ -65,6 +65,7 @@ public class ServerBootSFG {
joiner.add(entry.getKey()); joiner.add(entry.getKey());
} }
} }
// Legacy ServerInfo
String distro = Bukkit.getName().toLowerCase(); String distro = Bukkit.getName().toLowerCase();
if ( if (
!distro.contains("purpur") && !distro.contains("purpur") &&
@@ -79,6 +80,7 @@ public class ServerBootSFG {
severityMedium++; severityMedium++;
} }
if (INMS.get() instanceof NMSBinding1X) { if (INMS.get() instanceof NMSBinding1X) {
unsuportedversion = true; unsuportedversion = true;
joiner.add("Unsupported Minecraft Version"); joiner.add("Unsupported Minecraft Version");
core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class IrisJigsawStructurePlacement implements IRare {
} }
if (separation == -1 || spacing == -1) { 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); spacing = new RNG(seed).nextInt(separation, separation * 2);
} }
} }
settings.gradle
+1 -1
View File
@@ -23,7 +23,7 @@ pluginManagement {
} }
} }
rootProject.name = 'Iris' rootProject.name = 'Iris'
include 'app', 'com.volmit.gui' //include 'app', 'com.volmit.gui'
include(':core') include(':core')
include( include(
':nms:v1_20_R4', ':nms:v1_20_R4',