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

添加药水效果函数

Browse Source
This commit is contained in:
XiaoMoMi
2025-05-22 23:57:54 +08:00
parent f1588e349b
commit a965d231a7
17 changed files with 136 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bukkit/loader/src/main/resources/resources/default/configuration/plants.yml
View File

@@ -216,9 +216,10 @@ blocks:
z: "<arg:block.block_z> + 0.5"
particle: "minecraft:end_rod"
count: 15
offset-x: 0.4
offset-y: 0.4
offset-z: 0.4
offset-x: 0.05
offset-y: 0.05
offset-z: 0.05
speed: 0.1
- type: play_sound
sound: minecraft:entity.enderman.teleport
x: "<arg:block.block_x> + 0.5"

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureBreakEvent.java
View File

@@ -1,7 +1,6 @@
package net.momirealms.craftengine.bukkit.api.event;
import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture;
import net.momirealms.craftengine.core.entity.furniture.Furniture;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurnitureInteractEvent.java
View File

@@ -1,7 +1,6 @@
package net.momirealms.craftengine.bukkit.api.event;
import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture;
import net.momirealms.craftengine.core.entity.furniture.Furniture;
import net.momirealms.craftengine.core.entity.player.InteractionHand;
import org.bukkit.Location;
import org.bukkit.entity.Player;

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/FurniturePlaceEvent.java
View File

@@ -1,7 +1,6 @@
package net.momirealms.craftengine.bukkit.api.event;
import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture;
import net.momirealms.craftengine.core.entity.furniture.Furniture;
import net.momirealms.craftengine.core.entity.player.InteractionHand;
import org.bukkit.Location;
import org.bukkit.entity.Player;

21
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
View File

@@ -28,16 +28,15 @@ import net.momirealms.craftengine.core.util.VersionHelper;
import net.momirealms.craftengine.core.world.BlockPos;
import net.momirealms.craftengine.core.world.World;
import net.momirealms.craftengine.core.world.WorldEvents;
import org.bukkit.FluidCollisionMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.SoundCategory;
import org.bukkit.*;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.block.Block;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.RayTraceResult;
import org.jetbrains.annotations.Nullable;
@@ -858,4 +857,18 @@ public class BukkitServerPlayer extends Player {
public void setSaturation(float saturation) {
this.platformPlayer().setSaturation(saturation);
}
@Override
public void addPotionEffect(Key potionEffectType, int duration, int amplifier, boolean ambient, boolean particles) {
PotionEffectType type = Registry.POTION_EFFECT_TYPE.get(KeyUtils.toNamespacedKey(potionEffectType));
if (type == null) return;
this.platformPlayer().addPotionEffect(new PotionEffect(type, duration, amplifier, ambient, particles));
}
@Override
public void removePotionEffect(Key potionEffectType) {
PotionEffectType type = Registry.POTION_EFFECT_TYPE.get(KeyUtils.toNamespacedKey(potionEffectType));
if (type == null) return;
this.platformPlayer().removePotionEffect(type);
}
}

5
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/ParticleUtils.java
View File

@@ -3,7 +3,10 @@ package net.momirealms.craftengine.bukkit.util;
import net.momirealms.craftengine.core.plugin.context.Context;
import net.momirealms.craftengine.core.util.VersionHelper;
import net.momirealms.craftengine.core.world.particle.*;
import org.bukkit.*;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.Vibration;
import org.bukkit.World;
public final class ParticleUtils {
private ParticleUtils() {}

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

@@ -124,4 +124,8 @@ public abstract class Player extends AbstractEntity implements NetWorkUser {
public abstract float saturation();
public abstract void setSaturation(float saturation);
public abstract void addPotionEffect(Key potionEffectType, int duration, int amplifier, boolean ambient, boolean particles);
public abstract void removePotionEffect(Key potionEffectType);
}

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

@@ -34,6 +34,7 @@ public class EventFunctions {
register(CommonFunctions.SET_SATURATION, new SetSaturationFunction.FactoryImpl<>(EventConditions::fromMap));
register(CommonFunctions.PLAY_SOUND, new PlaySoundFunction.FactoryImpl<>(EventConditions::fromMap));
register(CommonFunctions.PARTICLE, new ParticleFunction.FactoryImpl<>(EventConditions::fromMap));
register(CommonFunctions.POTION_EFFECT, new PotionEffectFunction.FactoryImpl<>(EventConditions::fromMap));
}
public static void register(Key key, FunctionFactory<PlayerOptionalContext> factory) {

4
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/ActionBarFunction.java
View File

@@ -14,7 +14,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public class ActionBarFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final TextProvider message;
@@ -28,9 +27,8 @@ public class ActionBarFunction<CTX extends Context> extends AbstractConditionalF
@Override
public void runInternal(CTX ctx) {
Optional<Player> owner = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
if (this.selector == null) {
owner.ifPresent(it -> {
ctx.getOptionalParameter(DirectContextParameters.PLAYER).ifPresent(it -> {
it.sendActionBar(AdventureHelper.miniMessage().deserialize(this.message.get(ctx), ctx.tagResolvers()));
});
} else {

4
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/CommandFunction.java
View File

@@ -16,7 +16,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public class CommandFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final List<TextProvider> command;
@@ -33,9 +32,8 @@ public class CommandFunction<CTX extends Context> extends AbstractConditionalFun
@Override
public void runInternal(CTX ctx) {
if (this.asPlayer) {
Optional<Player> owner = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
if (this.selector == null) {
owner.ifPresent(it -> {
ctx.getOptionalParameter(DirectContextParameters.PLAYER).ifPresent(it -> {
for (TextProvider c : this.command) {
it.performCommand(c.get(ctx));
}

4
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/MessageFunction.java
View File

@@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public class MessageFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final List<TextProvider> messages;
@@ -31,9 +30,8 @@ public class MessageFunction<CTX extends Context> extends AbstractConditionalFun
@Override
public void runInternal(CTX ctx) {
Optional<Player> owner = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
if (this.selector == null) {
owner.ifPresent(it -> {
ctx.getOptionalParameter(DirectContextParameters.PLAYER).ifPresent(it -> {
for (TextProvider c : this.messages) {
it.sendMessage(AdventureHelper.miniMessage().deserialize(c.get(ctx), ctx.tagResolvers()), this.overlay);
}

3
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/OpenWindowFunction.java
View File

@@ -35,9 +35,8 @@ public class OpenWindowFunction<CTX extends Context> extends AbstractConditional
@Override
public void runInternal(CTX ctx) {
Optional<Player> owner = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
if (this.selector == null) {
owner.ifPresent(it -> {
ctx.getOptionalParameter(DirectContextParameters.PLAYER).ifPresent(it -> {
CraftEngine.instance().guiManager().openInventory(it, this.guiType);
if (this.optionalTitle != null) {
CraftEngine.instance().guiManager().updateInventoryTitle(it, AdventureHelper.miniMessage().deserialize(this.optionalTitle.get(ctx), ctx.tagResolvers()));

2
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/PlaceBlockFunction.java
View File

@@ -1,9 +1,7 @@
package net.momirealms.craftengine.core.plugin.context.function;
import net.momirealms.craftengine.core.block.BlockStateWrapper;
import net.momirealms.craftengine.core.block.DelayedInitBlockState;
import net.momirealms.craftengine.core.block.UpdateOption;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.Context;
import net.momirealms.craftengine.core.plugin.context.number.NumberProvider;

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

@@ -0,0 +1,69 @@
package net.momirealms.craftengine.core.plugin.context.function;
import net.momirealms.craftengine.core.entity.player.Player;
import net.momirealms.craftengine.core.plugin.context.*;
import net.momirealms.craftengine.core.plugin.context.number.NumberProvider;
import net.momirealms.craftengine.core.plugin.context.number.NumberProviders;
import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
import net.momirealms.craftengine.core.plugin.context.selector.PlayerSelector;
import net.momirealms.craftengine.core.plugin.context.selector.PlayerSelectors;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.ResourceConfigUtils;
import java.util.List;
import java.util.Map;
public class PotionEffectFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final PlayerSelector<CTX> selector;
private final Key potionEffectType;
private final NumberProvider duration;
private final NumberProvider amplifier;
private final boolean ambient;
private final boolean particles;
public PotionEffectFunction(Key potionEffectType, NumberProvider duration, NumberProvider amplifier, boolean ambient, boolean particles, PlayerSelector<CTX> selector, List<Condition<CTX>> predicates) {
super(predicates);
this.potionEffectType = potionEffectType;
this.duration = duration;
this.amplifier = amplifier;
this.selector = selector;
this.ambient = ambient;
this.particles = particles;
}
@Override
public void runInternal(CTX ctx) {
if (this.selector == null) {
ctx.getOptionalParameter(DirectContextParameters.PLAYER).ifPresent(it -> {
it.addPotionEffect(this.potionEffectType, this.duration.getInt(ctx), this.amplifier.getInt(ctx), this.ambient, this.particles);
});
} else {
for (Player target : this.selector.get(ctx)) {
RelationalContext relationalContext = ViewerContext.of(ctx, PlayerOptionalContext.of(target, ContextHolder.EMPTY));
target.addPotionEffect(this.potionEffectType, this.duration.getInt(relationalContext), this.amplifier.getInt(relationalContext), this.ambient, this.particles);
}
}
}
@Override
public Key type() {
return CommonFunctions.POTION_EFFECT;
}
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) {
Key effectType = Key.of(ResourceConfigUtils.requireNonEmptyStringOrThrow(arguments.get("potion-effect"), "warning.config.function.potion_effect.missing_potion_effect"));
NumberProvider duration = NumberProviders.fromObject(arguments.get("duration"));
NumberProvider amplifier = NumberProviders.fromObject(arguments.get("amplifier"));
boolean ambient = (boolean) arguments.getOrDefault("ambient", false);
boolean particles = (boolean) arguments.getOrDefault("particles", true);
return new PotionEffectFunction<>(effectType, duration, amplifier, ambient, particles, PlayerSelectors.fromObject(arguments.get("target"), conditionFactory()), getPredicates(arguments));
}
}
}

22
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/SetFoodFunction.java
View File

@@ -1,11 +1,12 @@
package net.momirealms.craftengine.core.plugin.context.function;
import net.momirealms.craftengine.core.entity.player.Player;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.Context;
import net.momirealms.craftengine.core.plugin.context.*;
import net.momirealms.craftengine.core.plugin.context.number.NumberProvider;
import net.momirealms.craftengine.core.plugin.context.number.NumberProviders;
import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
import net.momirealms.craftengine.core.plugin.context.selector.PlayerSelector;
import net.momirealms.craftengine.core.plugin.context.selector.PlayerSelectors;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.ResourceConfigUtils;
@@ -14,19 +15,28 @@ import java.util.Map;
import java.util.Optional;
public class SetFoodFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final PlayerSelector<CTX> selector;
private final NumberProvider count;
private final boolean add;
public SetFoodFunction(NumberProvider count, boolean add, List<Condition<CTX>> predicates) {
public SetFoodFunction(NumberProvider count, boolean add, PlayerSelector<CTX> selector, List<Condition<CTX>> predicates) {
super(predicates);
this.count = count;
this.add = add;
this.selector = selector;
}
@Override
public void runInternal(CTX ctx) {
Optional<Player> optionalPlayer = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
optionalPlayer.ifPresent(player -> player.setFoodLevel(this.add ? player.foodLevel() + this.count.getInt(ctx) : this.count.getInt(ctx)));
if (this.selector == null) {
Optional<Player> optionalPlayer = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
optionalPlayer.ifPresent(player -> player.setFoodLevel(this.add ? player.foodLevel() + this.count.getInt(ctx) : this.count.getInt(ctx)));
} else {
for (Player target : this.selector.get(ctx)) {
RelationalContext relationalContext = ViewerContext.of(ctx, PlayerOptionalContext.of(target, ContextHolder.EMPTY));
target.setFoodLevel(this.add ? target.foodLevel() + this.count.getInt(relationalContext) : this.count.getInt(relationalContext));
}
}
}
@Override
@@ -44,7 +54,7 @@ public class SetFoodFunction<CTX extends Context> extends AbstractConditionalFun
public Function<CTX> create(Map<String, Object> arguments) {
Object value = ResourceConfigUtils.requireNonNullOrThrow(arguments.get("food"), "warning.config.function.set_food.missing_food");
boolean add = (boolean) arguments.getOrDefault("add", false);
return new SetFoodFunction<>(NumberProviders.fromObject(value), add, getPredicates(arguments));
return new SetFoodFunction<>(NumberProviders.fromObject(value), add, PlayerSelectors.fromObject(arguments.get("target"), conditionFactory()), getPredicates(arguments));
}
}
}

22
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/SetSaturationFunction.java
View File

@@ -1,11 +1,12 @@
package net.momirealms.craftengine.core.plugin.context.function;
import net.momirealms.craftengine.core.entity.player.Player;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.Context;
import net.momirealms.craftengine.core.plugin.context.*;
import net.momirealms.craftengine.core.plugin.context.number.NumberProvider;
import net.momirealms.craftengine.core.plugin.context.number.NumberProviders;
import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
import net.momirealms.craftengine.core.plugin.context.selector.PlayerSelector;
import net.momirealms.craftengine.core.plugin.context.selector.PlayerSelectors;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.ResourceConfigUtils;
@@ -14,19 +15,28 @@ import java.util.Map;
import java.util.Optional;
public class SetSaturationFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final PlayerSelector<CTX> selector;
private final NumberProvider count;
private final boolean add;
public SetSaturationFunction(NumberProvider count, boolean add, List<Condition<CTX>> predicates) {
public SetSaturationFunction(NumberProvider count, boolean add, PlayerSelector<CTX> selector, List<Condition<CTX>> predicates) {
super(predicates);
this.count = count;
this.add = add;
this.selector = selector;
}
@Override
public void runInternal(CTX ctx) {
Optional<Player> optionalPlayer = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
optionalPlayer.ifPresent(player -> player.setSaturation(this.add ? player.saturation() + this.count.getFloat(ctx) : this.count.getFloat(ctx)));
if (this.selector == null) {
Optional<Player> optionalPlayer = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
optionalPlayer.ifPresent(player -> player.setSaturation(this.add ? player.saturation() + this.count.getFloat(ctx) : this.count.getFloat(ctx)));
} else {
for (Player target : this.selector.get(ctx)) {
RelationalContext relationalContext = ViewerContext.of(ctx, PlayerOptionalContext.of(target, ContextHolder.EMPTY));
target.setSaturation(this.add ? target.saturation() + this.count.getFloat(relationalContext) : this.count.getFloat(relationalContext));
}
}
}
@Override
@@ -44,7 +54,7 @@ public class SetSaturationFunction<CTX extends Context> extends AbstractConditio
public Function<CTX> create(Map<String, Object> arguments) {
Object value = ResourceConfigUtils.requireNonNullOrThrow(arguments.get("saturation"), "warning.config.function.set_saturation.missing_saturation");
boolean add = (boolean) arguments.getOrDefault("add", false);
return new SetSaturationFunction<>(NumberProviders.fromObject(value), add, getPredicates(arguments));
return new SetSaturationFunction<>(NumberProviders.fromObject(value), add, PlayerSelectors.fromObject(arguments.get("target"), conditionFactory()), getPredicates(arguments));
}
}
}

4
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/TitleFunction.java
View File

@@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public class TitleFunction<CTX extends Context> extends AbstractConditionalFunction<CTX> {
private final PlayerSelector<CTX> selector;
@@ -38,9 +37,8 @@ public class TitleFunction<CTX extends Context> extends AbstractConditionalFunct
@Override
public void runInternal(CTX ctx) {
Optional<Player> owner = ctx.getOptionalParameter(DirectContextParameters.PLAYER);
if (this.selector == null) {
owner.ifPresent(it -> it.sendTitle(
ctx.getOptionalParameter(DirectContextParameters.PLAYER).ifPresent(it -> it.sendTitle(
AdventureHelper.miniMessage().deserialize(this.main.get(ctx), ctx.tagResolvers()),
AdventureHelper.miniMessage().deserialize(this.sub.get(ctx), ctx.tagResolvers()),
this.fadeIn.getInt(ctx), this.stay.getInt(ctx), this.fadeOut.getInt(ctx)