From 88070c32c22f0f7e6d1426bec17878d36bf76e08 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sun, 9 Nov 2025 21:19:25 +0800 Subject: [PATCH] Clear, and docs --- README.md | 4 ++-- README_cn.md | 4 ++-- .../core/invoker/AbstractInvokerHolder.java | 1 - .../protocol/jade/accessor/BlockAccessor.java | 8 -------- .../jade/accessor/BlockAccessorImpl.java | 18 ------------------ .../protocol/jade/accessor/EntityAccessor.java | 5 ----- .../jade/accessor/EntityAccessorImpl.java | 12 ------------ .../provider/entity/AnimalOwnerProvider.java | 1 - .../servux/litematics/utils/Schema.java | 10 ++++++++++ 9 files changed, 14 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 026581ac..90fc4ab6 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ maven { } dependencies { - compileOnly("org.leavesmc.leaves:leaves-api:1.21.9-R0.1-SNAPSHOT") + compileOnly("org.leavesmc.leaves:leaves-api:1.21.10-R0.1-SNAPSHOT") } ``` @@ -40,7 +40,7 @@ Each time you want to update your dependency, you must re-build Leaves. Leaves-Server: ```kotlin dependencies { - compileOnly("org.leavesmc.leaves:leaves:1.21.9-R0.1-SNAPSHOT") + compileOnly("org.leavesmc.leaves:leaves:1.21.10-R0.1-SNAPSHOT") } ``` diff --git a/README_cn.md b/README_cn.md index 02d49ee3..a3c3f9d9 100644 --- a/README_cn.md +++ b/README_cn.md @@ -30,7 +30,7 @@ maven { } dependencies { - compileOnly("org.leavesmc.leaves:leaves-api:1.21.9-R0.1-SNAPSHOT") + compileOnly("org.leavesmc.leaves:leaves-api:1.21.10-R0.1-SNAPSHOT") } ``` @@ -39,7 +39,7 @@ dependencies { Leaves-Server: ```kotlin dependencies { - compileOnly("org.leavesmc.leaves:leaves:1.21.9-R0.1-SNAPSHOT") + compileOnly("org.leavesmc.leaves:leaves:1.21.10-R0.1-SNAPSHOT") } ``` diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/AbstractInvokerHolder.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/AbstractInvokerHolder.java index 824ad76c..b34f5448 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/AbstractInvokerHolder.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/AbstractInvokerHolder.java @@ -6,7 +6,6 @@ import org.leavesmc.leaves.protocol.core.LeavesProtocol; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.Modifier; public abstract class AbstractInvokerHolder { diff --git 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 index 00840725..b981cdd0 100644 --- 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,10 +1,8 @@ package org.leavesmc.leaves.protocol.jade.accessor; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -37,12 +35,6 @@ public interface BlockAccessor extends Accessor { return blockEntity(() -> blockEntity); } - Builder serverData(CompoundTag serverData); - - Builder showDetails(boolean showDetails); - - Builder serversideRep(ItemStack stack); - Builder blockEntity(Supplier blockEntity); Builder from(BlockAccessor accessor); diff --git 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 index 41d76fd1..919bfe50 100644 --- 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 @@ -92,21 +92,6 @@ public class BlockAccessorImpl extends AccessorImpl implements B return this; } - @Override - public Builder serverData(CompoundTag serverData) { - return this; - } - - @Override - public Builder showDetails(boolean showDetails) { - return this; - } - - @Override - public Builder serversideRep(ItemStack stack) { - return this; - } - @Override public Builder blockEntity(Supplier blockEntity) { this.blockEntity = blockEntity; @@ -151,12 +136,9 @@ public class BlockAccessorImpl extends AccessorImpl implements B return new Builder() .level(player.level()) .player(player) - .showDetails(showDetails) .hit(hit) .blockState(blockState) .blockEntity(blockEntity) - .serversideRep(serversideRep) - .serverData(data) .build(); } } diff --git 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 index 5d489733..f46108cf 100644 --- 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,6 +1,5 @@ package org.leavesmc.leaves.protocol.jade.accessor; -import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; @@ -30,10 +29,6 @@ public interface EntityAccessor extends Accessor { Builder hit(Supplier hit); - Builder serverData(CompoundTag serverData); - - Builder showDetails(boolean showDetails); - default Builder entity(Entity entity) { return entity(() -> entity); } diff --git 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 index 4979652e..a504489a 100644 --- 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 @@ -66,16 +66,6 @@ public class EntityAccessorImpl extends AccessorImpl implements return this; } - @Override - public Builder serverData(CompoundTag serverData) { - return this; - } - - @Override - public Builder showDetails(boolean showDetails) { - return this; - } - @Override public Builder entity(Supplier entity) { this.entity = entity; @@ -117,10 +107,8 @@ public class EntityAccessorImpl extends AccessorImpl implements return new EntityAccessorImpl.Builder() .level(player.level()) .player(player) - .showDetails(showDetails) .entity(entity) .hit(Suppliers.memoize(() -> new EntityHitResult(entity.get(), hitVec))) - .serverData(data) .build(); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java index d1520c88..ab26adc0 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java @@ -43,7 +43,6 @@ public enum AnimalOwnerProvider implements StreamServerDataProvider Add Schema Versions to this as versions get released // Minecraft Data Versions SCHEMA_FUTURE(9999, "FUTURE"), + SCHEMA_25W41A(4657, "25w41a"), + SCHEMA_1_21_10(4556, "1.21.10"), + SCHEMA_1_21_09(4554, "1.21.9"), + SCHEMA_25W36B(4546, "25w36b"), + SCHEMA_25W31A(4534, "25w31a"), + SCHEMA_1_21_08(4440, "1.21.8"), + SCHEMA_1_21_07(4438, "1.21.7"), + SCHEMA_1_21_06(4435, "1.21.6"), + SCHEMA_25W21A(4429, "25w21a"), + SCHEMA_25W16A(4423, "25w16a"), SCHEMA_1_21_05(4325, "1.21.5"), SCHEMA_25W10A(4319, "25w10a"), SCHEMA_25W03A(4304, "25w03a"), // Entity Data Components ( https://www.minecraft.net/en-us/article/minecraft-snapshot-25w03a )