Update visual effects #4123

TPGamesNL · 2021-06-27T09:58:15Z

Description

This change makes visual effects an expression instead of a literal, and it allows for multiple expressions in an effect's pattern. It also makes visual effects serializable again, which I broke in #3939.
It also adds the last two 1.17 particles, and adds a size parameter to the dust particle.

TODO: https://discord.com/channels/135877399391764480/672553438936301568/1013094898284646461 EffVisualEffect init entity check

~~TODO: fix CondIsBlock priority first, mb UnparsedLiteral stuff too~~ #5809

Target Minecraft Versions: any
Requirements: none
Related Issues: #3939, #4070, #4196, #4381

TPGamesNL · 2021-06-27T19:53:30Z

The reason the test fails, is because the condition air is a block is parsed as the CondCompare between air, the item type, and block, the class info.
Without this change, Skript would also try to parse it as CondCompare, but between air (item type) and shield block, the visual effect, because the pattern is (block [with a shield]|shield block), matching block. But this fails because Skript can't compare an item type with a visual effect, so the whole CondCompare is thrown out and parsing continues, which eventually gets to CondIsBlock, the right condition.
It can only parse this as a visual effect because visual effects are literals, but because this change makes visual effects expressions, this'll no longer happen, and it parses block as a class info, and Skript can compare an item type with a class info, so this is successful, and it is not parsed as CondIsBlock.

APickledWalrus

Nothing major

Should pretty much be fine as long as it's tested

APickledWalrus · 2022-07-15T18:18:18Z

src/main/java/ch/njol/skript/classes/data/SkriptClasses.java

 					@Override
 					@Nullable
 					public VisualEffect parse(String s, ParseContext context) {
-						return VisualEffects.parse(s);
+						return null;
+					}


You can just get rid of the override for this method since canParse returns false.

APickledWalrus · 2022-07-15T18:19:08Z

src/main/java/ch/njol/skript/util/visual/VisualEffects.java

 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.stream.Stream;

 public class VisualEffects {

-	private static final boolean NEW_EFFECT_DATA = Skript.classExists("org.bukkit.block.data.BlockData");
-	private static final boolean HAS_REDSTONE_DATA = Skript.classExists("org.bukkit.Particle$DustOptions");
+	private static final boolean DUST_OPTIONS_EXISTS = true;


This can just be removed

add vector projection expression Co-authored-by: LimeGlass <[email protected]>

…1-SNAPSHOT (SkriptLang#5739) * Bump io.papermc.paper:paper-api Bumps io.papermc.paper:paper-api from 1.19.4-R0.1-SNAPSHOT to 1.20-R0.1-SNAPSHOT. --- updated-dependencies: - dependency-name: io.papermc.paper:paper-api dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update and rename paper-1.19.3.json to paper-1.20.json * Update build.gradle * Update gradle.properties * Update default.lang --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LimeGlass <[email protected]>

…1-SNAPSHOT (SkriptLang#5746) * Bump io.papermc.paper:paper-api Bumps io.papermc.paper:paper-api from 1.20-R0.1-SNAPSHOT to 1.20.1-R0.1-SNAPSHOT. --- updated-dependencies: - dependency-name: io.papermc.paper:paper-api dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update build.gradle * Update gradle.properties * Update and rename paper-1.20.json to paper-1.20.1.json --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LimeGlass <[email protected]>

* Add quit reason * Cleanup * Versioning

… without a number defined. (SkriptLang#5790) Update ExprBlocks.java

Replace Java 9 replace method with Skript's method

Update Utils.java

….6.0 (SkriptLang#5810)

…5833)

…ang#5765)

…ion (SkriptLang#5813)

* Initial * Support plural * Merge with ExprChunk * Fix * Fix 2 * Cleanup class to obey code convention * Requested changes * Fix indent * Indent docs and improved pattern --------- Co-authored-by: LimeGlass <[email protected]>

sovdeeth · 2024-07-16T06:40:10Z

Closing due to inactivity.

TPGamesNL added 2 commits June 27, 2021 11:52

Update files

d58687c

Make serializable

e4bc1df

TPGamesNL added the enhancement Feature request, an issue about something that could be improved, or a PR improving something. label Jun 27, 2021

Merge branch 'master' into fix/visual-effects-expressions

726b82f

TPGamesNL force-pushed the fix/visual-effects-expressions branch from e5761b6 to 726b82f Compare June 27, 2021 19:38

Update english.lang

1b5f364

TPGamesNL mentioned this pull request Jun 29, 2021

is online/offline not working with variables #4125

Closed

Merge branch 'master' into fix/visual-effects-expressions

a759e17

TPGamesNL mentioned this pull request Jul 16, 2021

Error saving visual effect #4196

Open

1 task

TPGamesNL mentioned this pull request Oct 29, 2021

Passing block type to object function won't stay as a block type #4381

Closed

1 task

TPGamesNL and others added 3 commits July 12, 2022 17:44

Merge branch 'master' into fix/visual-effects-expressions

980def8

Post merge

106835f

Changes for 1.13+

433be2a

TPGamesNL force-pushed the fix/visual-effects-expressions branch from 733b4cb to 433be2a Compare July 12, 2022 15:55

APickledWalrus requested changes Jul 15, 2022

View reviewed changes

Merge branch 'master' into fix/visual-effects-expressions

dd491a4

TPGamesNL marked this pull request as draft July 20, 2022 12:36

TheLimeGlass and others added 12 commits June 5, 2023 23:37

Add is climbing (SkriptLang#5618)

aeaee7a

Add Vector Projection Expression (SkriptLang#5482)

b91b3a8

add vector projection expression Co-authored-by: LimeGlass <[email protected]>

Condition LivingEntity is Jumping (SkriptLang#5359)

97caf93

Add InventoryDragEvent (SkriptLang#5474)

3dd5394

Adds EffToggleCanPickUpItems + CondCanPickUpItems (SkriptLang#5357)

a5f0f4f

🚀 Add anvil repair cost expression (SkriptLang#4617)

1949a23

Adds Clamp Function (SkriptLang#5573)

302f8f9

Add quit reason (SkriptLang#5763)

ce1888c

* Add quit reason * Cleanup * Versioning

🚀 Add loop-counter & Improve loops (SkriptLang#4595)

9d06f02

Add CondIsLeftHanded and EffHandedness (SkriptLang#5494)

e08ec47

sovdeeth and others added 24 commits June 27, 2023 18:15

Vector from direction (SkriptLang#5502)

f6e4ccf

Add event-item and event-slot to Resurrect Event (SkriptLang#5683)

011c91e

Fix null pointer exception in ExprBlocks when using the ExprDirection…

549ebc3

… without a number defined. (SkriptLang#5790) Update ExprBlocks.java

Fix ExprRawString using a Java 9 feature (SkriptLang#5795)

843774d

Replace Java 9 replace method with Skript's method

Fixes error not properly being caught (SkriptLang#5798)

6caf20c

Update Utils.java

Bump org.gradle.toolchains.foojay-resolver-convention from 0.5.0 to 0…

230fabb

….6.0 (SkriptLang#5810)

Allow on pickup to be found easier on docs (SkriptLang#5823)

82749a5

Fix loot generate example (SkriptLang#5816)

5a44852

Adds ExprPortalCooldown (SkriptLang#5356)

5c50a3f

Fix EffActionBar NullPointException when message is null (SkriptLang#…

ebc0929

…5833)

Update the return function regex (SkriptLang#5814)

a11a98a

Catch the exception when pushing entity by non finite vector (SkriptL…

f0594a3

…ang#5765)

Fix bugs in the random number expression (SkriptLang#5748)

457a47d

🛠 Fix ExprTarget UOE (SkriptLang#5844)

7be44da

Add warning to notify the user about using teleport in the spawn sect…

2c2c055

…ion (SkriptLang#5813)

Add proper error for BlockData failing (SkriptLang#5808)

1460fdd

Delete CondIsWithinLocation in favor of CondIsWithin (SkriptLang#5803)

1bd8229

Fix example in ExprTeleportCause (SkriptLang#5807)

e7ec6c9

🚀 Item cooldown expression + condition (SkriptLang#4198)

4d6f42a

Adds CondHasLineOfSight (SkriptLang#5562)

21d2420

New Expression: Loaded Chunks of World (SkriptLang#5662)

996b57e

* Initial * Support plural * Merge with ExprChunk * Fix * Fix 2 * Cleanup class to obey code convention * Requested changes * Fix indent * Indent docs and improved pattern --------- Co-authored-by: LimeGlass <[email protected]>

Adds InventoryMoveItemEvent (SkriptLang#5462)

a580caf

New Expression: Attached Block of Arrow (SkriptLang#5589)

0c4a190

Merge branch 'master' into fix/visual-effects-expressions

851b479

Moderocky force-pushed the master branch 3 times, most recently from bd134d0 to 3f08853 Compare September 16, 2023 16:59

sovdeeth closed this Jul 16, 2024

Romitou mentioned this pull request Sep 26, 2024

Make visual effects serializable #7114

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update visual effects #4123

Update visual effects #4123

TPGamesNL commented Jun 27, 2021 •

edited by TheLimeGlass

Loading

TPGamesNL commented Jun 27, 2021

APickledWalrus left a comment

APickledWalrus Jul 15, 2022

APickledWalrus Jul 15, 2022

sovdeeth commented Jul 16, 2024

Update visual effects #4123

Update visual effects #4123

Conversation

TPGamesNL commented Jun 27, 2021 • edited by TheLimeGlass Loading

Description

TPGamesNL commented Jun 27, 2021

APickledWalrus left a comment

Choose a reason for hiding this comment

APickledWalrus Jul 15, 2022

Choose a reason for hiding this comment

APickledWalrus Jul 15, 2022

Choose a reason for hiding this comment

sovdeeth commented Jul 16, 2024

TPGamesNL commented Jun 27, 2021 •

edited by TheLimeGlass

Loading