Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-03 22:26:16 +00:00
Code Issues Releases Activity

进一步1.21.10兼容

Browse Source
This commit is contained in:
jhqwqmc
2025-10-03 14:33:24 +08:00
parent 0e64c48699
commit 1d759d57d5
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/CoreReflections.java
View File

@@ -3547,9 +3547,11 @@ public final class CoreReflections {
); );
public static final Method method$BlockBehaviour$entityInside = requireNonNull( public static final Method method$BlockBehaviour$entityInside = requireNonNull(
VersionHelper.isOrAbove1_21_5() ? VersionHelper.isOrAbove1_21_10()
ReflectionUtils.getDeclaredMethod(clazz$BlockBehaviour, void.class, new String[]{"entityInside", "a"}, clazz$BlockState, clazz$Level, clazz$BlockPos, clazz$Entity, clazz$InsideBlockEffectApplier) : ? ReflectionUtils.getDeclaredMethod(clazz$BlockBehaviour, void.class, new String[]{"entityInside", "a"}, clazz$BlockState, clazz$Level, clazz$BlockPos, clazz$Entity, clazz$InsideBlockEffectApplier, boolean.class)
ReflectionUtils.getDeclaredMethod(clazz$BlockBehaviour, void.class, new String[]{"entityInside", "a"}, clazz$BlockState, clazz$Level, clazz$BlockPos, clazz$Entity) : VersionHelper.isOrAbove1_21_5()
? ReflectionUtils.getDeclaredMethod(clazz$BlockBehaviour, void.class, new String[]{"entityInside", "a"}, clazz$BlockState, clazz$Level, clazz$BlockPos, clazz$Entity, clazz$InsideBlockEffectApplier)
: ReflectionUtils.getDeclaredMethod(clazz$BlockBehaviour, void.class, new String[]{"entityInside", "a"}, clazz$BlockState, clazz$Level, clazz$BlockPos, clazz$Entity)
); );
// 1.21.5+ // 1.21.5+

4
core/src/main/java/net/momirealms/craftengine/core/block/BlockBehavior.java
View File

@@ -100,8 +100,7 @@ public abstract class BlockBehavior {
return false; return false;
} }
// 1.20.1~1.21.8 BlockState state, Level level, BlockPos pos // BlockState state, Level level, BlockPos pos
// 1.21.9+ BlockState state, Level level, BlockPos pos
public int getAnalogOutputSignal(Object thisBlock, Object[] args) throws Exception { public int getAnalogOutputSignal(Object thisBlock, Object[] args) throws Exception {
return 0; return 0;
} }
@@ -143,6 +142,7 @@ public abstract class BlockBehavior {
// 1.20-1.21.4 BlockState state, Level level, BlockPos pos, Entity entity // 1.20-1.21.4 BlockState state, Level level, BlockPos pos, Entity entity
// 1.21.5+ BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier // 1.21.5+ BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier
// 1.21.10+ BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier, boolean flag
public void entityInside(Object thisBlock, Object[] args, Callable<Object> superMethod) throws Exception { public void entityInside(Object thisBlock, Object[] args, Callable<Object> superMethod) throws Exception {
} }

2
gradle.properties
View File

@@ -50,7 +50,7 @@ byte_buddy_version=1.17.5
ahocorasick_version=0.6.3 ahocorasick_version=0.6.3
snake_yaml_version=2.5 snake_yaml_version=2.5
anti_grief_version=0.20 anti_grief_version=0.20
nms_helper_version=1.0.100 nms_helper_version=1.0.101
evalex_version=3.5.0 evalex_version=3.5.0
reactive_streams_version=1.0.4 reactive_streams_version=1.0.4
amazon_awssdk_version=2.34.5 amazon_awssdk_version=2.34.5