Partially fix jade in tick freeze

2025-12-29 11:59:17 +00:00 · 2025-07-06 22:24:54 -07:00
parent 0f5b9cdd68
commit 0908443320
8 changed files with 18 additions and 18 deletions
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/Accessor.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/Accessor.java
@@ -3,13 +3,13 @@ package org.leavesmc.leaves.protocol.jade.accessor;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamEncoder;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
 import org.jetbrains.annotations.Nullable;

 public interface Accessor<T extends HitResult> {
-    Level getLevel();
+    ServerLevel getLevel();

    Player getPlayer();

--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/AccessorImpl.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/AccessorImpl.java
@@ -5,8 +5,8 @@ import net.minecraft.nbt.ByteArrayTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamEncoder;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
 import org.apache.commons.lang3.ArrayUtils;

@@ -14,20 +14,20 @@ import java.util.function.Supplier;

 public abstract class AccessorImpl<T extends HitResult> implements Accessor<T> {

-    private final Level level;
+    private final ServerLevel level;
    private final Player player;
    private final Supplier<T> hit;
    protected boolean verify;
    private RegistryFriendlyByteBuf buffer;

-    public AccessorImpl(Level level, Player player, Supplier<T> hit) {
+    public AccessorImpl(ServerLevel level, Player player, Supplier<T> hit) {
        this.level = level;
        this.player = player;
        this.hit = hit;
    }

    @Override
-    public Level getLevel() {
+    public ServerLevel getLevel() {
        return level;
    }

--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessor.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessor.java
@@ -1,8 +1,8 @@
 package org.leavesmc.leaves.protocol.jade.accessor;

 import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -23,7 +23,7 @@ public interface BlockAccessor extends Accessor<BlockHitResult> {

    @ApiStatus.NonExtendable
    interface Builder {
-        Builder level(Level level);
+        Builder level(ServerLevel level);

        Builder player(Player player);

--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessorImpl.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessorImpl.java
@@ -6,10 +6,10 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -61,14 +61,14 @@ public class BlockAccessorImpl extends AccessorImpl<BlockHitResult> implements B
    }

    public static class Builder implements BlockAccessor.Builder {
-        private Level level;
+        private ServerLevel level;
        private Player player;
        private BlockHitResult hit;
        private BlockState blockState = Blocks.AIR.defaultBlockState();
        private Supplier<BlockEntity> blockEntity;

        @Override
-        public Builder level(Level level) {
+        public Builder level(ServerLevel level) {
            this.level = level;
            return this;
        }
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/EntityAccessor.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/EntityAccessor.java
@@ -1,8 +1,8 @@
 package org.leavesmc.leaves.protocol.jade.accessor;

+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.EntityHitResult;
 import org.jetbrains.annotations.ApiStatus;

@@ -19,7 +19,7 @@ public interface EntityAccessor extends Accessor<EntityHitResult> {

    @ApiStatus.NonExtendable
    interface Builder {
-        Builder level(Level level);
+        Builder level(ServerLevel level);

        Builder player(Player player);

--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/EntityAccessorImpl.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/EntityAccessorImpl.java
@@ -4,10 +4,10 @@ import com.google.common.base.Suppliers;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -41,13 +41,13 @@ public class EntityAccessorImpl extends AccessorImpl<EntityHitResult> implements
    }

    public static class Builder implements EntityAccessor.Builder {
-        private Level level;
+        private ServerLevel level;
        private Player player;
        private Supplier<EntityHitResult> hit;
        private Supplier<Entity> entity;

        @Override
-        public Builder level(Level level) {
+        public Builder level(ServerLevel level) {
            this.level = level;
            return this;
        }
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/MobSpawnerCooldownProvider.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/MobSpawnerCooldownProvider.java
@@ -22,7 +22,7 @@ public enum MobSpawnerCooldownProvider implements StreamServerDataProvider<Block
    public @Nullable Integer streamData(@NotNull BlockAccessor accessor) {
        TrialSpawnerBlockEntity spawner = (TrialSpawnerBlockEntity) accessor.getBlockEntity();
        TrialSpawnerStateData spawnerData = spawner.getTrialSpawner().getStateData();
-        ServerLevel level = ((ServerLevel) accessor.getLevel());
+        ServerLevel level = accessor.getLevel();
        if (spawner.getTrialSpawner().canSpawnInLevel(level) && level.getGameTime() < spawnerData.cooldownEndsAt) {
            return (int) (spawnerData.cooldownEndsAt - level.getGameTime());
        }
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ItemCollector.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ItemCollector.java
@@ -55,7 +55,7 @@ public class ItemCollector<T> {
            return null;
        }
        long currentVersion = iterator.getVersion(container);
-        long gameTime = request.getLevel().getGameTime();
+        long gameTime = request.getLevel().getServer().getTickCount();
        if (mergedResult != null && iterator.isFinished()) {
            if (version == currentVersion) {
                return mergedResult; // content not changed