Byron Marohn
801793cc12
Merge upstream changes through 7961fa58
...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 12:13:43 -08:00
Byron Marohn
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
2018-12-20 11:33:56 -08:00
Kenzie Togami
2cad9a2c09
Switch to a license plugin for headers
2018-10-04 00:29:34 -07:00
Kenzie Togami
388187d26b
Cleanup javadoc warnings in worldedit-bukkit
2018-10-01 15:31:26 -07:00
Matthew Miller
42e0cceeab
Bukkit really needs methods to get by key/get key
2018-09-26 15:03:01 +10:00
Matthew Miller
cc1a54b5f0
Added an implementation tester to Bukkit, to determine which impl is in use. (For WE,WG,CB to use Paper/Spigot specific APIs)
2018-09-23 22:48:04 +10:00
Matthew Miller
02c6f11bb9
Added bStats
2018-09-20 22:59:42 +10:00
Jesse Boyd
b24d322d29
Update from sk89q/master
2018-09-03 00:10:38 +10:00
Matthew Miller
fdb9d77710
Finish the BlockData caching in Bukkit
2018-08-28 18:45:24 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Pieter12345
6c7a49733c
Fix plugin enabling on Bukkit without compatible adapter
...
When loading WorldEdit on a Bukkit server which it does not have an adapter for, a stacktrace is printed to console and WorldEdit does not load. This commit fixes that by registering the BukkitServerInterface before attempting to find a matching adapter.
2018-08-26 21:34:33 +02:00
Jesse Boyd
c3db5c0cf1
Fix persistent brushes
2018-08-24 07:18:14 +10:00
Jesse Boyd
dbd31ea347
Fixes boy0001/FastAsyncWorldedit#1090
2018-08-24 01:22:30 +10:00
Matthew Miller
58a5d9961b
Minor formatting and neatness changes.
2018-08-23 20:15:44 +10:00
Jesse Boyd
f43faae917
Update favs
2018-08-23 06:02:04 +10:00
Jesse Boyd
a9e99c7cd7
Load dummy jar on first launch
2018-08-22 04:18:10 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn)
2018-08-22 03:22:37 +10:00
Matthew Miller
d3b3d57041
Merge pull request #420 from sk89q/server-side-cui
...
Added a server side version of WorldEditCUI with limited functionality
2018-08-20 14:46:08 +10:00
Matthew Miller
7b83f97c35
Fixed NotABlockException not getting thrown
2018-08-19 14:41:09 +10:00
Matthew Miller
a354267e85
Try sending fake operator packets to support non-OP
2018-08-19 13:41:38 +10:00
Matthew Miller
4d0df10f88
Fixed sessions not saving on shutdown
2018-08-19 13:01:08 +10:00
Matthew Miller
034c165bee
Merge pull request #396 from boy0001/FallbackRegistrationListener-fix
...
Fix FallbackRegistrationListener
2018-08-18 20:46:48 +10:00
Matthew Miller
f8585adc79
Remove debug code
2018-08-18 15:27:26 +10:00
Matthew Miller
7f419618cc
Switch to using fake blocks, no more world pollution
2018-08-18 15:22:49 +10:00
Jesse Boyd
b8cc785717
Use Uri instead of BufferedImage for parameter
2018-08-17 22:48:33 +10:00
Jesse Boyd
43d5459595
Fix __reserved__ being solid
2018-08-17 19:21:45 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078
2018-08-17 18:27:48 +10:00
Jesse Boyd
29a364865d
Also register case sensitive
2018-08-17 03:30:55 +10:00
Jesse Boyd
60699f915d
comment this out
2018-08-17 03:28:34 +10:00
Jesse Boyd
c2a1fbf7cc
Fixes #1077
2018-08-17 02:55:06 +10:00
Jesse Boyd
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
Matthew Miller
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
Jesse Boyd
f254027f4b
Fix //wand
2018-08-16 00:04:40 +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
Matthew Miller
c31161d068
Moved report framework to WorldEdit and fixed a few bugs.
2018-08-15 12:45:18 +10:00
Jesse Boyd
131fd39f63
Various minor
...
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
Jesse Boyd
55d34343dd
Fix some api compatibility issues
2018-08-14 17:18:49 +10:00
Jesse Boyd
22511b2e19
Make this public
2018-08-14 12:07:11 +10:00
Jesse Boyd
1740c845d2
What are the dud BlockCategories?
2018-08-14 11:00:44 +10:00
Jesse Boyd
76a55b7712
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
# worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
2018-08-14 01:36:00 +10:00
Matthew Miller
96388df4b0
Add adapters for EntityType
2018-08-13 22:29:48 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods
2018-08-13 02:36:39 +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
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
Matthew Miller
526aa6cf49
If we fail to set NBT Data, try it without the adapter/NBT Data
2018-08-06 18:29:07 +10:00
Matthew Miller
88fc1771b5
Wrap createEntity in BukkitWorld to detect corrupt entities.
2018-08-05 14:24:09 +10:00
Matthew Miller
b2769befdb
Added a few utility methods.
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
65420af09e
Fixed //fill and //rotate
2018-08-04 11:43:41 +10:00
Matthew Miller
663dd1f4d8
Added an entity, weathertype, and gamemode registry.
2018-08-04 11:43:41 +10:00
