Commit Graph

2073 Commits

Author SHA1 Message Date
Ben Woo
bc1a2ff8a1
Merge branch 'MV5' into ben/mv5/teleporter
# Conflicts:
#	src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java
#	src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java
#	src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java
#	src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java
#	src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java
#	src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java
#	src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java
#	src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java
#	src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java
#	src/main/java/org/mvplugins/multiverse/core/world/LoadedMultiverseWorld.java
#	src/main/java/org/mvplugins/multiverse/core/world/helpers/PlayerWorldTeleporter.java
2023-09-13 23:04:36 +08:00
Jeremy Wood
db0d5da5ce
Merge pull request #3020 from Multiverse/ben/mv5/nuke-worldmanager
Nuke the old world manager
2023-09-13 09:55:32 -04:00
Ben Woo
fbab3bc269
Nuke the old world manager 2023-09-12 23:05:51 +08:00
Ben Woo
ba93195671
Move logic of teleporting players out of world from world manager 2023-09-12 18:07:12 +08:00
Ben Woo
9ddfa59712
Merge branch 'MV5' into ben/mv5/teleporter
# Conflicts:
#	src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java
2023-09-12 17:25:50 +08:00
Ben Woo
6f014838e9
Cleanup commands checkstyle and flags 2023-09-12 17:22:20 +08:00
Ben Woo
ef2b42d9a0
Check for destination's checkTeleportSafety 2023-09-12 16:36:43 +08:00
Ben Woo
245fac98e5
Implement new AsyncSafetyTeleporter 2023-09-12 16:33:43 +08:00
Ben Woo
0e43444523
Merge pull request #3018 from Multiverse/ben/mv5/player-world-action
Implement player world actions and some refactor
2023-09-12 14:20:42 +08:00
Ben Woo
f9bd7f136d
Split PlayerWorldAction to PlayerWorldTeleporter and EnforcementHandler 2023-09-12 13:13:54 +08:00
Ben Woo
a45849799d
Implement player world actions and some refactor 2023-09-12 12:45:09 +08:00
Ben Woo
80dba5068c
Merge pull request #2991 from zax71/MV5-always-spawn-location
Implement JoinDestination and EnableJoinDestination config options
2023-09-12 11:38:10 +08:00
Ben Woo
b78941c0a0
Refactor join-destination config and use async teleport 2023-09-12 11:33:50 +08:00
Ben Woo
dc3ec52d74
Merge branch 'MV5' into MV5-always-spawn-location 2023-09-12 11:27:38 +08:00
Ben Woo
57b27ce6e6
Fix hk2 ServiceLocatorGenerator 2023-09-12 11:16:30 +08:00
Ben Woo
d6c8d5381f
Merge branch 'MV5' into MV5-always-spawn-location
# Conflicts:
#	src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java
#	src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java
2023-09-12 10:38:04 +08:00
Ben Woo
5178d68828
Merge pull request #3017 from Multiverse/dtm/checkstyle/imports
Fix import order check.
2023-09-12 10:26:49 +08:00
Ben Woo
f6ba48c5f2
Apply new import order changes 2023-09-12 10:24:58 +08:00
Jeremy Wood
ede47e834b
Fix import order check. 2023-09-11 22:17:47 -04:00
Ben Woo
df7e333610
Merge pull request #3016 from Multiverse/ben/mv5/repackage
Move package to org.mvplugins.multiverse.core
2023-09-12 01:03:17 +08:00
Ben Woo
48f9e65321
Change third party relocate to org.mvplugins.multiverse.external. 2023-09-12 01:02:00 +08:00
Ben Woo
474630d1ff
Move package to org.mvplugins.multiverse.core 2023-09-12 00:56:20 +08:00
Ben Woo
1812315033
Merge pull request #3015 from Multiverse/ben/mv5/import-refactor
Optimise all imports
2023-09-12 00:45:18 +08:00
Ben Woo
e31ef1428c
Fix import order checkstyle and remove comment 2023-09-12 00:43:46 +08:00
Ben Woo
256ac67cf1
Optimise all imports 2023-09-12 00:41:17 +08:00
Ben Woo
9dbe7e20ad
Merge pull request #3014 from Multiverse/ben/mv5/a-lot-of-checkstyle
Fix a lot of checkstyles throughout
2023-09-12 00:29:14 +08:00
Ben Woo
e005b266ea
Add a todo about the todo checkstyle to enable todo warning after mv 2023-09-12 00:19:27 +08:00
Ben Woo
1dfdb611c6
Set back throw count to 0 2023-09-12 00:15:13 +08:00
Ben Woo
dd4b01f922
Fix a lot of checkstyles throughout 2023-09-12 00:07:25 +08:00
Ben Woo
39f3805ef3
Fix all imports once and for all 2023-09-11 23:09:34 +08:00
Jeremy Wood
d3fa42a035
Merge pull request #3013 from Multiverse/world-revamp-continue
Continue revamping World/WorldManager.
2023-09-11 10:42:47 -04:00
Ben Woo
46d115b2f3
Fix LocalizationTest 2023-09-11 22:13:48 +08:00
Ben Woo
690d956ce2
Merge branch 'MV5' into world-revamp-continue 2023-09-11 22:11:32 +08:00
Ben Woo
ffec23c9ed
Add docs and fix more checkstyles 2023-09-11 21:52:16 +08:00
Jeremy Wood
d77fb43536
Add continue-on-error to step as well. 2023-09-11 08:48:23 -04:00
Jeremy Wood
86e2ab45fb
Change checkstyle workflow back to PR annotations without failure. 2023-09-11 08:44:05 -04:00
Jeremy Wood
5a474d7efa
Merge pull request #3010 from Multiverse/ben/mv5/nested-locale-message
Add support for nested Message within MessageReplacement and fix some checkstyles
2023-09-11 08:30:09 -04:00
Jeremy Wood
ca9b244a89
Merge pull request #3011 from Multiverse/ben/mv5/upstream-checkstyle
Upstream checkstyle changes from world revamp
2023-09-11 08:13:42 -04:00
Ben Woo
329901afa6
Remove public from config nodes and remove names that are the same as path 2023-09-11 17:06:06 +08:00
Ben Woo
61570b1a7f
Merge pull request #3012 from Multiverse/ben/mv5/improve-world-purge
Cleanup world purger and add docs
2023-09-11 16:48:31 +08:00
Ben Woo
aa063007e8
Fix some checktyle issue in WorldPurger 2023-09-11 16:47:39 +08:00
Ben Woo
58c13c1f73
Copy spawn location when cloning world 2023-09-11 16:42:27 +08:00
Ben Woo
c0f2168ba4
Copy spawn location only if seed didnt change on regen 2023-09-11 16:40:03 +08:00
Ben Woo
ef0cb4b893
Do not apply spawn location if it's a null location 2023-09-11 16:39:34 +08:00
Ben Woo
c2ff8a467f
Make unsettable properties have null name 2023-09-11 16:38:49 +08:00
Ben Woo
404a2f4183
Cleanup adjust spawn logic 2023-09-11 16:03:36 +08:00
Ben Woo
a4a5be20f9
Use .get() for world folder, since it should fail if null 2023-09-11 15:49:27 +08:00
Ben Woo
481933b948
Add support for removing players before unloading world 2023-09-11 15:39:06 +08:00
Ben Woo
379e0172c4
Fix regen world keeping seed not working 2023-09-11 15:38:28 +08:00
Ben Woo
d8334ad71a
Refactor world results and add docs 2023-09-11 14:35:56 +08:00