feat: apply patches from upstream (Luminol)

2025-06-08 20:46:14 +08:00
parent 29c2dd96ec
commit e4a0c78d7e
23 changed files with 1390 additions and 20 deletions
@@ -165,7 +165,7 @@ index fb63e2a3205ea9f7aaee0ff0f4dc0cc1a5268507..645f2f41de74f4461685c753dcd6cfc5
                     );
                 }
 diff --git a/src/main/java/me/earthme/luminol/config/LuminolConfig.java b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
-index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb195a74daa0 100644
+index da945b930ed8ef24a907e9c397efa115d128a3d2..f9994cb3134accd2d43ae5de950fdb9700e7b466 100644
 --- a/src/main/java/me/earthme/luminol/config/LuminolConfig.java
 +++ b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
@@ -29,22 +29,33 @@ import java.util.jar.JarEntry;
@@ -273,7 +273,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         final EnumConfigCategory category = singleConfigModule.getCategory();
 
         Field[] fields = singleConfigModule.getClass().getDeclaredFields();
-@@ -199,7 +210,7 @@ public class LuminolConfig {
+@@ -200,7 +211,7 @@ public class LuminolConfig {
         }
     }
 
@@ -282,7 +282,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         configFileInstance.remove(name);
         Object configAtPath = configFileInstance.get(String.join(".", keys));
         if (configAtPath instanceof UnmodifiableConfig && ((UnmodifiableConfig) configAtPath).isEmpty()) {
-@@ -207,7 +218,7 @@ public class LuminolConfig {
+@@ -208,7 +219,7 @@ public class LuminolConfig {
         }
     }
 
@@ -291,7 +291,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         configFileInstance.remove(String.join(".", keys));
         Object configAtPath = configFileInstance.get(String.join(".", Arrays.copyOfRange(keys, 1, keys.length)));
         if (configAtPath instanceof UnmodifiableConfig && ((UnmodifiableConfig) configAtPath).isEmpty()) {
-@@ -215,11 +226,11 @@ public class LuminolConfig {
+@@ -216,11 +227,11 @@ public class LuminolConfig {
         }
     }
 
@@ -305,7 +305,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         if (configFileInstance.contains(key) && configFileInstance.get(key) != null) {
             stagedConfigMap.put(key, value);
             return true;
-@@ -227,7 +238,7 @@ public class LuminolConfig {
+@@ -228,7 +239,7 @@ public class LuminolConfig {
         return false;
     }
 
@@ -314,7 +314,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         if (!targetType.isAssignableFrom(value.getClass())) {
             try {
                 if (targetType == Integer.class) {
-@@ -251,27 +262,27 @@ public class LuminolConfig {
+@@ -252,27 +263,27 @@ public class LuminolConfig {
         return value;
     }
 
@@ -348,7 +348,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         List<String> allPaths = getAllConfigPaths(partialPath);
         List<String> result = new ArrayList<>();
 
-@@ -291,13 +302,13 @@ public class LuminolConfig {
+@@ -292,13 +303,13 @@ public class LuminolConfig {
         return result;
     }
 
@@ -364,7 +364,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         Set<Class<?>> classes = new LinkedHashSet<>();
         String packageDirName = pack.replace('.', '/');
         Enumeration<URL> dirs;
-@@ -328,7 +339,7 @@ public class LuminolConfig {
+@@ -329,7 +340,7 @@ public class LuminolConfig {
         return classes;
     }
 
@@ -373,7 +373,7 @@ index 0fed724ce1f0f4f731ab471333aa9fbaef70598e..145612d7ed358d3973f817f45fc5eb19
         File dir = new File(packagePath);
 
         if (!dir.exists() || !dir.isDirectory()) {
-@@ -352,7 +363,7 @@ public class LuminolConfig {
+@@ -353,7 +364,7 @@ public class LuminolConfig {
         }
     }
 
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Suisuroru <qwertyuiop14077@qq.com>
+Date: Thu, 20 Feb 2025 01:00:29 +0800
+Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+index c00ddfe41439954fa0fd87c0933f274c8a752eb6..ac0218fcdf9e9c77a30b7f09b2a5e557ef0f7591 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+@@ -150,9 +150,26 @@ public class CraftContainer extends AbstractContainerMenu {
+             case PLAYER:
+             case CHEST:
+             case ENDER_CHEST:
+-            case BARREL:
+-                this.delegate = new ChestMenu(net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
+                // Purpur start - Barrels and enderchests 6 rows
+                this.delegate = new ChestMenu(switch (me.earthme.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows) {
+                    case 6 -> net.minecraft.world.inventory.MenuType.GENERIC_9x6;
+                    case 5 -> net.minecraft.world.inventory.MenuType.GENERIC_9x5;
+                    case 4 -> net.minecraft.world.inventory.MenuType.GENERIC_9x4;
+                    case 2 -> net.minecraft.world.inventory.MenuType.GENERIC_9x2;
+                    case 1 -> net.minecraft.world.inventory.MenuType.GENERIC_9x1;
+                    default -> net.minecraft.world.inventory.MenuType.GENERIC_9x3;
+                }, windowId, bottom, top, top.getContainerSize() / 9);
+                 break;
+            case BARREL:
+                this.delegate = new ChestMenu(switch (me.earthme.lophine.config.modules.misc.ContainerExpansionConfig.barrelRows) {
+                    case 6 -> net.minecraft.world.inventory.MenuType.GENERIC_9x6;
+                    case 5 -> net.minecraft.world.inventory.MenuType.GENERIC_9x5;
+                    case 4 -> net.minecraft.world.inventory.MenuType.GENERIC_9x4;
+                    case 2 -> net.minecraft.world.inventory.MenuType.GENERIC_9x2;
+                    case 1 -> net.minecraft.world.inventory.MenuType.GENERIC_9x1;
+                    default -> net.minecraft.world.inventory.MenuType.GENERIC_9x3;
+                    }, windowId, bottom, top, top.getContainerSize() / 9);
+                // Purpur end - Barrels and enderchests 6 rows
+             case DISPENSER:
+             case DROPPER:
+                 this.delegate = new DispenserMenu(windowId, bottom, top);
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+index f850e6cea92edc87ed54cf54488b5ebb606913ed..f4db38de4348fb03db0b769bd5b5993184dd4abb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+@@ -84,7 +84,7 @@ public class CraftInventory implements Inventory {
+ 
+     @Override
+     public void setContents(ItemStack[] items) {
+-        Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize());
+    // Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize()); // Purpur - Barrels and enderchests 6 rows
+ 
+         for (int i = 0; i < this.getSize(); i++) {
+             if (i >= items.length) {
@@ -0,0 +1,154 @@
+--- /dev/null
+++ b/src/main/java/dev/tr7zw/entityculling/CullTask.java
+@@ -1,0 +_,151 @@
+package dev.tr7zw.entityculling;
+
+import ca.spottedleaf.moonrise.common.util.TickThread;
+import com.logisticscraft.occlusionculling.OcclusionCullingInstance;
+import com.logisticscraft.occlusionculling.util.Vec3d;
+import dev.tr7zw.entityculling.versionless.access.Cullable;
+import me.earthme.lophine.config.modules.experiment.RayTrackingEntityTrackerConfig;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.decoration.ArmorStand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class CullTask implements Runnable {
+
+    private volatile boolean requestCull = false;
+    private volatile boolean scheduleNext = true;
+    private volatile boolean inited = false;
+
+    private final OcclusionCullingInstance culling;
+    private final Player checkTarget;
+
+    private final int hitboxLimit;
+
+    public long lastCheckedTime = 0;
+
+    // reused preallocated vars
+    private final Vec3d lastPos = new Vec3d(0, 0, 0);
+    private final Vec3d aabbMin = new Vec3d(0, 0, 0);
+    private final Vec3d aabbMax = new Vec3d(0, 0, 0);
+
+    private static final Executor backgroundWorker = Executors.newCachedThreadPool(task -> {
+        final TickThread worker = new TickThread("EntityCulling") {
+            @Override
+            public void run() {
+                task.run();
+            }
+        };
+
+        worker.setDaemon(true);
+
+        return worker;
+    });
+
+    private final Executor worker;
+
+    public CullTask(
+            OcclusionCullingInstance culling,
+            Player checkTarget,
+            int hitboxLimit,
+            long checkIntervalMs
+    ) {
+        this.culling = culling;
+        this.checkTarget = checkTarget;
+        this.hitboxLimit = hitboxLimit;
+        this.worker = CompletableFuture.delayedExecutor(checkIntervalMs, TimeUnit.MILLISECONDS, backgroundWorker);
+    }
+
+    public void requestCullSignal() {
+        this.requestCull = true;
+    }
+
+    public void signalStop() {
+        this.scheduleNext = false;
+    }
+
+    public void setup() {
+        if (!this.inited)
+            this.inited = true;
+        else
+            return;
+        this.worker.execute(this);
+    }
+
+    @Override
+    public void run() {
+        try {
+            if (this.checkTarget.tickCount > 10) {
+                // getEyePosition can use a fixed delta as its debug only anyway
+                Vec3 cameraMC = this.checkTarget.getEyePosition(0);
+                if (requestCull || !(cameraMC.x == lastPos.x && cameraMC.y == lastPos.y && cameraMC.z == lastPos.z)) {
+                    long start = System.currentTimeMillis();
+
+                    requestCull = false;
+
+                    lastPos.set(cameraMC.x, cameraMC.y, cameraMC.z);
+                    culling.resetCache();
+
+                    cullEntities(cameraMC, lastPos);
+
+                    lastCheckedTime = (System.currentTimeMillis() - start);
+                }
+            }
+        }finally {
+            if (this.scheduleNext) {
+                this.worker.execute(this);
+            }
+        }
+    }
+
+    private void cullEntities(Vec3 cameraMC, Vec3d camera) {
+        for (Entity entity : this.checkTarget.level().getEntities().getAll()) {
+            if (!(entity instanceof Cullable cullable)) {
+                continue; // Not sure how this could happen outside from mixin screwing up the inject into
+                // Entity
+            }
+
+            if (entity.getType().skipRaytracningCheck) {
+                continue;
+            }
+
+            if (!cullable.isForcedVisible()) {
+                if (entity.isCurrentlyGlowing() || isSkippableArmorstand(entity)) {
+                    cullable.setCulled(false);
+                    continue;
+                }
+
+                if (!entity.position().closerThan(cameraMC, RayTrackingEntityTrackerConfig.tracingDistance)) {
+                    cullable.setCulled(false); // If your entity view distance is larger than tracingDistance just
+                    // render it
+                    continue;
+                }
+
+                AABB boundingBox = entity.getBoundingBox();
+                if (boundingBox.getXsize() > hitboxLimit || boundingBox.getYsize() > hitboxLimit
+                        || boundingBox.getZsize() > hitboxLimit) {
+                    cullable.setCulled(false); // Too big to bother to cull
+                    continue;
+                }
+
+                aabbMin.set(boundingBox.minX, boundingBox.minY, boundingBox.minZ);
+                aabbMax.set(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ);
+
+                boolean visible = culling.isAABBVisible(aabbMin, aabbMax, camera);
+
+                cullable.setCulled(!visible);
+            }
+        }
+    }
+
+    private boolean isSkippableArmorstand(Entity entity) {
+        if (!RayTrackingEntityTrackerConfig.skipMarkerArmorStands)
+            return false;
+        return entity instanceof ArmorStand && entity.isInvisible();
+    }
+}
@@ -0,0 +1,45 @@
+--- /dev/null
+++ b/src/main/java/dev/tr7zw/entityculling/DefaultChunkDataProvider.java
+@@ -1,0 +_,42 @@
+package dev.tr7zw.entityculling;
+
+import com.logisticscraft.occlusionculling.DataProvider;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.chunk.ChunkAccess;
+
+public class DefaultChunkDataProvider implements DataProvider {
+    private final Level level;
+
+    public DefaultChunkDataProvider(Level level) {
+        this.level = level;
+    }
+
+    @Override
+    public boolean prepareChunk(int chunkX, int chunkZ) {
+        return this.level.getChunkIfLoaded(chunkX, chunkZ) != null;
+    }
+
+    @Override
+    public boolean isOpaqueFullCube(int x, int y, int z) {
+        BlockPos pos = new BlockPos(x, y, z);
+
+        final ChunkAccess access = this.level.getChunkIfLoaded(pos);
+        if (access == null) {
+            return false;
+        }
+
+        if (this.level.isOutsideBuildHeight(pos)) {
+            return Blocks.VOID_AIR.defaultBlockState().isSolidRender();
+        } else {
+            return access.getBlockState(pos).isSolidRender();// 好孩子不要学坏叔叔这样绕过异步拦截()
+        }
+    }
+
+    @Override
+    public void cleanup() {
+        DataProvider.super.cleanup();
+    }
+
+}
@@ -0,0 +1,20 @@
+--- /dev/null
+++ b/src/main/java/dev/tr7zw/entityculling/versionless/access/Cullable.java
+@@ -1,0 +_,17 @@
+package dev.tr7zw.entityculling.versionless.access;
+
+public interface Cullable {
+
+    public void setTimeout();
+
+    public boolean isForcedVisible();
+
+    public void setCulled(boolean value);
+
+    public boolean isCulled();
+
+    public void setOutOfCamera(boolean value);
+
+    public boolean isOutOfCamera();
+
+}
@@ -0,0 +1,30 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/modules/experiment/CommandConfig.java
+@@ -1,0 +_,27 @@
+package me.earthme.lophine.config.modules.experiment;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class CommandConfig implements IConfigModule {
+    @ConfigInfo(baseName = "command_block_enabled", comments =
+            """
+                    Allow to use command block""")
+    public static boolean block = false;
+
+    @ConfigInfo(baseName = "tick_command_enabled", comments =
+            """
+                    Allow to use tick command""")
+    public static boolean tick = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.EXPERIMENT;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "command";
+    }
+}
@@ -0,0 +1,25 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java
+@@ -1,0 +_,22 @@
+package me.earthme.lophine.config.modules.experiment;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class EntityDamageSourceTraceConfig implements IConfigModule {
+    @ConfigInfo(baseName = "enabled", comments =
+            """
+                    Allow trace damage source cross different Region Scheduler.""")
+    public static boolean enabled = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.EXPERIMENT;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "entity_damage_source_trace";
+    }
+}
@@ -0,0 +1,31 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java
+@@ -1,0 +_,28 @@
+package me.earthme.lophine.config.modules.experiment;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class RayTrackingEntityTrackerConfig implements IConfigModule {
+    @ConfigInfo(baseName = "enabled")
+    public static boolean enabled = false;
+    @ConfigInfo(baseName = "skip_marker_armor_stands")
+    public static boolean skipMarkerArmorStands = true;
+    @ConfigInfo(baseName = "check_interval_ms")
+    public static int checkIntervalMs = 10;
+    @ConfigInfo(baseName = "tracing_distance")
+    public static int tracingDistance = 48;
+    @ConfigInfo(baseName = "hitbox_limit")
+    public static int hitboxLimit = 50;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.EXPERIMENT;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "ray_tracking_entity_tracker";
+    }
+}
@@ -0,0 +1,30 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/modules/misc/ContainerExpansionConfig.java
+@@ -1,0 +_,27 @@
+package me.earthme.lophine.config.modules.misc;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class ContainerExpansionConfig implements IConfigModule {
+    @ConfigInfo(baseName = "barrel_rows", comments =
+            """
+                    range: 1~6\s""")
+    public static int barrelRows = 3;
+
+    @ConfigInfo(baseName = "enderchest_rows", comments =
+            """
+                    range: 1~6\s""")
+    public static int enderchestRows = 3;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "container_expansion";
+    }
+}
@@ -0,0 +1,26 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/modules/misc/DisableEndCrystalCheckConfig.java
+@@ -1,0 +_,23 @@
+package me.earthme.lophine.config.modules.misc;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+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 disableCheck = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "end_crystal";
+    }
+}
@@ -0,0 +1,57 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/modules/misc/RaidChangesConfig.java
+@@ -1,0 +_,54 @@
+package me.earthme.lophine.config.modules.misc;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class RaidChangesConfig implements IConfigModule {
+    @ConfigInfo(baseName = "allow_skip_cooldown", comments =
+            """
+                    Allow players with bad omen to skip a
+                    30-second cooldown and trigger attacks directly""")
+    public static boolean trigger = false;
+
+    @ConfigInfo(baseName = "give_bad_omen_when_kill_raid_captain", comments =
+            """
+                    Enable players to obtain a bad omen
+                    effect when killing the raid captain""")
+    public static boolean effect = false;
+
+    @ConfigInfo(baseName = "bad_omen_infinite", comments =
+            """
+                    Enable bad omen effect infinite time
+                        --- this config is not old version's function""")
+    public static boolean infinite = false;
+
+    @ConfigInfo(baseName = "skip_height_check", comments =
+            """
+                    Disable y <= 96 check.
+                    If you enabled use_old_position_find, this config
+                    will useless and always behavior of enabled""")
+    public static boolean heightCheck = false;
+
+    @ConfigInfo(baseName = "skip_self_raid_check", comments =
+            """
+                    Disable raid self check
+                        --- this config is not old version's function""")
+    public static boolean selfCheck = false;
+
+    @ConfigInfo(baseName = "use_old_position_find", comments =
+            """
+                    Revert Old raid's find spawn position logic
+                        --- This revert MC-274911""")
+    public static boolean posRevert = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "revert_raid_changes";
+    }
+}
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/lophine/config/modules/removed/RemovedConfig.java
-@@ -1,0 +_,26 @@
+@@ -1,0 +_,25 @@
 +package me.earthme.lophine.config.modules.removed;
 +
 +import me.earthme.luminol.config.EnumConfigCategory;
@@ -11,7 +11,6 @@
 +
 +public class RemovedConfig implements IConfigModule {
 +    @TransformedConfig(name = "example", category = {"removed", "example"}, transform = false)
-+    @DoNotLoad
 +    @ConfigInfo(baseName = "removed", comments =
 +            """
 +                    RemovedConfig redirect to here, no any function.""")