diff --git a/luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch b/luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch index 96fcfba..0efdc6f 100644 --- a/luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch +++ b/luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to modify tripwire behavior diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java -index 8a3a8b0fdf9545a41501dc992c6982d9c8ce7b66..8139387c1b0814c86d770f5ef6dda952140467ea 100644 +index 8a3a8b0fdf9545a41501dc992c6982d9c8ce7b66..8f9f5b0bf098a32a732e3ff9f636e3ea828e5f43 100644 --- a/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/net/minecraft/world/level/block/TripWireHookBlock.java @@ -200,10 +200,17 @@ public class TripWireHookBlock extends Block { @@ -16,7 +16,7 @@ index 8a3a8b0fdf9545a41501dc992c6982d9c8ce7b66..8139387c1b0814c86d770f5ef6dda952 - if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) { - if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3); // Paper - prevent tripwire from updating + // Luminol start - tripwire and tripwireHook dupe -+ if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled) { ++ if (me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.enabled) { + level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3); + level.getBlockState(blockPos1); + } else { @@ -30,7 +30,7 @@ index 8a3a8b0fdf9545a41501dc992c6982d9c8ce7b66..8139387c1b0814c86d770f5ef6dda952 } } diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java -index 49b810ae9d9a8d0718a5f8c512e15a5573ed04fd..ae48255ee384a7b4a44c8754601200d361665934 100644 +index 49b810ae9d9a8d0718a5f8c512e15a5573ed04fd..37ebb23c9c053de0530254d98f2120058833f232 100644 --- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java +++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java @@ -28,6 +28,11 @@ public class EndPlatformFeature extends Feature { @@ -40,8 +40,8 @@ index 49b810ae9d9a8d0718a5f8c512e15a5573ed04fd..ae48255ee384a7b4a44c8754601200d3 + // Luminol start - tripwire behavior modifier + java.util.List blockList1 = new java.util.ArrayList<>(); + java.util.List blockList2 = new java.util.ArrayList<>(); -+ boolean flag21 = !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.AllowTripwireDupe.behaviorMode, "VANILLA20") -+ && !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.AllowTripwireDupe.behaviorMode, "MIXED"); ++ boolean flag21 = !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.behaviorMode, "VANILLA20") ++ && !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.behaviorMode, "MIXED"); for (int i = -2; i <= 2; i++) { for (int i1 = -2; i1 <= 2; i1++) { for (int i2 = -1; i2 < 3; i2++) { @@ -51,8 +51,8 @@ index 49b810ae9d9a8d0718a5f8c512e15a5573ed04fd..ae48255ee384a7b4a44c8754601200d3 if (dropBlocks) { - blockList.destroyBlock(blockPos, true, null); // CraftBukkit + boolean flag = false; -+ if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled) { -+ switch (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.behaviorMode) { ++ if (me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.enabled) { ++ switch (me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.behaviorMode) { + case "VANILLA20": { + flag = true; + } @@ -82,7 +82,7 @@ index 49b810ae9d9a8d0718a5f8c512e15a5573ed04fd..ae48255ee384a7b4a44c8754601200d3 - if (dropBlocks) { - blockList.placeBlocks(state -> level.destroyBlock(state.getPosition(), true, null)); -+ if (flag21 || !me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled) { ++ if (flag21 || !me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.enabled) { + if (dropBlocks) { + blockList.placeBlocks(state -> level.destroyBlock(state.getPosition(), true, null)); + } else { diff --git a/luminol-server/minecraft-patches/features/0025-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0025-Gale-Optimize-noise-generation.patch index 562c4de..d741ca7 100644 --- a/luminol-server/minecraft-patches/features/0025-Gale-Optimize-noise-generation.patch +++ b/luminol-server/minecraft-patches/features/0025-Gale-Optimize-noise-generation.patch @@ -3,9 +3,11 @@ From: MrHua269 Date: Wed, 22 Jan 2025 17:23:16 +0800 Subject: [PATCH] Gale: Optimize noise generation -Co-authored by: Martijn Muijsers , ishland -As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0106-Optimize-noise-generation.patch) and C2ME (https://github.com/RelativityMC/C2ME-fabric) -Licensed under: MIT (https://opensource.org/licenses/MIT) +Co-authored by: Martijn Muijsers +ishland +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0106-Optimize-noise-generation.patch) +C2ME (https://github.com/RelativityMC/C2ME-fabric) +Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java b/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java index fb11a2eea540d55e50eab59f9857ca5d99f556f8..dcc1a3f8b611c9f103b848db90b077b984b60ada 100644 diff --git a/luminol-server/minecraft-patches/features/0026-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0026-Gale-Replace-AI-attributes-with-optimized-collection.patch index 6e8a35d..2541025 100644 --- a/luminol-server/minecraft-patches/features/0026-Gale-Replace-AI-attributes-with-optimized-collection.patch +++ b/luminol-server/minecraft-patches/features/0026-Gale-Replace-AI-attributes-with-optimized-collection.patch @@ -3,8 +3,10 @@ From: MrHua269 Date: Wed, 22 Jan 2025 17:18:00 +0800 Subject: [PATCH] Gale: Replace AI attributes with optimized collections -Co-authored by: Martijn Muijsers , 2No2Name <2No2Name@web.de> -As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch) and Lithium (https://github.com/CaffeineMC/lithium-fabric) +Co-authored by: Martijn Muijsers +2No2Name <2No2Name@web.de> +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch) +Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java diff --git a/luminol-server/minecraft-patches/features/0027-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0027-Gale-Skip-entity-move-if-movement-is-zero.patch index c0b3e18..5aa39db 100644 --- a/luminol-server/minecraft-patches/features/0027-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/luminol-server/minecraft-patches/features/0027-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -3,8 +3,10 @@ From: MrHua269 Date: Sun, 12 Jan 2025 15:35:15 +0800 Subject: [PATCH] Gale: Skip entity move if movement is zero -Co-authored by: Martijn Muijsers , ishland -As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0103-Skip-entity-move-if-movement-is-zero.patch) and VMP (https://github.com/RelativityMC/VMP-fabric) +Co-authored by: Martijn Muijsers +ishland +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0103-Skip-entity-move-if-movement-is-zero.patch) +VMP (https://github.com/RelativityMC/VMP-fabric) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java diff --git a/luminol-server/minecraft-patches/features/0028-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0028-Gale-Use-platform-math-functions.patch index 4d92163..194baa3 100644 --- a/luminol-server/minecraft-patches/features/0028-Gale-Use-platform-math-functions.patch +++ b/luminol-server/minecraft-patches/features/0028-Gale-Use-platform-math-functions.patch @@ -3,8 +3,10 @@ From: MrHua269 Date: Sun, 12 Jan 2025 14:15:24 +0800 Subject: [PATCH] Gale: Use platform math functions -Co-authored by: Martijn Muijsers , Xymb -As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0019-Use-platform-math-functions.patch) and Kaiiju(https://github.com/KaiijuMC/Kaiiju) +Co-authored by: Martijn Muijsers +Xymb +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0019-Use-platform-math-functions.patch) +Kaiiju (https://github.com/KaiijuMC/Kaiiju) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/util/Mth.java b/net/minecraft/util/Mth.java diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/TripwireBehaviorConfig.java.patch similarity index 82% rename from luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java.patch rename to luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/TripwireBehaviorConfig.java.patch index bf82484..8589fe0 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/TripwireBehaviorConfig.java.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java ++++ b/src/main/java/me/earthme/luminol/config/modules/misc/TripwireBehaviorConfig.java @@ -1,0 +_,29 @@ +package me.earthme.luminol.config.modules.misc; + @@ -8,13 +8,13 @@ +import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.TransformedConfig; + -+public class AllowTripwireDupe implements IConfigModule { ++public class TripwireBehaviorConfig implements IConfigModule { + @ConfigInfo(baseName = "enabled") + public static boolean enabled = false; + @TransformedConfig(name = "behavior-mode", category = {"misc", "tripwire_dupe"}) + @ConfigInfo(baseName = "behavior_mode", comments = + """ -+ Allowed Value: ++ Available Value: + VANILLA20 + VANILLA21 + MIXED""")