Commit Graph

102 Commits

Author SHA1 Message Date
96dcb95b7c Javadoc and Formatting fixes. (#619)
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
2020-10-05 13:41:41 -04:00
d00899e177 More support for 3D biomes (#608)
* More support for 3D biomes

* Resolved merge conflicts
2020-09-12 15:31:42 +02:00
02886b0387 Updated the WorldEdit license using find and replace 2020-08-24 21:31:47 -04:00
75cbae8261 Merge pull request #568 from HazelTheWitch/fix-spline-sweep
Fixed NullPointerException in Spline and Sweep brush
2020-08-21 18:25:09 +02:00
cd0dac813c Incorrectly rounding results. 2020-08-15 23:39:30 -07:00
e51f6e562d Sweep brush semi-fix 2020-08-15 14:20:47 -07:00
da9c4ad543 Handle null case in equality checking BlockVector3+DFSNode 2020-08-15 09:28:39 -07:00
bb05bd24d9 Implement more noise patterns 2020-08-15 13:17:44 +02:00
4041b2aa1d Updated Math package with upstream and formatted code 2020-08-14 20:49:59 -04:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
f7d375c76c Lazy heightmap range fix 2020-07-03 16:29:27 +01:00
e7df3177cc Upstream merge 2020-03-23 20:47:30 -04:00
647665c3b0 Upstream is better than downstream 2020-02-13 20:19:45 -05:00
020c674c01 Revert migration of FaweCache to Kotlin 2020-01-29 15:01:38 -05:00
e0f6869573 Revert "More code quality fixes"
This reverts commit 2d6957ce
2020-01-23 14:41:57 -05:00
2d6957ce1c More code quality fixes 2020-01-22 21:15:52 -05:00
88359f0215 More Kotlin 2020-01-21 14:30:13 -05:00
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
89bc664f69 Fix flipping of chests and stairs (#526)
* Fix flipping of chests and stairs

* Check if the new property value is valid before updating

* Only for horizontal flips double chests/stairs should be modified
2019-11-12 21:09:28 +10:00
cfa147cf76 WIP clipboard offsets
TODO schem load -> BlockArrayClipboard
2019-11-11 22:34:33 +00:00
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
d8d7c8c53f Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline
 Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
	worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
	worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
2019-11-02 15:58:46 -04:00
b97b40e413 various
use vector.add for compatibility with vs-flattened
flush before remember
share meta objects across players
fix wg compatibility
2019-11-02 19:31:32 +01:00
9cf02fe654 WIP Anvil API 2019-10-31 21:04:02 +01:00
b533408022 wip clipboard migration 2019-10-31 14:12:23 +01:00
ca843f1b90 Minor changes for readability 2019-10-23 22:34:44 -04:00
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
d434dfcfdd some minor refactoring 2019-08-18 02:09:09 +01:00
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
f472c20bfb Memory optimizations (#505)
* Remove LocatedBlock overhead in LBL map

* Add new space-efficient block map, with thourough testing

* Drop ordering property, add full insertion test

* Add licenses

* Fix mocked platform conflicts

* Disable full block map testing for faster builds

* Re-implement BlockMap with fastutil maps

* Re-write chunk batching to be memory efficient

* Make MultiStageReorder use BlockMap

* Increase LBL load factor, fix long-pack limit detection

* Fix infinite loop in chunk batching

* Save memory in history by cleaning up MSR

* Re-implement LocatedBlockList in BlockMap

* Fix data race with BlockType lazy fields

* Make IDs ALWAYS present, only runtime-consistent. Use for memory efficiency in BlockMap

* Remap inner structure of BlockMap for smaller maps

* Remove containedBlocks fields, not very efficient

* Fix minor de-optimizing bug in stage reorder

* Make long packed y signed

* Add extended Y limit configuration option

* Add licenses

* Store 3 ints for unoptimized BV list

* Add final to BitMath

* Correct int-cast for long-packing
2019-08-12 22:06:40 +10: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
99ee32fe8e Many fixes for buffered extents 2019-07-04 11:43:36 -07:00
d27daefd3e Implement getBlock for chunk batching extent
Also improve speed of comparators, by using ::comparingX and bitwise
ops.
2019-07-03 21:11:36 -07: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