diff --git a/luminol-server/minecraft-patches/features/0010-Add-config-to-disable-end-crystal-check.patch b/luminol-server/minecraft-patches/features/0010-Add-config-to-disable-end-crystal-check.patch new file mode 100644 index 0000000..8e4bf39 --- /dev/null +++ b/luminol-server/minecraft-patches/features/0010-Add-config-to-disable-end-crystal-check.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +Date: Wed, 21 May 2025 13:04:00 +0800 +Subject: [PATCH] Add config to disable end crystal check + + +diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java +index 2e156694b337760be986fdf1cbf863b0d896ef2d..b55ac3c0d19cf9117368c17687fa34099bfe3533 100644 +--- a/net/minecraft/world/level/dimension/end/EndDragonFight.java ++++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java +@@ -546,6 +546,8 @@ public class EndDragonFight { + + blockPos = this.portalLocation; + } ++ // Luminol start - Disable end crystal check ++ if (!me.earthme.luminol.config.modules.misc.DisableEndCrystalCheckConfig.disableEndCrystalCheck) { + // Paper start - Perf: Do crystal-portal proximity check before entity lookup + if (placedEndCrystalPos != null) { + // The end crystal must be 0 or 1 higher than the portal origin +@@ -561,6 +563,7 @@ public class EndDragonFight { + } + } + // Paper end - Perf: Do crystal-portal proximity check before entity lookup ++ } // Luminol end - Disable end crystal check + + + List list = Lists.newArrayList(); diff --git a/luminol-server/minecraft-patches/features/0010-Add-config-to-disable-entity-tick-catchers.patch b/luminol-server/minecraft-patches/features/0011-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0010-Add-config-to-disable-entity-tick-catchers.patch rename to luminol-server/minecraft-patches/features/0011-Add-config-to-disable-entity-tick-catchers.patch diff --git a/luminol-server/minecraft-patches/features/0011-Add-config-to-disable-heightmap-warning.patch b/luminol-server/minecraft-patches/features/0012-Add-config-to-disable-heightmap-warning.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0011-Add-config-to-disable-heightmap-warning.patch rename to luminol-server/minecraft-patches/features/0012-Add-config-to-disable-heightmap-warning.patch diff --git a/luminol-server/minecraft-patches/features/0012-Add-config-to-enable-tick-command.patch b/luminol-server/minecraft-patches/features/0013-Add-config-to-enable-tick-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0012-Add-config-to-enable-tick-command.patch rename to luminol-server/minecraft-patches/features/0013-Add-config-to-enable-tick-command.patch diff --git a/luminol-server/minecraft-patches/features/0013-Add-config-to-modify-tripwire-behavior.patch b/luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch similarity index 97% rename from luminol-server/minecraft-patches/features/0013-Add-config-to-modify-tripwire-behavior.patch rename to luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch index e9d2095..23fbb2a 100644 --- a/luminol-server/minecraft-patches/features/0013-Add-config-to-modify-tripwire-behavior.patch +++ b/luminol-server/minecraft-patches/features/0014-Add-config-to-modify-tripwire-behavior.patch @@ -31,7 +31,7 @@ index 9aace993c6c18f1a50610e4766225485984b8167..419c1c7e14691a472b70ed548ecb928c } } diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java -index f96fc1391167dea48cac1caa464b9026657df89a..ba2da205b046d7d3aab8fb21e116f9be73b13eb3 100644 +index f96fc1391167dea48cac1caa464b9026657df89a..29b286386546db9d809f1b1b5c98571d3058a0f5 100644 --- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java +++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java @@ -27,6 +27,11 @@ public class EndPlatformFeature extends Feature { @@ -84,7 +84,7 @@ index f96fc1391167dea48cac1caa464b9026657df89a..ba2da205b046d7d3aab8fb21e116f9be - // SPIGOT-7856: End platform not dropping items after replacing blocks - if (dropBlocks) { - blockList.getList().forEach((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.AllowTripwireDupe.enabled) { + // Luminol start - When updated replace it with newer code + if (dropBlocks) { + java.util.function.Consumer beforeRun = state -> level.destroyBlock(state.getPosition(), !blockList1.contains(state.getPosition()), null); diff --git a/luminol-server/minecraft-patches/features/0014-Add-config-to-revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0015-Add-config-to-revert-raid-changes.patch similarity index 94% rename from luminol-server/minecraft-patches/features/0014-Add-config-to-revert-raid-changes.patch rename to luminol-server/minecraft-patches/features/0015-Add-config-to-revert-raid-changes.patch index d078c08..9a79bb9 100644 --- a/luminol-server/minecraft-patches/features/0014-Add-config-to-revert-raid-changes.patch +++ b/luminol-server/minecraft-patches/features/0015-Add-config-to-revert-raid-changes.patch @@ -21,7 +21,7 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..8672757a4d5fb5c247599782fece6b8d if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) { serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier)); diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java -index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618996cc5bc 100644 +index 2f45befbb50645f1bfb5961ad725f3670ff0d592..190b9f46029ba0a0d69f68db2c56301f4ea21c94 100644 --- a/net/minecraft/world/entity/raid/Raid.java +++ b/net/minecraft/world/entity/raid/Raid.java @@ -325,7 +325,20 @@ public class Raid { @@ -30,7 +30,7 @@ index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618 if (flag1) { - this.waveSpawnPos = this.getValidSpawnPos(); + // Luminol Start - Raid revert -+ if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.pos_revert) { ++ if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.posRevert) { + this.waveSpawnPos = this.getValidSpawnPos(); + } else { + int n4 = 0; @@ -53,7 +53,7 @@ index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618 - BlockPos blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(20)); + // Luminol Start - Raid revert + BlockPos blockPos; -+ if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.pos_revert) { ++ if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.posRevert) { + blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(20)); + } else { + blockPos = this.waveSpawnPos.isPresent() ? this.waveSpawnPos.get() : this.findRandomSpawnPos(i, 20); @@ -67,7 +67,7 @@ index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618 } - if (i > 5) { -+ if (i > (me.earthme.luminol.config.modules.misc.RaidChangesConfig.pos_revert ? 3 : 5)) { // Luminol - Raid revert ++ if (i > (me.earthme.luminol.config.modules.misc.RaidChangesConfig.posRevert ? 3 : 5)) { // Luminol - Raid revert org.bukkit.craftbukkit.event.CraftEventFactory.callRaidStopEvent(this, org.bukkit.event.raid.RaidStopEvent.Reason.UNSPAWNABLE); // CraftBukkit this.stop(); break; @@ -94,7 +94,7 @@ index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618 int i3 = this.center.getZ() + Mth.floor(Mth.sin(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f); int height = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, i2, i3); - if (Mth.abs(height - this.center.getY()) <= 96) { -+ if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.height_check || Mth.abs(height - this.center.getY()) <= 96) { // Leaves - Disable height check ++ if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.heightCheck || Mth.abs(height - this.center.getY()) <= 96) { // Leaves - Disable height check mutableBlockPos.set(i2, height, i3); if (!this.level.isVillage(mutableBlockPos) || i <= 7) { int i4 = 10; @@ -126,7 +126,7 @@ index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618 return this.addWaveMob(wave, raider, true); } diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java -index 7c385baae81b9a987c0e1e4deb017884600331bc..75a8e0602c249df4b587a454e35f4cd7eab2a25c 100644 +index 7c385baae81b9a987c0e1e4deb017884600331bc..075563d83fadd85191117685fa3b97a9fad14488 100644 --- a/net/minecraft/world/entity/raid/Raider.java +++ b/net/minecraft/world/entity/raid/Raider.java @@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster { @@ -178,7 +178,7 @@ index 7c385baae81b9a987c0e1e4deb017884600331bc..75a8e0602c249df4b587a454e35f4cd7 public boolean hasRaid() { - return this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null); -+ return !me.earthme.luminol.config.modules.misc.RaidChangesConfig.self_check && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null)); // Leaves - Disable raid self check ++ return !me.earthme.luminol.config.modules.misc.RaidChangesConfig.selfCheck && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null)); // Leaves - Disable raid self check } public boolean hasActiveRaid() { diff --git a/luminol-server/minecraft-patches/features/0015-Add-config-to-verify-signature-only-in-online-mode.patch b/luminol-server/minecraft-patches/features/0016-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0015-Add-config-to-verify-signature-only-in-online-mode.patch rename to luminol-server/minecraft-patches/features/0016-Add-config-to-verify-signature-only-in-online-mode.patch diff --git a/luminol-server/minecraft-patches/features/0016-Add-configurable-region-format-framework-linear-v2-r.patch b/luminol-server/minecraft-patches/features/0017-Add-configurable-region-format-framework-linear-v2-r.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0016-Add-configurable-region-format-framework-linear-v2-r.patch rename to luminol-server/minecraft-patches/features/0017-Add-configurable-region-format-framework-linear-v2-r.patch diff --git a/luminol-server/minecraft-patches/features/0017-Add-fix-for-off-region-adult-following-ai-behavior.patch b/luminol-server/minecraft-patches/features/0018-Add-fix-for-off-region-adult-following-ai-behavior.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0017-Add-fix-for-off-region-adult-following-ai-behavior.patch rename to luminol-server/minecraft-patches/features/0018-Add-fix-for-off-region-adult-following-ai-behavior.patch diff --git a/luminol-server/minecraft-patches/features/0018-Add-force-the-data-command-to-be-enabled-config.patch b/luminol-server/minecraft-patches/features/0019-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0018-Add-force-the-data-command-to-be-enabled-config.patch rename to luminol-server/minecraft-patches/features/0019-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/luminol-server/minecraft-patches/features/0019-Add-tick-regions-api.patch b/luminol-server/minecraft-patches/features/0020-Add-tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0019-Add-tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0020-Add-tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0020-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/luminol-server/minecraft-patches/features/0021-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0020-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch rename to luminol-server/minecraft-patches/features/0021-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch diff --git a/luminol-server/minecraft-patches/features/0021-Teleport-async-if-entity-was-moving-to-another-regio.patch b/luminol-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0021-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to luminol-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/luminol-server/minecraft-patches/features/0022-Try-fixing-folia-off-region-POI-accessing-issue.patch b/luminol-server/minecraft-patches/features/0023-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0022-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to luminol-server/minecraft-patches/features/0023-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/luminol-server/minecraft-patches/features/0023-Correct-player-respawn-place.patch b/luminol-server/minecraft-patches/features/0024-Correct-player-respawn-place.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0023-Correct-player-respawn-place.patch rename to luminol-server/minecraft-patches/features/0024-Correct-player-respawn-place.patch diff --git a/luminol-server/minecraft-patches/features/0024-Command-IllegalArgumentException-crash-fix.patch b/luminol-server/minecraft-patches/features/0025-Command-IllegalArgumentException-crash-fix.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0024-Command-IllegalArgumentException-crash-fix.patch rename to luminol-server/minecraft-patches/features/0025-Command-IllegalArgumentException-crash-fix.patch diff --git a/luminol-server/minecraft-patches/features/0025-Do-not-search-the-block-out-of-current-region.patch b/luminol-server/minecraft-patches/features/0026-Do-not-search-the-block-out-of-current-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Do-not-search-the-block-out-of-current-region.patch rename to luminol-server/minecraft-patches/features/0026-Do-not-search-the-block-out-of-current-region.patch diff --git a/luminol-server/minecraft-patches/features/0026-Force-disable-builtin-spark-plugin.patch b/luminol-server/minecraft-patches/features/0027-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0026-Force-disable-builtin-spark-plugin.patch rename to luminol-server/minecraft-patches/features/0027-Force-disable-builtin-spark-plugin.patch diff --git a/luminol-server/minecraft-patches/features/0027-Fix-creative-player-item-pick.patch b/luminol-server/minecraft-patches/features/0028-Fix-creative-player-item-pick.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Fix-creative-player-item-pick.patch rename to luminol-server/minecraft-patches/features/0028-Fix-creative-player-item-pick.patch diff --git a/luminol-server/minecraft-patches/features/0028-Fix-a-series-issue-around-entity-memory-typed-Global.patch b/luminol-server/minecraft-patches/features/0029-Fix-a-series-issue-around-entity-memory-typed-Global.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Fix-a-series-issue-around-entity-memory-typed-Global.patch rename to luminol-server/minecraft-patches/features/0029-Fix-a-series-issue-around-entity-memory-typed-Global.patch diff --git a/luminol-server/minecraft-patches/features/0029-Fix-incorrectly-synced-data-after-player-teleportati.patch b/luminol-server/minecraft-patches/features/0030-Fix-incorrectly-synced-data-after-player-teleportati.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Fix-incorrectly-synced-data-after-player-teleportati.patch rename to luminol-server/minecraft-patches/features/0030-Fix-incorrectly-synced-data-after-player-teleportati.patch diff --git a/luminol-server/minecraft-patches/features/0030-Fix-off-tickregion-sync-teleport.patch b/luminol-server/minecraft-patches/features/0031-Fix-off-tickregion-sync-teleport.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Fix-off-tickregion-sync-teleport.patch rename to luminol-server/minecraft-patches/features/0031-Fix-off-tickregion-sync-teleport.patch diff --git a/luminol-server/minecraft-patches/features/0031-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0032-Fix-uncorrected-death-check-of-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Fix-uncorrected-death-check-of-folia.patch rename to luminol-server/minecraft-patches/features/0032-Fix-uncorrected-death-check-of-folia.patch diff --git a/luminol-server/minecraft-patches/features/0032-Paper-Hopper-behavior-fix.patch b/luminol-server/minecraft-patches/features/0033-Paper-Hopper-behavior-fix.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Paper-Hopper-behavior-fix.patch rename to luminol-server/minecraft-patches/features/0033-Paper-Hopper-behavior-fix.patch diff --git a/luminol-server/minecraft-patches/features/0033-Paper-Prevent-zombie-reinforcements-loading-chunks.patch b/luminol-server/minecraft-patches/features/0034-Paper-Prevent-zombie-reinforcements-loading-chunks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Paper-Prevent-zombie-reinforcements-loading-chunks.patch rename to luminol-server/minecraft-patches/features/0034-Paper-Prevent-zombie-reinforcements-loading-chunks.patch diff --git a/luminol-server/minecraft-patches/features/0034-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0035-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0035-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0036-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0036-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0037-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0037-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0037-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0038-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0038-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0038-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0039-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/minecraft-patches/features/0039-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/luminol-server/minecraft-patches/features/0039-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0040-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0040-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0040-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0041-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0041-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/minecraft-patches/features/0041-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0042-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0041-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0042-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0042-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0043-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0043-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0043-Gale-Faster-chunk-serialization.patch b/luminol-server/minecraft-patches/features/0044-Gale-Faster-chunk-serialization.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0043-Gale-Faster-chunk-serialization.patch rename to luminol-server/minecraft-patches/features/0044-Gale-Faster-chunk-serialization.patch diff --git a/luminol-server/minecraft-patches/features/0044-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0045-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0044-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0045-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0045-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0046-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0045-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0046-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0046-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0047-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0046-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0047-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0047-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0048-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0047-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0048-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0048-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0049-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0048-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0049-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0049-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0050-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0049-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0050-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0051-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0051-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0051-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0051-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0052-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0053-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0052-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0053-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/luminol-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0054-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0054-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0054-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0055-Add-missing-teleportation-apis-for-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0054-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0055-Add-missing-teleportation-apis-for-folia.patch diff --git a/luminol-server/minecraft-patches/features/0055-Portal-Behavior-Modifiers.patch b/luminol-server/minecraft-patches/features/0056-Portal-Behavior-Modifiers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0055-Portal-Behavior-Modifiers.patch rename to luminol-server/minecraft-patches/features/0056-Portal-Behavior-Modifiers.patch diff --git a/luminol-server/minecraft-patches/features/0056-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0057-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0056-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0057-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0058-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0058-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch b/luminol-server/minecraft-patches/features/0059-Leaves-Fix-SculkCatalyst-exp-skip.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch rename to luminol-server/minecraft-patches/features/0059-Leaves-Fix-SculkCatalyst-exp-skip.patch diff --git a/luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Cross-Region-Damage-trace.patch b/luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Cross-Region-Damage-trace.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Cross-Region-Damage-trace.patch rename to luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Cross-Region-Damage-trace.patch diff --git a/luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Raytracing-tracker.patch b/luminol-server/minecraft-patches/features/0061-Add-config-to-enable-Raytracing-tracker.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Raytracing-tracker.patch rename to luminol-server/minecraft-patches/features/0061-Add-config-to-enable-Raytracing-tracker.patch diff --git a/luminol-server/minecraft-patches/features/0061-Lithium-Fast-util.patch b/luminol-server/minecraft-patches/features/0062-Lithium-Fast-util.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0061-Lithium-Fast-util.patch rename to luminol-server/minecraft-patches/features/0062-Lithium-Fast-util.patch diff --git a/luminol-server/minecraft-patches/features/0062-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/luminol-server/minecraft-patches/features/0063-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0062-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to luminol-server/minecraft-patches/features/0063-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/DefaultTransferLogic.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/DefaultTransformLogic.java.patch similarity index 56% rename from luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/DefaultTransferLogic.java.patch rename to luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/DefaultTransformLogic.java.patch index 9811b29..8ea7d8b 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/DefaultTransferLogic.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/DefaultTransformLogic.java.patch @@ -1,9 +1,9 @@ --- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/DefaultTransferLogic.java ++++ b/src/main/java/me/earthme/luminol/config/DefaultTransformLogic.java @@ -1,0 +_,7 @@ +package me.earthme.luminol.config; + -+public class DefaultTransferLogic { ++public class DefaultTransformLogic { + public Object transform(Object obj) { + return obj; + } diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/LuminolConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/LuminolConfig.java.patch index 2c4822a..4c0bafb 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/LuminolConfig.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/LuminolConfig.java.patch @@ -131,24 +131,24 @@ + boolean removed = fullConfigKeyName.equals("removed.removed_config.removed"); + + if (!configFileInstance.contains(fullConfigKeyName) || removed) { -+ for (TransferringConfig transferringConfig : field.getAnnotationsByType(TransferringConfig.class)) { -+ final String oldConfigKeyName = String.join(".", transferringConfig.category()) + "." + transferringConfig.name(); ++ for (TransformedConfig transformedConfig : field.getAnnotationsByType(TransformedConfig.class)) { ++ final String oldConfigKeyName = String.join(".", transformedConfig.category()) + "." + transformedConfig.name(); + Object oldValue = configFileInstance.get(oldConfigKeyName); + if (oldValue != null) { + boolean success = true; -+ if (transferringConfig.transfer() && !removed) { ++ if (transformedConfig.transform() && !removed) { + try { -+ for (Class logic : transferringConfig.transferLogic()) { ++ for (Class logic : transformedConfig.transformLogic()) { + oldValue = logic.getDeclaredConstructor().newInstance().transform(oldValue); + } + configFileInstance.add(fullConfigKeyName, oldValue); + } catch (Exception e) { + success = false; -+ logger.error("Failed to transfer removed config {}!", transferringConfig.name()); ++ logger.error("Failed to transform removed config {}!", transformedConfig.name()); + } + } + -+ if (success) removeConfig(oldConfigKeyName, transferringConfig.category()); ++ if (success) removeConfig(oldConfigKeyName, transformedConfig.category()); + final String comments = configInfo.comments(); + + if (!comments.isBlank()) configFileInstance.setComment(fullConfigKeyName, comments); diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/TransferringConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/TransformedConfig.java.patch similarity index 53% rename from luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/TransferringConfig.java.patch rename to luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/TransformedConfig.java.patch index a291ca7..4f61b02 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/TransferringConfig.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/TransformedConfig.java.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/TransferringConfig.java ++++ b/src/main/java/me/earthme/luminol/config/TransformedConfig.java @@ -1,0 +_,22 @@ +package me.earthme.luminol.config; + @@ -8,18 +8,18 @@ +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) -+@Repeatable(TransferringConfig.List.class) -+public @interface TransferringConfig { ++@Repeatable(TransformedConfig.List.class) ++public @interface TransformedConfig { + String name() default ""; + + String[] category() default ""; + -+ boolean transfer() default true; ++ boolean transform() default true; + -+ Class[] transferLogic() default {DefaultTransferLogic.class}; ++ Class[] transformLogic() default {DefaultTransformLogic.class}; + + @Retention(RetentionPolicy.RUNTIME) + @interface List { -+ TransferringConfig[] value(); ++ TransformedConfig[] value(); + } +} diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/DisableEndCrystalCheckConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/DisableEndCrystalCheckConfig.java.patch new file mode 100644 index 0000000..e9f2f92 --- /dev/null +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/DisableEndCrystalCheckConfig.java.patch @@ -0,0 +1,26 @@ +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/misc/DisableEndCrystalCheckConfig.java +@@ -1,0 +_,23 @@ ++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 DisableEndCrystalCheckConfig implements IConfigModule { ++ @ConfigInfo(baseName = "disable_end_crystal_check", comments = ++ """ ++ Disable paper's End Crystal position check. ++ It reverts to vanilla respawn dragon logic.""") ++ public static boolean disableEndCrystalCheck = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.MISC; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "end_crystal"; ++ } ++} diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch index b29c40a..9ed4b8e 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch @@ -31,19 +31,19 @@ + Disable y <= 96 check. + If you enabled revert_274911, this config will useless + and always behavior of enabled""") -+ public static boolean height_check = false; ++ public static boolean heightCheck = false; + + @ConfigInfo(baseName = "skip-self-raid-check", comments = + """ + Disable raid self check\s + --- this config is not old version's function""") -+ public static boolean self_check = false; ++ public static boolean selfCheck = false; + + @ConfigInfo(baseName = "revert-274911", comments = + """ + Revert Old raid's find spawn position logic + --- This revert MC-274911""") -+ public static boolean pos_revert = false; ++ public static boolean posRevert = false; + + @Override + public EnumConfigCategory getCategory() { diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/removed/RemovedConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/removed/RemovedConfig.java.patch index bef2e70..d673c85 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/removed/RemovedConfig.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/removed/RemovedConfig.java.patch @@ -6,7 +6,7 @@ +import me.earthme.luminol.config.*; + +public class RemovedConfig implements IConfigModule { -+ @TransferringConfig(name = "example", category = {"removed", "example"}, transfer = false) ++ @TransformedConfig(name = "example", category = {"removed", "example"}, transform = false) + @DoNotLoad + @ConfigInfo(baseName = "removed", comments = + """