Update to world events #5114

Fusezion · 2022-09-24T02:20:06Z

Description

This PR adds of %worlds% into the WorldSaveEvent, WorldLoadEvent, WorldUnloadEvent, and WorldInitEvent
I've also added a new effect for manually saving worlds

save all worlds
save [the] %worlds%

Target Minecraft Versions: any
Requirements: N/A
Related Issues: #5113 #3656

Removes world load/unload/init/save from simpleevents Adds a save world effect

Fusezion · 2022-09-24T04:51:08Z

I haven't merged this as of yet as I'm unsure if it'll be worth it but should I also include an effect to
unload world as it exist within bukkit

I was planning to add an effect for load as well but with the fact Bukkit doesn't have a method for this I'm unable to

TheLimeGlass · 2022-09-24T08:42:59Z

I don't think you need world before %worlds% as the ClassInfo parse will remove the word world

Fusezion · 2022-09-24T08:43:54Z

Alright I'll remove it in a bit once I finish the breedable stuff

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

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

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

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

This will be the first batch, anything not updated I'll edit manually on my end Co-authored-by: LimeGlass <[email protected]>

Finished off the requested changes that weren't merged with first batch along with switch some other things around

Missed a requested change

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

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

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

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

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

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

Some requested changes Syntax change for EffUnloadWorld Changed from World[] to Literal<World>

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

Co-authored-by: LimeGlass <[email protected]>

APickledWalrus

Nice additions :)

Instead of having four event classes though, I think you should just do something like https://github.com/SkriptLang/Skript/blob/master/src/main/java/ch/njol/skript/events/EvtItem.java where multiple events are registered in the same file (so that they use the same check method) since these check methods are very similar

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

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

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

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

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

Combined all world events into a single file, "EvtWorld" Did the requested changes for both effects Added a warning about possibly freezing a server with the save effect Co-Authored-By: Patrick Miller <[email protected]>

Removed some commented out code Fixed a spelling mistake or two Removed accidental * import

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

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

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

Co-authored-by: Ayham Al Ali <[email protected]>

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

…hancment/worldupdates

- Removed 'getAnd' - Removed plurality

Fusezion · 2024-01-01T05:54:39Z

Latest commit remove the worlds plurality and the suggested getAnd error message. this event still works with plurals however only as on world save of "world" or "world_the_end if you attempt to use and skript will treat it as a list and error with the base one.

If a change is wanted to add it back I have zero intention to 'getAnd' calls on world save of "world" an and list when it should be false. Skript will need to change that behavior before this is attempted again.

sovdeeth · 2024-01-01T05:59:44Z

Latest commit remove the worlds plurality and the suggested getAnd error message. this event still works with plurals however only as on world save of "world" or "world_the_end if you attempt to use and skript will treat it as a list and error with the base one.

If a change is wanted to add it back I have zero intention to 'getAnd' calls on world save of "world" an and list when it should be false. Skript will need to change that behavior before this is attempted again.

Sorry I'm really confused about what you're trying to say here
All I understood is that you fixed the issue with a single world failing?

Fusezion · 2024-01-01T06:02:48Z

Sorry I'm really confused about what you're trying to say here All I understood is that you fixed the issue with a single world failing?

Fixed? yes, lazily to be fair. I basically just removed it, Skript treats 1 or 2 the same as 1 so %world% supports both choices without 1 and 2 support. But I believe I might have miss understood your review, as I thought you were against and being a supported option

Fusezion · 2024-01-01T06:13:18Z

Alright now that I understood you weren't against and being supported, I've reverted previous commit and added your suggested of setAnd(false) let me know if I did it wrong

Orrr not give me a bit intellij is breaking

…hancment/worldupdates

Fusezion · 2024-01-01T06:20:33Z

Alright so updated my branch and it broke it as setAnd was renamed in #6000 to invertAnd

sovdeeth

One small change

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

Co-authored-by: sovdee <[email protected]>

APickledWalrus

just some concerns about syntax consistency

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

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

Address his desired reviews Co-authored-by: Patrick Miller <[email protected]>

Update to world events

0fe7372

Removes world load/unload/init/save from simpleevents Adds a save world effect

Added unload world effect

29404c3

TheLimeGlass added enhancement Feature request, an issue about something that could be improved, or a PR improving something. feature Pull request adding a new feature. labels Sep 24, 2022

Removed world from effects

692c909

TheLimeGlass requested changes Sep 28, 2022

View reviewed changes

Fusezion and others added 3 commits September 29, 2022 06:07

Apply suggestions from code review

481be81

This will be the first batch, anything not updated I'll edit manually on my end Co-authored-by: LimeGlass <[email protected]>

Merge branch 'SkriptLang:master' into enhancment/worldupdates

375117c

Requested changes

b75f1bb

Finished off the requested changes that weren't merged with first batch along with switch some other things around

Fusezion requested a review from TheLimeGlass September 29, 2022 11:13

Update EffWorldUnload.java

6c90aaf

Missed a requested change

TheLimeGlass requested changes Sep 30, 2022

View reviewed changes

src/main/java/ch/njol/skript/effects/EffWorldUnload.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/events/EvtWorldInit.java Outdated Show resolved Hide resolved

Requested changes

c270768

TheLimeGlass requested changes Oct 6, 2022

View reviewed changes

Hopefully final touches to this

0ae6991

Some requested changes Syntax change for EffUnloadWorld Changed from World[] to Literal<World>

TheLimeGlass requested a review from APickledWalrus November 16, 2022 21:09

TheLimeGlass requested changes Nov 16, 2022

View reviewed changes

src/main/java/ch/njol/skript/effects/EffWorldUnload.java Outdated Show resolved Hide resolved

Requested change

0b045a1

Co-authored-by: LimeGlass <[email protected]>

TheLimeGlass approved these changes Nov 16, 2022

View reviewed changes

Merge branch 'master' into enhancment/worldupdates

4c9bd6c

APickledWalrus requested changes Nov 24, 2022

View reviewed changes

EvtWorld - Request and Changes

431823f

Combined all world events into a single file, "EvtWorld" Did the requested changes for both effects Added a warning about possibly freezing a server with the save effect Co-Authored-By: Patrick Miller <[email protected]>

Fusezion requested a review from APickledWalrus January 27, 2023 08:43

Fusezion added 2 commits January 27, 2023 03:51

Changes

6266bd2

Removed some commented out code Fixed a spelling mistake or two Removed accidental * import

Merge branch 'SkriptLang:master' into enhancment/worldupdates

3f103ba

AyhamAl-Ali requested changes Jan 27, 2023

View reviewed changes

Apply suggestions from code review

369303a

Co-authored-by: Ayham Al Ali <[email protected]>

Moderocky changed the base branch from master to dev/feature September 18, 2023 09:42

sovdeeth added 2.8 Targeting a 2.8.X version release feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. labels Dec 30, 2023

sovdeeth requested changes Dec 30, 2023

View reviewed changes

src/main/java/ch/njol/skript/events/EvtWorld.java Outdated Show resolved Hide resolved

sovdeeth removed the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Dec 30, 2023

Fusezion added 4 commits December 31, 2023 13:57

Merge branch 'dev/feature' into enhancment/worldupdates

354223b

Merge branch 'dev/feature' into enhancment/worldupdates

56872e8

Merge remote-tracking branch 'origin/enhancment/worldupdates' into en…

5710086

…hancment/worldupdates

Update EvtWorld

77769c0

- Removed 'getAnd' - Removed plurality

Fusezion requested a review from sovdeeth January 1, 2024 05:54

Merge branch 'dev/feature' into enhancment/worldupdates

7e2f37d

Revert previous commit and implement sovde's actual suggestion

00575e2

Merge remote-tracking branch 'origin/enhancment/worldupdates' into en…

6d03788

…hancment/worldupdates

Revert previous commit and implement sovde's actual suggestion

ecb6d21

sovdeeth requested changes Jan 1, 2024

View reviewed changes

src/main/java/ch/njol/skript/events/EvtWorld.java Outdated Show resolved Hide resolved

Update src/main/java/ch/njol/skript/events/EvtWorld.java

2fa67ea

Co-authored-by: sovdee <[email protected]>

Fusezion requested review from sovdeeth January 1, 2024 18:08

sovdeeth approved these changes Jan 1, 2024

View reviewed changes

APickledWalrus requested changes Jan 1, 2024

View reviewed changes

Fusezion and others added 2 commits January 1, 2024 15:49

Ease the concerns of pickle with some cucumbers

2189543

Address his desired reviews Co-authored-by: Patrick Miller <[email protected]>

Merge branch 'dev/feature' into enhancment/worldupdates

c3aaa7a

APickledWalrus approved these changes Jan 1, 2024

View reviewed changes

APickledWalrus merged commit 16e217d into SkriptLang:dev/feature Jan 1, 2024
4 checks passed

Fusezion deleted the enhancment/worldupdates branch January 1, 2024 21:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to world events #5114

Update to world events #5114

Fusezion commented Sep 24, 2022 •

edited

Loading

Fusezion commented Sep 24, 2022 •

edited

Loading

TheLimeGlass commented Sep 24, 2022

Fusezion commented Sep 24, 2022

APickledWalrus left a comment

Fusezion commented Jan 1, 2024

sovdeeth commented Jan 1, 2024

Fusezion commented Jan 1, 2024 •

edited

Loading

Fusezion commented Jan 1, 2024 •

edited

Loading

Fusezion commented Jan 1, 2024

sovdeeth left a comment

APickledWalrus left a comment

Update to world events #5114

Update to world events #5114

Conversation

Fusezion commented Sep 24, 2022 • edited Loading

Description

Fusezion commented Sep 24, 2022 • edited Loading

TheLimeGlass commented Sep 24, 2022

Fusezion commented Sep 24, 2022

APickledWalrus left a comment

Choose a reason for hiding this comment

Fusezion commented Jan 1, 2024

sovdeeth commented Jan 1, 2024

Fusezion commented Jan 1, 2024 • edited Loading

Fusezion commented Jan 1, 2024 • edited Loading

Fusezion commented Jan 1, 2024

sovdeeth left a comment

Choose a reason for hiding this comment

APickledWalrus left a comment

Choose a reason for hiding this comment

Fusezion commented Sep 24, 2022 •

edited

Loading

Fusezion commented Sep 24, 2022 •

edited

Loading

Fusezion commented Jan 1, 2024 •

edited

Loading

Fusezion commented Jan 1, 2024 •

edited

Loading