Add worldborders #7006

Phill310 · 2024-08-29T15:59:21Z

Description

Add worldborder syntax to Skript. Continuation of #5229
Player's worldborder is always virtual

Conditions:

updated IsWithin condition

Effects:

expand/shrink worldborder (maybe add grow/contract aliases)
I don't like the way I am registering the syntax right now with the of and 's but I can't think of a different way

Events:

Worldborder bounds change
Worldborder bounds finish change
Worldborder center change

Expressions:

Sections:

Create worldborder

Target Minecraft Versions: any
Requirements: Paper for worldborder events
Related Issues: #5178, #3848

src/main/java/ch/njol/skript/expressions/ExprWorldBorder.java

src/main/java/ch/njol/skript/effects/EffWorldBorderExpand.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderSize.java

Fusezion

TEST!

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

src/main/java/ch/njol/skript/conditions/CondIsInsideWorldBorder.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderSize.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderWarningDistance.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderWarningTime.java

Fusezion · 2024-08-29T16:32:46Z

A lot of chez's stuff might of been repeated he beat me ;(

src/test/skript/tests/syntaxes/effects/EffWorldborderExpand.sk

sovdeeth

just needs some formatting updates, mainly around annotations!

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

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

src/main/java/ch/njol/skript/effects/EffWorldBorderExpand.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderSize.java

src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java

src/main/java/ch/njol/skript/aliases/Aliases.java

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

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

src/main/java/ch/njol/skript/effects/EffWorldBorderExpand.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderWarningTime.java

Efnilite · 2024-12-25T20:22:51Z

src/main/java/ch/njol/skript/expressions/ExprWorldBorderWarningTime.java

+import org.jetbrains.annotations.Nullable;
+
+@Name("Warning Time of World Border")
+@Description("The warning time of a world border. If the border is shrinking, the player's screen will be tinted red once the border will catch the player within this time period.")


so if the player is outside the border it will be tinted red after one second? im not sure what this expression does

Its specifically when the worldborder is shrinking. If the player is outside the final worldborder (after the shrink), their screen will turn red x seconds before it reaches their current location

src/test/skript/tests/syntaxes/effects/EffWorldborderExpand.sk

src/main/java/ch/njol/skript/expressions/ExprWorldBorderWarningTime.java

src/test/skript/tests/syntaxes/effects/EffWorldborderExpand.sk

TheAbsolutionism

Just a few things

src/main/java/ch/njol/skript/expressions/ExprWorldBorder.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderCenter.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderDamageAmount.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderDamageBuffer.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderSize.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderDamageAmount.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderCenter.java

TheAbsolutionism · 2024-12-25T20:44:19Z

src/main/java/ch/njol/skript/expressions/ExprWorldBorderCenter.java

+		Location location = mode == ChangeMode.SET ? (Location) delta[0] : null;
+		for (WorldBorder worldBorder : getExpr().getArray(event)) {
+			switch (mode) {
+				case SET:


Not a big deal, but maybe an enhanced switch?

src/main/java/ch/njol/skript/expressions/ExprWorldBorder.java

src/main/java/ch/njol/skript/expressions/ExprWorldBorderCenter.java

…order#getMaxCenterCoordinate

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com> Co-authored-by: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com>

TheAbsolutionism

I believe that's about it, unless you add more classes

src/main/java/ch/njol/skript/expressions/ExprSecCreateWorldBorder.java

Co-authored-by: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com>

src/main/java/ch/njol/skript/effects/EffWorldBorderExpand.java

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

src/main/java/ch/njol/skript/events/SimpleEvents.java

src/main/java/ch/njol/skript/expressions/ExprSecCreateWorldBorder.java

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>

src/main/java/ch/njol/skript/expressions/ExprSecCreateWorldBorder.java

…der.java Co-authored-by: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com>

sovdeeth

lots of failing tests + conflicts

…e/worldborder

cheeezburga reviewed Aug 29, 2024

View reviewed changes

Fusezion suggested changes Aug 29, 2024

View reviewed changes

sovdeeth added the feature Pull request adding a new feature. label Aug 30, 2024

Phill310 marked this pull request as ready for review September 9, 2024 01:55

Moderocky requested changes Sep 13, 2024

View reviewed changes

src/test/skript/tests/syntaxes/effects/EffWorldborderExpand.sk Outdated Show resolved Hide resolved

sovdeeth requested changes Sep 13, 2024

View reviewed changes

Moderocky force-pushed the feature/worldborder branch from 2cdbc4e to d7dbc0c Compare December 25, 2024 20:15

Efnilite requested changes Dec 25, 2024

View reviewed changes

TheAbsolutionism suggested changes Dec 25, 2024

View reviewed changes

Moderocky force-pushed the feature/worldborder branch from 499ff66 to e6eef8b Compare December 26, 2024 18:17

Phill310 and others added 19 commits December 26, 2024 18:20

Initial setup

65e0efc

Fix imports

a3f7f47

Use pattern variables for instanceof

000e562

Cleaner switch statements

28044ac

Specify paper version

dd4f4f4

Use newer timespan method

593401d

Require "world border" when editing a world border's attributes

97c3ffc

Move IsInsideWorldBorder to IsWithin condition

1588c3d

Make variable name readable

8cb9c9d

Clean up conditions

e08a74b

Make radius/diameter optional

5c125f5

Make damage have a minimum of 0

47c2805

Make warning distance have a minimum of 0

3ccc84c

Make damage buffer have a minimum of 0

1b793ca

Make warning time have a minimum of 0

f759e46

Force the center location to stay inside the limits defined by WorldB…

dfc45fc

…order#getMaxCenterCoordinate

Tests!

3134439

End files with a new line

85a81e5

Apply suggestions from code review

4636119

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>

Phill310 and others added 4 commits December 26, 2024 18:20

Apply suggestions from code review

ce149d9

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com> Co-authored-by: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com>

Phil's stuff.

5296312

More of Phil's stuff.

6c1083d

Whoops I imported again

e708061

Moderocky force-pushed the feature/worldborder branch from e6eef8b to e708061 Compare December 26, 2024 18:22

Moderocky approved these changes Dec 26, 2024

View reviewed changes

TheAbsolutionism suggested changes Dec 26, 2024

View reviewed changes

Phill310 and others added 6 commits December 26, 2024 11:04

Apply suggestions from code review

bd313ce

Co-authored-by: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com>

register properties as defaults

281395e

Add docs

d2e5379

Clean up toString

a697be1

Update tests

7486f83

Merge branch 'dev/feature' into feature/worldborder

7e47366

Phill310 requested review from sovdeeth, Efnilite and TheAbsolutionism December 28, 2024 07:55

Efnilite requested changes Dec 28, 2024

View reviewed changes

Phill310 and others added 3 commits December 28, 2024 09:34

Apply suggestions from code review

063a0a1

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>

Fix imports

7e97332

Remove duplicate event registration

b7c5ef4

Phill310 requested a review from Efnilite December 28, 2024 17:41

TheAbsolutionism reviewed Dec 29, 2024

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprSecCreateWorldBorder.java Outdated Show resolved Hide resolved

Phill310 and others added 2 commits December 28, 2024 23:42

Update src/main/java/ch/njol/skript/expressions/ExprSecCreateWorldBor…

783c5e8

…der.java Co-authored-by: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com>

Merge branch 'dev/feature' into feature/worldborder

2e413e8

sovdeeth requested changes Dec 30, 2024

View reviewed changes

Efnilite and others added 4 commits December 31, 2024 01:53

Merge branch 'dev/feature' into feature/worldborder

2c89859

Merge branch 'dev/feature' into feature/worldborder

6318c09

Fix typo

c39a1f2

Merge remote-tracking branch 'origin/feature/worldborder' into featur…

98da501

…e/worldborder

Phill310 requested a review from sovdeeth January 6, 2025 01:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add worldborders #7006

Add worldborders #7006

Phill310 commented Aug 29, 2024 •

edited

Loading

Fusezion left a comment

Fusezion commented Aug 29, 2024

sovdeeth left a comment

Efnilite Dec 25, 2024

Phill310 Dec 28, 2024

TheAbsolutionism left a comment

TheAbsolutionism Dec 25, 2024

TheAbsolutionism left a comment

sovdeeth left a comment

Add worldborders #7006

Are you sure you want to change the base?

Add worldborders #7006

Conversation

Phill310 commented Aug 29, 2024 • edited Loading

Description

Fusezion left a comment

Choose a reason for hiding this comment

Fusezion commented Aug 29, 2024

sovdeeth left a comment

Choose a reason for hiding this comment

Efnilite Dec 25, 2024

Choose a reason for hiding this comment

Phill310 Dec 28, 2024

Choose a reason for hiding this comment

TheAbsolutionism left a comment

Choose a reason for hiding this comment

TheAbsolutionism Dec 25, 2024

Choose a reason for hiding this comment

TheAbsolutionism left a comment

Choose a reason for hiding this comment

sovdeeth left a comment

Choose a reason for hiding this comment

Phill310 commented Aug 29, 2024 •

edited

Loading