diff --git a/gradle.properties b/gradle.properties index 3195fe2..bf3e7ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -foliaRef=8b9ddf18599dc583fd93be732698437923214f30 +foliaRef=5b5e45a560c9ab7f23670aabc2e29ed334aeb3ac org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch b/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch index 11c2b68..5dde74b 100644 --- a/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch +++ b/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch @@ -18,7 +18,7 @@ index 41a9cc693183e96c83837692e93b177a521d6789..f4a2d1a2d467808b9cb75fc32765ddc2 } else { return new ProfilePublicKey(data); diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java -index 6a7e5a642e2eaf7d5dffadb81738f7385a38c0af..f16500a50904aade3d984b908b11b8edd9c05ba1 100644 +index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..1baed35051e9f0f5331bc8ae62a9a8848c3ee322 100644 --- a/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/net/minecraft/world/level/block/TripWireHookBlock.java @@ -215,7 +215,7 @@ public class TripWireHookBlock extends Block { diff --git a/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch b/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch index 43ba916..a3c306c 100644 --- a/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch +++ b/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch @@ -22,10 +22,10 @@ index de8b9048c8395c05b8688bc9d984b8ad680f15b3..f42692cd4f0154705c3d5b030d281cfc + // KioCG end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 136ae23d7f470a1f3589f99ba8bf2e804da5d0ef..84304fc8c26a6e1e3515b131a2ee3357262efcc3 100644 +index 7723b2fbc8a1d1907ded37d7530e34d3cac8bdce..7dd3bcf9395722b3ab21f9bb7e9aa501105b0fd8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2403,6 +2403,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2404,6 +2404,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.expToDrop = data.getInt("expToDrop"); handle.keepLevel = data.getBoolean("keepLevel"); } @@ -41,7 +41,7 @@ index 136ae23d7f470a1f3589f99ba8bf2e804da5d0ef..84304fc8c26a6e1e3515b131a2ee3357 } } -@@ -2424,6 +2433,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2425,6 +2434,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { data.putLong("lastPlayed", System.currentTimeMillis()); data.putString("lastKnownName", handle.getScoreboardName()); @@ -57,7 +57,7 @@ index 136ae23d7f470a1f3589f99ba8bf2e804da5d0ef..84304fc8c26a6e1e3515b131a2ee3357 // Paper start - persist for use in offline save data if (!nbttagcompound.contains("Paper")) { nbttagcompound.put("Paper", new CompoundTag()); -@@ -3593,4 +3611,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3595,4 +3613,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.containerMenu.broadcastChanges(); return new PaperPlayerGiveResult(leftovers.build(), drops.build()); } diff --git a/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch b/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch index 5776ed7..c9f4e4d 100644 --- a/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch +++ b/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch @@ -18,10 +18,10 @@ index a0b84535a9d3833d4df692b85b272f145559dd80..c2ba46408b5ad727d7a17f21d47b2898 return; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bb1a8220174a2882c7056733536f57586044dc75..1bd5b452ffe7afb23f4aca608a5d026a731a4a4c 100644 +index acff6136c321fd1b097c9888bce6195571663d75..d3569ee6b56a401b18068785bfb3df15393edb2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -313,7 +313,7 @@ public final class CraftServer implements Server { +@@ -314,7 +314,7 @@ public final class CraftServer implements Server { public static Exception excessiveVelEx; // Paper - Velocity warnings private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes @@ -30,7 +30,7 @@ index bb1a8220174a2882c7056733536f57586044dc75..1bd5b452ffe7afb23f4aca608a5d026a // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler(); // Folia - region threading -@@ -491,7 +491,7 @@ public final class CraftServer implements Server { +@@ -492,7 +492,7 @@ public final class CraftServer implements Server { } this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper @@ -39,7 +39,7 @@ index bb1a8220174a2882c7056733536f57586044dc75..1bd5b452ffe7afb23f4aca608a5d026a } public boolean getCommandBlockOverride(String command) { -@@ -1155,7 +1155,7 @@ public final class CraftServer implements Server { +@@ -1156,7 +1156,7 @@ public final class CraftServer implements Server { this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper @@ -48,7 +48,7 @@ index bb1a8220174a2882c7056733536f57586044dc75..1bd5b452ffe7afb23f4aca608a5d026a this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -1184,7 +1184,7 @@ public final class CraftServer implements Server { +@@ -1185,7 +1185,7 @@ public final class CraftServer implements Server { this.loadPlugins(); this.enablePlugins(PluginLoadOrder.STARTUP); this.enablePlugins(PluginLoadOrder.POSTWORLD); diff --git a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch index e72ea5f..bfd6eec 100644 --- a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch +++ b/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] SparklyPaper Optimize canSee checks diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 84304fc8c26a6e1e3515b131a2ee3357262efcc3..e3fe81a1d91f60c6696070751c5220ec1868390a 100644 +index 7dd3bcf9395722b3ab21f9bb7e9aa501105b0fd8..c7c2e7b3b2faddc202edf5f933ed906fdd4d16af 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -213,7 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -214,7 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private boolean hasPlayedBefore = false; private final ConversationTracker conversationTracker = new ConversationTracker(); private final Set channels = new HashSet(); @@ -17,7 +17,7 @@ index 84304fc8c26a6e1e3515b131a2ee3357262efcc3..e3fe81a1d91f60c6696070751c5220ec private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2267,9 +2267,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2268,9 +2268,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) { diff --git a/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch index ede6012..91ed194 100644 --- a/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch +++ b/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch @@ -23,10 +23,10 @@ index f42692cd4f0154705c3d5b030d281cfc333803ed..39cc976f65f826a00e2e637c139f9134 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1bd5b452ffe7afb23f4aca608a5d026a731a4a4c..754803ff749d2f4db88df9e9f08264c6b147df89 100644 +index d3569ee6b56a401b18068785bfb3df15393edb2c..d3c0322ef35e85adfa7398da83e2589a9b9837d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1422,7 +1422,11 @@ public final class CraftServer implements Server { +@@ -1423,7 +1423,11 @@ public final class CraftServer implements Server { registryAccess = levelDataAndDimensions.dimensions().dimensionsRegistryAccess(); } else { LevelSettings levelSettings; diff --git a/luminol-server/paper-patches/features/0010-Tick-regions-api.patch b/luminol-server/paper-patches/features/0010-Tick-regions-api.patch index cb6117f..92765f8 100644 --- a/luminol-server/paper-patches/features/0010-Tick-regions-api.patch +++ b/luminol-server/paper-patches/features/0010-Tick-regions-api.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Tick regions api diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d7973737809177b577ce029d146325194eb0831e..57944f3f12417e5727b47caad3e9d03b4720b298 100644 +index d9bca225cb9c88e978fdbebbb0b361d160acbaa3..4a5989fd7964beaa4e9a1b7f52799dc416f4b132 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2544,4 +2544,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {