From 420bb5e7e86394cc58eb0719e3dfa9e1615756fd Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Thu, 9 Jul 2026 19:22:49 +0800 Subject: [PATCH] Fixup renaming --- .../0043-Petal-Reduce-sensor-work.patch | 4 +- ...tle-goal-selector-during-inactive-ti.patch | 2 +- ...-Configurable-vanilla-username-check.patch | 4 +- .../common/scheduler/SchedulingManager.java | 1 - .../ThreadLocalWorldGenSchedulingState.java | 45 ------------------- .../src/main/java/su/plo/matter/Globals.java | 2 +- .../main/java/su/plo/matter/HashingV2.java | 2 +- .../su/plo/matter/WorldgenCryptoRandom.java | 2 +- 8 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/ThreadLocalWorldGenSchedulingState.java diff --git a/camellia-server/minecraft-patches/features/0043-Petal-Reduce-sensor-work.patch b/camellia-server/minecraft-patches/features/0043-Petal-Reduce-sensor-work.patch index 383527d..efeab35 100644 --- a/camellia-server/minecraft-patches/features/0043-Petal-Reduce-sensor-work.patch +++ b/camellia-server/minecraft-patches/features/0043-Petal-Reduce-sensor-work.patch @@ -8,7 +8,7 @@ As part of: Petal (https://github.com/Bloom-host/Petal/blob/cc691540fb48240f38b3 Licensed under: GPL-3.0 (https://github.com/Bloom-host/Petal/blob/cc691540fb48240f38b376f3d94c8b0db2b60d99/LICENSE) diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 3c59325cb82a66a74d6605b51db83ff63e59e089..1d6f66ed1f5b2f7be7a361685452473756dd10a1 100644 +index 3c59325cb82a66a74d6605b51db83ff63e59e089..cab6061af551352a27e623af2ced3f497c5af2b3 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java @@ -840,11 +840,12 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -19,7 +19,7 @@ index 3c59325cb82a66a74d6605b51db83ff63e59e089..1d6f66ed1f5b2f7be7a3616854524737 ProfilerFiller profiler = Profiler.get(); profiler.push("sensing"); - this.sensing.tick(); -+ if (idBasedTickCount % moe.monnairealms.camellia.config.modules.optimizations.PetalReduceSensorWorkConfig.delayTicks == 0 || !me.earthme.luminol.config.modules.optimizations.PetalReduceSensorWorkConfig.enabled) this.sensing.tick(); // Camellia - Petal - Reduce sensor work ++ if (idBasedTickCount % moe.monnairealms.camellia.config.modules.optimizations.PetalReduceSensorWorkConfig.delayTicks == 0 || !moe.monnairealms.camellia.config.modules.optimizations.PetalReduceSensorWorkConfig.enabled) this.sensing.tick(); // Camellia - Petal - Reduce sensor work profiler.pop(); - int idBasedTickCount = this.tickCount + this.getId(); + //int idBasedTickCount = this.tickCount + this.getId(); // Camellia - Petal - Move up diff --git a/camellia-server/minecraft-patches/features/0046-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/camellia-server/minecraft-patches/features/0046-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch index 2461b8f..797ff4a 100644 --- a/camellia-server/minecraft-patches/features/0046-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch +++ b/camellia-server/minecraft-patches/features/0046-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch @@ -9,7 +9,7 @@ Original patch: https://github.com/pufferfish-gg/Pufferfish/blob/ver/1.21/puffer Original license(GPL-3.0): https://github.com/pufferfish-gg/Pufferfish/blob/ver/1.21/PATCH-LICENSE diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 1d6f66ed1f5b2f7be7a361685452473756dd10a1..85f903a5c61fe957594f1278500f2dc589081561 100644 +index cab6061af551352a27e623af2ced3f497c5af2b3..e87af051432e0118fc4c16d7ac321b3072ef0c24 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java @@ -215,12 +215,14 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs diff --git a/camellia-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch b/camellia-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch index bffc2a8..8839ba7 100644 --- a/camellia-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch +++ b/camellia-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch @@ -8,7 +8,7 @@ A part of Leaf(https://github.com/Winds-Studio/Leaf/blob/edb0504069139beaa6f39ef License: https://github.com/Winds-Studio/Leaf/blob/edb0504069139beaa6f39efa4702370c2576b3fc/LICENSE.md diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -index ceaf63c76272b2a11b92f877b9828e93ec79d47f..185f4448559064219338705927efe0b37795fa2e 100644 +index ceaf63c76272b2a11b92f877b9828e93ec79d47f..be8319e3548eeac6cc7a333e95ec9a0b092b8a3e 100644 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -67,6 +67,14 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile { @@ -32,7 +32,7 @@ index ceaf63c76272b2a11b92f877b9828e93ec79d47f..185f4448559064219338705927efe0b3 + // Leaf start - Configurable vanilla username check + public CraftPlayerProfile cloneCustom() { -+ CraftPlayerProfile clone = new CraftPlayerProfile(this.getId(), this.getName(), me.earthme.luminol.config.modules.misc.UsernameCheckConfig.useCustomUsernameRegex()); ++ CraftPlayerProfile clone = new CraftPlayerProfile(this.getId(), this.getName(), moe.monnairealms.camellia.config.modules.misc.UsernameCheckConfig.useCustomUsernameRegex()); + clone.setProperties(getProperties()); + return clone; + } diff --git a/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SchedulingManager.java b/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SchedulingManager.java index f5ccdc2..c0e32d8 100644 --- a/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SchedulingManager.java +++ b/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SchedulingManager.java @@ -24,7 +24,6 @@ package com.ishland.c2me.base.common.scheduler; -import com.ishland.c2me.base.common.GlobalExecutors; import com.ishland.flowsched.executor.ExecutorManager; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArraySet; diff --git a/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/ThreadLocalWorldGenSchedulingState.java b/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/ThreadLocalWorldGenSchedulingState.java deleted file mode 100644 index 66d3620..0000000 --- a/camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/ThreadLocalWorldGenSchedulingState.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2021-2026 ishland - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package com.ishland.c2me.base.common.scheduler; - -import net.minecraft.server.world.ChunkHolder; - -public class ThreadLocalWorldGenSchedulingState { - - private static final ThreadLocal chunkHolder = new ThreadLocal<>(); - - public static ChunkHolder getChunkHolder() { - return chunkHolder.get(); - } - - public static void setChunkHolder(ChunkHolder holder) { - chunkHolder.set(holder); - } - - public static void clearChunkHolder() { - chunkHolder.remove(); - } - -} diff --git a/camellia-server/src/main/java/su/plo/matter/Globals.java b/camellia-server/src/main/java/su/plo/matter/Globals.java index 6d55f08..9f4626a 100644 --- a/camellia-server/src/main/java/su/plo/matter/Globals.java +++ b/camellia-server/src/main/java/su/plo/matter/Globals.java @@ -1,7 +1,7 @@ package su.plo.matter; import com.google.common.collect.Iterables; -import me.earthme.luminol.config.modules.function.SecureSeedConfig; +import moe.monnairealms.camellia.config.modules.function.SecureSeedConfig; import net.minecraft.server.level.ServerLevel; import java.math.BigInteger; diff --git a/camellia-server/src/main/java/su/plo/matter/HashingV2.java b/camellia-server/src/main/java/su/plo/matter/HashingV2.java index 89ffd1b..c187ea8 100644 --- a/camellia-server/src/main/java/su/plo/matter/HashingV2.java +++ b/camellia-server/src/main/java/su/plo/matter/HashingV2.java @@ -1,6 +1,6 @@ package su.plo.matter; -import me.earthme.luminol.config.modules.function.SecureSeedConfig; +import moe.monnairealms.camellia.config.modules.function.SecureSeedConfig; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/camellia-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java b/camellia-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java index dc53035..4c5e4b0 100644 --- a/camellia-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java +++ b/camellia-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java @@ -1,6 +1,6 @@ package su.plo.matter; -import me.earthme.luminol.config.modules.function.SecureSeedConfig; +import moe.monnairealms.camellia.config.modules.function.SecureSeedConfig; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; import net.minecraft.world.level.levelgen.LegacyRandomSource;