Commit Graph

307 Commits

Author SHA1 Message Date
Matthew Miller
69b1b5ebd5 Merge branch 'version/7.2.x' 2021-01-25 20:55:59 +10:00
wizjany
ef9af59ce5 Update Bukkit adapter for 1.16.5.
Just a data version bump. Barely dodged the mapping changes this time.
2021-01-15 22:08:47 -05:00
zml
0036e06f89
Alter the CUI lifecycle to be more consistent and reliable (#1633)
* Alter the CUI lifecycle to be more consistent

This handling reduces the platform-specific behaviour of CUI handshakes,
and ensures that the appropriate state is maintained when a client
connection ends but a LocalSession remains cached.

* Apply review suggestions

* fabric: Update to new networking API

* session: Correct field grouping for cui attempts
2021-01-16 13:07:29 +10:00
wizjany
5e1ee250e0 Update Bukkit adapter for 1.16.5.
Just a data version bump. Barely dodged the mapping changes this time.
2021-01-15 21:29:20 -05:00
Matthew Miller
7a268b0b5d
Add WorldEdit version and platform to schematics (#1635)
* Add WorldEdit version and platform to schematics

* Use an actual platform ID rather than name, for more accurate info.

* Put the platform data within another nested tag

* Use a best-effort legacy platform ID

* Review changes

* Move the getId impl to Platform

* Review notes

* Review notes

* 😓
2021-01-02 21:01:40 +10:00
wizjany
bb464a6f0c Update adapters to fix #1586. 2020-12-09 22:39:19 -05:00
Octavia Togami
b4e5bc7dbf
Properly deploy version into core/bukkit 2020-11-02 18:16:23 -08:00
wizjany
6ac7bbeab2 [Bukkit] Update for 1.16.4. 2020-11-02 17:00:48 -05:00
Octavia Togami
bc64990e7e
Move to packaged translations (#1555)
* Move to packaged translations

* License that file

* Fix some checkstyle too

* Support reloading translation files

* Add missing dash for unpack directory

* Mark unpacked zips as owner-only
2020-10-08 17:42:23 -07:00
Lewis B
beb784e0ff
Add -w flag to butcher for water mobs (#1548)
* Add -w flag to butcher for water mobs

* PR feedback
2020-10-05 13:50:20 +10:00
Matthew Miller
26d8306833
Fixed snow being placed through slabs (#1541)
* Added a method to check whether a block can be placed at a location

* Make the snow system only place at locations that it can by game logic

* Make canPlaceAt a default method

* Fixed PR comments

* Use a World field

* Just throw directly

* IAE makes more sense

* Remove unused import

* Check for editsession without a world
2020-10-02 16:53:05 +10:00
Matthew Miller
2056218b4a
Remove data versions from the Bukkit adapters (#1507)
* Remove data versions from the Bukkit adapters

* Don't allow saving schematics without an adapter in place on Bukkit.

* Removed confusing line
2020-09-19 18:00:43 +10:00
wizjany
1cba5c38f5 Update adapters for 1.16.3. 2020-09-10 18:28:33 -04:00
Octavia Togami
3996998c5f Deprecate BlockQuirkExtent, handle lower down
Ice is no longer turning into water since before 1.7.10, so that part has been
removed entirely.
2020-08-28 20:57:10 -07:00
Matthew Miller
61a5d7d648 Fixed undo/redo editsessions not retaining settings 2020-08-24 22:39:58 +10:00
Matthew Miller
c7885f2f17 Bump Adapters for neighbouring validations fix 2020-08-24 22:33:37 +10:00
wizjany
d2239ef7de Copy the class source validator from WG.
Warns when other plugins incorrectly shade WE or our libs.
2020-08-14 01:03:13 -04:00
wizjany
0f7936ca17 Update for Spigot 1.16.2. 2020-08-13 21:44:03 -07:00
Octavia Togami
f2ce020da0 Officially propagate GPL downwards to all files 2020-08-13 21:06:39 -07:00
Matthew Miller
0a9fa869c9
Fixed an issue where upwards resolved schematics would break schem list (#1481)
* Fixed an issue where upwards resolved schematics would break schem list

* Missed diff

* PR changes

* Further fixes

* Improve sorting logic

* Pass in comparator rather than using sort type

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-08-13 18:01:37 +10:00
Octavia Togami
ffaf8e00be
Add tracing feature to EditSessions (#1301)
* Add tracing feature to EditSessions

This helps track down what plugin (or more specifically, extent) is
blocking actions from happening.

* Set a trace hook instead of a one-off command

* Correct the logic for determining tracing active

* Fix extra newline in AbstractPlayerActor

* Fix checkstyle

* Improve messaging of trace mode
2020-08-10 22:43:51 -07:00
Matthew Miller
05014b1fc9 Add an update side effect. Only for Bukkit for now 2020-08-09 22:44:44 +10:00
Octavia Togami
cbe788c9a3
Remove duplicate dependency entry 2020-07-28 16:20:14 -07:00
Matthew Miller
3c402e4afd Bump adapters for regen changes 2020-07-26 13:26:34 +10:00
dordsor21
c3f533e893 Remove EditSession regenerate method from Bukkit Adapters
Since adapters are not API, the EditSession regeneration methods should not be exposed here.
2020-07-26 13:22:26 +10:00
dordsor21
c4abc9a247 Allow regeneration to accept Extents instead of EditSessions.
Allows for custom Extents to be parsed to regen, and for clipboard regeneration, etc whilst still allowing EditSessions
2020-07-26 13:22:26 +10:00
Octavia Togami
213239ee94
Restore overworld check for bukkit 2020-07-15 20:12:33 -07:00
wizjany
9aea9f2b9c Add updated bukkit adapter. 2020-07-15 20:10:25 -07:00
Octavia Togami
5803cb10b5 Fix 3D biome support testing
3D biomes always work on dedicated servers, at least as far as the
client knows. This is so terrible though. Mojang why.
2020-07-15 20:10:25 -07:00
Octavia Togami
7134ff4494
Remove all compile deps, use api/impl as appropriate 2020-07-15 18:48:47 -07:00
wizjany
9d9aaac15a Add fungi and chorus plant tree types.
Closes #1411.
2020-07-12 14:34:48 -04:00
Octavia Togami
22acd2b486
Error if loaded in even OLDER versions of Bukkit
Take that, 1.8 servers.
2020-07-11 19:29:50 -07:00
Octavia Togami
f023b46fae
Error + disable if loaded in old MC versions on Bukkit 2020-07-11 19:20:09 -07:00
wizjany
373f86953b Update adapter jar for file deletion fix.
Fixes #1427.
2020-07-09 23:54:33 -04:00
Octavia Togami
81f6e3e7cf Cleanup some javac warnings 2020-07-07 20:38:57 -07:00
Octavia Togami
eb52afa296 Create a brand new checkstyle config
And also apply it!
2020-07-07 20:38:57 -07:00
Octavia Togami
781abd511d Add final to many fields 2020-07-07 20:38:57 -07:00
Matthew Miller
9b4bfbed2d
Localise WorldEditException and error handling (#1393)
* Localise the ExceptionConverter

* Further work on localising exceptions

* Everything but input parsing is now localised

* Finish making errors localisable

* Fixed a few notes from review

* Fixed another spot

* More changes

* Specialise parser errors
2020-07-05 14:57:13 +10:00
Octavia Togami
bf6cd1ea08
Regeneration Options (#1415)
* Add RegenOptions to the API

* Integerate regen options into //regen

* Rename isRegenBiomes to shouldRegenBiomes

* Go through the EditSession for setting biomes

* Respect 3D biome support in regen

* Add RegenOptions implementation for 1.16 Bukkit adapter.

Co-authored-by: wizjany <wizjany@gmail.com>
2020-07-03 22:17:34 -07:00
Octavia Togami
71e104bcb1
Replace setPosition with trySetPosition (#1403)
Allows cancellation information to be fed back into the ascend/descend
algorithms.
2020-07-01 08:24:58 -07:00
Octavia Togami
8aa034c78f
Fix or suppress deprecation warnings in most code (#1404)
Didn't touch commands or some of Sponge
2020-07-01 08:24:42 -07:00
wizjany
410d4c5eee Return correct world folders on Bukkit, used in /delchunks.
Fixes #1365.
2020-06-24 23:56:48 -04:00
wizjany
9e186225bd Update adapter jar. 2020-06-24 23:30:55 -04:00
Octavia Togami
6513513b3e
Mojang AB and the Column Biome Fuzzer (#1376)
* Allow API detection of the biome fuzzer in use

This allows us to warn, fix, or optimize biome edits to the overworld.

* Drop edits to Y = 0 for biomes in overworld

* Re-work ArbitraryBiomeShape to simplify logic

Also fixes not being able to use THE_VOID with it
2020-06-23 23:33:20 -07:00
Matthew Miller
f5e36ed8a8
Add 3D biomes support (Adds #1358) (#1361)
* Initial work on 3D biomes. Not implemented for Bukkit, and history is unfinished

* Further implement 3D Biomes. It's now usable on Forge/Fabric

* Fix a few cases of apply. Gotta fix the deprecated methods at some point

* Add Bukkit support

* Add clipboard support. Schematics are still not great, but the Sponge schem format doesn't support this yet.

* Fix the last of the issues

* Fixed up review comments

* Fixed review notes

* Simplify

* max is inclusive

* Standardize non-abstract compatibility handling

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-06-22 09:25:49 +10:00
wizjany
57d62b0bf5
Count wandering traders as NPCs for /butcher. (#1359)
* Count wandering traders as NPCs for /butcher.

Fixes #1347.

* Change variable case.
2020-06-14 13:55:14 +10:00
Matthew Miller
495ac44f5c
feat(tool): added stack tool (#1338)
* feat(tool): added stack tool

* Implement review comments

* Don't register an alias for stacker

* Apply suggestions

* Fixed /stacker alias

* Indent

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Remove unused imports

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-06-13 14:25:37 +10:00
Matthew Miller
267fe1ffe0
feat(i18n): use a translation loader to allow CB/WG to use WorldEdit's TranslationManager (#1327)
* feat(i18n): use a translation loader to allow CB/WG to use WorldEdit's TranslationManager

* Replace the old ResourceLoader with the new one

* Make ResourceLoader per-platform

* Update worldedit-core/src/main/java/com/sk89q/worldedit/util/io/WorldEditResourceLoader.java

* Improve the impl to allow a default

* Update based on review suggestions

* Local resource should be pathName too

* Delegate to getRootResource, and prevent pathName from starting with /

* HTML

* Format javadoc a little better

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2020-05-14 17:40:11 +10:00
Matthew Miller
7a8c512916 Fixed typo in default disallowed blocks on Bukkit 2020-05-11 20:57:42 +10:00
Octavia Togami
3fdb10ad15
Delay command block active update if needed (#1285)
* Delay command block active update if needed

If we are checking if a command block session is active, and we are not
on the main thread, schedule a task instead to update the active status
eventually, rather than waiting on the main thread.

Fixes #1284.

* What's that? Non-static state, you say?

Just saw we have a field for the plugin here. Might as well use it.

* Check if chunk is loaded for sender before type
2020-04-19 13:08:44 -07:00