Commit Graph

69 Commits

Author SHA1 Message Date
d434dfcfdd some minor refactoring 2019-08-18 02:09:09 +01:00
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
a476ab1ea0 merge 2019-08-07 01:29:49 +10:00
7967ef4db4 ff586011 2019-07-30 07:39:18 +10:00
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
6e13b44f84 resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b 2019-07-18 20:12:23 +10:00
be8213d8ee resolve conflicts 2019-07-18 16:56:57 +10:00
dd38cbe750 . 2019-07-18 04:30:02 +10:00
ff94a1e5ed 8108d0a9 2019-07-18 04:24:21 +10:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
cf0c735cf3 Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
4a40c7d99c Renaming and cleanup and a new method. 2019-07-09 15:50:13 -04:00
f99d6e7478 wip on 1.14 2019-07-09 17:18:51 +10:00
f1e98da01f d0a31691e1 2019-06-29 03:29:53 +10:00
2b0a310e0e filter sphere 2019-06-29 00:16:12 +10:00
846a1b0769 6c94cca15e 2019-06-29 00:01:51 +10:00
d0a31691e1 Small changes 2019-06-26 20:14:00 -04:00
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
57f992a524 Remove nullblock from EditSession 2019-06-23 14:05:14 -04:00
ec001b8d3b Revert "Upstream, generics, formatting"
This reverts commit cd88e513a8.
2019-06-12 15:45:41 +02:00
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
b42553116c Removal of many prefixes and deprecation of FaweLocation
- Removed some prefixes to help make upstream merging a bit easier.
- Replaced reflection code for titles with the regular bukkit api.
- Removed FAWELocation and FAWEPlayer where it wasn't needed.
- Deprecated FaweLocation since having it in the first place is very stupid.
- FAWEPlayer should also be deprecated soon because the majority of that code is redundant.
2019-06-05 21:28:02 -04:00
6c94cca15e Selective upstream merge
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
6bc5b4a823 . 2019-05-29 06:31:22 +10:00
c797dcb194 WIP filter patterns 2019-05-12 23:32:04 +10:00
093542c337 fix compile + use mutable vector for affine transform + fix bstats package 2019-04-07 20:43:59 +10:00
6558e549fd Fix smooth brush 2019-04-06 06:52:12 +11:00
be5541b61b revert some changes 2019-04-05 15:48:41 +11:00
94d5d8df8e Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
1beea3cd22 Some more upstream merge 2019-04-04 21:28:41 +11:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
2407f9246f How did it compile locally? 2019-04-03 00:21:42 -04:00
122236f6c7 Too lazy to write a commit message 2019-04-02 23:36:32 -04:00
29692f3fbe Migrate to SLF4J 2019-04-02 18:21:02 -04:00
92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
d6804737cf Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
243d6476ac Re-add smooth filtering via a mask.
Instead of trying to maintain a list of "natural terrain blocks", just
let the user specify a mask of blocks to use for the height map filter.

https://gfycat.com/severaljauntycondor
2019-02-26 23:54:53 -05:00
f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -05:00
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
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -05:00
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
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
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
2c8b2fe089 Move vectors to static creators, for caching 2018-11-03 23:00:24 -07:00
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
b24d322d29 Update from sk89q/master 2018-09-03 00:10:38 +10:00
c931095736 Little bit of formatting 2018-08-27 17:24:18 +10:00
e7c27b08bf Remove stub injector methods 2018-08-13 02:36:39 +10:00