From 07cdfaf45fa784e53bf35376bd714f1a8cc92c79 Mon Sep 17 00:00:00 2001 From: ShaneBeee Date: Sun, 10 May 2026 12:34:39 -0700 Subject: [PATCH 1/4] SkriptUtils - fix parse effect expression not getting the player --- .../com/shanebeestudios/skbee/api/util/SkriptUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/shanebeestudios/skbee/api/util/SkriptUtils.java b/src/main/java/com/shanebeestudios/skbee/api/util/SkriptUtils.java index 5b6a06a90..caea260c9 100644 --- a/src/main/java/com/shanebeestudios/skbee/api/util/SkriptUtils.java +++ b/src/main/java/com/shanebeestudios/skbee/api/util/SkriptUtils.java @@ -33,13 +33,13 @@ public class SkriptUtils { * @return True if parsed correctly else false */ public static boolean parseEffect(String stringEffect, CommandSender sender, Event parentEvent) { - Effect effect = Effect.parse(stringEffect, null); - if (effect == null) return false; - Event newEvent = new EffectCommandEvent(sender, stringEffect); ParserInstance parserInstance = ParserInstance.get(); parserInstance.setCurrentEvent("effect command", EffectCommandEvent.class); + Effect effect = Effect.parse(stringEffect, null); + if (effect == null) return false; + AtomicBoolean parsed = new AtomicBoolean(false); Variables.withLocalVariables(parentEvent, newEvent, () -> parsed.set(TriggerItem.walk(effect, newEvent))); parserInstance.deleteCurrentEvent(); From 587c4a057bfb94bb4e8040008b7a0c505fa75750 Mon Sep 17 00:00:00 2001 From: ShaneBeee Date: Sun, 10 May 2026 20:04:52 -0700 Subject: [PATCH 2/4] ExprKnockbackAttackerVictim - fix pattern mistake --- .../ExprKnockbackAttackerVictim.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackAttackerVictim.java b/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackAttackerVictim.java index cbd15c2b9..4d7001c9f 100644 --- a/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackAttackerVictim.java +++ b/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackAttackerVictim.java @@ -15,16 +15,16 @@ public class ExprKnockbackAttackerVictim extends SimpleExpression implements EventRestrictedSyntax { public static void register(Registration reg) { - reg.newSimpleExpression(ExprKnockbackAttackerVictim.class, Entity.class, "simple", - "[the] knockback (:attacker|victim)") - .name("Knockback Attacker/Victim") - .description("The attacker/victim in an entity knockback event.") - .examples("on entity knockback:", - "\tif knockback attacker is a player:", - "\t\tif knockback victim is a sheep:", - "\t\t\tcancel event") - .since("1.8.0") - .register(); + reg.newSimpleExpression(ExprKnockbackAttackerVictim.class, Entity.class, + "[the] knockback (:attacker|victim)") + .name("Knockback Attacker/Victim") + .description("The attacker/victim in an entity knockback event.") + .examples("on entity knockback:", + "\tif knockback attacker is a player:", + "\t\tif knockback victim is a sheep:", + "\t\t\tcancel event") + .since("1.8.0") + .register(); } private boolean useAttacker; From 16328ee5b78395034c1597ad15fc5d90b777ed6c Mon Sep 17 00:00:00 2001 From: ShaneBeee Date: Sun, 10 May 2026 20:05:37 -0700 Subject: [PATCH 3/4] ExprKnockbackVelocity - another pattern bug --- .../other/expressions/ExprKnockbackVelocity.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackVelocity.java b/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackVelocity.java index 34ad6ed3a..df1412715 100644 --- a/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackVelocity.java +++ b/src/main/java/com/shanebeestudios/skbee/elements/other/expressions/ExprKnockbackVelocity.java @@ -17,14 +17,14 @@ public class ExprKnockbackVelocity extends SimpleExpression implements EventRestrictedSyntax { public static void register(Registration reg) { - reg.newSimpleExpression(ExprKnockbackVelocity.class, Vector.class, "simple", - "[the] knockback velocity") - .name("Knockback Velocity") - .description("The knockback velocity in an entity knockback event.") - .examples("on entity knockback:", - "\tset knockback velocity to knockback velocity * -1") - .since("3.16.0") - .register(); + reg.newSimpleExpression(ExprKnockbackVelocity.class, Vector.class, + "[the] knockback velocity") + .name("Knockback Velocity") + .description("The knockback velocity in an entity knockback event.") + .examples("on entity knockback:", + "\tset knockback velocity to knockback velocity * -1") + .since("3.16.0") + .register(); } @Override From 733444c8b572a5af2c8440aa672e6ebffd38e968 Mon Sep 17 00:00:00 2001 From: ShaneBeee Date: Mon, 11 May 2026 19:48:48 -0700 Subject: [PATCH 4/4] ItemComponent/types - add auto gen note --- .../skbee/elements/itemcomponent/types/Types.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/shanebeestudios/skbee/elements/itemcomponent/types/Types.java b/src/main/java/com/shanebeestudios/skbee/elements/itemcomponent/types/Types.java index 9ea808f8b..32879697e 100644 --- a/src/main/java/com/shanebeestudios/skbee/elements/itemcomponent/types/Types.java +++ b/src/main/java/com/shanebeestudios/skbee/elements/itemcomponent/types/Types.java @@ -6,6 +6,7 @@ import ch.njol.util.Math2; import com.github.shanebeee.skr.Registration; import com.shanebeestudios.skbee.api.registry.KeyUtils; +import com.shanebeestudios.skbee.api.util.Util; import io.papermc.paper.datacomponent.DataComponentType; import io.papermc.paper.datacomponent.item.consumable.ConsumeEffect; import io.papermc.paper.datacomponent.item.consumable.ConsumeEffect.ApplyStatusEffects; @@ -60,7 +61,8 @@ public String toVariableNameString(ConsumeEffect consumeEffect) { .user("data ?component ?types?") .name("Data Component Type") .description("Represents the different types of data components.", - "See [**Data Components**](https://minecraft.wiki/w/Data_component_format#List_of_components) on McWiki for more detailed info.") + "See [**Data Components**](https://minecraft.wiki/w/Data_component_format#List_of_components) on McWiki for more detailed info.", + Util.AUTO_GEN_NOTE) .since("3.11.0") .register();