Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,822 Commits 1 Branch 0 Tags 50 MiB
4610688fcb
Commit Graph

1193 Commits

Author SHA1 Message Date
MattBDev
0a07599abf Update build files and NOTICE.txt 2020-08-14 15:29:15 -04:00
N0tMyFaultOG
bbff5c60b2 Fix metrics 2020-08-14 15:04:06 -04:00
N0tMyFaultOG
cfb1510503 Fix compile 2020-08-14 14:41:49 -04:00
NotMyFault
2562010589 Update dead repo 2020-08-14 14:41:48 -04:00
wea_ondara
ae23794b43 fix //cut -e 2020-07-29 22:43:52 +02:00
Aurora
b411ea9af4 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-26 19:03:46 +02:00
wea_ondara
50971ee311 fix entity undo 2020-07-26 15:52:51 +02:00
dordsor21
72269e08e6
Force sync teleports with trySetPosition 
Fixes #542
 2020-07-24 20:29:08 +01:00
dordsor21
d3ff4131a3
Fix incorrect light array reference. 
Possibly fixes #531 and #535
 2020-07-24 20:21:05 +01:00
dordsor21
28837c7106
Fix P2 clear area 2020-07-24 11:42:33 +01:00
MattBDev
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
MattBDev
1e80c0429a Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-13 13:09:55 -04:00
MattBDev
2a493ac9c6 Update trySetPosition 2020-07-13 13:09:03 -04:00
dordsor21
eb9ed098bb
use z not x 2020-07-11 12:41:33 +01:00
dordsor21
ef58cf567b
Clean up P2 v5 hook a little. 
Should be a good step at removing any OOBs and incorrect-height-sets
 2020-07-11 12:39:27 +01:00
Octavia Togami
4c299bc0b8 Replace setPosition with trySetPosition (#1403) 
Allows cancellation information to be fed back into the ascend/descend
algorithms.

(cherry picked from commit 71e104bcb187a5313e88dda5df79059c8ffbc1fe)
 2020-07-10 13:22:48 -04:00
dordsor21
33b2b634ac
Allow specific P2 queue hooks to be disabled 2020-07-09 22:14:24 +01:00
dordsor21
d92cded832
add biomes, and do it all at once using a clipboard. Crude, but eh 2020-07-04 12:45:00 +01:00
Aurora
bc45a112ee Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-03 19:54:08 +02:00
Aurora
94b1233d98
implement entities in paste -e 2020-07-03 19:52:55 +02:00
dordsor21
63bc151f6c
Hopefully allow for unloaded world to be referenced after GC. 
Possibly fixes #504
 2020-07-03 13:27:26 +01:00
dordsor21
f1d4104480
Bunch of changes to help masks 2020-07-02 22:09:12 +01:00
dordsor21
18c9da372c
GetBlocks should default to air not reserved 2020-07-02 18:16:15 +01:00
dordsor21
b58877a57b
Use BlockType not BlockState 2020-07-02 14:51:09 +01:00
dordsor21
d3afc9c65d
Update to p2 5.12.2 and implement clear pipeline 2020-07-02 14:34:05 +01:00
dordsor21
ce406e404b
We shouldn't be setting REGENERATIVE_CLEAR to false 2020-07-01 19:46:43 +01:00
Aurora
34298f7dee
Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +02:00
dordsor21
3e40f82d9a
fix error on loading for some versions 2020-07-01 15:05:38 +01:00
N0tMyFaultOG
fdbef4e12c Update DummyFawe.src 2020-07-01 14:22:04 +02:00
dordsor21
6be429cc96
Lighting: 
- bring fixes to 1.16
- Fix for all lighting where it only set sky lighting if not present, even if it was trying to set block lighting (unlikely to have caused issues as block lighting seems always to be present, but wrong nonetheless)
 2020-07-01 12:55:58 +01:00
dordsor21
3b19738ea0
Merge branch '1.15' into 1.16 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
 2020-07-01 12:47:04 +01:00
dordsor21
3f3c49c0a8
Looks like working block setting and removal 2020-07-01 12:41:20 +01:00
dordsor21
4ca19acb48
implement 1.16 methods 2020-06-30 13:51:27 +01:00
dordsor21
f84958957c
Fix various lighting issues 
fixes #496
possibly fixes #497
 2020-06-30 13:44:26 +01:00
Octavia Togami
b59b95c282 Cherry-pick WNA, minor changes. 1.16 VERY WIP 
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
 2020-06-29 22:05:41 -04:00
Matthew Miller
82adab77b4 Additional work towards 1.16 compatibility 
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
 2020-06-26 22:14:19 -04:00
IronApollo
f2bc8d86fc Work towards 1.16 compatibility 
This commit will allow the branch to build properly but the plugin will not function properly due to the lack of a proper adapter implementation. Proceeding will require the implementation of the SideEffects system from upstream (865c3a24d2 (diff-8fd33296e427c87d0296ad7f3ccc050a)).
 2020-06-26 19:08:45 -04:00
MattBDev
aab10adb79 Fixed all but one remaining API changes in 1.16.1 
No testing has been performed yet.
 2020-06-25 20:57:06 -04:00
MattBDev
b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
wizjany
6d056847c1 Update adapter jar. 
(cherry picked from commit 9e186225bd25f4805d09081f8b8ca717f61a73a4)
 2020-06-25 15:41:49 -04:00
NotMyFault
ef704e23ad
Add a few disallowed blocks as example... 
since people fail to use the proper syntax
 2020-06-18 10:51:53 +02:00
IronApollo
238c56a3c6 Revert "Revert matt's changes" 
This reverts commit bfcc6184ad.
 2020-06-13 14:41:36 -04:00
N0tMyFaultOG
bfcc6184ad Revert matt's changes 
Let's not break Fawe, thanks
 2020-06-13 18:48:57 +02:00
MattBDev
7cc1994e20 Use StandardCharsets 2020-06-12 21:45:49 -04:00
Matthew Miller
33adba4a6f Use a long to refer to the volume of a region to prevent overflow (#1350) 
* Use a long to refer to the volume of a region, and rename the method to getVolume

* Fixed issues noted in review

* Forgot to floor

* Fixed review notes

* Can use a long here rather than BigDecimal

* Improve javadocs

* style

(cherry picked from commit 328030fd6281e58a4ea1d0cdd0a2e274da90afbe)
 2020-06-12 21:45:49 -04:00
MattBDev
9f6e0ebd5c Minor changes to NMS logic 2020-06-12 21:45:48 -04:00
aurorasmiles
6965fe2b90
Update PlotSquaredFeature.java 2020-05-30 10:46:05 +02:00
Aurora
5602b33b78
Fix a few links 2020-05-30 09:17:21 +02:00
dordsor21
75153d8da8 Fix getLightOpacity 2020-05-27 17:25:03 +01:00
dordsor21
bdc14c10c7
Fix relight and removelight (#475) 
* Start work on lighting engine (does not build)

* Implement getLighting

* Setting, flushing light etc works. Getting light should be working..?

* Better queue/chunk handling

* Use correct location for lighting update

* Correct set location, remove debug

* cleanup a little

* Fix fixlight

* Apply to all versions for the numpties

* Remove lighting extent if not using

* Actually bitmask blocks when setting in chunks

* Initialise Maps and Dequeues with inital size

* format

* Documentation maybe
 2020-05-27 11:45:08 +01:00
Aurora
1f898cd0d1 Negate "hasCollision" for isTranslucent() also for 1.15.0 and 1.14 2020-05-25 19:00:16 +01:00
Aurora
d9240c5626 Negate "hasCollision" for isTranslucent() 2020-05-25 19:00:16 +01:00
dordsor21
4e4b812fdd dum 2020-05-20 09:47:57 +01:00
dordsor21
9085365165 Override P2's /plot set 2020-05-20 09:44:59 +01:00
dordsor21
a6514f8a78 Ultimately the Striped locks will have no affect, even if kinda cool. 2020-05-20 07:58:14 +01:00
dordsor21
fd3604beba replace synchronisation with Striped access semaphore locks 2020-05-18 16:52:33 +01:00
dordsor21
31cc5e0b60 Synchronise on the nmsWorld so we're not attempting to load two chunks at the same time. 
Possibly fixes #471
 2020-05-18 16:04:10 +01:00
dordsor21
5be11c541b Put the synchronisation higher up the food chain 2020-05-14 22:32:32 +01:00
dordsor21
3a7c23be45 Fix #443 
Temp as it's performance-degrading, but works well enough for now
 2020-05-14 22:10:09 +01:00
dordsor21
35169230ad Sort of fix biome getting 
It seems to want to put random blocks where the biome isn't
 2020-05-14 16:27:24 +01:00
dordsor21
bdc129cf7b Update to latest p2 v5 
(implement FAWE biome setting)
 2020-05-14 16:20:17 +01:00
dordsor21
5225099ec0 Fix biome setting in 1.15 2020-05-14 16:17:29 +01:00
dordsor21
be58cd42ac Add option to disable ticking existing blocks when not fastmode 2020-05-11 16:09:31 +01:00
dordsor21
36faf107e6 Allow fastmode to be used in a lot more places 
- Option to stop fastmode from bothering to fix existing ticking blocks
 2020-05-11 15:36:52 +01:00
MattBDev
a813cbfcdf Update world interface 2020-05-10 20:57:24 -04:00
dordsor21
0dee452e1a Don't attempt to set field on null ChunkSection 2020-05-09 17:42:40 +01:00
dordsor21
56175ffe0f Revert this so it compiles on the ci for now. 2020-05-09 16:30:28 +01:00
dordsor21
b1f1c0f4f0 Possible fix for #331 
- Should ensure the server doesn't tick the chunksection while we're editing it
- Basically using the old issue with FAWE breaking block ticking by setting this to zero :)
 2020-05-09 16:23:38 +01:00
dordsor21
8f60544aad Override some methods in AsyncWorld 2020-05-09 15:11:40 +01:00
dordsor21
56c720914e Settings.IMP is terrible. Don't initialise it thousands of times. 2020-05-08 18:17:47 +01:00
dordsor21
c757b01803 By default only allow existing blocks to tick. 
- Revert back to default FAWE behaviour where placed blocks do not tick by default (until a restart, or another edit is done in the same chunksection without changing the block)
 2020-05-08 16:16:08 +01:00
dordsor21
56972ee40b
Trim performance (#451) 
* Increase performance slightly when trimming.
If the chunk section is all one blocks (common in plotworlds) it'll be a nice little boost.

* Cache whether blocks are ticking or not. Greatly reduces the time required to create a palette

* collapse 5 lines to 2.

* Also apply to 14 and 15 for the numpties

* Cleanup
Actually ignore the exception - remove my debug print.
Remove double semi-colon

* Apparently 1.14/15 matter too still.
 2020-05-07 23:00:13 +01:00
IronApollo
65afa79c17 Remove WorldguardFlag.java 
The main functionality of WorldguardFlag.java was ported to Worldguard.java. This *shouldn't* break functionality of either the Worldguard or WorldguardFlag features, but users should be cautious and provide prompt feedback if any unintended changes are found.
 2020-05-03 19:45:04 -04:00
dordsor21
0ca81e9d67
Fix FAWE killing chunk ticks. Also allow ticking for set blocks. (#439) 
* Fix FAWE killing chunk ticks. Also allow ticking for set blocks.

* Reduce for-loop to being one loop in createPalette

* set the value in the set array and break so we don't continue onwards in the set's ordinal switch statement
 2020-05-03 17:50:09 +01:00
MattBDev
5fb18259d5 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-04-30 16:27:08 -04:00
MattBDev
ef3642d521 Small spring cleaning 
I changed really small bits and pieces of code. If you have questions just comment and I'll answer them.
 2020-04-30 16:26:52 -04:00
dordsor21
9869cf09c6 Apply fda7d00747 to other versions so numpties that use old versions for no reason stop complaining too 2020-04-30 15:14:59 +01:00
Pierre Grimaud
f9a40599fb
Fix typos 2020-04-29 19:36:34 +02:00
dordsor21
fda7d00747 A more verbose fix to #329 and similar issues. 
- Re-read chunksections the first time they're "loaded" for an operation
 - Reset the chunksection if there are block changes when setting blocks via reflection
 - These are maybe gonna affect performance a bit? Idk. Seems to be alright for me
 - These are maybe gonna make more issues? Yeah maybe, but I couldn't find any
 2020-04-29 18:17:21 +01:00
MattBDev
600a1a5daa Implement previously unsupported methods in DelegateLock 2020-04-29 11:29:02 -04:00
MattBDev
3265a9e794 Remove unused regenerate method 2020-04-28 11:16:51 -04:00
MattBDev
491be025cc Minor changes to urls and todo's 2020-04-27 17:35:04 -04:00
Josh Knight
915fa5f00c
Merge pull request #416 from Sauilitired/tile-entity 
Properly remove tile entities in BukkitGetBlocks_1_15_2
 2020-04-22 14:57:49 -04:00
dordsor21
8bde932354 Add p2 v4 compat. 
Anyone that hasn't built FAWE before won't be able to build it again as the v4 repo doesn't exist - it relies on local gradle cache.
 2020-04-22 08:10:17 +01:00
Alexander Söderberg
c478dbd249
Backport changes 2020-04-21 23:58:14 +02:00
Alexander Söderberg
8a19c4c38c
Don't mark the chunk as dirty. 2020-04-21 15:40:53 +02:00
Alexander Söderberg
2c85ff1673
Properly remove tile entities in BukkitGetBlocks_1_15_2 2020-04-21 15:23:23 +02:00
dordsor21
952aaf8b43 Fix p2 compatibility and replace empcraft.com/maven2 2020-04-21 11:39:42 +01:00
Octavia Togami
ff47e6f717 Cherry-pick to fix EntryMaker issue 2020-04-16 20:26:55 -04:00
MattBDev
8d1efcfb21 Update Bukkit Interfaces to allow for compilation 2020-04-10 13:25:56 -04:00
IronApollo
16df4abd18 Reflection field name changes 
Old ones were outdated. Brush visualization is still WIP and can result in client being kicked from the server for bad packets.
 2020-04-01 00:20:25 -04:00
MattBDev
6e1cb4cfbc Remove more useless messages 2020-03-31 19:39:37 -04:00
dordsor21
a6a4400317 Port fixed for #389 from 1.15.2 adapter to other adapters. 2020-03-31 10:26:23 +01:00
dordsor21
318e367cf0 Correctly unregister player on quit and close clipboard if using disk. 2020-03-30 17:41:41 +01:00
Marco
342da647d7 Fixing that the PlayerDropItemEvent was not fired 2020-03-29 11:53:31 +02:00
dordsor21
8ffdd8a9e9 Better reading of schematic biomes. 
Use biomes in the P2 schematic handler and save as a .schem not .schematic (when it's enabled again)
 2020-03-28 10:44:51 +00:00
MattBDev
8d61f84466 Stop messing with the PlotSquared queue system 
Stops synchronized chunk loading on PlotSquared and our queue didn't really do anything better than what PlotSquared did.
 2020-03-27 12:28:09 -04:00
IronApollo
46d24fff0f Update AsyncWorld.java 2020-03-26 17:11:07 -04:00
IronApollo
fa738504a8 Fix some important chunk issues 
This commit should properly synchronize the initialization of the adapter's ibdToStateOrdinal (the char array FAWE uses to convert NMS IBlockData objects to an internal ordinal for chunk operations) so references to this array do not push incorrect characters down the line.

Potentially fixes #373
Fixes #363
Fixes #332
 2020-03-26 16:08:36 -04:00
MattBDev
e648b35b95 Small code quality changes 2020-03-24 12:32:36 -04:00
Octavia Togami
692caeea8a Read WE version from manifest ourselves 
(cherry picked from commit 947775b5e54aa9dd89d68ee0b382939796301902)
 2020-03-23 19:31:56 -04:00
Octavia Togami
989680d159 Only add adapters to dist jar 
(cherry picked from commit 20d630ce5b217799811779d7581d5878ddc83a6d)
 2020-03-23 16:27:03 -04:00
MattBDev
89ee1cb21a Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-22 14:10:13 -04:00
MattBDev
7ef02dfbde Lighting in AyncBlock is set to 15 (at least for now) 2020-03-22 14:05:51 -04:00
Matt
8f2c3df61b
Merge pull request #359 from tsao-chi-fork/patch-1 
use JavaPlugin.getResource() instead of JarFile.getEntry()
 2020-03-21 17:32:14 -04:00
MattBDev
45ac55185f Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-20 21:19:37 -04:00
MattBDev
a49a09a042 Added clarification for debugging message because of people thinking it is an error. 2020-03-20 20:04:31 -04:00
thislooksfun
a22bcb1c2a
Fix tab completion 2020-03-19 17:23:11 -05:00
MattBDev
9f07894f28 Performance improvement based on case study by @me4502 2020-03-19 13:08:25 -04:00
MattBDev
8a70f97445 Mask and Pattern modifications 2020-03-17 23:05:52 -04:00
MattBDev
1df5853f33 Remove unnecessary reflection 2020-03-17 22:27:41 -04:00
ㄗㄠˋ ㄑㄧˊ
dcee873b57
fix typo 2020-03-11 13:35:37 +08:00
ㄗㄠˋ ㄑㄧˊ
39e1026400
use try-with-resources 2020-03-11 13:34:11 +08:00
MattBDev
f63782f2f4 Fix Metrics 2020-03-10 17:31:36 -04:00
MattBDev
325d90fe39 Add stubs for new Bukkit API 2020-03-10 17:29:37 -04:00
MattBDev
14d2c9a5c3 Update BlockStateIdAccess and added a debug message 2020-03-10 17:22:53 -04:00
ㄗㄠˋ ㄑㄧˊ
bd692917e6
remove unnecessary import 2020-03-10 12:36:16 +08:00
ㄗㄠˋ ㄑㄧˊ
fbb1078569
use JavaPlugin.getResource() instead of JarFile.getEntry() 2020-03-09 13:14:16 +08:00
MattBDev
35538e7d61 Update Metrics.java 2020-03-05 19:01:06 -05:00
MattBDev
e32e17b15c Fixed an NullPointerException with PlotSquared 2020-03-05 18:05:33 -05:00
MattBDev
915ab43f6e Cleanup unused code. 2020-03-05 16:07:20 -05:00
Octavia Togami
f18cb1a0e1 Update gradle 2020-03-02 19:40:36 -05:00
IronApollo
d2bcc6dd35 Fix #346 , minor hook changes 
- Removed deprecated FaweMaskManager#getMask(Player)
- Removed deprecated constructor FaweMask(BlockVector3, BlockVector3)
 2020-02-26 10:17:11 -05:00
MattBDev
0918396ab6 Update bukkit gradle 2020-02-25 23:21:01 -05:00
MattBDev
c52db75976 Delete unused file 2020-02-25 18:26:04 -05:00
MattBDev
f3d19cf87d Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-23 12:49:41 -05:00
MattBDev
bfcf24b27b Small quality of code changes 2020-02-23 12:48:22 -05:00
Spottedleaf
7388d3310f Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into workaround-visiblechunks 2020-02-22 20:11:28 -08:00
Spottedleaf
f6675160f1 Also target 1.15 & 1.14 adapters 2020-02-22 20:11:23 -08:00
IronApollo
14ac3205ce Check for PlotSquared before initializing the feature class 
Some users are experiencing issues during startup with FAWE not finding PlotSquared resulting in errors.
 2020-02-22 21:02:12 -05:00
Spottedleaf
0d18b15393 Workaround for replacing PlayerChunkMap#visibleChunks field 
I run a fork of paper which replaces the visibleChunks and updatingChunks
field for gc performance reasons - visibleChunks is updated via
cloning updatingChunks, and at high chunk counts this causes gc issues
due to the humongous allocation. Unfortunately the only solution is to
not clone the map - which is why the field is removed.

Instead of BukkitAdapter#getPlayerChunk using the visibleChunks field,
it now uses a MethodHandle for PlayerChunkMap#getVisibleChunk. This method is
present on spigot & paper (only protected on spigot - which is why reflection is required),
and I preserve the same thread-safety it provides in my fork - so this solution
will not break compatibility with craftbukkit, spigot, and paper.
 2020-02-22 07:07:40 -08:00
MattBDev
62cb04b8ca Remove CFI redirect and other minor changes. 2020-02-21 14:56:21 -05:00
MattBDev
516e7e4ca6 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-02-21 00:00:11 -05:00
MattBDev
99f7b23a8c Changes to API and something else I forgot because I got distracted 2020-02-20 23:59:57 -05:00
IronApollo
c9aebf17d8 Fix #320 ; optimize adapter imports 2020-02-20 21:28:28 -05:00
MattBDev
e0bb1ce853 Revert "More minor cleanup" 
This reverts commit 38435d50
 2020-02-18 18:06:08 -05:00
MattBDev
38435d50b4 More minor cleanup 2020-02-18 18:00:39 -05:00
MattBDev
49dbd4b76b Minor changes 2020-02-14 14:29:08 -05:00
MattBDev
647665c3b0 Upstream is better than downstream 2020-02-13 20:19:45 -05:00
MattBDev
73c5e34040 Fixed AsyncWorld for real 2020-02-13 13:12:11 -05:00
MattBDev
4d4709b2f6 Removed ChunkListener8 and resolved compiling issues 2020-02-13 13:07:30 -05:00
MattBDev
e56e9e39ee Implement new World interface methods 2020-02-12 18:19:12 -05:00
MattBDev
b1c11c9597 Implement new World interface methods 2020-02-12 17:46:07 -05:00
MattBDev
0723620722 Remove remaining BlocksHub references from the code. 2020-02-12 17:09:28 -05:00
MattBDev
ceec0ec0b9 API Breaking 
Removed LoggingChangeSet since it wasn't functional and the majority of it was commented out.
Migrated a lot of RunnableVal implementations to Suppliers for improved readability and a very small speed improvement.
 2020-02-12 17:04:21 -05:00
MattBDev
6dd85e48ba Various changes 
the most notable change is that PlotSquared is being moved to the Bukkit module again to allow for future compatibility with version 5 of the plugin.
 2020-02-12 16:18:36 -05:00
MattBDev
0047f20d5d Minor code quality changes 
Changed Lock to subclass ReentrantLock since that is the only subclass DelegateLock should be using. The lock should also never be null so I added an annotation in the constructor.
I also removed some code and replaced it with PaperLib code to just clean up things a little bit.
 2020-02-07 14:33:51 -05:00
MattBDev
5feac07bf0 Revert "Fixed commands not working" 
This reverts commit 0b5eb903
 2020-02-06 20:33:19 -05:00
MattBDev
f9e7b7300e Minor changes 2020-02-05 16:27:50 -05:00
MattBDev
75653087b9 Remove FAWE-Piston 
Disables a lot of previous functionality in FAWE until replacements can be made. This commit was untested and may cause major issues.
 2020-02-05 00:37:42 -05:00
MattBDev
3452fd5a63 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-04 17:59:08 -05:00
IronApollo
4f3db6f3da Attempted fix for #329 
Removing this code seemed to fix the issue while not breaking general editing abilities. Needs testing to determine any unintended side effects!
 2020-02-01 20:28:48 -05:00
IronApollo
83bb3966ca Update adapter to 1.15.2 
Adapter updated to 1.15.2, mostly a clone of 1.15 / 1.15.1's adapter. I encountered no issues from this, but the field names for our reflections may need to be double-checked for accuracy in this Minecraft version.
 2020-02-01 20:11:02 -05:00
MattBDev
6c5ac08a3c Minor upstream changes 2020-01-31 17:44:50 -05:00
wizjany
f4d03291c5 Revert "Revert "Add Vault as a softdepend to the Bukkit variant to prevent a warning from Spigot"" 
This reverts commit 376f241b7dfbe3cf221adaae340661d0c9a5c81f.

Spigot bad. Also LP bad. This really shouldn't be necessary but it's
probably safer due to all the weird shit spigot and LP do.

(cherry picked from commit 68d48148d3df6e01815d05c462ba22498734fdc4)
 2020-01-31 14:41:22 -05:00
MattBDev
7236b0a026 Minor code changes 2020-01-29 17:10:59 -05:00
MattBDev
2cc66b0d98 Minor upstream file changes 2020-01-29 16:13:28 -05:00
MattBDev
d381617f11 Revert "Using an array instead of an EnumMap isn't necessary here" 
This reverts commit 240a817e
 2020-01-29 16:03:02 -05:00
MattBDev
020c674c01 Revert migration of FaweCache to Kotlin 2020-01-29 15:01:38 -05:00
MattBDev
7d4acbdcac Remove some reflection from QueueHandler 2020-01-29 14:33:41 -05:00
MattBDev
cb6359f010 Removed 1.13.2 support. 2020-01-27 18:54:31 -05:00
MattBDev
240a817e6e Using an array instead of an EnumMap isn't necessary here 2020-01-26 16:45:07 -05:00
MattBDev
5d5ee7e61e Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-26 13:10:18 -05:00
MattBDev
8078cf077a consistency changes 2020-01-26 13:01:16 -05:00
NotMyFault
93ebd21a61 Update bStats adding ID 2020-01-25 02:26:49 +01:00
MattBDev
e0f6869573 Revert "More code quality fixes" 
This reverts commit 2d6957ce
 2020-01-23 14:41:57 -05:00
MattBDev
37003ec089 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-22 21:15:58 -05:00
MattBDev
2d6957ce1c More code quality fixes 2020-01-22 21:15:52 -05:00
NotMyFault
8b69767cd8 Add support for 1.15.2 and some minors 
- Removed duplicated dependencies
- Credited important contributors
- Updated website with an actual website
- Update DummyFawe internal version to 1.15.2
 2020-01-22 01:09:07 +01:00
MattBDev
88359f0215 More Kotlin 2020-01-21 14:30:13 -05:00
MattBDev
0cad7f229b API improvements 2020-01-15 20:38:46 -05:00
MattBDev
da7c21d32a Removed metrics from API 
We shouldn't have exposed it in the first place.
 2020-01-15 17:20:40 -05:00
MattBDev
2fb1c3bdbc Remove factions due to maven repo being down 2020-01-13 21:02:31 -05:00
MattBDev
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
MattBDev
b2be1ea9fb Remove duplicated methods 2020-01-10 19:26:26 -05:00
MattBDev
86a55b7bf0 Merge remote-tracking branch 'origin/wip' into 1.15 2020-01-10 19:22:23 -05:00
MattBDev
98d0420c08 Minor tweaks 2020-01-10 13:29:20 -05:00
NotMyFault
b88d7b3e60 Don't send bad packets 2020-01-10 14:26:24 +01:00
NotMyFault
3ee920f9e6 Update upstream 2020-01-08 19:36:12 +01:00
Jesse Boyd
900268633d
Fix compile 2020-01-07 00:41:41 +00:00
Jesse Boyd
e69ea37665
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-07 00:09:49 +00:00
Jesse Boyd
5abf6ce2a5
Update Metrics.java 2020-01-07 11:07:03 +11:00
NotMyFault
b292416496 Upstream and some refactoring 
Note: Maybe this doesn't compile, ij is broken af smh, let's give it a try...
 2020-01-04 18:34:30 +01:00
Jesse Boyd
c05cdd8faa
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-04 10:12:33 +00:00
Jesse Boyd
88a95221a8
Make masks more stateless 2020-01-04 10:11:13 +00:00
MattBDev
05760c49cd Fixed compile issues and disabled plotsquared hook 2020-01-03 16:05:25 -05:00
MattBDev
f3e0109be2 A lot of small changes 2020-01-03 15:38:30 -05:00
NotMyFault
3fb5ac6be8 Rename debugpaste value names 2020-01-03 14:48:44 +01:00
Jesse Boyd
9efdd886c5
Fix translate args 2019-12-25 02:34:20 +00:00
KennyTV
8569359d8f Fix Java 12+ compatibility 2019-12-21 21:21:25 +01:00
Jesse Boyd
39faa740a2
Fix some adapter issues 
regen 1.13, tile get npe, null block type values
 2019-12-21 09:45:59 +00:00
Jesse Boyd
c2cc4f5aeb
Fix craftbook 2019-12-20 05:54:03 +00:00
NotMyFault
f37bc9417c Merge branch 'merge' into 1.15 2019-12-19 19:05:27 +01:00
Jesse Boyd
8c1a379575
Hide adapter stacktrace 2019-12-19 17:01:22 +00:00
Jesse Boyd
5d039c0e2b
Update plugin.yml 2019-12-19 16:51:54 +00:00
Jesse Boyd
1a64976195
load 1.15 adapter 2019-12-19 16:33:08 +00:00
Jesse Boyd
6a49b71cf2
Fix compile 2019-12-19 16:19:46 +00:00
Jesse Boyd
ea5f7a77be
Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge 2019-12-16 09:08:28 +00:00
Jesse Boyd
6ddeb2ebf5
Various minor 
refactor some region dependencies
swithc masking extent to a filter (so it can be parallelized)
Some unfinished refactoring of the filters
remove piston messages from strings.json
 2019-12-16 09:07:51 +00:00
MattBDev
ee94bc2ddb More work to get 1.15 working 2019-12-11 17:47:34 -05:00
MattBDev
a137d719cb Remove 1.13 and 1.14 code 2019-12-11 17:47:14 -05:00
NotMyFault
68144232ba More 1.15 wip No.2 2019-12-11 17:06:05 +01:00
NotMyFault
053b1a20d6 More 1.15 wip 2019-12-11 14:45:27 +01:00
NotMyFault
5358c51011 1.15 (wip) 
Adapters and nms needs updating still, alongside some other fixes and changes, but I'm too tired for that now
 2019-12-11 02:11:52 +01:00
NotMyFault
a058f13d6e Updates 2019-12-09 21:34:26 +01:00
NotMyFault
80d7b0582f i18n upstream merge 2019-12-09 20:07:57 +01:00
Jesse Boyd
21d736cd1d
Merge pull request #275 from IntellectualSites/dependency-cleanup 
Cleanup outdated/eol dependencies
 2019-12-03 11:40:52 +11:00
NotMyFault
0f1715ea9f Revert "Merge pull request #274 from IntellectualSites/api" 
This reverts commit 79d9bda912, reversing
changes made to 0fcac39592.
 2019-11-29 14:28:06 +01:00
Jesse Boyd
a36778794b
fix paste tile npe 2019-11-29 02:56:07 +00:00
Jesse Boyd
79d9bda912
Merge pull request #274 from IntellectualSites/api 
Generate maven artifacts
 2019-11-29 13:49:03 +11:00
NotMyFault
0fcac39592 Add more information to plugin.yml 2019-11-28 16:58:03 +01:00
NotMyFault
32880e520b Remove Regios - Outdated since CB 1.6.2 2019-11-28 16:34:53 +01:00
NotMyFault
1b2710f823 Remove ASkyBlock 
ASkyBlock does only exist up to 1.12 and won't be continued to higher versions.
 2019-11-27 23:50:32 +01:00
NotMyFault
38bdb929f4 Generate maven artifacts 
I'm not a kotlin dsl expert, but that seems to work.
 2019-11-27 23:33:42 +01:00
Jesse Boyd
913ada31fb
Fix lighting 1.14 2019-11-24 02:26:52 +00:00
Jesse Boyd
ee54dcd809
wip generatebiome 
will finish later
 2019-11-24 01:50:05 +00:00
Jesse Boyd
174b3ec573
Delete worldedit-adapters.jar 2019-11-24 11:58:33 +11:00
Jesse Boyd
1f19b92b0b
1.13? 2019-11-24 00:57:29 +00:00
Jesse Boyd
50c9a2c2d2
Fxi regen (again) 2019-11-23 18:41:05 +00:00
Jesse Boyd
2fcd375912
potentially fix regen 2019-11-23 17:50:38 +00:00
Jesse Boyd
944c8c5521
Fixes #255 compass exceptipn 2019-11-23 05:15:48 +00:00
Jesse Boyd
97a4d2e103
Fixed regen 2019-11-23 04:45:43 +00:00
Jesse Boyd
1844d4dba7
Various major 
Add regen
Add //history [find|restore|rollback|summary|clear]
 - history commands are interactable
 - inspect brush info is interactable
Commands are now logged to a searchable database
Fix some cases of id/ordinal mismatch
 2019-11-23 04:31:48 +00:00
Jesse Boyd
85382ad109
Fix permissions 2019-11-22 15:30:45 +00:00
Jesse Boyd
0c85db920c
save strings.json 2019-11-21 20:37:56 +00:00
Jesse Boyd
1341e38a90
fix compile 2019-11-21 19:56:10 +00:00
Jesse Boyd
66744bfaa4
Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge 2019-11-21 13:50:05 +00:00
Jesse Boyd
37b6c406ac
reduce diff 2019-11-21 07:57:32 +00:00
Jesse Boyd
52a502a1c6
Refactor confirmation 2019-11-21 06:50:37 +00:00
Jesse Boyd
444aa0dda7
adapter jar ? 
It doesn't have a maven repo, so idk?
Might be worth making one, or using a url for the dependency
 2019-11-20 03:54:34 +00:00
Jesse Boyd
144ea2ef34
Lazy tags + get / set tiles 
Lazy tags means tiles/ents are not translated into the nms NBTBase until it is needed. Should be faster in cases where getFullBlock is called, but nbt is not always needed.
Commands like Copy and Paste, where the input/output are both nms worlds, can entirely bypass WorldEdit translating to and from the WorldEdit JNBT classes.
 2019-11-20 03:40:52 +00:00
Jesse Boyd
60759934a3
Fix some merge issues 2019-11-20 00:11:54 +00:00
Jesse Boyd
0e22d4718a
fix some merge issues 2019-11-19 22:07:30 +00:00
Jesse Boyd
5d8adbc10c
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
Kenzie Togami
122f3b2562
8af68fc884 2019-11-19 04:43:30 +00:00
Jesse Boyd
1b07846746
some adapter refactoring 2019-11-19 04:40:40 +00:00
Matthew Miller
ded86d4872 Fixed issues brought up in review 2019-11-18 19:50:52 +10:00
Jesse Boyd
0087a0d6ab
Various minor 
fix undo null sections
fix cancel for certain parallel jobs
optimize schem paste
 2019-11-17 22:47:56 +00:00
Jesse Boyd
329df8d33b
various minor 
Increase target size
remove unnecessary brush sync
send chunk on biome change
 2019-11-17 20:29:25 +00:00
Jesse Boyd
3f92f12e89
synchronize char blocks 2019-11-17 20:02:33 +00:00
Jesse Boyd
e661652c12
Fix setting blocks in null sections 2019-11-17 19:30:28 +00:00
Jesse Boyd
69c225c00f
Fix //vis 2019-11-17 17:22:21 +00:00
Matthew Miller
96e56bdd0c Rebase translation work for easier rebasing 2019-11-16 22:42:14 +10:00
Jesse Boyd
0b1a36bb7d
WIP VisualExtent 2019-11-16 00:20:14 +00:00
Matthew Miller
77ef0ae417
Bypass Bukkit in more situations (#532) 
* Bypass Bukkit in more situations

* Use orElseGet

* Apply the same optimisation in the reverse BlockData adapter, and use lambdas instead of AIC

* Remove bukkit type checks

* Improve reliability of fallbacks
 2019-11-15 12:02:46 +10:00
Jesse Boyd
601890fe64
Fix biome sending 2019-11-14 19:21:28 +00:00
Jesse Boyd
b1244c7780
Remove unused methods from IFawe 2019-11-14 10:54:09 +00:00
MattBDev
630245bb9f Attempt to fix compile and other small changes 2019-11-11 16:22:03 -05:00
MattBDev
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
Jesse Boyd
d61dac5aa5
Fix CFI generation 2019-11-08 22:30:39 +00:00
Jesse Boyd
faa63b0c35
CFI changeset 2019-11-08 05:27:04 +00:00
Jesse Boyd
82f5c4ebed
Fix compile 2019-11-07 10:28:17 +00:00
Jesse Boyd
0bfb1dbdd1
Fix BlockArrayClipboard offset 2019-11-05 15:08:44 +00:00
Jesse Boyd
92b34e4fa9
Regen using EditSession 2019-11-05 08:03:00 +00:00
Jesse Boyd
1e16095cba
Fix palette / region iteration 2019-11-04 07:47:31 +00:00
Jesse Boyd
930dfb7f7c
Various minor 
thread local cleans on close
remove unnecessary loop on set
remove unnecessary get on set
clean CFI cache on generate
 2019-11-03 16:59:11 +00:00
MattBDev
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
MattBDev
f262271519 Message updates 2019-11-02 15:53:25 -04:00
Jesse Boyd
32d837414b
static blocktype initialization 
instead of using hacky reflection
 2019-11-02 20:35:51 +01:00
Jesse Boyd
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
Jesse Boyd
f8e1654a4e
Update BukkitGetBlocks_1_14.java 2019-11-02 18:37:17 +01:00
Jesse Boyd
934559fea6
Add vs perms 2019-11-02 18:37:07 +01:00
Jesse Boyd
df9e9e510a
Limit processing 2019-11-02 12:13:42 +01:00
Jesse Boyd
0c1fdcc498
remove broken debug 2019-11-01 22:56:07 +01:00
Jesse Boyd
9cf02fe654
WIP Anvil API 2019-10-31 21:04:02 +01:00
Jesse Boyd
c383fab2c2
cfi packet listener 2019-10-30 12:58:21 +01:00
Jesse Boyd
72951cdf23
Various 
fake chunk packet
aliases
cfi wip
 2019-10-30 12:26:52 +01:00
Jesse Boyd
8356004ec9
chunk sending / cfi 2019-10-26 14:21:49 +01:00
MattBDev
ca843f1b90 Minor changes for readability 2019-10-23 22:34:44 -04:00
Jesse Boyd
938dde68b2
Don't force load 
didn't realize this loads the chunk, I just need to delay unloading until the operation is complete
 2019-10-23 16:44:36 +01:00
Jesse Boyd
2080e9786b
commanding-pipeline diff 2019-10-23 05:23:52 +01:00
Kenzie Togami
91a78f725a
Some shading fixes 2019-10-19 00:48:49 -07:00
MattBDev
7d60053aaf Fixed the mixup of backslash and forward slash 2019-10-09 21:51:37 -04:00
MattBDev
c928564b59 Delete "in" 2019-10-09 20:47:23 -04:00
MattBDev
ccd8f2c2a9 Attempt to fix command execution. 2019-10-09 20:43:28 -04:00
MattBDev
183d733825 Add a check to prevent PlotSquared Features from trying to load. 2019-10-09 16:28:33 -04:00
MattBDev
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
MattBDev
11d30d2f94 Disabled FAWE commands until the plugin can actually set a block again 2019-10-07 15:09:52 -04:00
Kenzie Togami
0767f56711 Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523) 
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output

(cherry picked from commit 03c0cce53e)
 2019-10-07 12:57:47 -04:00
MattBDev
3431bd0644 Remove old plugin support and migrate to Piston (non-FAWE) 2019-10-07 12:27:18 -04:00
Kenzie Togami
03c0cce53e Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523) 
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output
 2019-10-05 19:06:18 +10:00
MattBDev
51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
wizjany
da0ef12239 Add Bukkit watchdog implementation. 2019-09-30 16:47:24 -04:00
Kenzie Togami
8af68fc884
Initial watchdog setup. Bukkit needs adapters, everything needs testing. 2019-09-29 22:09:55 -07:00
MattBDev
94e4fb089a Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:20:59 -04:00
MattBDev
24a147465d Fixed a bunch of extends and removed slottableblockbag 2019-09-21 21:00:45 -04:00
MattBDev
8b96cdc9a5 * 
A tribute to Jesse
 2019-09-20 21:52:35 -04:00
MattBDev
c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00
MattBDev
16e24a2400 Created an Item Registry Test (non-functional) 2019-09-19 11:30:22 -04:00
MattBDev
3bcfcd3008 Fixed bug with wands and updated tests 2019-09-18 15:09:04 -04:00
MattBDev
4357c4b049 Fixed not being able to login. 2019-09-15 12:50:37 -04:00
MattBDev
e72f1b32df I hate when md_5 actually decides to do stuff. 2019-09-13 23:12:49 -04:00
MattBDev
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
MattBDev
ae2d765533 Removed duplicated method and implemented missing ones 2019-09-03 12:17:21 -04:00
MattBDev
06a92d29b1 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
#	worldedit-libs/core/build.gradle.kts
 2019-09-02 15:24:53 -04:00
MattBDev
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
Jesse Boyd
68eea925e1
update adapter and platform manager 2019-08-29 13:57:03 +01:00
Jesse Boyd
4e49d16505
fix dependencies 2019-08-26 05:45:03 +01:00
Matthew Miller
0620478763
feature(cli): Added a CLI version of WorldEdit, and allowed most commands to be run from console (#508) 
* Re-do commits to avoid awful rebase

* You can load and save a schematic file now. Still gotta setup ability to use commands as a console actor.

* Add a world override concept to LocalSession, and allow a lot more commands to be performed by actors.

* Fixed commands, and set the loaded schematic as the world override in CLI

* Properly load tags

* Added 1.14.4 data values

* Allow a majority of commands to be performed by the console.

* Fixed a lot of PR requested changes

* Added a Locatable interface and use that for getting the location of the player in commands.

* Added script support. Currently requires a newline at the end of the script.

* Shade everything to allow this to run locally - should probably minimize this to an extent later.

* Actually hook up the version

* Added a //world command to set the override

* Fixed a missed checkstyle issue

* Added CommandBlock support to Bukkit

* Make command block support configurable

* Minor cleanup and implementing a few of the final functions

* Fixed most issues from PR

* Improve UX, saving is now automatic and unknown command messages show

* Better save docs and support any clipboard format

* Include the entire formats list

* Arrays.copyOf

* Clear the world override if the selector is called on another world.

* Update logging extent to allow basic logging with non-player actors
 2019-08-25 19:58:28 +10:00
Jesse Boyd
ae89c16390
merge 2019-08-23 08:36:33 +01:00
Jesse Boyd
47e2226be5
fix shadow jar 2019-08-18 02:54:27 +01:00
Jesse Boyd
3b7b115bb6
fix build gradle 2019-08-18 02:15:03 +01:00
Jesse Boyd
d434dfcfdd
some minor refactoring 2019-08-18 02:09:09 +01:00
Jesse Boyd
21caf0cf94
delete some classes 2019-08-18 01:59:07 +01:00
Jesse Boyd
b3601eb858
Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 2019-08-18 01:57:14 +01:00
Jesse Boyd
4427c0dd38
Update build.gradle 2019-08-18 01:56:06 +01:00
MattBDev
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
Kenzie Togami
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
wizjany
17cfdee347 Update/remove more dead links. 2019-08-06 23:07:26 -04:00
wizjany
95d5adb30c Update docs links to point to enginehub. 2019-08-06 21:49:43 -04:00
Jesse Boyd
74fe88ae01
merge 2019-08-07 01:28:12 +10:00
Jesse Boyd
cdb9abc117
9a4473b73f 2019-07-30 07:44:19 +10:00
Jesse Boyd
da858f2131
Check isEmpty for sign color 2019-07-29 05:07:46 +10:00
Kenzie Togami
76b608f90b
Fix suggestions on Bukkit for good 2019-07-27 23:31:38 -07:00
wizjany
0f420f02ff Fix some load-order issues probably. 
Edge cases might still exist around plugins which use WE for initial
world-gen, or in general plugins that try to access the platform
before it's ready.
 2019-07-27 11:45:21 -04:00
MattBDev
9a4473b73f Formatting 2019-07-25 15:09:12 -04:00
MattBDev
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
wizjany
2cc6a367c6 Move floatAt logic to AbstractPlayer, add isAllowedToFly and setFlying. 2019-07-23 22:16:26 -04:00
wizjany
e504c29df6 Fix potential race condition. 
I guess.
 2019-07-23 21:41:39 -04:00
MattBDev
9816eb3102 More work on commands 2019-07-23 16:26:18 -04:00
MattBDev
b230999ca0 Mainly formatting and some work on schematic commands 2019-07-22 22:22:32 -04:00
MattBDev
46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
Jesse Boyd
283351fea5
fix conflicts 2019-07-22 16:39:43 +10:00
Jesse Boyd
07283af614
some bindings 2019-07-22 16:02:51 +10:00
MattBDev
9c3122a227 More work on getting commands to compile 2019-07-21 22:49:08 -04:00
wizjany
a65351e43e Don't load old adapters. 2019-07-19 21:19:09 -04:00
wizjany
7c41949f40 Update bukkit adapters for 1.14.4. 2019-07-19 20:44:39 -04:00
Jesse Boyd
e86e4c9c53
wip on FaweQueue 2019-07-19 06:49:29 +10:00
Jesse Boyd
4ed3fe724e
Merge branch 'breaking-114' into commanding 2019-07-18 20:22:44 +10:00
Jesse Boyd
6e13b44f84
resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b 2019-07-18 20:12:23 +10:00
Jesse Boyd
be8213d8ee
resolve conflicts 2019-07-18 16:56:57 +10:00
Jesse Boyd
dd38cbe750
. 2019-07-18 04:30:02 +10:00
Jesse Boyd
8d60c0197b
Update AsyncChunk.java 2019-07-17 22:09:48 +10:00
Jesse Boyd
7a42bd208f
Update AsyncWorld.java 2019-07-17 22:04:05 +10:00
Jesse Boyd
505af853bd
setLocation should be synchronized 2019-07-17 22:00:00 +10:00
Jesse Boyd
eff203c3b8
Merge branch 'breaking' into breaking-114 2019-07-17 21:31:06 +10:00
Jesse Boyd
8f902c797d
Don't print within high stack depth conditions 
FAWE is trying to detect prevent a stackoverflow from block/item lag. Calling print adds to the stack depth.
 2019-07-17 21:28:46 +10:00
Jesse Boyd
68ea3d6e99
revert some changes 2019-07-17 20:50:54 +10:00
Jesse Boyd
08dead5a86
cleanup build script 2019-07-17 19:43:14 +10:00
Jesse Boyd
ae9efc3df1
Merge branch 'breaking-114' into filter-pipeline 2019-07-17 14:55:04 +10:00
MattBDev
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
Jesse Boyd
5d41bdb7c7
merge from breaking 2019-07-17 06:10:18 +10:00
Jesse Boyd
71a9256617
Merge branch 'breaking' into breaking-114 2019-07-17 06:08:18 +10:00
Jesse Boyd
cfbde956f4
some refactoring to pipeline classes (WIP) 2019-07-17 05:10:39 +10:00
Kenzie Togami
3b157b67c3
Move Bukkit to JUnit 5 2019-07-15 16:38:33 -07:00
Kenzie Togami
429d022752
Move Core to JUnit 5 2019-07-15 16:38:33 -07:00
Kenzie Togami
ab8397e517
Migrate Bukkit to Kotlin DSL 2019-07-12 13:49:45 -07:00
Kenzie Togami
19802e478c
Re-write root and libs to Kotlin DSL 2019-07-12 13:49:45 -07:00
NotMyFault
fee57017cd Bump dummy version to 1.14 2019-07-11 22:50:28 +02:00
Jesse Boyd
cf09ca7f37
delete FaweQueue 2019-07-12 01:32:14 +10:00
Jesse Boyd
4dea4f4c45
method changed 2019-07-11 20:12:18 +10:00
Jesse Boyd
3e8fd842d8
use ivy repo 2019-07-11 08:42:44 +10:00
Jesse Boyd
2c76c23bf2
don't use nms world.n 2019-07-11 08:11:37 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
Jesse Boyd
280147491d
protochunk 2019-07-11 07:52:55 +10:00
Jesse Boyd
cafd4bfece
use Locale.ROOT for uppercase as well 2019-07-10 22:26:31 +10:00
Jesse Boyd
a98a91e066
Use Locale.ROOT 2019-07-10 21:03:00 +10:00
Jesse Boyd
b32d46b08a
Use Locale.ROOT 2019-07-10 21:01:56 +10:00
Jesse Boyd
50e649acb8
update items 2019-07-10 20:58:27 +10:00
Jesse Boyd
20b7b121b1
1.14 blocks 2019-07-10 06:49:51 +10:00
MattBDev
4a40c7d99c Renaming and cleanup and a new method. 2019-07-09 15:50:13 -04:00
Jesse Boyd
6a87d2107d
fix compile 2019-07-10 04:58:53 +10:00
Jesse Boyd
19468b64d4
Use bstats for metrics 
The metrics config option will be removed in the future
 - The current value will be copied over when generating bstats config
 2019-07-09 17:46:27 +10:00
Jesse Boyd
f99d6e7478
wip on 1.14 2019-07-09 17:18:51 +10:00
wizjany
a18f26f8af Play nicer with naughty plugins. 2019-07-06 09:44:53 -04:00
MattBDev
ffc2092d93 toggles and timeouts 2019-06-30 14:56:32 -04:00
wizjany
625cbe5e3d Make //count take a mask. Also doc updates, perm fixes. 2019-06-30 00:38:17 -04:00
Jesse Boyd
0d7b4629ba
re-add 1.13 depend 2019-06-29 16:08:03 +10:00
Jesse Boyd
de52b65738
Add paper methods to AsyncWorld 2019-06-29 16:04:37 +10:00
Jesse Boyd
6a7935829b
Merge from upstream 2019-06-29 16:01:32 +10:00
Jesse Boyd
a4344fb2df
add 1.14 depend (non functional) 2019-06-29 14:06:19 +10:00
MattBDev
8dd5f0c298 Fix a compile error 2019-06-28 18:24:56 -04:00
Jesse Boyd
664a7017b6
Add NotNull annotation to adapter 2019-06-29 06:28:14 +10:00
Jesse Boyd
8b9a2ff18c
get tool from player 2019-06-29 04:27:46 +10:00
Jesse Boyd
d6280ec945
Avoid redundant check for performance critical code 2019-06-29 04:23:51 +10:00
Jesse Boyd
a2efdbc488
a1c15e1c39 2019-06-29 03:10:47 +10:00
Jesse Boyd
5a67363a78
0313320816 2019-06-29 02:24:57 +10:00
Jesse Boyd
c773a1e278
Remove FaweLocation 
it was a leftover from when WE didn't have Location
 2019-06-29 00:13:30 +10:00
Jesse Boyd
846a1b0769
6c94cca15e 2019-06-29 00:01:51 +10:00
Jesse Boyd
fecb380d44
aea5b68ced 2019-06-28 22:43:32 +10:00
MattBDev
e38541aa9b Updates to gradle files. 2019-06-26 21:34:20 -04:00
MattBDev
d0a31691e1 Small changes 2019-06-26 20:14:00 -04:00
MattBDev
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
MattBDev
57f992a524 Remove nullblock from EditSession 2019-06-23 14:05:14 -04:00
MattBDev
8c9090a21d I changed stuff. That's all I remember 2019-06-23 13:27:34 -04:00
wizjany
d763ab374c
Re-add delchunks command (#481) 
The new command now writes a json file to WorldEdit's working directory with instructions on which chunks to delete, which is read by the plugin/mod at startup and calls the ChunkDeleter.
The chunk deleter parses the json and iterates the instructions, backing up .mca files as it goes and overwriting the offset headers with 0 wherever a chunk needs to be deleted.
This allows Minecraft to reclaim the space used for that chunk, as well as forcing it to be generated from scratch next time the area is loaded.
 2019-06-22 14:20:14 -04:00
MattBDev
1e02560039 Remove BukkitMask 2019-06-21 19:58:40 -04:00
MattBDev
0313320816 As Jesse would say... * 2019-06-20 20:05:18 -04:00
wizjany
0088fe79b3 Cleanup Bukkit internal id usage. 2019-06-15 17:33:17 +10:00
Kenzie Togami
27c7d488a2 Add perf. improvments for Forge 2019-06-15 17:33:17 +10:00
Kenzie Togami
8c17aab9c5 Clean-up some misc. parts of the code 2019-06-15 17:33:17 +10:00
wizjany
dc21b4df58 This does something idk. 2019-06-15 17:33:17 +10:00
Kenzie Togami
a3a175ab8c Initial attempt at binding state IDs 2019-06-15 17:33:17 +10:00
wizjany
e1c191599c Implement item brushes and item NBT for bukkit. 
This allows usage of `/br <apply|paint> <shape> item` and the `offhand`
syntax for item parser to use NBT.
 2019-06-14 16:37:23 -04:00
wizjany
213cadf093 Import cleanup, ensure gradle uses https for deps, bump deps. 2019-06-13 09:17:00 -04:00
NotMyFault
5f037df326 Adding missing permissions 
Added some basic permissions to some basic and fawe specific commands.
Since they weren't around previously, they are true by default, however, you can now revoke/negate them.
 2019-06-13 00:48:40 +02:00
MattBDev
1f14d4652e Upstream changes, prefix changes, formatting changes, variable name changes 
I think that draining waterlogged items also works now?
 2019-06-12 17:13:53 -04:00
NotMyFault
ec001b8d3b Revert "Upstream, generics, formatting" 
This reverts commit cd88e513a8.
 2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
wizjany
efb7650d6f Fix some reload issues. 
And some unload issues.
 2019-06-11 18:02:24 -04:00
wizjany
3fd661c513 Don't attempt to check unloaded world refs. 2019-06-08 11:25:36 -04:00
MattBDev
7f3c4c4828 A lot of removals, upstream merges, and maybe more. 2019-06-07 20:58:48 -04:00
MattBDev
229182aa63 Remove CUI and other cleaning 2019-06-06 18:39:51 -04:00
MattBDev
b42553116c Removal of many prefixes and deprecation of FaweLocation 
- Removed some prefixes to help make upstream merging a bit easier.
- Replaced reflection code for titles with the regular bukkit api.
- Removed FAWELocation and FAWEPlayer where it wasn't needed.
- Deprecated FaweLocation since having it in the first place is very stupid.
- FAWEPlayer should also be deprecated soon because the majority of that code is redundant.
 2019-06-05 21:28:02 -04:00
MattBDev
6c94cca15e Selective upstream merge 
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
 2019-06-04 12:40:11 -04:00
wizjany
e3097dd0fc Use java-library to exclude some deps. 2019-06-03 23:56:34 -04:00
wizjany
3df2410254 Change chunk loading method. 
Behavior of loadChunk changed a lot for the worse in CB 1.14.
 2019-06-02 21:56:29 -04:00
wizjany
1e7c074217 Few misc command fixes. 2019-06-01 09:35:27 -04:00
wizjany
59447c6ee3
Gradle sucks. 2019-05-31 13:53:28 -04:00
wizjany
44ee1546b7
Apparently CB uses this. 2019-05-31 11:48:08 -04:00
wizjany
4e43595c99
Fix builds maybe. 2019-05-31 11:24:38 -04:00
MattBDev
aea5b68ced Upstream merges and a few code cleanups 2019-05-30 16:07:30 -04:00
wizjany
6ad274677f Don't require command for CUI init. 2019-05-29 23:15:06 -04:00
wizjany
ec3648e521 Wrap and unwrap. 
Exceptions are fun.
 2019-05-29 23:15:05 -04:00
MattBDev
a0eb7ce59e Typo Fixes and Added Annotations 2019-05-28 23:23:51 -04:00
wizjany
6962b2e7b6 Add comprehensive suggestions to many commands. 
All patterns now have suggestions, including recursive patterns.
Suggestions will suggest blocks and block states.
All masks now have suggestions, though mask intersections are not
yet supported due to issues with quotes strings.
EntityRemover and ItemFactory now also have completions, as well
as all RegistryConverters (though I am unsure how many are actually
used).

Also use paper's AsyncTabComplete event, if available.
 2019-05-28 22:55:20 -04:00
Jesse Boyd
6bc5b4a823
. 2019-05-29 06:31:22 +10:00
wizjany
871c25e1cd Initial support for 1.14.2. 2019-05-27 19:52:58 -04:00
wizjany
48fb669119 Guard against reloads breaking too much. 2019-05-25 18:11:23 -04:00
wizjany
7b47d9a945
Add /tracemask. (#474) 
Allows setting a mask used for block traces. This allows brush tools to
pass through various materials, such as water (e.g. `/tracemask #solid`
or `/tracemask !air,water`) before starting to build.
By default, a null mask is equivalent to #existing (original behavior).

https://gfycat.com/ImmaculateFrayedCockatiel
 2019-05-23 21:12:31 -04:00
MattBDev
6b0fcc8712 Removed some null checks and fixed some variable names 2019-05-22 14:40:56 -04:00
wizjany
b0777f6b06 Use DFUs for some additional data fixing. 
Legacy mapper now uses the data fixers to upgrade blocks and item types
(e.g. signs, dyes that changed names in 1.14).
The sponge schematic reader can now attempt to use the data fixers to
upgrade blocks, block entities, biomes and entities. This has been
tested with the 1.13 -> 1.14 changes. It is yet to be seen if it will
continue to work because...
The mc edit schematic reader has code for using data fixers, but it is
currently disabled as there seem to be some issues with fixing up older
block entities.
 2019-05-20 16:39:58 -04:00
wizjany
334d5cfaab The "spawner|mobType" syntax once again makes functional mob spawners. 
Also fix block parser context not being restricted.
 2019-05-18 10:16:08 -04:00
wizjany
41cfcb6d55 Use a jar for bukkit impl adapters. 
120 class files is a bit much.
 2019-05-14 18:34:53 -04:00
wizjany
931b7ee694 Update for 1.14.1 2019-05-14 00:09:21 -04:00
wizjany
f9d0d340e7 Add DFUs. Currently used by //restore. 2019-05-13 23:07:53 -04:00
wizjany
5c97418cca Fix NBT list conversion in 1.14. 2019-05-13 18:49:43 -04:00
Jesse Boyd
c797dcb194
WIP filter patterns 2019-05-12 23:32:04 +10:00
Kenzie Togami
8a3e6a12b9 Implement suggestions for Bukkit + Sponge 2019-05-05 23:06:20 -07:00
Kenzie Togami
acc0e7d09c Fix logging on Bukkit, align adapter versions 2019-05-05 23:06:20 -07:00
wizjany
ceff17c4f7 Misc fixes. 
Closes a few old youtrack issues which I don't remember because I had
like 30 tabs open, and a few other issues which I found while testing
some of those.
 2019-05-05 15:15:03 -04:00
Jesse Boyd
d603f45063
remove debug 2019-05-05 22:19:13 +10:00
Jesse Boyd
7c174beaee
Region filter 2019-05-05 03:58:26 +10:00
Jesse Boyd
4116adcfef
Some refactoring 2019-05-03 03:38:08 +10:00
Jesse Boyd
f5944fbcaf
filter set 2019-05-03 00:45:03 +10:00
Jesse Boyd
8dcc005ec1
tile/biome/entity set 2019-05-02 18:27:33 +10:00
wizjany
57c161a602 Actually initialize GameModes and WeatherTypes. 2019-05-02 00:08:19 -04:00
Kenzie Togami
13a8c480e3 Insert Locale.ROOT into all case change methods 2019-05-01 15:24:32 -07:00
Jesse Boyd
ad52e01e9f
update players 2019-05-02 05:19:25 +10:00
Jesse Boyd
4619fd2b49
Reuse get array after apply 2019-05-02 05:02:11 +10:00
Jesse Boyd
18e6c09fdd
use paper writeLock 2019-05-02 04:30:32 +10:00
Jesse Boyd
adb2c37a02
set blocks 2019-05-02 04:19:15 +10:00
Jesse Boyd
f96760b36c
block set test 2019-05-02 02:01:41 +10:00
Jesse Boyd
eec08c81ad
async chunk loading 2019-05-02 01:45:18 +10:00
Kenzie Togami
7c1764548d
Deprecate old system, still in use by WG/CB 2019-04-30 13:53:14 -07:00
Jesse Boyd
33e119ccb6
implement block get 2019-05-01 02:19:10 +10:00
dordsor21
e2c9454399
Don't print stack trace, print another few lines of debug for using paper 
Closes #133 bye bye
 2019-04-30 11:56:30 +01:00
wizjany
3c04a83852 Add nicer error when using player commands as console. 
Also fix slash counts for Bukkit.
 2019-04-29 17:39:30 -04:00