Added config for tripwire dupe

LuminolMC · Dec 29, 2024 · 1984558 · 1984558
1 parent ab5b160
commit 1984558
Show file tree

Hide file tree

Showing 40 changed files with 50 additions and 4 deletions.
diff --git a/patches/server/0013-Add-config-for-tripwire-dupe.patch 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/...erify-signature-only-in-online-mode.patch → ...erify-signature-only-in-online-mode.patch b/...erify-signature-only-in-online-mode.patch → ...erify-signature-only-in-online-mode.patch
diff --git a/...fig-to-disable-entity-tick-catchers.patch → ...fig-to-disable-entity-tick-catchers.patch b/...fig-to-disable-entity-tick-catchers.patch → ...fig-to-disable-entity-tick-catchers.patch
diff --git a/...dd-config-to-disable-async-catchers.patch → ...dd-config-to-disable-async-catchers.patch b/...dd-config-to-disable-async-catchers.patch → ...dd-config-to-disable-async-catchers.patch
diff --git a/...nfig-for-command-block-command-exec.patch → ...nfig-for-command-block-command-exec.patch b/...nfig-for-command-block-command-exec.patch → ...nfig-for-command-block-command-exec.patch
diff --git a/...-region-adult-following-ai-behavior.patch → ...-region-adult-following-ai-behavior.patch b/...-region-adult-following-ai-behavior.patch → ...-region-adult-following-ai-behavior.patch
diff --git a/...region-format-framework-linear-v2-r.patch → ...region-format-framework-linear-v2-r.patch b/...region-format-framework-linear-v2-r.patch → ...region-format-framework-linear-v2-r.patch
diff --git a/...-fixing-folia-spector-teleportation.patch → ...-fixing-folia-spector-teleportation.patch b/...-fixing-folia-spector-teleportation.patch → ...-fixing-folia-spector-teleportation.patch
diff --git a/...-entity-was-moving-to-another-regio.patch → ...-entity-was-moving-to-another-regio.patch b/...-entity-was-moving-to-another-regio.patch → ...-entity-was-moving-to-another-regio.patch
diff --git a/...olia-off-region-POI-accessing-issue.patch → ...olia-off-region-POI-accessing-issue.patch b/...olia-off-region-POI-accessing-issue.patch → ...olia-off-region-POI-accessing-issue.patch
diff --git a/...-Force-disable-builtin-spark-plugin.patch → ...-Force-disable-builtin-spark-plugin.patch b/...-Force-disable-builtin-spark-plugin.patch → ...-Force-disable-builtin-spark-plugin.patch
diff --git a/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch b/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch
diff --git a/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch b/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch
diff --git a/...iju-Entity-tick-and-removal-limiter.patch → ...iju-Entity-tick-and-removal-limiter.patch b/...iju-Entity-tick-and-removal-limiter.patch → ...iju-Entity-tick-and-removal-limiter.patch
diff --git a/...erver/0026-Petal-Reduce-sensor-work.patch → ...erver/0027-Petal-Reduce-sensor-work.patch b/...erver/0026-Petal-Reduce-sensor-work.patch → ...erver/0027-Petal-Reduce-sensor-work.patch
diff --git a/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch b/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch
diff --git a/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch b/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch
diff --git a/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch b/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch
diff --git a/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch b/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch
diff --git a/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch b/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch
diff --git a/...032-Pufferfish-Optimize-suffocation.patch → ...033-Pufferfish-Optimize-suffocation.patch b/...032-Pufferfish-Optimize-suffocation.patch → ...033-Pufferfish-Optimize-suffocation.patch
diff --git a/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch b/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-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/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch b/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch
diff --git a/...rver/0035-Pufferfish-SIMD-Utilities.patch → ...rver/0036-Pufferfish-SIMD-Utilities.patch b/...rver/0035-Pufferfish-SIMD-Utilities.patch → ...rver/0036-Pufferfish-SIMD-Utilities.patch
diff --git a/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch b/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch
diff --git a/...er/0037-Gale-Optimize-sun-burn-tick.patch → ...er/0038-Gale-Optimize-sun-burn-tick.patch b/...er/0037-Gale-Optimize-sun-burn-tick.patch → ...er/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/...38-Gale-Use-platform-math-functions.patch → ...39-Gale-Use-platform-math-functions.patch b/...38-Gale-Use-platform-math-functions.patch → ...39-Gale-Use-platform-math-functions.patch
diff --git a/...0039-Gale-Optimize-noise-generation.patch → ...0040-Gale-Optimize-noise-generation.patch b/...0039-Gale-Optimize-noise-generation.patch → ...0040-Gale-Optimize-noise-generation.patch
diff --git a/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch b/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch
diff --git a/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch b/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-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/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch b/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch
diff --git a/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch b/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch b/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch
diff --git a/...047-Leaf-Skip-event-if-no-listeners.patch → ...048-Leaf-Skip-event-if-no-listeners.patch b/...047-Leaf-Skip-event-if-no-listeners.patch → ...048-Leaf-Skip-event-if-no-listeners.patch
diff --git a/...8-Purpur-use-alternative-keep-alive.patch → ...9-Purpur-use-alternative-keep-alive.patch b/...8-Purpur-use-alternative-keep-alive.patch → ...9-Purpur-use-alternative-keep-alive.patch
diff --git a/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch b/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch
diff --git a/patches/server/0050-Fix-MC-2025.patch → patches/server/0051-Fix-MC-2025.patch b/patches/server/0050-Fix-MC-2025.patch → 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/...er/0051-FoliaPR-Add-TPS-From-Region.patch → ...er/0052-FoliaPR-Add-TPS-From-Region.patch b/...er/0051-FoliaPR-Add-TPS-From-Region.patch → ...er/0052-FoliaPR-Add-TPS-From-Region.patch