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

添加捡起物品触发器

Browse Source
This commit is contained in:
XiaoMoMi
2025-10-18 19:08:27 +08:00
parent db8fbe9907
commit 6ff1035331
10 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/BukkitEntity.java
View File

@@ -103,4 +103,9 @@ public class BukkitEntity extends AbstractEntity {
public <T> void setEntityData(EntityData<T> data, T value, boolean force) {
FastNMS.INSTANCE.method$SynchedEntityData$set(entityData(), data.entityDataAccessor(), value, force);
}
@Override
public void remove() {
this.platformEntity().remove();
}
}

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

@@ -576,18 +576,33 @@ public class ItemEventListener implements Listener {
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onPickUpItem(EntityPickupItemEvent event) {
if (!Config.triggerUpdatePickUp()) return;
if (!(event.getEntity() instanceof Player player)) return;
org.bukkit.entity.Item itemDrop = event.getItem();
ItemStack itemStack = itemDrop.getItemStack();
Item<ItemStack> wrapped = this.itemManager.wrap(itemStack);
ItemUpdateResult result = this.itemManager.updateItem(wrapped, () -> ItemBuildContext.of(BukkitAdaptors.adapt(player)));
Optional<CustomItem<ItemStack>> optionalCustomItem = wrapped.getCustomItem();
if (optionalCustomItem.isEmpty()) return;
BukkitServerPlayer serverPlayer = BukkitAdaptors.adapt(player);
CustomItem<ItemStack> customItem = optionalCustomItem.get();
if (Config.triggerUpdatePickUp() && customItem.updater().isPresent()) {
ItemUpdateResult result = this.itemManager.updateItem(wrapped, () -> ItemBuildContext.of(serverPlayer));
if (result.updated()) {
itemDrop.setItemStack((ItemStack) result.finalItem().getItem());
}
}
Cancellable dummy = Cancellable.dummy();
customItem.execute(PlayerOptionalContext.of(serverPlayer, ContextHolder.builder()
.withParameter(DirectContextParameters.ENTITY, new BukkitEntity(itemDrop))
.withParameter(DirectContextParameters.POSITION, LocationUtils.toWorldPosition(itemDrop.getLocation()))
.withParameter(DirectContextParameters.EVENT, dummy)
), EventTrigger.PICK_UP);
if (dummy.isCancelled()) {
event.setCancelled(true);
return;
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
public void onInventoryClickItem(InventoryClickEvent event) {

2
core/src/main/java/net/momirealms/craftengine/core/entity/Entity.java
View File

@@ -48,4 +48,6 @@ public interface Entity {
}
<T> void setEntityData(EntityData<T> data, T value, boolean force);
void remove();
}

4
core/src/main/java/net/momirealms/craftengine/core/entity/player/Player.java
View File

@@ -180,4 +180,8 @@ public abstract class Player extends AbstractEntity implements NetWorkUser {
public abstract Locale selectedLocale();
public abstract void setSelectedLocale(@Nullable Locale locale);
@Override
public void remove() {
}
}

1
core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java
View File

@@ -47,6 +47,7 @@ public class EventFunctions {
register(CommonFunctions.TOAST, new ToastFunction.FactoryImpl<>(EventConditions::fromMap));
register(CommonFunctions.DAMAGE, new DamageFunction.FactoryImpl<>(EventConditions::fromMap));
register(CommonFunctions.MERCHANT_TRADE, new MerchantTradeFunction.FactoryImpl<>(EventConditions::fromMap));
register(CommonFunctions.REMOVE_ENTITY, new RemoveEntityFunction.FactoryImpl<>(EventConditions::fromMap));
}
public static void register(Key key, FunctionFactory<PlayerOptionalContext> factory) {

1
core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventTrigger.java
View File

@@ -10,6 +10,7 @@ public enum EventTrigger {
CONSUME("eat", "consume", "drink"),
BREAK("break", "dig"),
PLACE("place", "build"),
PICK_UP("pick_up", "pick"),
STEP("step"),;
public static final Map<String, EventTrigger> BY_NAME = new HashMap<>();

1
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/CommonFunctions.java
View File

@@ -36,4 +36,5 @@ public final class CommonFunctions {
public static final Key SET_VARIABLE = Key.of("craftengine:set_variable");
public static final Key DAMAGE = Key.of("craftengine:damage");
public static final Key MERCHANT_TRADE = Key.of("craftengine:merchant_trade");
public static final Key REMOVE_ENTITY = Key.of("craftengine:remove_entity");
}

39
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/RemoveEntityFunction.java Normal file
View File

@@ -0,0 +1,39 @@
package net.momirealms.craftengine.core.plugin.context.function;
import net.momirealms.craftengine.core.entity.Entity;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.Context;
import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
import net.momirealms.craftengine.core.util.Key;
import java.util.List;
import java.util.Map;
public class RemoveEntityFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
public RemoveEntityFunction(List<Condition<CTX>> predicates) {
super(predicates);
}
@Override
public void runInternal(CTX ctx) {
ctx.getOptionalParameter(DirectContextParameters.ENTITY).ifPresent(Entity::remove);
}
@Override
public Key type() {
return CommonFunctions.REMOVE_ENTITY;
}
public static class FactoryImpl<CTX extends Context> extends AbstractFactory<CTX> {
public FactoryImpl(java.util.function.Function<Map<String, Object>, Condition<CTX>> factory) {
super(factory);
}
@Override
public Function<CTX> create(Map<String, Object> arguments) {
return new RemoveEntityFunction<>(getPredicates(arguments));
}
}
}

1
core/src/main/java/net/momirealms/craftengine/core/plugin/context/parameter/DirectContextParameters.java
View File

@@ -65,4 +65,5 @@ public final class DirectContextParameters {
public static final ContextKey<Boolean> IS_CUSTOM = ContextKey.direct("is_custom");
public static final ContextKey<Boolean> IS_BLOCK_ITEM = ContextKey.direct("is_block_item");
public static final ContextKey<GameMode> GAMEMODE = ContextKey.direct("gamemode");
public static final ContextKey<Integer> COUNT = ContextKey.direct("count");
}

1
core/src/main/java/net/momirealms/craftengine/core/plugin/context/parameter/ItemParameterProvider.java
View File

@@ -15,6 +15,7 @@ public class ItemParameterProvider implements ChainParameterProvider<Item<?>> {
CONTEXT_FUNCTIONS.put(DirectContextParameters.ID, Item::id);
CONTEXT_FUNCTIONS.put(DirectContextParameters.CUSTOM_MODEL_DATA, i -> i.customModelData().orElse(null));
CONTEXT_FUNCTIONS.put(DirectContextParameters.IS_CUSTOM, Item::isCustomItem);
CONTEXT_FUNCTIONS.put(DirectContextParameters.COUNT, Item::count);
CONTEXT_FUNCTIONS.put(DirectContextParameters.IS_BLOCK_ITEM, Item::isBlockItem);
}