Commit Graph

104 Commits

Author SHA1 Message Date
7d7da78dbc Fuzzier fuzzies 2019-02-03 07:13:21 -05:00
4b5b7b8003 Clean up other compiler warnings 2019-02-03 06:06:07 -05:00
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00
ea0ca470f1 Fix Metrics injection 2019-02-03 03:51:15 -05:00
26d4ea101e Fixed the bundle being directly used outside of the registry system. 2019-02-03 03:44:10 -05:00
9c3964d330 Added a way to get the spawn position of a world 2019-02-02 11:29:51 -05:00
e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -05:00
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
62e6e9de96 Some general changes to the handling of blocks 2019-01-14 05:49:05 -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
90b3439dc2 Even more changes made towards a proper Vector update, as well as minor FAVS changes to accomodate for recent vector changes. 2019-01-13 01:38:08 -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
2259f7d025 Merge upstream changes through 88f22f2e
This was not a straightforward merge. A new method was added upstream to:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

This file has been substantially changed vs upstream worldedit. I merged
things as best I could - added the new method to this interface, and
then implemented it in:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

Unfortunately there's no easy way to test that it works - so I left a note...

Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-23 19:58:49 -08:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
801793cc12 Merge upstream changes through 7961fa58
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 12:13:43 -08:00
dab9e9a799 Fix imports - build working again
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:09:58 -08: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
bc25b76ac0 Fix getLegacyCombined 2018-10-13 19:16:53 +11:00
ff877ec03b Make BlockType#getDefaultState like other fields 2018-10-04 17:20:07 -07:00
ef2c07ca24 Update forge for new block API 2018-10-04 17:18:43 -07:00
d0ea5121f2 Make some BlockType fields lazy, to avoid early Platform dependencies 2018-10-04 17:18:01 -07:00
5896b2eba4 Typo fix and neatify 2018-10-04 01:12:29 +02:00
620308b2ba Bypass warning invalid block registered for __RESERVED__ 2018-10-02 05:51:08 -04:00
36cbc5d9d0 Cleanup javadoc warnings in worldedit-core 2018-10-01 15:30:23 -07:00
cfbf7dbec0 Update from sk89q/master 2018-09-25 15:35:21 +10:00
fd6034fbdd Added the 1.13.1 new blocks. 2018-09-23 20:22:33 +10:00
00ac111e46 Fix height brush 2018-09-23 17:10:56 +10:00
4969dac39c Potential minor performance improvements when checking fuzzy equality. 2018-09-20 16:56:46 +10:00
fc949e3efc Fixes #1112 2018-09-08 03:11:56 +10:00
5559e2dec5 Merge remote-tracking branch 'refs/remotes/sk89q/master' 2018-09-08 01:53:04 +10:00
b24d322d29 Update from sk89q/master 2018-09-03 00:10:38 +10:00
480f2de3af Add 1.13 chunk format for snapshots
Fixes WORLDEDIT-3714
2018-09-02 04:33:08 +02:00
418cfa6d03 Update towny hook / fix pattern traverser 2018-08-29 01:04:25 +10:00
abd886acd7 some hasty refactoring 2018-08-28 02:56:28 +10:00
c931095736 Little bit of formatting 2018-08-27 17:24:18 +10:00
f43faae917 Update favs 2018-08-23 06:02:04 +10:00
6d3aabecda Don't default to air for legacy mapper 2018-08-22 04:13:42 +10:00
c55353e5b1 Various command (use es6 if java9 + nashorn) 2018-08-22 03:22:37 +10:00
69ab1781c6 Replace FuzzyBlockMask with BlockMask, and added BlockTypeMask as a more performant mask for just block types. 2018-08-20 15:57:42 +10:00
44c5447edb Parse instead of get block for masks 2018-08-17 23:05:34 +10:00
36ede1b27d Fixes boy0001/FastAsyncWorldedit#1078 2018-08-17 18:27:48 +10:00
4ffb9bce6c Various minor
Fix image brush
Fix some java 9 issues
Fix metrics being disabled
Fix compile: duplicate method in SimpleBlockMaterial
Load as both FastAsyncWorldEdit and WorldEdit
2018-08-16 23:21:39 +10:00
6ebdc00fba Merge remote-tracking branch 'refs/remotes/sk89q/master'
# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java
2018-08-16 20:06:27 +10:00
2172ebba83 Fix some issues with java 9 / reflection 2018-08-16 19:56:31 +10:00
bc5609114b Add a material to check if air is air, because there are now 3 types of air. 2018-08-16 15:42:11 +10:00
1d3cf75d06 *Fix merge 2018-08-15 14:13:41 +10:00
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