Repo-Mirror/LuminolMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed java compile

Browse Source
This commit is contained in:
MrHua269
2024-07-12 21:53:21 +08:00
parent 5c631a232b
commit 6918237be3
3 changed files with 583 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1071
patches/server/0002-Rebrand-to-Luminol.patch
View File

File diff suppressed because it is too large Load Diff

32
patches/server/0061-Fix-linear-java-compile.patch Normal file
View File

@@ -0,0 +1,32 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <wangxyper@163.com>
Date: Fri, 12 Jul 2024 21:52:54 +0800
Subject: [PATCH] Fix linear java compile
diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
index 4938d86f62071f578822684f576b838296d4070f..654eaae20ccddd6d6ffa6f431472e28ffb44ae0c 100644
--- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
@@ -118,9 +118,9 @@ public class WorldUpgrader {
// LinearPurpur start
String worldName = this.levelStorage.getLevelId();
- org.purpurmc.purpur.region.RegionFileFormat formatName = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().purpurConfig.regionFormatName;
- int linearCompression = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().purpurConfig.regionFormatLinearCompressionLevel;
- boolean linearCrashOnBrokenSymlink = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().purpurConfig.linearCrashOnBrokenSymlink;
+ org.purpurmc.purpur.region.RegionFileFormat formatName = me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormatType;
+ int linearCompression = me.earthme.luminol.config.modules.misc.RegionFormatConfig.linearCompressionLevel;
+ boolean linearCrashOnBrokenSymlink = me.earthme.luminol.config.modules.misc.RegionFormatConfig.linearCrashOnBrokenSymlink;
builder1.put(resourcekey1, new ChunkStorage(formatName, linearCompression, linearCrashOnBrokenSymlink, path.resolve("region"), this.dataFixer, true));
// LinearPurpur end
}
@@ -268,7 +268,7 @@ public class WorldUpgrader {
try {
// LinearPurpur start
String worldName = this.levelStorage.getLevelId();
- int linearCompression = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().purpurConfig.regionFormatLinearCompressionLevel;
+ int linearCompression = me.earthme.luminol.config.modules.misc.RegionFormatConfig.linearCompressionLevel;
org.purpurmc.purpur.region.AbstractRegionFile regionfile = org.purpurmc.purpur.region.AbstractRegionFileFactory.getAbstractRegionFile(linearCompression, file2.toPath(), file1.toPath(), true);
// LinearPurpur end

19
patches/server/0062-Fix-membar-java-compile.patch Normal file
View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <wangxyper@163.com>
Date: Fri, 12 Jul 2024 21:53:03 +0800
Subject: [PATCH] Fix membar java compile
diff --git a/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
index a33a45194273cc1b4e4157a5449c7994968a3480..e7b37460587ec5b0b1b24e164713a7e19da9e40e 100644
--- a/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
+++ b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
@@ -174,7 +174,7 @@ public class GlobalServerMemoryBar {
}
if (memPercent <= 50){
- return BossBar.Color.valueOf(MembarConfig.memColors.getFirst());
+ return BossBar.Color.valueOf(MembarConfig.memColors.get(0));
}
if (memPercent <= 70){