Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-30 12:29:15 +00:00
Code Issues Releases Activity

添加小石子配置

Browse Source
This commit is contained in:
XiaoMoMi
2025-06-21 23:27:09 +08:00
parent c45c2f1af6
commit f5953bd491
16 changed files with 233 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/StackableBlockBehavior.java
View File

@@ -13,6 +13,7 @@ import net.momirealms.craftengine.core.entity.player.InteractionResult;
import net.momirealms.craftengine.core.entity.player.Player;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.context.UseOnContext;
import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
import net.momirealms.craftengine.core.sound.SoundData;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.MiscUtils;
@@ -56,18 +57,11 @@ public class StackableBlockBehavior extends BukkitBlockBehavior {
}
BlockPos pos = context.getClickedPos();
World world = context.getLevel();
if (state.get(this.amountProperty) < this.amountProperty.max) {
updateStackableBlock(state, pos, world, item, player, context.getHand());
if (state.get(this.amountProperty) >= this.amountProperty.max) {
return InteractionResult.SUCCESS_AND_CANCEL;
}
BlockPos actualPos = pos.relative(context.getClickedFace());
ImmutableBlockState actualState = world.getBlockAt(actualPos).customBlockState();
boolean isValid = actualState != null && !actualState.isEmpty() && actualState.contains(this.amountProperty);
if (isValid && actualState.get(this.amountProperty) < this.amountProperty.max) {
updateStackableBlock(actualState, actualPos, world, item, player, context.getHand());
return InteractionResult.SUCCESS_AND_CANCEL;
}
return InteractionResult.PASS;
updateStackableBlock(state, pos, world, item, player, context.getHand());
return InteractionResult.SUCCESS_AND_CANCEL;
}
private void updateStackableBlock(ImmutableBlockState state, BlockPos pos, World world, Item<ItemStack> item, Player player, InteractionHand hand) {
@@ -77,7 +71,7 @@ public class StackableBlockBehavior extends BukkitBlockBehavior {
if (this.stackSound != null) {
world.playBlockSound(new Vec3d(location.getX(), location.getY(), location.getZ()), this.stackSound);
}
FastNMS.INSTANCE.method$ItemStack$consume(item.getLiteralObject(), 1, player.serverPlayer());
item.count(item.count() - 1);
player.swingHand(hand);
}
@@ -86,7 +80,10 @@ public class StackableBlockBehavior extends BukkitBlockBehavior {
@Override
@SuppressWarnings("unchecked")
public BlockBehavior create(CustomBlock block, Map<String, Object> arguments) {
IntegerProperty amount = (IntegerProperty) ResourceConfigUtils.requireNonNullOrThrow(block.getProperty("amount"), "warning.config.block.behavior.stackable.missing_amount");
String propertyName = String.valueOf(arguments.getOrDefault("property", "amount"));
IntegerProperty amount = (IntegerProperty) ResourceConfigUtils.requireNonNullOrThrow(block.getProperty(propertyName), () -> {
throw new LocalizedResourceConfigException("warning.config.block.behavior.stackable.missing_property", propertyName);
});
Map<String, Object> sounds = (Map<String, Object>) arguments.get("sounds");
SoundData stackSound = null;
if (sounds != null) {

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/UnsafeCompositeBlockBehavior.java
View File

@@ -35,7 +35,7 @@ public class UnsafeCompositeBlockBehavior extends BukkitBlockBehavior {
public InteractionResult useOnBlock(UseOnContext context, ImmutableBlockState state) {
for (AbstractBlockBehavior behavior : this.behaviors) {
InteractionResult result = behavior.useOnBlock(context, state);
if (result != InteractionResult.PASS) {
if (result != InteractionResult.PASS && result != InteractionResult.TRY_EMPTY_HAND) {
return result;
}
}

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/handler/ProjectilePacketHandler.java
View File

@@ -130,6 +130,7 @@ public class ProjectilePacketHandler implements EntityPacketHandler {
it -> ItemDisplayEntityData.DisplayedItem.addEntityDataIfNotDefaultValue(FastNMS.INSTANCE.field$CraftItemStack$handle(it), itemDisplayValues),
() -> ItemDisplayEntityData.DisplayedItem.addEntityDataIfNotDefaultValue(literalItem, itemDisplayValues));
ItemDisplayEntityData.DisplayType.addEntityDataIfNotDefaultValue(meta.displayType().id(), itemDisplayValues);
ItemDisplayEntityData.BillboardConstraints.addEntityDataIfNotDefaultValue(meta.billboard().id(), itemDisplayValues);
return itemDisplayValues;
}

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

@@ -1274,8 +1274,8 @@ public final class CoreReflections {
ReflectionUtils.getDeclaredField(clazz$BlockStateBase, boolean.class, 11)
);
public static final Field field$BlockStateBase$Cache$propagatesSkylightDown = requireNonNull(
ReflectionUtils.getDeclaredField(clazz$BlockStateBase$Cache, boolean.class, 2)
public static final Field field$BlockStateBase$Cache$propagatesSkylightDown = ReflectionUtils.getDeclaredField(
clazz$BlockStateBase$Cache, boolean.class, 2
);
public static final Field field$BlockStateBase$requiresCorrectToolForDrops = requireNonNull(