diff --git a/patches/server/0013-Add-config-for-tripwire-dupe.patch b/patches/server/0013-Add-config-for-tripwire-dupe.patch new file mode 100644 index 0000000..f888b05 --- /dev/null +++ b/patches/server/0013-Add-config-for-tripwire-dupe.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> +Date: Tue, 24 Dec 2024 13:28:56 -0500 +Subject: [PATCH] Add config for tripwire dupe + +Bring back MC-59471, MC-129055 on 1.21.2+, which fixed in 1.21.2 snapshots 24w33a and 24w36a + +diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..8def8aad908f5e6b828d7d9179bfe1962c39f9f7 +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java +@@ -0,0 +1,20 @@ ++package me.earthme.luminol.config.modules.misc; ++ ++import me.earthme.luminol.config.ConfigInfo; ++import me.earthme.luminol.config.EnumConfigCategory; ++import me.earthme.luminol.config.IConfigModule; ++ ++public class TripwireConfig implements IConfigModule { ++ @ConfigInfo(baseName = "enabled") ++ public static boolean enabled = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.MISC; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "tripwire_dupe"; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +index c2589f42c467ca672417c24076313da51bb2dcbb..f85f53082cf5a56c723648f68bb103d58da0e8bd 100644 +--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +@@ -206,7 +206,7 @@ public class TripWireHookBlock extends Block { + if (iblockdata4 != null) { + BlockState iblockdata5 = world.getBlockState(blockposition2); + +- if (iblockdata5.is(Blocks.TRIPWIRE) || iblockdata5.is(Blocks.TRIPWIRE_HOOK)) { ++ if (me.earthme.luminol.config.modules.misc.TripwireConfig.enabled || iblockdata5.is(Blocks.TRIPWIRE) || iblockdata5.is(Blocks.TRIPWIRE_HOOK)) { // Luminol - Add config for tripwire dupe + world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3); + } + } diff --git a/patches/server/0013-Add-config-to-verify-signature-only-in-online-mode.patch b/patches/server/0014-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 100% rename from patches/server/0013-Add-config-to-verify-signature-only-in-online-mode.patch rename to patches/server/0014-Add-config-to-verify-signature-only-in-online-mode.patch diff --git a/patches/server/0014-Add-config-to-disable-entity-tick-catchers.patch b/patches/server/0015-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from patches/server/0014-Add-config-to-disable-entity-tick-catchers.patch rename to patches/server/0015-Add-config-to-disable-entity-tick-catchers.patch diff --git a/patches/server/0015-Add-config-to-disable-async-catchers.patch b/patches/server/0016-Add-config-to-disable-async-catchers.patch similarity index 100% rename from patches/server/0015-Add-config-to-disable-async-catchers.patch rename to patches/server/0016-Add-config-to-disable-async-catchers.patch diff --git a/patches/server/0016-Add-experiment-config-for-command-block-command-exec.patch b/patches/server/0017-Add-experiment-config-for-command-block-command-exec.patch similarity index 100% rename from patches/server/0016-Add-experiment-config-for-command-block-command-exec.patch rename to patches/server/0017-Add-experiment-config-for-command-block-command-exec.patch diff --git a/patches/server/0017-Add-fix-for-off-region-adult-following-ai-behavior.patch b/patches/server/0018-Add-fix-for-off-region-adult-following-ai-behavior.patch similarity index 100% rename from patches/server/0017-Add-fix-for-off-region-adult-following-ai-behavior.patch rename to patches/server/0018-Add-fix-for-off-region-adult-following-ai-behavior.patch diff --git a/patches/server/0018-Add-configurable-region-format-framework-linear-v2-r.patch b/patches/server/0019-Add-configurable-region-format-framework-linear-v2-r.patch similarity index 100% rename from patches/server/0018-Add-configurable-region-format-framework-linear-v2-r.patch rename to patches/server/0019-Add-configurable-region-format-framework-linear-v2-r.patch diff --git a/patches/server/0019-Try-fixing-folia-spector-teleportation.patch b/patches/server/0020-Try-fixing-folia-spector-teleportation.patch similarity index 100% rename from patches/server/0019-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0020-Try-fixing-folia-spector-teleportation.patch diff --git a/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0021-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0021-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0021-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0022-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from patches/server/0021-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to patches/server/0022-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/patches/server/0022-Force-disable-builtin-spark-plugin.patch b/patches/server/0023-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from patches/server/0022-Force-disable-builtin-spark-plugin.patch rename to patches/server/0023-Force-disable-builtin-spark-plugin.patch diff --git a/patches/server/0023-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0024-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0023-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0024-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0025-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0025-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0025-Kaiiju-Entity-tick-and-removal-limiter.patch b/patches/server/0026-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from patches/server/0025-Kaiiju-Entity-tick-and-removal-limiter.patch rename to patches/server/0026-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/patches/server/0026-Petal-Reduce-sensor-work.patch b/patches/server/0027-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0026-Petal-Reduce-sensor-work.patch rename to patches/server/0027-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0028-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0028-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0028-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0029-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0028-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0029-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0031-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0032-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0031-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0032-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0032-Pufferfish-Optimize-suffocation.patch b/patches/server/0033-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0032-Pufferfish-Optimize-suffocation.patch rename to patches/server/0033-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 99% rename from patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch index c1d2805..b164b4c 100644 --- a/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -83,7 +83,7 @@ index 5503d506c595296ecad09a3ce4497a365f216af5..98aef7a3cfc759e4415df3a56b5fe01e if (!tickratemanager.isEntityFrozen(entity)) { gameprofilerfiller.push("checkDespawn"); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bd3f0c807c36ecfb8a89a0ca68ffa0c3640b7423..821fcf2bd1dacda191d7c8c17199069ebb9e73d3 100644 +index 64e081f993c2c844f83af227380b8a957eaabad4..15cbbd8c660b8544bd39c8f4ebe8e44922fe81b1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -390,6 +390,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0035-Pufferfish-SIMD-Utilities.patch b/patches/server/0036-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from patches/server/0035-Pufferfish-SIMD-Utilities.patch rename to patches/server/0036-Pufferfish-SIMD-Utilities.patch diff --git a/patches/server/0036-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0036-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0037-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0037-Gale-Optimize-sun-burn-tick.patch b/patches/server/0038-Gale-Optimize-sun-burn-tick.patch similarity index 97% rename from patches/server/0037-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0038-Gale-Optimize-sun-burn-tick.patch index 49c928d..5c8bf28 100644 --- a/patches/server/0037-Gale-Optimize-sun-burn-tick.patch +++ b/patches/server/0038-Gale-Optimize-sun-burn-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 821fcf2bd1dacda191d7c8c17199069ebb9e73d3..9c29f99c9426db12231d7423ca24ca6fecf9c868 100644 +index 15cbbd8c660b8544bd39c8f4ebe8e44922fe81b1..ae3af52c8b6368e40e39bcd9ecd8e2cdcb0b9c5b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -274,7 +274,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0038-Gale-Use-platform-math-functions.patch b/patches/server/0039-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0038-Gale-Use-platform-math-functions.patch rename to patches/server/0039-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0039-Gale-Optimize-noise-generation.patch b/patches/server/0040-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0039-Gale-Optimize-noise-generation.patch rename to patches/server/0040-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0040-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0041-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0040-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0041-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0041-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0042-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0041-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0042-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 95% rename from patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch index f7554e0..3ad198d 100644 --- a/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9c29f99c9426db12231d7423ca24ca6fecf9c868..3b2bce1b5261a0efbbfcd7d38bf7f093d97df3a6 100644 +index ae3af52c8b6368e40e39bcd9ecd8e2cdcb0b9c5b..b6aaa238626bc747379f991c17c279de52907083 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -283,6 +283,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0043-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0044-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0043-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0044-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0044-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0045-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0044-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0045-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0045-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0046-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0045-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0046-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0046-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0047-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0046-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0047-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0047-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0048-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0047-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0048-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0048-Purpur-use-alternative-keep-alive.patch b/patches/server/0049-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0048-Purpur-use-alternative-keep-alive.patch rename to patches/server/0049-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0049-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0050-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0049-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0050-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0050-Fix-MC-2025.patch b/patches/server/0051-Fix-MC-2025.patch similarity index 95% rename from patches/server/0050-Fix-MC-2025.patch rename to patches/server/0051-Fix-MC-2025.patch index 88fc9e7..e155d77 100644 --- a/patches/server/0050-Fix-MC-2025.patch +++ b/patches/server/0051-Fix-MC-2025.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2d9f75526240689facba1a4fbef7d40ef8299a1d..76f7479798b72cc9219ccb97b5c99e4645ce43d2 100644 +index 3700f7c1893e9ccdcef04ae1fab5d7c97c5a91d7..50cd9a50b773a1c10f58a6c0ccbad1b512d1f4f1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2774,6 +2774,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0051-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0052-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0051-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0052-FoliaPR-Add-TPS-From-Region.patch