Commit Graph

114 Commits

Author SHA1 Message Date
1b101740fe Use a proper registry for biomes 2019-02-16 17:27:00 +10:00
0e5847e1ce Various fixes 2019-02-03 09:22:10 -05:00
2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -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
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
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
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
3fefcbf971 Remove all raw usages of BSH, improve API generics 2018-12-26 16:39:10 -08:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
b75d5149eb Fixed the bundle being directly used outside of the registry system. 2018-12-23 21:43:20 +10:00
6312bcecf6 Fixed the item parser not using the ItemRegistry 2018-12-23 19:02:58 +10: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
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
f8bf547c9e Added some missing bukkit registries 2018-10-14 17:55:57 +10:00
bc25b76ac0 Fix getLegacyCombined 2018-10-13 19:16:53 +11:00
abd886acd7 some hasty refactoring 2018-08-28 02:56:28 +10:00
6d3aabecda Don't default to air for legacy mapper 2018-08-22 04:13:42 +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
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
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
131fd39f63 Various minor
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
55d34343dd Fix some api compatibility issues 2018-08-14 17:18:49 +10:00
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
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
c05c33cab0 Make a lot of progress on legacy conversions. 2018-08-04 11:43:42 +10:00
1480606b52 Fixed a few more issues found looking over the changeset. 2018-08-04 11:43:42 +10:00
965e977411 Fixed a few more errors, and added legacy support to the item parser. 2018-08-04 11:43:41 +10:00
9f9fda72b7 Re-add legacy support to block parser, and fix query tool. 2018-08-04 11:43:41 +10:00
572bf04482 Cleanup the bukkit implementation, and update to the 1.13 release items/blocks. 2018-08-04 11:43:41 +10:00
c3d832c3fd State system is done. It works. Finally. Still a few rough edges that need fixing however. 2018-08-04 11:43:41 +10:00
6b5f218809 Basically finish the state system. Just 1 more bug that I'm encountering. 2018-08-04 11:43:41 +10:00
4938f419ad Almost finished the state system. Just got to have it actually load in the values. 2018-08-04 11:43:41 +10:00
3e1d438565 Get it to a point where it works minimally on 1.13 Spigot. 2018-08-04 11:43:41 +10:00
ee6af8ee76 state stuff 2018-08-04 11:43:40 +10:00
40a665a509 package move 2018-08-04 11:43:40 +10:00
70208c38fd category changes 2018-08-04 11:43:40 +10:00
d33e2e98aa registry changes 2018-08-04 11:43:40 +10:00
a48c319e7e package move 2018-08-04 11:43:40 +10:00
57c13ef8f4 Continue moving out of legacy BlockType 2018-08-04 11:43:40 +10:00
93b225ca3c Expose a way of switching between ItemType and BlockType for ItemBlocks. 2018-08-04 11:43:39 +10:00
b06937d1c8 Setup a legacy mapper system. The file does not exist yet. 2018-08-04 11:43:39 +10:00
282eca7663 Added a category system and refactored registries 2018-08-04 11:43:39 +10:00