Jesse Boyd
75f059fdc5
check length, not null
2019-07-17 05:28:55 +10:00
Jesse Boyd
b3e11d2094
patch for missing tile position data
2019-07-17 05:16:08 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114
2019-07-11 08:08:55 +10:00
Jesse Boyd
a98a91e066
Use Locale.ROOT
2019-07-10 21:03:00 +10:00
Jesse Boyd
b32d46b08a
Use Locale.ROOT
2019-07-10 21:01:56 +10:00
MattBDev
4a40c7d99c
Renaming and cleanup and a new method.
2019-07-09 15:50:13 -04:00
Jesse Boyd
f99d6e7478
wip on 1.14
2019-07-09 17:18:51 +10:00
Jesse Boyd
13b602cb83
isAffectedBlock
2019-06-29 06:31:07 +10:00
Jesse Boyd
58c6b6278f
a69b239848
2019-06-29 04:20:48 +10:00
Jesse Boyd
7a9adacc32
Don't read the entire file to check the format
2019-06-29 01:42:22 +10:00
Jesse Boyd
55dad5a972
7f3c4c4828
2019-06-29 01:39:58 +10:00
Jesse Boyd
846a1b0769
6c94cca15e
2019-06-29 00:01:51 +10:00
MattBDev
d0a31691e1
Small changes
2019-06-26 20:14:00 -04:00
MattBDev
a69b239848
Upstream
2019-06-25 13:07:47 -04:00
wizjany
902754ce8a
Bit more cleanup for schematic handling.
2019-06-21 11:07:03 -04:00
wizjany
a3d23fdcea
Fix requirements of sponge schematic spec.
...
Fixes WORLDEDIT-3929.
2019-06-20 18:51:29 -04:00
wizjany
213cadf093
Import cleanup, ensure gradle uses https for deps, bump deps.
2019-06-13 09:17:00 -04:00
MattBDev
1f14d4652e
Upstream changes, prefix changes, formatting changes, variable name changes
...
I think that draining waterlogged items also works now?
2019-06-12 17:13:53 -04:00
NotMyFault
ec001b8d3b
Revert "Upstream, generics, formatting"
...
This reverts commit cd88e513a8
.
2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8
Upstream, generics, formatting
2019-06-11 20:31:56 -04:00
MattBDev
7f3c4c4828
A lot of removals, upstream merges, and maybe more.
2019-06-07 20:58:48 -04:00
MattBDev
6c94cca15e
Selective upstream merge
...
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
Jesse Boyd
6bc5b4a823
.
2019-05-29 06:31:22 +10:00
wizjany
4b15439e03
Don't attempt to update empty or invalid flower pots.
2019-05-25 00:35:12 -04:00
wizjany
b0777f6b06
Use DFUs for some additional data fixing.
...
Legacy mapper now uses the data fixers to upgrade blocks and item types
(e.g. signs, dyes that changed names in 1.14).
The sponge schematic reader can now attempt to use the data fixers to
upgrade blocks, block entities, biomes and entities. This has been
tested with the 1.13 -> 1.14 changes. It is yet to be seen if it will
continue to work because...
The mc edit schematic reader has code for using data fixers, but it is
currently disabled as there seem to be some issues with fixing up older
block entities.
2019-05-20 16:39:58 -04:00
wizjany
56908a7d62
Update to final Sponge schem v2 spec.
...
Read lenient, write strict.
2019-05-09 16:59:06 -04:00
Kenzie Togami
13a8c480e3
Insert Locale.ROOT into all case change methods
2019-05-01 15:24:32 -07:00
Kenzie Togami
e06c8b84b4
Merge branch 'master' into feature/piston-commands
2019-04-29 22:44:15 -07:00
wizjany
d48702aad6
Fix schematic id conversion for entities with multiple renames.
2019-04-28 10:56:34 -04:00
wizjany
b3053f19ce
Pagination changes and cleanup.
...
Refactored PaginationBox to be abstract. Implementations can generate individual components as needed now.
Add lots of Component usage to schematic list, help listings, etc.
Fix a few schematic and file resolution issues.
2019-04-28 01:12:05 -04:00
wizjany
b7ea46db2f
Re-add 1.13 entity renames.
...
Accidentally replaced the new ones with the old ones.
This is why we need DFUs.
2019-04-26 21:48:03 -04:00
wizjany
31a8328fb5
Add data version to BukkitImplAdapter.
...
Also throttle unknown-block warning when loading MCEdit schematics.
2019-04-26 16:41:39 +10:00
wizjany
f0587354be
Cleanup, make copy/paste flags consistent, add status messages.
2019-04-26 16:41:39 +10:00
wizjany
17fba54305
Update SpongeSchematic format to version 2.
...
Allows saving and loading entities and biomes.
2019-04-26 16:41:39 +10:00
wizjany
af1af43ac1
Allow copy/pasting biomes.
...
Copy takes a -b flag to copy biomes.
Paste takes a -b flag to paste biomes (if available).
This allows flexibility to create/load schematics with/without biomes
(when schematic biome support is added).
Also added a -m mask flag to paste to set a source mask, and a -e flag
to skip pasting entities if they are loaded.
2019-04-26 16:41:39 +10:00
wizjany
26511bcc25
Add licenses.
2019-04-26 16:41:39 +10:00
wizjany
fcb42f05cf
Add skull handler.
2019-04-26 16:41:39 +10:00
wizjany
526b3366b5
Add more schematic compat, cleanup.
2019-04-26 16:41:39 +10:00
Kenzie Togami
bfc1fd8fd0
Add licenses
2019-04-26 16:41:39 +10:00
Kenzie Togami
56ef786415
Don't touch the Direction tag, as possibly only Facing changed.
2019-04-26 16:41:39 +10:00
Kenzie Togami
efc4ebe309
Fix 1.13 entity direction code, port old schematics
2019-04-26 16:41:39 +10:00
Jesse Boyd
f849caf655
Fix clipboard upload/download
2019-04-15 21:05:26 +10:00
NotMyFault
ab3394c35e
Add prefixes and make FAWE more translatable
2019-04-07 01:13:23 +02:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType
2019-04-06 03:34:11 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +11:00
Jesse Boyd
1beea3cd22
Some more upstream merge
2019-04-04 21:28:41 +11:00
Jesse Boyd
8897109dc4
wip upstream merge
2019-04-04 00:25:16 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking
2019-04-03 16:53:34 +11:00
matt
29692f3fbe
Migrate to SLF4J
2019-04-02 18:21:02 -04:00
Jesse Boyd
f87e31683e
don't use origin as the region bounds
2019-04-02 00:19:32 +11:00
Jesse Boyd
c9f1fed282
Fixes #88
2019-04-02 00:08:56 +11:00
Jesse Boyd
6e6a3f9035
Fix plotsquared schematic hook
2019-04-01 21:30:21 +11:00
Jesse Boyd
92a7bd5e44
minor tweak for mutable vectors
2019-04-01 03:09:20 +11:00
wizjany
a80420d14b
Add biome storage to BlockArrayClipboard.
2019-03-30 00:42:28 -04:00
wizjany
42d0d6e79a
Use getTag instead of requireTag in a few places.
2019-03-29 23:44:18 -04:00
NotMyFault
8623dd0009
Fixes #80
2019-03-27 15:38:21 +01:00
matt
85bfd16d7c
Code cleaning
...
Most notable change: Remove redundant type parameters and replaced with <>. This is a small step to bring us closer to upstream parity.
2019-03-25 19:55:32 -04:00
IronApollo
3236bdd78e
Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup
2019-03-25 13:42:11 -04:00
Kenzie Togami
d6804737cf
Switch to SLF4J logging.
2019-03-13 19:51:48 -07:00
wizjany
7c89ece96e
Few tweaks to schematic loading and error fixes.
...
* Not all EntityTypes in Bukkit have the correct enum name.
* Don't read entire schematic files to list. Go off file extension only.
(Reading in files is more accurate, but slow.)
* Enforce extensions. (Due to the above, while you can technically make a
schematic called 'test.txt', it's better that we save it as
'test.txt.schem'.)
* Fix a few minor warnings.
2019-03-08 16:00:49 -05:00
IronApollo
c98a311146
Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader
2019-03-06 03:06:47 -05:00
Matthew Miller
1b101740fe
Use a proper registry for biomes
2019-02-16 17:27:00 +10:00
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -05:00
Matthew Miller
c935e381b7
Added a method to teleport entities across worlds.
2019-02-02 11:23:02 -05:00
IronApollo
e53535319d
Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!)
2019-01-31 10:08:58 -05:00
IronApollo
f74381b93f
Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system
2019-01-13 02:00:14 -05:00
Matthew Miller
628c9cc0b7
Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
2019-01-10 09:54:21 -05:00
Kenzie Togami
4d6045813c
Move vectors to static creators, for caching
2019-01-10 07:17:04 -05:00
Byron Marohn
ab6aed703d
Merge current FAWE master ( 227d6d91
) into new-vector-system
...
Signed-off-by: Byron Marohn <combustible@live.com>
2019-01-09 22:35:26 -08:00
IronApollo
842b1307c7
Current Progress #3
2019-01-09 02:13:44 -05:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics
2018-12-26 16:39:10 -08:00
IronApollo
d4157b7e0e
Current progress with update
2018-12-23 11:19:33 -05:00
Matthew Miller
c949b07df1
Added a method to teleport entities across worlds.
2018-12-21 16:56:10 +10:00
Byron Marohn
c0fa1602ad
Restore the formatting of many things to upstream WorldEdit - no code changes
...
This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.
This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b
) into this codebase.
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-20 11:33:56 -08:00
Kenzie Togami
2c8b2fe089
Move vectors to static creators, for caching
2018-11-03 23:00:24 -07:00
Kenzie Togami
399e0ad5fa
Refactor vector system to be cleaner
...
- Move Vector, etc. into `.math` package
- Drop many methods that will be auto-promoted anyways, eg. with
`divide(int)` and `divide(double)` the first is now gone.
- Take Block vectors into their own class hierarchy
- Make it clear throughout the API what takes blockvectors
- many more improvements
2018-11-03 23:00:23 -07:00
Matthew Miller
93de97dc19
Allow modifying the region of a BlockArrayClipboard
2018-10-24 16:50:15 +10:00
Jesse Boyd
f65887c957
Some ammendments to PR boy0001/WorldEdit#9
2018-10-17 23:41:38 +11:00
IronApollo
17e8be0bd2
Fixes some schematic files not being found with proper input
2018-10-14 07:14:12 -04:00
Jesse Boyd
5b5336cc83
some fixes
...
Use sponge schematic format instead of structure block
Fix VS undo running on main thread
Fix missing sections when setting blocks
2018-09-18 12:49:33 +10:00
Jesse Boyd
ee9467b5e4
Merge with origin/master
2018-09-12 20:23:34 +10:00
Gerrygames
934680dac2
fix sponge schematic offset
2018-09-04 14:26:50 +02:00
Jesse Boyd
b24d322d29
Update from sk89q/master
2018-09-03 00:10:38 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Matthew Miller
c931095736
Little bit of formatting
2018-08-27 17:24:18 +10:00
Jesse Boyd
20feefcab2
Fix schematic load with no specified format
2018-08-17 02:55:41 +10:00
Jesse Boyd
d85ad6e116
Implement CuboidClipboard
2018-08-17 01:54:13 +10:00
Jesse Boyd
50fce3147f
Add BuiltInClipboardFormat
2018-08-17 00:05:56 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods
2018-08-13 02:36:39 +10:00
Jesse Boyd
a629d15c74
Copy paste/merge FAWE classes to this WorldEdit fork
...
- so certain people can look at the diff and complain about my sloppy code :(
Signed-off-by: Jesse Boyd <jessepaleg@gmail.com>
2018-08-13 00:03:07 +10:00
Matthew Miller
f54d6afb65
Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
2018-08-10 20:29:06 +10:00
Matthew Miller
d11c3ae600
Fixed reading in schematics failing if they had tile entity data because of a Spigot change.
2018-08-06 17:57:40 +10:00
Matthew Miller
334143357a
Added LongArrayTag support to NBT
2018-08-05 13:36:53 +10:00
Matthew Miller
38cff7c7b2
Fixed up tile entities in Sponge schematics.
2018-08-04 11:43:43 +10:00
Matthew Miller
3d265ff9b9
Added entity translations
2018-08-04 11:43:42 +10:00
Matthew Miller
7773ef6f9a
Fixed a few issues with Sponge schematic handling.
2018-08-04 11:43:42 +10:00
Matthew Miller
2c1b234e38
Fixed some issues with Sponge schematics.
2018-08-04 11:43:42 +10:00
Matthew Miller
ea349bdbf1
Fix checkstyle issues.
2018-08-04 11:43:42 +10:00
Matthew Miller
a75d9e896b
Start work on the Sponge schematic format. This should work but it may not, it's untested.
2018-08-04 11:43:42 +10:00
Matthew Miller
fdb7ada295
Added some error handling for legacy conversions of schematics.
2018-08-04 11:43:42 +10:00