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-05-30 20:11:24 +08:00
parent 70a89c0de3
commit 48895697e8
6 changed files with 239 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
View File

@@ -78,8 +78,6 @@ public class ItemEventListener implements Listener {
Item<ItemStack> itemInHand = serverPlayer.getItemInHand(hand);
Location interactionPoint = event.getInteractionPoint();
BlockHitResult hitResult = null;
if (action == Action.RIGHT_CLICK_BLOCK && interactionPoint != null) {
Direction direction = DirectionUtils.toDirection(event.getBlockFace());
@@ -108,6 +106,13 @@ public class ItemEventListener implements Listener {
return;
}
// fix client side issues
if (action.isRightClick() && hitResult != null &&
InteractUtils.willConsume(player, BlockStateUtils.fromBlockData(immutableBlockState.vanillaBlockState().handle()), hitResult, itemInHand)) {
player.updateInventory();
//PlayerUtils.resendItemInHand(player);
}
Cancellable dummy = Cancellable.dummy();
// run custom functions
CustomBlock customBlock = immutableBlockState.owner().value();

417
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/InteractUtils.java
View File

@@ -3,6 +3,7 @@ package net.momirealms.craftengine.bukkit.util;
import net.momirealms.craftengine.bukkit.item.recipe.BukkitRecipeManager;
import net.momirealms.craftengine.core.block.BlockKeys;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.ItemKeys;
import net.momirealms.craftengine.core.item.recipe.OptimizedIDItem;
import net.momirealms.craftengine.core.item.recipe.RecipeTypes;
import net.momirealms.craftengine.core.item.recipe.input.SingleItemInput;
@@ -26,31 +27,32 @@ import java.util.Optional;
public class InteractUtils {
private static final Map<Key, QuadFunction<Player, Item<ItemStack>, BlockData, BlockHitResult, Boolean>> INTERACTIONS = new HashMap<>();
private static final Map<Key, QuadFunction<Player, Item<ItemStack>, BlockData, BlockHitResult, Boolean>> WILL_CONSUME = new HashMap<>();
private static final Key NOTE_BLOCK_TOP_INSTRUMENTS = Key.of("minecraft:noteblock_top_instruments");
private InteractUtils() {}
static {
register(BlockKeys.NOTE_BLOCK, (player, item, blockState, result) -> result.getDirection() != Direction.UP || !item.is(NOTE_BLOCK_TOP_INSTRUMENTS));
register(BlockKeys.CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.WHITE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.ORANGE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.MAGENTA_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.LIGHT_BLUE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.YELLOW_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.LIME_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.PINK_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.GRAY_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.LIGHT_GRAY_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.CYAN_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.PURPLE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.BLUE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.BROWN_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.GREEN_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.RED_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.BLACK_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
register(BlockKeys.BELL, (player, item, blockState, result) -> {
registerInteraction(BlockKeys.NOTE_BLOCK, (player, item, blockState, result) -> result.getDirection() != Direction.UP || !item.is(NOTE_BLOCK_TOP_INSTRUMENTS));
registerInteraction(BlockKeys.CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.WHITE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.ORANGE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.MAGENTA_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.LIGHT_BLUE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.YELLOW_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.LIME_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.PINK_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.GRAY_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.LIGHT_GRAY_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.CYAN_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.PURPLE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.BLUE_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.BROWN_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.GREEN_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.RED_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.BLACK_CANDLE_CAKE, (player, item, blockState, result) -> !canEat(player, false));
registerInteraction(BlockKeys.BELL, (player, item, blockState, result) -> {
Direction direction = result.getDirection();
BlockPos pos = result.getBlockPos();
if (blockState instanceof Bell bell) {
@@ -76,203 +78,215 @@ public class InteractUtils {
}
return false;
});
register(BlockKeys.SOUL_CAMPFIRE, (player, item, blockState, result) -> {
registerInteraction(BlockKeys.SOUL_CAMPFIRE, (player, item, blockState, result) -> {
if (!Config.enableRecipeSystem()) return false;
Optional<Holder.Reference<Key>> optional = BuiltInRegistries.OPTIMIZED_ITEM_ID.get(item.id());
return optional.filter(keyReference -> BukkitRecipeManager.instance().recipeByInput(RecipeTypes.CAMPFIRE_COOKING, new SingleItemInput<>(new OptimizedIDItem<>(
keyReference, item.getItem()
))) != null).isPresent();
});
register(BlockKeys.CAMPFIRE, (player, item, blockState, result) -> {
registerInteraction(BlockKeys.CAMPFIRE, (player, item, blockState, result) -> {
if (!Config.enableRecipeSystem()) return false;
Optional<Holder.Reference<Key>> optional = BuiltInRegistries.OPTIMIZED_ITEM_ID.get(item.id());
return optional.filter(keyReference -> BukkitRecipeManager.instance().recipeByInput(RecipeTypes.CAMPFIRE_COOKING, new SingleItemInput<>(new OptimizedIDItem<>(
keyReference, item.getItem()
))) != null).isPresent();
});
register(BlockKeys.HOPPER, (player, item, blockState, result) -> true);
register(BlockKeys.DISPENSER, (player, item, blockState, result) -> true);
register(BlockKeys.DROPPER, (player, item, blockState, result) -> true);
register(BlockKeys.CRAFTER, (player, item, blockState, result) -> true);
register(BlockKeys.REPEATER, (player, item, blockState, result) -> true);
register(BlockKeys.COMPARATOR, (player, item, blockState, result) -> true);
register(BlockKeys.DAYLIGHT_DETECTOR, (player, item, blockState, result) -> true);
register(BlockKeys.LECTERN, (player, item, blockState, result) -> true);
register(BlockKeys.CHEST, (player, item, blockState, result) -> true);
register(BlockKeys.ENDER_CHEST, (player, item, blockState, result) -> true);
register(BlockKeys.TRAPPED_CHEST, (player, item, blockState, result) -> true);
register(BlockKeys.BEACON, (player, item, blockState, result) -> true);
register(BlockKeys.ENCHANTING_TABLE, (player, item, blockState, result) -> true);
register(BlockKeys.BREWING_STAND, (player, item, blockState, result) -> true);
register(BlockKeys.GRINDSTONE, (player, item, blockState, result) -> true);
register(BlockKeys.ANVIL, (player, item, blockState, result) -> true);
register(BlockKeys.CHIPPED_ANVIL, (player, item, blockState, result) -> true);
register(BlockKeys.DAMAGED_ANVIL, (player, item, blockState, result) -> true);
register(BlockKeys.FURNACE, (player, item, blockState, result) -> true);
register(BlockKeys.CRAFTING_TABLE, (player, item, blockState, result) -> true);
register(BlockKeys.STONECUTTER, (player, item, blockState, result) -> true);
register(BlockKeys.SMITHING_TABLE, (player, item, blockState, result) -> true);
register(BlockKeys.LOOM, (player, item, blockState, result) -> true);
register(BlockKeys.BARREL, (player, item, blockState, result) -> true);
register(BlockKeys.SMOKER, (player, item, blockState, result) -> true);
register(BlockKeys.BLAST_FURNACE, (player, item, blockState, result) -> true);
register(BlockKeys.LEVER, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_BUTTON, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.EXPOSED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.OXIDIZED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WEATHERED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_EXPOSED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_OXIDIZED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_WEATHERED_COPPER_DOOR, (player, item, blockState, result) -> true);
register(BlockKeys.COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.EXPOSED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.OXIDIZED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WEATHERED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_EXPOSED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_OXIDIZED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.WAXED_WEATHERED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_FENCE_GATE, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_WALL_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.OAK_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.SPRUCE_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BIRCH_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.ACACIA_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CHERRY_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.JUNGLE_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.DARK_OAK_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.PALE_OAK_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.MANGROVE_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.CRIMSON_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.WARPED_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.BAMBOO_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
register(BlockKeys.SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.WHITE_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.ORANGE_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.MAGENTA_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.LIGHT_BLUE_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.YELLOW_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.LIME_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.PINK_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.GRAY_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.LIGHT_GRAY_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.CYAN_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.PURPLE_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.BLUE_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.BROWN_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.GREEN_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.RED_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.BLACK_SHULKER_BOX, (player, item, blockState, result) -> true);
register(BlockKeys.WHITE_BED, (player, item, blockState, result) -> true);
register(BlockKeys.ORANGE_BED, (player, item, blockState, result) -> true);
register(BlockKeys.MAGENTA_BED, (player, item, blockState, result) -> true);
register(BlockKeys.LIGHT_BLUE_BED, (player, item, blockState, result) -> true);
register(BlockKeys.YELLOW_BED, (player, item, blockState, result) -> true);
register(BlockKeys.LIME_BED, (player, item, blockState, result) -> true);
register(BlockKeys.PINK_BED, (player, item, blockState, result) -> true);
register(BlockKeys.GRAY_BED, (player, item, blockState, result) -> true);
register(BlockKeys.LIGHT_GRAY_BED, (player, item, blockState, result) -> true);
register(BlockKeys.CYAN_BED, (player, item, blockState, result) -> true);
register(BlockKeys.PURPLE_BED, (player, item, blockState, result) -> true);
register(BlockKeys.BLUE_BED, (player, item, blockState, result) -> true);
register(BlockKeys.BROWN_BED, (player, item, blockState, result) -> true);
register(BlockKeys.GREEN_BED, (player, item, blockState, result) -> true);
register(BlockKeys.RED_BED, (player, item, blockState, result) -> true);
register(BlockKeys.BLACK_BED, (player, item, blockState, result) -> true);
register(BlockKeys.DRAGON_EGG, (player, item, blockState, result) -> true);
register(BlockKeys.REPEATING_COMMAND_BLOCK, (player, item, blockState, result) -> true);
register(BlockKeys.CHAIN_COMMAND_BLOCK, (player, item, blockState, result) -> true);
register(BlockKeys.COMMAND_BLOCK, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.HOPPER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DISPENSER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DROPPER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRAFTER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.REPEATER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.COMPARATOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DAYLIGHT_DETECTOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LECTERN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHEST, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ENDER_CHEST, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.TRAPPED_CHEST, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BEACON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ENCHANTING_TABLE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BREWING_STAND, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.GRINDSTONE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ANVIL, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHIPPED_ANVIL, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DAMAGED_ANVIL, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.FURNACE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRAFTING_TABLE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.STONECUTTER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SMITHING_TABLE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LOOM, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BARREL, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SMOKER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BLAST_FURNACE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LEVER, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_BUTTON, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.EXPOSED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OXIDIZED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WEATHERED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_EXPOSED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_OXIDIZED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_WEATHERED_COPPER_DOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.EXPOSED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OXIDIZED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WEATHERED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_EXPOSED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_OXIDIZED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WAXED_WEATHERED_COPPER_TRAPDOOR, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_FENCE_GATE, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_WALL_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.OAK_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SPRUCE_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BIRCH_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ACACIA_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHERRY_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.JUNGLE_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DARK_OAK_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PALE_OAK_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MANGROVE_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CRIMSON_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WARPED_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BAMBOO_WALL_HANGING_SIGN, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WHITE_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ORANGE_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MAGENTA_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LIGHT_BLUE_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.YELLOW_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LIME_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PINK_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.GRAY_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LIGHT_GRAY_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CYAN_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PURPLE_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BLUE_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BROWN_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.GREEN_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.RED_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BLACK_SHULKER_BOX, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.WHITE_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.ORANGE_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.MAGENTA_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LIGHT_BLUE_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.YELLOW_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LIME_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PINK_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.GRAY_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.LIGHT_GRAY_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CYAN_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.PURPLE_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BLUE_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BROWN_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.GREEN_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.RED_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.BLACK_BED, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.DRAGON_EGG, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.REPEATING_COMMAND_BLOCK, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.CHAIN_COMMAND_BLOCK, (player, item, blockState, result) -> true);
registerInteraction(BlockKeys.COMMAND_BLOCK, (player, item, blockState, result) -> true);
}
private static void register(Key key, QuadFunction<org.bukkit.entity.Player, Item<ItemStack>, BlockData, BlockHitResult, Boolean> function) {
static {
registerWillConsume(BlockKeys.CACTUS, (player, item, blockState, result) ->
result.getDirection() == Direction.UP && item.id().equals(ItemKeys.CACTUS));
}
private static void registerInteraction(Key key, QuadFunction<org.bukkit.entity.Player, Item<ItemStack>, BlockData, BlockHitResult, Boolean> function) {
var previous = INTERACTIONS.put(key, function);
if (previous != null) {
CraftEngine.instance().logger().warn("Duplicated interaction check: " + key);
}
}
private static void registerWillConsume(Key key, QuadFunction<org.bukkit.entity.Player, Item<ItemStack>, BlockData, BlockHitResult, Boolean> function) {
var previous = WILL_CONSUME.put(key, function);
if (previous != null) {
CraftEngine.instance().logger().warn("Duplicated interaction check: " + key);
}
}
public static boolean isInteractable(Player player, BlockData state, BlockHitResult hit, Item<ItemStack> item) {
Key blockType = BlockStateUtils.getBlockOwnerIdFromData(state);
if (INTERACTIONS.containsKey(blockType)) {
@@ -281,6 +295,15 @@ public class InteractUtils {
return false;
}
}
public static boolean willConsume(Player player, BlockData state, BlockHitResult hit, Item<ItemStack> item) {
Key blockType = BlockStateUtils.getBlockOwnerIdFromData(state);
if (WILL_CONSUME.containsKey(blockType)) {
return WILL_CONSUME.get(blockType).apply(player, item, state, hit);
} else {
return false;
}
}
private static boolean canEat(Player player, boolean ignoreHunger) {
return ignoreHunger || player.isInvulnerable() || player.getFoodLevel() < 20;

4
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/PlayerUtils.java
View File

@@ -16,6 +16,7 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import java.sql.Ref;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +35,8 @@ public final class PlayerUtils {
int containerId = Reflections.field$AbstractContainerMenu$containerId.getInt(inventoryMenu);
int heldItemSlot = player.getInventory().getHeldItemSlot();
int stateId = (int) Reflections.method$AbstractContainerMenu$incrementStateId.invoke(inventoryMenu);
Object packet = Reflections.constructor$ClientboundContainerSetSlotPacket.newInstance(containerId, stateId, heldItemSlot + 36, FastNMS.INSTANCE.method$CraftItemStack$asNMSCopy(itemInHand));
BukkitCraftEngine.instance().networkManager().sendPacket(player, packet);
} catch (ReflectiveOperationException e) {
CraftEngine.instance().logger().warn("Failed to resend item in hand", e);
}

6
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
View File

@@ -6911,6 +6911,12 @@ public class Reflections {
)
);
public static final Constructor<?> constructor$ClientboundContainerSetSlotPacket = requireNonNull(
ReflectionUtils.getConstructor(
clazz$ClientboundContainerSetSlotPacket, int.class, int.class, int.class, clazz$ItemStack
)
);
// 1.21.2+
public static final Class<?> clazz$ClientboundSetCursorItemPacket =
ReflectionUtils.getClazz(