Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-05 12:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,911 Commits 1 Branch 0 Tags 50 MiB
6f3888a963
Commit Graph

431 Commits

Author SHA1 Message Date
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) into this codebase.

Signed-off-by: Byron Marohn <combustible@live.com>
 2018-12-20 11:33:56 -08:00
NotMyFault
5520813ae6 Switching from IRC to Discord 
To offer us a better possibility to help you regarding issues or bugs, join us on discord https://discord.gg/ngZCzbU
 2018-12-18 21:54:17 +01:00
dordsor21
07c86f32ae Definitely fix build 2018-12-17 13:47:29 +00:00
NotMyFault
7a1b75f110
Significantly improved the quality of Simplified Chinese translation 2018-12-10 16:58:27 +01:00
NotMyFault
99fb2b546c Fixing Italian translation 2018-11-21 14:37:44 +01:00
NotMyFault
ec22c4f180
Merge pull request #19 from IronApollo/master 
Fix for '//mask ?' resulting in pattern error
Fixes CommandSuggestionEvent 
Update FaweLocalBlockQueue to support Plotsquared restrictions
 2018-11-14 07:41:42 +01:00
NotMyFault
9b1836f336 Language update 2/2 2018-11-05 16:54:31 +01:00
NotMyFault
291ce3dfd7
Adding Italian translation 2018-11-04 20:56:22 +01:00
NotMyFault
69168c7262 Updating & fixing repo 
- Updated Paper download link going to 1.13
- Updated translations from boy0001/FastAsyncWorldEdit
-
 2018-11-02 13:20:54 +01:00
IronApollo
9896a1339e Updates to FaweLocalBlockQueue to allow FAWE-P2 compatibility 2018-11-01 07:24:56 -04:00
IronApollo
767607ea68 Fix for '//mask ?' resulting in pattern error 2018-10-29 06:39:40 -04:00
Jesse Boyd
a7c6d5e987
schem list validation 2018-10-17 23:57:36 +11:00
Jesse Boyd
f65887c957
Some ammendments to PR boy0001/WorldEdit#9 2018-10-17 23:41:38 +11:00
NotMyFault
2d8a2fc9c7 Minors 
- Typo fixes
- updated jenkins download link
 2018-10-16 22:15:45 +02:00
Jesse Boyd
c04f99a720
#1158 2018-10-16 02:27:10 +11:00
IronApollo
17e8be0bd2 Fixes some schematic files not being found with proper input 2018-10-14 07:14:12 -04:00
Jesse Boyd
7cf7c0712f
fix fixwater/lava + tile paste 2018-10-13 19:50:13 +11:00
Jesse Boyd
bc25b76ac0
Fix getLegacyCombined 2018-10-13 19:16:53 +11:00
Jesse Boyd
3414fdd5a0
Fix brush cache Name 2018-10-13 18:55:09 +11:00
Jesse Boyd
888cbcedee
tweak undo message 2018-10-13 15:21:39 +11:00
Jesse Boyd
1a12c065a1
Various minor fixes 
Fix drain
Fix some messages lacking prefix
Fix non persistent brushes
 2018-10-13 15:15:38 +11:00
Kenzie Togami
ff877ec03b
Make BlockType#getDefaultState like other fields 2018-10-04 17:20:07 -07:00
Kenzie Togami
ef2c07ca24
Update forge for new block API 2018-10-04 17:18:43 -07:00
Kenzie Togami
d0ea5121f2
Make some BlockType fields lazy, to avoid early Platform dependencies 2018-10-04 17:18:01 -07:00
NotMyFault
730e50a710
That wasn't supposed to be like that 2018-10-04 20:52:54 +02:00
NotMyFault
39ba616ffa heightmapinterface permission 
Heightmapinterface permission added as you can download it on any server
 2018-10-04 20:42:43 +02:00
NotMyFault
4b07928994 Fixing wrong syntax 2018-10-04 20:20:05 +02:00
Kenzie Togami
2cad9a2c09
Switch to a license plugin for headers 2018-10-04 00:29:34 -07:00
NotMyFault
5896b2eba4 Typo fix and neatify 2018-10-04 01:12:29 +02:00
NotMyFault
a26cf574de Warn before update restart 2018-10-04 00:44:00 +02:00
NotMyFault
037714ab76 Possibly fix for searchItem message 2018-10-04 00:29:01 +02:00
BuildTools
6a3177f4e7 Fixed DefaultBlockParser incorrectly referencing disallowedBlocks 2018-10-02 07:32:24 -04:00
BuildTools
620308b2ba Bypass warning invalid block registered for __RESERVED__ 2018-10-02 05:51:08 -04:00
Kenzie Togami
36cbc5d9d0
Cleanup javadoc warnings in worldedit-core 2018-10-01 15:30:23 -07:00
Matthew Miller
59584ba10c [Experimental] Don't check for permissions on root parents. 2018-09-26 15:41:27 +10:00
Jesse Boyd
cfbf7dbec0
Update from sk89q/master 2018-09-25 15:35:21 +10:00
Matthew Miller
fd6034fbdd Added the 1.13.1 new blocks. 2018-09-23 20:22:33 +10:00
Jesse Boyd
f07dfbfeff
Fix inventory mode + nbt 2018-09-23 17:29:13 +10:00
Jesse Boyd
00ac111e46
Fix height brush 2018-09-23 17:10:56 +10:00
Jesse Boyd
e452fc9556
Fix schem load NPE 2018-09-23 15:48:09 +10:00
Matthew Miller
1a2cd3a948 Fixes WORLDEDIT-3609, Message should say cut when //cut is used. 2018-09-20 17:09:50 +10:00
Matthew Miller
4969dac39c Potential minor performance improvements when checking fuzzy equality. 2018-09-20 16:56:46 +10:00
Jesse Boyd
5b5336cc83
some fixes 
Use sponge schematic format instead of structure block
Fix VS undo running on main thread
Fix missing sections when setting blocks
 2018-09-18 12:49:33 +10:00
Jesse Boyd
83464013ba
Fix oregen 2018-09-14 07:38:29 +10:00
Jesse Boyd
8ed67f66ad
Merge boy0001/FastAsyncWorldEdit 2018-09-14 02:42:55 +10:00
Jesse Boyd
ee9467b5e4
Merge with origin/master 2018-09-12 20:23:34 +10:00
Jesse Boyd
277ff8f787
Fix command confirmation session 2018-09-08 09:10:36 +10:00
Jesse Boyd
ffa9eace6f
Fix /none 2018-09-08 03:17:27 +10:00
Jesse Boyd
fc949e3efc
Fixes #1112 2018-09-08 03:11:56 +10:00
Jesse Boyd
11fe5061cc
Fix optional heightmap NPE 2018-09-08 02:06:25 +10:00
Jesse Boyd
5559e2dec5
Merge remote-tracking branch 'refs/remotes/sk89q/master' 2018-09-08 01:53:04 +10:00
Jesse Boyd
1c8845f23f
Fixes #1011 2018-09-08 01:34:29 +10:00
Jesse Boyd
39a85d54ea
pull changes from boy0001/FastAsyncWorldEdit 2018-09-08 01:31:30 +10:00
Jesse Boyd
6ae0d3f64e
Fixes boy0001/FastAsyncWorldEdit#1099 2018-09-08 01:09:31 +10:00
Jesse Boyd
d99765f13f
add min/max args 2018-09-07 06:45:19 +10:00
Jesse Boyd
7af1b3dcc8
Add heightmap web util command 2018-09-07 06:40:13 +10:00
Jesse Boyd
594d72d2fe
Fix free build restrictions 2018-09-05 07:09:24 +10:00
Jesse Boyd
685a3c015f
*(part of previous commit) 2018-09-05 05:10:26 +10:00
Jesse Boyd
82ede1d42b
freebuild region restrictions 2018-09-05 05:10:15 +10:00
Gerrygames
934680dac2 fix sponge schematic offset 2018-09-04 14:26:50 +02:00
Jesse Boyd
5f8e2ed4d8
Allow local images for brushes 2018-09-03 07:46:35 +10:00
Jesse Boyd
b24d322d29
Update from sk89q/master 2018-09-03 00:10:38 +10:00
Brokkonaut
480f2de3af Add 1.13 chunk format for snapshots 
Fixes WORLDEDIT-3714
 2018-09-02 04:33:08 +02:00
Matthew Miller
8bfbc55c71 Enable experimental //walls for non-cuboid regions. 2018-08-30 16:42:50 +10:00
Matthew Miller
fdc3cd56f7 Add a mask for block categories. Eg, you can now do //replace ##wool minecraft:sand to replace all wool with sand 2018-08-30 14:51:38 +10:00
Jesse Boyd
418cfa6d03
Update towny hook / fix pattern traverser 2018-08-29 01:04:25 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring 2018-08-28 02:56:28 +10:00
Matthew Miller
c931095736 Little bit of formatting 2018-08-27 17:24:18 +10:00
Jesse Boyd
a61c856adc
Allow certain commands to bypass queuing 2018-08-24 19:33:52 +10: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
Jesse Boyd
963d1192c2
Don't require Selection classifier for region binding 2018-08-23 13:37:03 +10:00
Jesse Boyd
f43faae917
Update favs 2018-08-23 06:02:04 +10:00
Jesse Boyd
9927cde616
JS command perms 2018-08-22 17:13:01 +10:00
Jesse Boyd
9129ca2519
Fix copy/paste printing decimal position 2018-08-22 04:23:35 +10:00
Jesse Boyd
6d3aabecda
Don't default to air for legacy mapper 2018-08-22 04:13:42 +10:00
Jesse Boyd
260290aa85
fix frb #import 2018-08-22 04:08:13 +10:00
Jesse Boyd
8de18566c0
Searchitem use fawe prefix 2018-08-22 03:52:13 +10:00
Jesse Boyd
f161c69a66
Use parse for search item 2018-08-22 03:25:42 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn) 2018-08-22 03:22:37 +10:00
Jesse Boyd
43531a0da0
Use expression for brush radius 2018-08-22 02:58:10 +10:00
Matthew Miller
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
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
0f8cc99c35 Disable server CUI by default. 2018-08-19 13:46:24 +10:00
Matthew Miller
4d0df10f88 Fixed sessions not saving on shutdown 2018-08-19 13:01:08 +10:00
Matthew Miller
41c307a4b5 Set the session to dirty if the server CUI is changed. 2018-08-19 10:46:46 +10:00
Matthew Miller
dc39300af8
Merge pull request #364 from mickare/patch-1 
Fix region contain method
 2018-08-18 20:33:53 +10:00
Matthew Miller
eba91cac5f Added a config option to entirely disable server side cui. 2018-08-18 19:42:45 +10:00
Matthew Miller
20b67db48d Added a command to turn it on/off 2018-08-18 16:34:32 +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
Matthew Miller
cf10f8ff8a Proof of concept server-side CUI handler. Note: This pollutes the world with blocks atm 2018-08-18 14:22:08 +10:00
Jesse Boyd
0cc0ee7f03
Basic tab suggestions 2018-08-18 01:37:35 +10:00
Jesse Boyd
5d47d1bce6
Rethrow input parse in mask parser 2018-08-17 23:07:41 +10:00
Jesse Boyd
44c5447edb
Parse instead of get block for masks 2018-08-17 23:05:34 +10:00
Jesse Boyd
b8cc785717
Use Uri instead of BufferedImage for parameter 2018-08-17 22:48:33 +10:00
Jesse Boyd
ae65708d82
Fix some command parsing issues 
Tab complete runs on main thread - that could be an issue
 2018-08-17 20:13:33 +10:00
Jesse Boyd
43d5459595
Fix __reserved__ being solid 2018-08-17 19:21:45 +10:00
Jesse Boyd
177bfaa930
Rename setCopyEntities to setCopyingEntities 2018-08-17 18:33:37 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078 2018-08-17 18:27:48 +10:00
Jesse Boyd
20feefcab2
Fix schematic load with no specified format 2018-08-17 02:55:41 +10:00
Jesse Boyd
d85ad6e116
Implement CuboidClipboard 2018-08-17 01:54:13 +10:00
Jesse Boyd
50fce3147f
Add BuiltInClipboardFormat 2018-08-17 00:05:56 +10:00
Jesse Boyd
ebd27781a7
Catch pattern syntax 2018-08-16 23:38:56 +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
Jesse Boyd
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
Jesse Boyd
2172ebba83
Fix some issues with java 9 / reflection 2018-08-16 19:56:31 +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
8de1fff263
Fix block parse NPE 2018-08-16 00:34:20 +10:00
Jesse Boyd
15d0d16da6
Update the tips to reflect 1.13 changes 2018-08-16 00:31:44 +10:00
Jesse Boyd
19125bee5f
Update Existing pattern usage 2018-08-16 00:14:03 +10:00
Jesse Boyd
7ed96ec358
Add property pattern 2018-08-16 00:12:07 +10:00
Jesse Boyd
659ed09bf1
Fix compile 2018-08-16 00:04:16 +10:00
Jesse Boyd
13d2ae20d5
Make end tag singleton 2018-08-15 17:02:17 +10:00
Jesse Boyd
1d3cf75d06
*Fix merge 2018-08-15 14:13:41 +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
db65e96700
Ignore invalid properties 2018-08-14 20:57:32 +10:00
Jesse Boyd
ced4fed9db
Create pom 2018-08-14 20:41:52 +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
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
Jesse Boyd
1601ea07a8
Clear the command/method map after registration 2018-08-14 00:39:19 +10:00
Jesse Boyd
0632a9ce96
Fix some merge issues 2018-08-14 00:38:33 +10:00
Jesse Boyd
025360753f
Update german translations 2018-08-14 00:38:02 +10:00
Jesse Boyd
fce706c78f
Add API method for creation schematic visualizer 2018-08-14 00:37:47 +10:00
Matthew Miller
e0e7778536 Fixed some bugs and cleanup some code. 2018-08-13 22:18:12 +10:00
Jesse Boyd
7fb3899bb7
Use BlockState for player inventory getBlock 2018-08-13 03:31:26 +10:00
Jesse Boyd
6f04022738
And these stubs 2018-08-13 03:23:53 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods 2018-08-13 02:36:39 +10:00
Jesse Boyd
fa06ff357e
Use current PlayerDirection 2018-08-13 01:43:20 +10:00
Jesse Boyd
289707b410
Missed this 2018-08-13 01:28:23 +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
Jesse Boyd
a920c77cb8
update legacy.sjon to fix some issues 
added some missing entries to the legacy.json using a script
 2018-08-12 23:52:46 +10:00
Matthew Miller
f96487a2d1 Use BlockStateHolder for setBlocks 2018-08-10 20:36:00 +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
5f4cc3e694 Cleanup a little bit more code. 2018-08-06 19:08:15 +10:00
Matthew Miller
d11c3ae600 Fixed reading in schematics failing if they had tile entity data because of a Spigot change. 2018-08-06 17:57:40 +10:00
Matthew Miller
334143357a Added LongArrayTag support to NBT 2018-08-05 13:36:53 +10:00
Matthew Miller
38cff7c7b2 Fixed up tile entities in Sponge schematics. 2018-08-04 11:43:43 +10:00
Matthew Miller
b2769befdb Added a few utility methods. 2018-08-04 11:43:42 +10:00
Matthew Miller
b2bc043eeb Added 155:3 and 155:4 translation 2018-08-04 11:43:42 +10:00
Matthew Miller
3d265ff9b9 Added entity translations 2018-08-04 11:43:42 +10:00
Matthew Miller
2f3bc59e1b Fixed //move 2018-08-04 11:43:42 +10:00
Matthew Miller
7773ef6f9a Fixed a few issues with Sponge schematic handling. 2018-08-04 11:43:42 +10:00
Matthew Miller
2c1b234e38 Fixed some issues with Sponge schematics. 2018-08-04 11:43:42 +10:00
Matthew Miller
ea349bdbf1 Fix checkstyle issues. 2018-08-04 11:43:42 +10:00
Matthew Miller
a75d9e896b Start work on the Sponge schematic format. This should work but it may not, it's untested. 2018-08-04 11:43:42 +10:00