MattBDev
fd336feb46
Upstream merge of TranslationManager and ResourceLoader
2020-08-24 12:38:30 -04:00
MattBDev
3bc692ff11
Part 1 of upstream merge and format
2020-07-13 22:50:59 -04:00
MattBDev
df60e50c96
Revert more changes
2020-01-29 15:32:51 -05:00
MattBDev
8078cf077a
consistency changes
2020-01-26 13:01:16 -05:00
MattBDev
0d2fff2cd2
Upstream Merge
2020-01-10 22:32:12 -05:00
NotMyFault
3ee920f9e6
Update upstream
2020-01-08 19:36:12 +01:00
Jesse Boyd
2bd65f6423
Update LegacyMapper.java
2019-12-19 16:58:00 +00:00
NotMyFault
39b60aa742
Fix legacy id conversion
2019-12-09 22:36:52 +01:00
NotMyFault
b0208e06cd
More updates
2019-12-09 21:59:51 +01:00
Jesse Boyd
1f19b92b0b
1.13?
2019-11-24 00:57:29 +00:00
Jesse Boyd
60759934a3
Fix some merge issues
2019-11-20 00:11:54 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:23:47 +00:00
Jesse Boyd
240b2de90c
Update to PlotSquared-we branch
2019-11-06 09:29:20 +00:00
Jesse Boyd
2f3c6769c8
Legacy clipboards
2019-11-02 07:15:56 +01:00
MattBDev
cbbe8b5dfa
upstream changes
2019-08-15 15:24:18 -04:00
MattBDev
46f5b12b36
Convert tabs to whitespace.
2019-07-22 16:42:40 -04:00
MattBDev
8108d0a936
Major command changes that don't work yet.
2019-07-16 23:44:34 -04:00
MattBDev
a69b239848
Upstream
2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39
Many upstream changes. Should be non-breaking
2019-06-25 09:00:44 -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
wizjany
f2f9c26602
Expanded the scope of item brushes (/br apply item, /br paint item).
...
They now additionally take a direction in which the simulated item usage
should be facing.
Also allow the item parser to parse "hand" and "offhand" as items, to
allow platforms with NBT item support return items with NBT (since
parsing is a slightly more complex task).
2019-06-09 20:44:30 -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
Matthew Miller
f7670f7812
Temporary fix for forge having terrible classpath issues.
2019-04-28 18:47:28 +10:00
Jesse Boyd
144215c813
Don't construct new BaseBlock
2019-04-06 01:12:57 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +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
Kenzie Togami
d6804737cf
Switch to SLF4J logging.
2019-03-13 19:51:48 -07:00
Kenzie Togami
4878f38250
Fix platform registration, config setup
2019-03-04 19:36:06 -08:00
IronApollo
24fbc86cdd
INDEV -- Pushed for in-house testing and development
2019-02-17 03:47:32 -05:00
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -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
62e6e9de96
Some general changes to the handling of blocks
2019-01-14 05:49:05 -05: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
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
Jesse Boyd
bc25b76ac0
Fix getLegacyCombined
2018-10-13 19:16:53 +11:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Jesse Boyd
6d3aabecda
Don't default to air for legacy mapper
2018-08-22 04:13:42 +10:00
Jesse Boyd
a67441bbff
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
2018-08-15 14:02:51 +10:00
Jesse Boyd
55d34343dd
Fix some api compatibility issues
2018-08-14 17:18:49 +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
c05c33cab0
Make a lot of progress on legacy conversions.
2018-08-04 11:43:42 +10:00
Matthew Miller
1480606b52
Fixed a few more issues found looking over the changeset.
2018-08-04 11:43:42 +10:00
Matthew Miller
9f9fda72b7
Re-add legacy support to block parser, and fix query tool.
2018-08-04 11:43:41 +10:00
Matthew Miller
6b5f218809
Basically finish the state system. Just 1 more bug that I'm encountering.
2018-08-04 11:43:41 +10:00
Matthew Miller
3e1d438565
Get it to a point where it works minimally on 1.13 Spigot.
2018-08-04 11:43:41 +10:00
