From 01d686b42082aa30ad409b761e2512f57c3d467e Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Thu, 30 Jan 2025 13:54:44 +0800 Subject: [PATCH] Removed duplicated changes --- ...> 0002-Add-luminol-config-framework.patch} | 0 .../features/0002-Metrics-tweaks.patch | 23 ------------------- ...0003-Add-config-for-server-mod-name.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ... 0005-Add-config-for-vanilla-random.patch} | 0 ...r.patch => 0006-Add-a-simple-tpsbar.patch} | 0 ...r.patch => 0007-Add-a-simple-membar.patch} | 0 ...Add-config-for-offline-mode-warning.patch} | 0 ...config-for-out-of-order-chat-checks.patch} | 0 ...erify-signature-only-in-online-mode.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...dd-config-to-disable-async-catchers.patch} | 0 ...nfig-for-command-block-command-exec.patch} | 0 ...region-format-framework-linear-v2-r.patch} | 0 ...015-Add-config-for-watchdog-timeout.patch} | 0 ...-entity-was-moving-to-another-regio.patch} | 0 ...olia-off-region-POI-accessing-issue.patch} | 0 ...-Force-disable-builtin-spark-plugin.patch} | 0 ...eck-if-the-block-is-not-belong-to-c.patch} | 0 ...I-and-display-of-chunkhot-in-tpsbar.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...2-Purpur-Use-alternative-keep-alive.patch} | 0 ...3-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...ch => 0024-Petal-Reduce-sensor-work.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...026-Pufferfish-Optimize-suffocation.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...h => 0028-Pufferfish-SIMD-Utilities.patch} | 0 ...try.patch => 0029-Pufferfish-Sentry.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...032-Leaf-Skip-event-if-no-listeners.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ...-api.patch => 0034-Tick-regions-api.patch} | 0 34 files changed, 23 deletions(-) rename luminol-server/paper-patches/features/{0003-Add-luminol-config-framework.patch => 0002-Add-luminol-config-framework.patch} (100%) delete mode 100644 luminol-server/paper-patches/features/0002-Metrics-tweaks.patch rename luminol-server/paper-patches/features/{0004-Add-config-for-server-mod-name.patch => 0003-Add-config-for-server-mod-name.patch} (100%) rename luminol-server/paper-patches/features/{0005-Add-config-for-unsafe-teleportation.patch => 0004-Add-config-for-unsafe-teleportation.patch} (100%) rename luminol-server/paper-patches/features/{0006-Add-config-for-vanilla-random.patch => 0005-Add-config-for-vanilla-random.patch} (100%) rename luminol-server/paper-patches/features/{0007-Add-a-simple-tpsbar.patch => 0006-Add-a-simple-tpsbar.patch} (100%) rename luminol-server/paper-patches/features/{0008-Add-a-simple-membar.patch => 0007-Add-a-simple-membar.patch} (100%) rename luminol-server/paper-patches/features/{0009-Add-config-for-offline-mode-warning.patch => 0008-Add-config-for-offline-mode-warning.patch} (100%) rename luminol-server/paper-patches/features/{0010-Add-config-for-out-of-order-chat-checks.patch => 0009-Add-config-for-out-of-order-chat-checks.patch} (100%) rename luminol-server/paper-patches/features/{0011-Add-config-to-verify-signature-only-in-online-mode.patch => 0010-Add-config-to-verify-signature-only-in-online-mode.patch} (100%) rename luminol-server/paper-patches/features/{0012-Add-config-to-disable-entity-tick-catchers.patch => 0011-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename luminol-server/paper-patches/features/{0013-Add-config-to-disable-async-catchers.patch => 0012-Add-config-to-disable-async-catchers.patch} (100%) rename luminol-server/paper-patches/features/{0014-Add-experiment-config-for-command-block-command-exec.patch => 0013-Add-experiment-config-for-command-block-command-exec.patch} (100%) rename luminol-server/paper-patches/features/{0015-Add-configurable-region-format-framework-linear-v2-r.patch => 0014-Add-configurable-region-format-framework-linear-v2-r.patch} (100%) rename luminol-server/paper-patches/features/{0016-Add-config-for-watchdog-timeout.patch => 0015-Add-config-for-watchdog-timeout.patch} (100%) rename luminol-server/paper-patches/features/{0017-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0016-Teleport-async-if-entity-was-moving-to-another-regio.patch} (100%) rename luminol-server/paper-patches/features/{0018-Try-fixing-folia-off-region-POI-accessing-issue.patch => 0017-Try-fixing-folia-off-region-POI-accessing-issue.patch} (100%) rename luminol-server/paper-patches/features/{0019-Force-disable-builtin-spark-plugin.patch => 0018-Force-disable-builtin-spark-plugin.patch} (100%) rename luminol-server/paper-patches/features/{0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch => 0019-Skip-collision-check-if-the-block-is-not-belong-to-c.patch} (100%) rename luminol-server/paper-patches/features/{0021-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch => 0020-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch} (100%) rename luminol-server/paper-patches/features/{0022-Kaiiju-Entity-tick-and-removal-limiter.patch => 0021-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename luminol-server/paper-patches/features/{0023-Purpur-Use-alternative-keep-alive.patch => 0022-Purpur-Use-alternative-keep-alive.patch} (100%) rename luminol-server/paper-patches/features/{0024-Purpur-Lobotomize-stuck-villagers.patch => 0023-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename luminol-server/paper-patches/features/{0025-Petal-Reduce-sensor-work.patch => 0024-Petal-Reduce-sensor-work.patch} (100%) rename luminol-server/paper-patches/features/{0026-Pufferfish-Reduce-projectile-chunk-loading.patch => 0025-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename luminol-server/paper-patches/features/{0027-Pufferfish-Optimize-suffocation.patch => 0026-Pufferfish-Optimize-suffocation.patch} (100%) rename luminol-server/paper-patches/features/{0028-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0027-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename luminol-server/paper-patches/features/{0029-Pufferfish-SIMD-Utilities.patch => 0028-Pufferfish-SIMD-Utilities.patch} (100%) rename luminol-server/paper-patches/features/{0030-Pufferfish-Sentry.patch => 0029-Pufferfish-Sentry.patch} (100%) rename luminol-server/paper-patches/features/{0031-Gale-Variable-entity-wake-up-duration.patch => 0030-Gale-Variable-entity-wake-up-duration.patch} (100%) rename luminol-server/paper-patches/features/{0032-SparklyPaper-Optimize-canSee-checks.patch => 0031-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename luminol-server/paper-patches/features/{0033-Leaf-Skip-event-if-no-listeners.patch => 0032-Leaf-Skip-event-if-no-listeners.patch} (100%) rename luminol-server/paper-patches/features/{0034-Leaf-Secure-seed-and-matter-seed-command.patch => 0033-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename luminol-server/paper-patches/features/{0035-Tick-regions-api.patch => 0034-Tick-regions-api.patch} (100%) diff --git a/luminol-server/paper-patches/features/0003-Add-luminol-config-framework.patch b/luminol-server/paper-patches/features/0002-Add-luminol-config-framework.patch similarity index 100% rename from luminol-server/paper-patches/features/0003-Add-luminol-config-framework.patch rename to luminol-server/paper-patches/features/0002-Add-luminol-config-framework.patch diff --git a/luminol-server/paper-patches/features/0002-Metrics-tweaks.patch b/luminol-server/paper-patches/features/0002-Metrics-tweaks.patch deleted file mode 100644 index 17c7641..0000000 --- a/luminol-server/paper-patches/features/0002-Metrics-tweaks.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Thu, 30 Jan 2025 09:23:42 +0800 -Subject: [PATCH] Metrics tweaks - - -diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 1ea251a202dc6386a110ee515d3329902f14e08e..1d9e924e95c14c730027deceff745dd7bc895b29 100644 ---- a/src/main/java/com/destroystokyo/paper/Metrics.java -+++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -675,6 +675,12 @@ public class Metrics { - - return map; - })); -+ -+ // Luminol start - Luminol metrices -+ metrics.addCustomChart(new SimplePie("minecraft_version", () -> { -+ return net.minecraft.server.MinecraftServer.getServer().getServerVersion(); -+ })); -+ // Luminol end - } - - } diff --git a/luminol-server/paper-patches/features/0004-Add-config-for-server-mod-name.patch b/luminol-server/paper-patches/features/0003-Add-config-for-server-mod-name.patch similarity index 100% rename from luminol-server/paper-patches/features/0004-Add-config-for-server-mod-name.patch rename to luminol-server/paper-patches/features/0003-Add-config-for-server-mod-name.patch diff --git a/luminol-server/paper-patches/features/0005-Add-config-for-unsafe-teleportation.patch b/luminol-server/paper-patches/features/0004-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from luminol-server/paper-patches/features/0005-Add-config-for-unsafe-teleportation.patch rename to luminol-server/paper-patches/features/0004-Add-config-for-unsafe-teleportation.patch diff --git a/luminol-server/paper-patches/features/0006-Add-config-for-vanilla-random.patch b/luminol-server/paper-patches/features/0005-Add-config-for-vanilla-random.patch similarity index 100% rename from luminol-server/paper-patches/features/0006-Add-config-for-vanilla-random.patch rename to luminol-server/paper-patches/features/0005-Add-config-for-vanilla-random.patch diff --git a/luminol-server/paper-patches/features/0007-Add-a-simple-tpsbar.patch b/luminol-server/paper-patches/features/0006-Add-a-simple-tpsbar.patch similarity index 100% rename from luminol-server/paper-patches/features/0007-Add-a-simple-tpsbar.patch rename to luminol-server/paper-patches/features/0006-Add-a-simple-tpsbar.patch diff --git a/luminol-server/paper-patches/features/0008-Add-a-simple-membar.patch b/luminol-server/paper-patches/features/0007-Add-a-simple-membar.patch similarity index 100% rename from luminol-server/paper-patches/features/0008-Add-a-simple-membar.patch rename to luminol-server/paper-patches/features/0007-Add-a-simple-membar.patch diff --git a/luminol-server/paper-patches/features/0009-Add-config-for-offline-mode-warning.patch b/luminol-server/paper-patches/features/0008-Add-config-for-offline-mode-warning.patch similarity index 100% rename from luminol-server/paper-patches/features/0009-Add-config-for-offline-mode-warning.patch rename to luminol-server/paper-patches/features/0008-Add-config-for-offline-mode-warning.patch diff --git a/luminol-server/paper-patches/features/0010-Add-config-for-out-of-order-chat-checks.patch b/luminol-server/paper-patches/features/0009-Add-config-for-out-of-order-chat-checks.patch similarity index 100% rename from luminol-server/paper-patches/features/0010-Add-config-for-out-of-order-chat-checks.patch rename to luminol-server/paper-patches/features/0009-Add-config-for-out-of-order-chat-checks.patch diff --git a/luminol-server/paper-patches/features/0011-Add-config-to-verify-signature-only-in-online-mode.patch b/luminol-server/paper-patches/features/0010-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 100% rename from luminol-server/paper-patches/features/0011-Add-config-to-verify-signature-only-in-online-mode.patch rename to luminol-server/paper-patches/features/0010-Add-config-to-verify-signature-only-in-online-mode.patch diff --git a/luminol-server/paper-patches/features/0012-Add-config-to-disable-entity-tick-catchers.patch b/luminol-server/paper-patches/features/0011-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from luminol-server/paper-patches/features/0012-Add-config-to-disable-entity-tick-catchers.patch rename to luminol-server/paper-patches/features/0011-Add-config-to-disable-entity-tick-catchers.patch diff --git a/luminol-server/paper-patches/features/0013-Add-config-to-disable-async-catchers.patch b/luminol-server/paper-patches/features/0012-Add-config-to-disable-async-catchers.patch similarity index 100% rename from luminol-server/paper-patches/features/0013-Add-config-to-disable-async-catchers.patch rename to luminol-server/paper-patches/features/0012-Add-config-to-disable-async-catchers.patch diff --git a/luminol-server/paper-patches/features/0014-Add-experiment-config-for-command-block-command-exec.patch b/luminol-server/paper-patches/features/0013-Add-experiment-config-for-command-block-command-exec.patch similarity index 100% rename from luminol-server/paper-patches/features/0014-Add-experiment-config-for-command-block-command-exec.patch rename to luminol-server/paper-patches/features/0013-Add-experiment-config-for-command-block-command-exec.patch diff --git a/luminol-server/paper-patches/features/0015-Add-configurable-region-format-framework-linear-v2-r.patch b/luminol-server/paper-patches/features/0014-Add-configurable-region-format-framework-linear-v2-r.patch similarity index 100% rename from luminol-server/paper-patches/features/0015-Add-configurable-region-format-framework-linear-v2-r.patch rename to luminol-server/paper-patches/features/0014-Add-configurable-region-format-framework-linear-v2-r.patch diff --git a/luminol-server/paper-patches/features/0016-Add-config-for-watchdog-timeout.patch b/luminol-server/paper-patches/features/0015-Add-config-for-watchdog-timeout.patch similarity index 100% rename from luminol-server/paper-patches/features/0016-Add-config-for-watchdog-timeout.patch rename to luminol-server/paper-patches/features/0015-Add-config-for-watchdog-timeout.patch diff --git a/luminol-server/paper-patches/features/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch b/luminol-server/paper-patches/features/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from luminol-server/paper-patches/features/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to luminol-server/paper-patches/features/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/luminol-server/paper-patches/features/0018-Try-fixing-folia-off-region-POI-accessing-issue.patch b/luminol-server/paper-patches/features/0017-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from luminol-server/paper-patches/features/0018-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to luminol-server/paper-patches/features/0017-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/luminol-server/paper-patches/features/0019-Force-disable-builtin-spark-plugin.patch b/luminol-server/paper-patches/features/0018-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from luminol-server/paper-patches/features/0019-Force-disable-builtin-spark-plugin.patch rename to luminol-server/paper-patches/features/0018-Force-disable-builtin-spark-plugin.patch diff --git a/luminol-server/paper-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch b/luminol-server/paper-patches/features/0019-Skip-collision-check-if-the-block-is-not-belong-to-c.patch similarity index 100% rename from luminol-server/paper-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch rename to luminol-server/paper-patches/features/0019-Skip-collision-check-if-the-block-is-not-belong-to-c.patch diff --git a/luminol-server/paper-patches/features/0021-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/luminol-server/paper-patches/features/0020-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from luminol-server/paper-patches/features/0021-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to luminol-server/paper-patches/features/0020-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/luminol-server/paper-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/paper-patches/features/0021-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/paper-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/paper-patches/features/0021-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/paper-patches/features/0023-Purpur-Use-alternative-keep-alive.patch b/luminol-server/paper-patches/features/0022-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/paper-patches/features/0023-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/paper-patches/features/0022-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/paper-patches/features/0024-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/paper-patches/features/0023-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/paper-patches/features/0024-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/paper-patches/features/0023-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/paper-patches/features/0025-Petal-Reduce-sensor-work.patch b/luminol-server/paper-patches/features/0024-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/paper-patches/features/0025-Petal-Reduce-sensor-work.patch rename to luminol-server/paper-patches/features/0024-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/paper-patches/features/0026-Pufferfish-Reduce-projectile-chunk-loading.patch b/luminol-server/paper-patches/features/0025-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from luminol-server/paper-patches/features/0026-Pufferfish-Reduce-projectile-chunk-loading.patch rename to luminol-server/paper-patches/features/0025-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/luminol-server/paper-patches/features/0027-Pufferfish-Optimize-suffocation.patch b/luminol-server/paper-patches/features/0026-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from luminol-server/paper-patches/features/0027-Pufferfish-Optimize-suffocation.patch rename to luminol-server/paper-patches/features/0026-Pufferfish-Optimize-suffocation.patch diff --git a/luminol-server/paper-patches/features/0028-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/luminol-server/paper-patches/features/0027-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from luminol-server/paper-patches/features/0028-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to luminol-server/paper-patches/features/0027-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/luminol-server/paper-patches/features/0029-Pufferfish-SIMD-Utilities.patch b/luminol-server/paper-patches/features/0028-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from luminol-server/paper-patches/features/0029-Pufferfish-SIMD-Utilities.patch rename to luminol-server/paper-patches/features/0028-Pufferfish-SIMD-Utilities.patch diff --git a/luminol-server/paper-patches/features/0030-Pufferfish-Sentry.patch b/luminol-server/paper-patches/features/0029-Pufferfish-Sentry.patch similarity index 100% rename from luminol-server/paper-patches/features/0030-Pufferfish-Sentry.patch rename to luminol-server/paper-patches/features/0029-Pufferfish-Sentry.patch diff --git a/luminol-server/paper-patches/features/0031-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/paper-patches/features/0030-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/paper-patches/features/0031-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/paper-patches/features/0030-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/paper-patches/features/0033-Leaf-Skip-event-if-no-listeners.patch b/luminol-server/paper-patches/features/0032-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from luminol-server/paper-patches/features/0033-Leaf-Skip-event-if-no-listeners.patch rename to luminol-server/paper-patches/features/0032-Leaf-Skip-event-if-no-listeners.patch diff --git a/luminol-server/paper-patches/features/0034-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/paper-patches/features/0033-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/paper-patches/features/0034-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/paper-patches/features/0033-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/paper-patches/features/0035-Tick-regions-api.patch b/luminol-server/paper-patches/features/0034-Tick-regions-api.patch similarity index 100% rename from luminol-server/paper-patches/features/0035-Tick-regions-api.patch rename to luminol-server/paper-patches/features/0034-Tick-regions-api.patch