Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,922 Commits 1 Branch 0 Tags 50 MiB
2a5b385578
Commit Graph

1862 Commits

Author SHA1 Message Date
NotMyFault
44c5ab164c
Remove whitespace 
Regarding fc537b92e0
 2020-05-12 11:11:24 +02:00
MattBDev
0848e68b9f Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-05-11 17:46:55 -04:00
MattBDev
7c35477b8c Remove Empcraft messages 2020-05-11 17:46:41 -04:00
NotMyFault
74f9b37a39
Fix missing space 2020-05-11 18:47:14 +02:00
dordsor21
be58cd42ac Add option to disable ticking existing blocks when not fastmode 2020-05-11 16:09:31 +01:00
dordsor21
0b30ca9dcc Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-05-11 15:36:56 +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
NotMyFault
31da111e1e
Fix anvil translation string 2020-05-11 15:07:47 +02:00
dordsor21
8c38ac0fbc Fix #460 2020-05-11 13:38:06 +01:00
NotMyFault
4f2b0e6f4e
Fix missing space 2020-05-09 21:08:14 +02:00
NotMyFault
73f8f1a0a7
Fix wrong translation key 2020-05-09 20:58:47 +02:00
dordsor21
cb20cef0e6 Fix loading schematic from URLs 2020-05-09 16:45:42 +01:00
dordsor21
42d7419b4b Fixes #402 
- Similar to previous commit. If the chunksection was empty, then __reserved__ was parsed to the clipboard, and then not correctly identified as air
- Now assume all __reserved__ is air when writing to clipboards
 2020-05-09 13:56:41 +01:00
dordsor21
ffa25b1d9a Fixes #452 
- ChunkSections containing only air are technically null according to NMS Chunks
- Therefore if we're replacing air, we should ignore the result of get.hasSection(layer) by using "full = true" as it returns false if the chunksection is only air
- We also then need to ensure that the masks correctly identify that the block is "air"
 2020-05-09 13:39:41 +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
dordsor21
a2b0a5e622 Fix offset mask (< and >) 2020-05-07 19:38:42 +01:00
IronApollo
8b1a0bbc34 Fix #417 
This commit aims to fix existing issues regarding the "0/-1 blocks affected" bug. Introducing the new LinkedFilter class allows us to use multiple filters for single-filter operations, e.g. applying a pattern to blocks while also counting the amount of blocks applied to. SetFilter.java was also removed due to not being used.
 2020-05-07 12:29:18 -04:00
dordsor21
afba834b83 Don't commit murder to console or log files 2020-05-06 20:55:30 +01:00
dordsor21
0c539b4e84 Fix replace patterns 
Fixes #445 #440 #372
 2020-05-06 15:50:57 +01:00
dordsor21
3abf964620 Better logic for selecting schematic format. 
- You had to specifically use //schem load <schematic>.schematic mcedit to load legacy schematics, now if you're loading .schematic it assumes you're wanting mcedit format
 - If you end up attempting to load an mcedit schematic with the sponge reader it now throws an exception.
 2020-05-05 16:16:27 +01:00
IronApollo
6dec0ab2ba Override #equals method in AbstractRegion.java 
This is an attempt to fix CPU spikes which do not reduce and continue mounting until the server reaches ~300%-500% usage. This override should allow prompt equality checks for regions based on the world, the minimum point, the maximum point, and area covered by the region.

Issues found regarding this change should be quickly reported so this can be reverted and replaced with another appropriate solution.
 2020-05-03 19:51:48 -04:00
dordsor21
a6f2cd0fb5 add // to mask and range 2020-05-02 18:34:49 +01: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
508d595b8d Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-04-29 21:30:28 +01:00
dordsor21
847d22f7d6 This seems to fix #429 
- the undo remove or add block removal adding thing.
 2020-04-29 21:30:15 +01:00
IronApollo
aae760c625 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-04-29 14:17:48 -04:00
IronApollo
8247f78e9d Override hashCode method in AbstractRegion 
This commit fixes the PlotSquared issue where running a PlotSquared command could result in intense lag on the main thread. This was mainly seen with running the /p info command on an extremely large plot.

Since #world can be null, the uniqueness of this hashCode is not the best, but since it's essentially just a collection of BlockVector3's, I don't believe this change will break anything. If it does, please let me know! Feedback on the uniqueness of this is welcomed.
 2020-04-29 14:17:05 -04: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
6faa93f3d4 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-04-29 10:58:57 -04:00
MattBDev
d9829614f2 Fixes #408 
The issue seems to be that a some upstream code was removed for likely "performance" reasons. Obviously, wrong since it broke stuff.
 2020-04-28 22:26:16 -04:00
dordsor21
058990f6fe schem.intellectualsites.com (points to athion.net but cnamed) 2020-04-28 11:25:24 +01:00
Octavia Togami
4307e3a671 Transpile using Babel 
This is pretty slow right now, but works as a proof-of-concept.
 2020-04-27 23:18:21 -04:00
Octavia Togami
4f8ac056ab Correct typo in region selector docs 
(cherry picked from commit 9a11c57846ab2e18faad4572d8f4655b617d9260)
 2020-04-27 23:15:07 -04:00
MattBDev
aeb2820d89 Add debug message to addProcessor 2020-04-27 19:17:23 -04:00
MattBDev
b13dea19c5 Add debug messages 2020-04-27 19:04:20 -04:00
MattBDev
491be025cc Minor changes to urls and todo's 2020-04-27 17:35:04 -04:00
dordsor21
004a60d145 allow parallel threads to be changed. 
- Interesting behaviour with forwardextendcopy stuff (move, stack etc) though.
 2020-04-25 11:57:59 +01:00
Octavia Togami
864d160102 Update Piston to fix bugs 
Closes #1292 via Piston fixes.

(cherry picked from commit dc56b602c0367fbd24f954de2b8be4e864add59f)
 2020-04-24 16:05:15 -04:00
Octavia Togami
3426e0103b Make the null-result case visible to the user 
Fixes #1303.

(cherry picked from commit 83438644dcdc470517f67c0d55ff4889f71cc435)
 2020-04-24 15:57:34 -04:00
wizjany
ee3a30d582 Don't suggest default namespaces. 
This just ends adding a lot of `minecraft:` to otherwise short commands.

(cherry picked from commit d2601851835201d11e5805250ecffc703d0b0cd6)
 2020-04-24 15:57:07 -04:00
chickeneer
396b03edf7 Add compatibility handlers for beds and banners for MCEdit Schematics (#561) 
* Add compatibility handlers for beds and banners

* IntTag#getValue does not return null so do not check that

(cherry picked from commit 53ac21aa8723d71040d580902cfeae551a9cabf6)
 2020-04-24 15:56:22 -04:00
MattBDev
77a2f1bc41 Remove unneeded repository 
PlotSquared 4 and PlotSquared 5 are both on the same maven repo
 2020-04-24 15:54:40 -04:00
dordsor21
820ae19dc2 Read processors in reverse order. 
- EditSessionBuilder always assigns the history processors before the limit extents, meaning the limit did not get properly flushed to history, but because spigot is notified of the changes after the processes have taken place, the correct edit was displayed to the player and placed into the world.
 - This might break other stuff...
 2020-04-23 23:46:43 +01:00
dordsor21
69bd0274dd Fix undo for stack, move 
- Most/anything using ForwardCopyExtent basically
 2020-04-23 17:07:34 +01:00
dordsor21
29b82d4e51 Remove a load of soft errors in EditSession. 2020-04-23 17:07:01 +01:00
dordsor21
c714e26f68 Reformat paste in ClipboardCommands because it was ugly 2020-04-23 17:01:17 +01: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
NotMyFault
9636f35e45
Fix typo 2020-04-21 16:43:25 +02:00
dordsor21
952aaf8b43 Fix p2 compatibility and replace empcraft.com/maven2 2020-04-21 11:39:42 +01:00
dordsor21
330fc39dde Further non-standard selection fixes as per #393 
- Fix incorrect usage of initChunk (it's run in the right place now)
 - Fix poorly implemented //sel sphere "improvements"
 2020-04-19 19:46:41 +01:00
dordsor21
b52fc46f19 Regarding #393 
- Fix CharFilterBlock not being properly created (the chunk X and Z were never set)
 - Replace BlockVector3#divide with bitshift because you can't divide down and then bitshift back up with the correct results for negative values
 2020-04-19 13:56:02 +01:00
dordsor21
7b9a64e9a6 add a bunch of // aliases for commands 2020-04-19 11:43:30 +01:00
Octavia Togami
415e91b519 Re-apply 374ad99 
Accidentally fixed the EntryMaker issue before I pulled 374ad99. Should reflect upstream now.
 2020-04-16 20:41:59 -04:00
IronApollo
8b97a11fa4 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-04-16 20:27:47 -04:00
IronApollo
e1ba16b699 Fix #403 2020-04-16 20:27:38 -04:00
Octavia Togami
ff47e6f717 Cherry-pick to fix EntryMaker issue 2020-04-16 20:26:55 -04:00
dordsor21
97d73889cc Remove _ from tree type as easy fix for actually typing the correct tree type 2020-04-16 17:22:22 +01:00
mrlasagne
cba7c21ce5
Fix special masks issue 
This fixes the issue where masks other than SimpleBlock masks (like Offset mask or negate mask) would not work.

The issue was caused by parseFromListInput() who would throw SuggestInputParseException if the input was not a valid block definition.
But as the parser was catching NoMatchException only, this was causing an error and the MaskFactory was broken.
 2020-04-13 22:34:15 +02:00
Octavia Togami
735a37ffd0 Use custom radix sort for ordering blocks (#1277) 
* Use custom radix sort for ordering blocks

* Licenses :P

* Fix ordering, add test for it

* Grant Gradle more memory (thx Fabric)

* Increase (?) / Specify memory for core tests

* Many attempts at fixing OOM

(cherry picked from commit bb013aa89b8457c4649e2546eef0aa94b9fc4020)
 2020-04-10 13:42:27 -04:00
Octavia Togami
374ad992a2 Properly close all files when dealing with archives (#1274) 
* Properly close all files when dealing with archives

* Move file utils to SafeFiles class

* Licenses

(cherry picked from commit a600266d41151eec4f2239cf90e202bb99fa3a8b)
 2020-04-10 13:38:14 -04:00
MattBDev
092bf98ea5 Odd sort-of fix for allowing //stack to be undone 2020-04-10 13:25:27 -04:00
MattBDev
5cc7a09769 Fixes #366 
That issue was actually a NoSuchElementException.
 2020-04-02 15:51:55 -04:00
MattBDev
dded68e071 Add missing code to SpongeSchematicReader 2020-04-02 15:49:45 -04:00
MattBDev
b2752a511a Add logging messages for CPU checking. 2020-04-01 13:10:25 -04:00
MattBDev
e223f77825 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-04-01 13:09:15 -04:00
MattBDev
dbd3cfbef6 Add logging messages for CPU checking. 2020-04-01 13:08:16 -04:00
IronApollo
755ea09797 Fix #390 
Turns out the FilterBlock's getOrdinal value is from the "get", and does not share the same reference as setOrdinal, whose value is from the "set", would modify.

Because of this, even if #getOrdinal returns 0, we still must update the set with 0 by #setOrdinal.
 2020-04-01 00:26:11 -04:00
IronApollo
110347214e Update SingleThreadQueueExtent.java 2020-03-31 20:29:03 -04:00
MattBDev
56395534fa Remove useless messages 2020-03-31 19:28:21 -04:00
wizjany
2ea85ab004 Make //size text color consistent. 
(cherry picked from commit eb8fcdcd5b797a7ec1db0c53c3602f79d4f971bf)
 2020-03-31 00:33:43 -04:00
dordsor21
318e367cf0 Correctly unregister player on quit and close clipboard if using disk. 2020-03-30 17:41:41 +01:00
dordsor21
3cd30ebbff Fix DiskOptimisedClipboard not closing 2020-03-30 17:00:41 +01:00
dordsor21
76efbed4b2 Fix rotation breaking NBT data: 
- Don't only copy NBT over if the original block had a Rot tag
 2020-03-30 16:01:50 +01:00
dordsor21
3d8303a227 Remove my debug 2020-03-30 12:13:39 +01:00
dordsor21
5197ed04ec Fix MemoryOptimizedClipboard 2020-03-30 12:06:15 +01:00
dordsor21
45e0d37889 Clipboards paste biomes 2020-03-30 10:27:03 +01:00
Josh Knight
5f3d6cdc79
Merge pull request #384 from xCykrix/1.15 
Correct JVM Architecture Detection
 2020-03-29 19:33:37 -04:00
Samuel J Voeller
63d594a069
Fix #355 2020-03-29 17:47:32 -05:00
Marco
1d562c7cc3 Fixing wrong translation keys 2020-03-29 12:41:10 +02:00
IronApollo
8c7d4c0cc5 Fix #377 
- Added comments to help explain some of the logic of the Region/CuboidRegion filtering
 2020-03-28 20:51:53 -04: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
6275e9298e Modify Tests 2020-03-27 19:09:26 -04:00
MattBDev
9c3fea6567 Remove poorly implemented biomes in MCEdit schematics 2020-03-27 19:09:01 -04:00
MattBDev
62165250ce Remove FAWE language option in config 2020-03-27 19:08:32 -04:00
MattBDev
7db61be075 Started stripping apart EditSessionBuilder 2020-03-26 22:26:11 -04:00
MattBDev
e648b35b95 Small code quality changes 2020-03-24 12:32:36 -04:00
MattBDev
1577ef61d4 Upstream merge 2020-03-23 20:59:56 -04:00
MattBDev
b2e3d40be2 Rename uploadAnonymous to upload 2020-03-23 20:48:58 -04:00
MattBDev
e7df3177cc Upstream merge 2020-03-23 20:47:30 -04:00
Octavia Togami
692caeea8a Read WE version from manifest ourselves 
(cherry picked from commit 947775b5e54aa9dd89d68ee0b382939796301902)
 2020-03-23 19:31:56 -04:00
MattBDev
752a2624f8 Added warnings in DiskOptimizedClipboard to help resolve non-closed file issue 2020-03-23 18:45:23 -04:00
MattBDev
221500e7db Remove assetpacks 2020-03-23 18:38:07 -04:00
wizjany
dabba81902 Allow expand to be used by console. (#1264) 
* Allow expand to be used by console.

Also fix direction converter requiring a player.

* Revert exception.

(cherry picked from commit b4d2db3dee01d6af4f49d6ee1ea015dbd685839c)
 2020-03-23 16:47:04 -04:00
MattBDev
1fd4d7c27e Update draw.js 2020-03-22 15:46:02 -04:00
MattBDev
ae57dd5d61 fixed compile errors 2020-03-20 21:39:40 -04:00
MattBDev
45ac55185f Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-20 21:19:37 -04:00
MattBDev
2f8c4ab6f2 Update to debugpaste command 2020-03-20 21:12:11 -04:00
MattBDev
91f0e03ab4 Update links in settings 2020-03-20 20:06:27 -04:00
Matt
13b4d5e88d
Merge pull request #368 from thislooksfun/feature/fix-tab-completion 
Fix tab completion
 2020-03-19 20:14:07 -04:00
thislooksfun
64cae57319
Fix clamping issue 2020-03-19 18:14:55 -05: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
2e1c0c83f5 Minor adjustments to masks 2020-03-18 13:33:09 -04:00
MattBDev
2f8c2666df Removed LightingExtent and organized some classes. 2020-03-18 12:58:18 -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
MattBDev
ecedc1ff12 New masks 2020-03-17 22:23:03 -04:00
MattBDev
85b65669bd Update some incorrect code missing from last commit 2020-03-11 18:43:21 -04:00
MattBDev
6f9babe55e Remove metrics from settings file 2020-03-10 17:32:28 -04:00
MattBDev
77dfdf111a Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-10 17:23:34 -04:00
MattBDev
14d2c9a5c3 Update BlockStateIdAccess and added a debug message 2020-03-10 17:22:53 -04:00
NotMyFault
0a0b41bf0b Update discord links 2020-03-10 00:06:26 +01:00
MattBDev
ef6a5fd442 Code removal in EditSessionBuilder 2020-03-05 19:01:29 -05:00
MattBDev
c1fe16b0e9 Generics improvements 2020-03-05 16:43:26 -05:00
MattBDev
50ceb4d715 More cleanup 2020-03-05 16:10:38 -05:00
MattBDev
58eae73040 Grammar fix 2020-03-05 16:10:17 -05:00
MattBDev
915ab43f6e Cleanup unused code. 2020-03-05 16:07:20 -05:00
MattBDev
417cbd585f Remove unused setting 2020-03-04 22:50:05 -05:00
MattBDev
8eab3d098c Close at least one of the streams in IBlocks.java 2020-03-04 00:52:42 -05:00
MattBDev
b818c03f84 Various minor changes 2020-03-03 23:21:10 -05:00
MattBDev
e2d7a5918d Remove PE/PC remapping 2020-03-03 17:03:47 -05:00
MattBDev
5de7c31a8c Update gradle 2020-03-03 15:36:21 -05:00
MattBDev
57a4c993a1 Avoid reflection in MaskTraverser if possible 2020-03-02 22:53:50 -05:00
MattBDev
dd4d405b36 Use INSTANCE instead of legacy() due to shading issues 2020-03-02 22:32:47 -05:00
MattBDev
9241e2d018 Migrate EmptyClipboard to Kotlin 2020-03-02 21:18:36 -05:00
MattBDev
0acbcdd6e5 Rename .java to .kt 2020-03-02 21:18:34 -05:00
Octavia Togami
f1fb51f748 Fix exponent parsing, remove impossible (?) case 
(cherry picked from commit 02da42f90b8a912047c00479df789563853cfeee)
 2020-03-02 19:18:00 -05:00
Octavia Togami
57154224dc Cover even more cases 
(cherry picked from commit b8130eb5dd3a242742cb549f8160a942d9157471)
 2020-03-02 19:17:52 -05:00
Octavia Togami
0e4a206f72 Cover many more ops 
(cherry picked from commit 3dbaae79cd4aa37724fb8969bbf595180e152f3e)
 2020-03-02 19:17:45 -05:00
Octavia Togami
a464bde43b Fix not operator 
(cherry picked from commit 00c7d3a157d8d859ede501d71282e82fba40e37b)
 2020-03-02 19:17:43 -05:00
Octavia Togami
e20765beef Fix pre- and post- ops 
(cherry picked from commit 0f787a89b8f2b0f29e0e4a2327224a3b0d050171)
 2020-03-02 19:17:41 -05:00
Octavia Togami
6d9f30e6a6 Remove non-valued return 
(cherry picked from commit 42e515f43523ffbfe0b28c2f3f5c342e4d4b1c1d)
 2020-03-02 19:17:33 -05:00
Octavia Togami
8c385b0593 Extract common simple test case method 
(cherry picked from commit 910c89be65501e8f6bcb823e819a0a16073db60a)
 2020-03-02 19:17:24 -05:00
Octavia Togami
5b4b5de761 Fix bug introduced in return-handling refactor 
(cherry picked from commit f8be17d362e51ff9f56f3e76e6776f9012c168f5)
 2020-03-02 19:17:03 -05:00
Octavia Togami
eb950bd75e Add more expression test cases, fix bugs 
Also added a few more comments + reorganized exceptions that are
invoke-internal.

(cherry picked from commit cbd686548fd62248fabbaab551a6875a14170957)
 2020-03-02 19:16:23 -05:00
Octavia Togami
cd1948648c Make testEvaluate more compact 
(cherry picked from commit b9ba337f38205c79ae70e689d2a6db60f90acc9d)
 2020-03-02 19:15:00 -05:00
Octavia Togami
8d065d767d Fix bug introduced in return-handling refactor 
(cherry picked from commit f8be17d362e51ff9f56f3e76e6776f9012c168f5)
 2020-03-02 19:12:11 -05:00
Octavia Togami
eae2c00008 Add more expression test cases, fix bugs 
Also added a few more comments + reorganized exceptions that are
invoke-internal.

(cherry picked from commit cbd686548fd62248fabbaab551a6875a14170957)
 2020-03-02 19:11:51 -05:00
Octavia Togami
e8bc0c0e1f Expression Goodie Bag (#553) 
* Remove async expression eval. Implement timeout inline

* Remove static state from expr functions

* Remove now-unused TL stack

* Rework some expr handles

(cherry picked from commit 6bc1d4647cc6892ae4dca9fc0e2d239777903c38)
 2020-03-02 19:09:33 -05:00
Octavia Togami
88a5806b0f Drop a bunch of static method imports 
(cherry picked from commit 0e37196036b61f485ff8678ef85967080c0811a5)
 2020-03-02 19:09:26 -05:00
MattBDev
de1bd22f85 Expression changes 2020-03-02 19:08:04 -05:00
MattBDev
2b29266db2 Catch IOException on report command 2020-03-02 17:49:51 -05:00
MattBDev
95b4ce59a1 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-03-02 17:43:32 -05:00
MattBDev
b7b11cc478 Gradle Upgrades and Clipboard Refactoring 2020-03-02 17:43:27 -05:00
Josh Knight
f3aa8c5b9a
Merge pull request #349 from BrodyBeckwith/walls 
Fix cuboid wall creation
 2020-03-02 17:06:40 -05:00
MattBDev
e1b946d0da Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-02 16:57:49 -05:00
Matt
589c59768f
Merge pull request #343 from mathiascode/openj9-13 
Add support for OpenJ9 13
 2020-03-02 10:45:18 -05:00
BrodyBeckwith
29cd844fb1
Fix cuboid wall creation 
Fixes #341
 2020-02-29 18:52:50 -05:00
BrodyBeckwith
9043692dbd
Don't attempt to set blocks below 0 and above 255 
Fixes #307
 2020-02-29 17:42:00 -05:00
Matthew Miller
c566bb8333 Replaced the "please report this" message in the legacy schematic loader 
(cherry picked from commit be30a94be5aedc9e365491372fb80d2ea98ff368)
 2020-02-27 21:44:37 -05:00
MattBDev
0bf0848758 Started refactoring Clipboards 2020-02-27 21:35:59 -05:00
MattBDev
fb45fd51fb Fixed missed schematic link change 2020-02-27 21:09:02 -05:00
MattBDev
6e7cc2d2bc Merge remote-tracking branch 'origin/1.15' into 1.15 2020-02-27 20:28:01 -05:00
MattBDev
2edc3bc344 Revert recent changes to DiskOptimizedClipboard 2020-02-27 20:26:23 -05:00
NotMyFault
df8a2c314b
Fix schematic interface 2020-02-28 00:29:45 +01:00
IronApollo
8535bc859a Fix #347 2020-02-27 14:14:01 -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
IronApollo
12431e7b7a Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-26 09:35:47 -05:00
IronApollo
de4cb586eb Fix PlotSquared hook 2020-02-26 09:35:41 -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
mathiascode
4095786bbe Add support for OpenJ9 13 2020-02-22 06:02:18 +02:00
IronApollo
3a050fba3b Fix immediate crash for some users 2020-02-21 18:26:43 -05:00
MattBDev
62cb04b8ca Remove CFI redirect and other minor changes. 2020-02-21 14:56:21 -05:00
MattBDev
4695c008b4 Fix compression library not loading. 2020-02-21 11:19:54 -05:00
MattBDev
99f7b23a8c Changes to API and something else I forgot because I got distracted 2020-02-20 23:59:57 -05:00
MattBDev
475330720e Moved initialization to declaration 2020-02-20 20:39:28 -05:00
MattBDev
798e04a644 Remove DelegateClipboard 2020-02-19 13:44:39 -05:00
MattBDev
1ed4118319 More upstream changes to clipboard 2020-02-19 13:37:19 -05:00
MattBDev
a8538b25a3 Revert "Rename .java to .kt" 
This reverts commit 175b3a93
 2020-02-18 18:06:28 -05:00
MattBDev
8e97b3b4b1 Revert "Lighting and Database changes" 
This reverts commit 39dfc244
 2020-02-18 18:06:19 -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
39dfc2444b Lighting and Database changes 2020-02-18 17:21:09 -05:00
MattBDev
175b3a93ce Rename .java to .kt 2020-02-18 17:21:06 -05:00
MattBDev
d243d02fb6 Add a debugging message 2020-02-18 14:32:44 -05:00
MattBDev
534c81f7d8 Removed redundant code and modifications to NullExtent 2020-02-18 14:27:05 -05:00
MattBDev
728b36cd8c Remove dead code and minor changes to existing code 2020-02-18 13:18:43 -05:00
MattBDev
3e718e2e0b Compile fixes 2020-02-17 17:19:14 -05:00
MattBDev
98bd93c752 Clamp Y coordinates during selection 2020-02-17 17:00:29 -05:00
MattBDev
048974dca5 Introduce Resettable interface 2020-02-16 15:14:34 -05:00
MattBDev
efbe1a737d Commented out Lighting commands 2020-02-14 14:35:11 -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
86539c1758 Fixed infinite loop causing massive CPU usage 2020-02-13 18:32:26 -05:00
MattBDev
7e7fc89e81 Added debug messages to diagnose a critical CPU usage issue 2020-02-13 18:15:45 -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
5feac07bf0 Revert "Fixed commands not working" 
This reverts commit 0b5eb903
 2020-02-06 20:33:19 -05:00
MattBDev
614f5e1c16 Minor changes 2020-02-06 16:33:31 -05:00
MattBDev
0b5eb903b6 Fixed commands not working 2020-02-06 15:34:22 -05:00
MattBDev
490e200a70 Revert "Minor EditSession changes" 
This reverts commit 5ff9b122
 2020-02-05 19:43:50 -05:00
MattBDev
5ff9b1226a Minor EditSession changes 2020-02-05 17:54:19 -05:00
MattBDev
1ee362a878 Re-added #false and #true masks 2020-02-05 17:44:33 -05:00
MattBDev
27e2b95218 Rename translation 2020-02-05 17:35:56 -05:00
MattBDev
aa04b0c326 World checks in BrushSettings don't offer any performance benefit 2020-02-05 10:40:29 -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
Griffin Kubesa
8f82a763bf
Remove debug line 2020-02-02 16:12:18 -05:00
Matt
cb1fd7400e
Remove debug line 2020-02-01 23:16:30 -05:00
MattBDev
6c5ac08a3c Minor upstream changes 2020-01-31 17:44:50 -05:00
Octavia Togami
38d5506e18 Generify BlockMap 
(cherry picked from commit 7384b6973498084f4082d7e1a805b84b13a3ba44)
 2020-01-31 14:42:38 -05:00
Octavia Togami
d5828861de Always use UTF-8 for loading translations 
(cherry picked from commit 624b3a449b5746cee84557992b9b217ac135cf50)
 2020-01-31 14:42:02 -05:00
MattBDev
336e411e10 Minor code changes 2020-01-29 17:53:34 -05:00
MattBDev
7236b0a026 Minor code changes 2020-01-29 17:10:59 -05:00
MattBDev
bef69b5be3 Minor language changes 2020-01-29 16:11:52 -05:00
MattBDev
df60e50c96 Revert more changes 2020-01-29 15:32:51 -05:00
MattBDev
020c674c01 Revert migration of FaweCache to Kotlin 2020-01-29 15:01:38 -05:00
MattBDev
cb6359f010 Removed 1.13.2 support. 2020-01-27 18:54:31 -05:00
MattBDev
995e1261e5 Removed some redundant code 2020-01-26 16:03:10 -05:00
MattBDev
8078cf077a consistency changes 2020-01-26 13:01:16 -05:00
MattBDev
e0f6869573 Revert "More code quality fixes" 
This reverts commit 2d6957ce
 2020-01-23 14:41:57 -05:00
MattBDev
2d6957ce1c More code quality fixes 2020-01-22 21:15:52 -05: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
2d5a8ce573 Cleaned up a lot of code and introduced Kotlin to the project 2020-01-14 19:44:09 -05:00
MattBDev
b8e3941bb4 Revert "Add some debug messages to aid in future coding decisions." 
This reverts commit c4f376a2
 2020-01-13 17:44:51 -05:00
MattBDev
c4f376a2e5 Add some debug messages to aid in future coding decisions. 2020-01-13 16:54:29 -05:00
MattBDev
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -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
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
d35812f098
wip history list command 2020-01-07 00:30:11 +00:00
Jesse Boyd
a84eb29d86
Merge commit 'e69ea37' 2020-01-07 00:14:25 +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
a52b645175
rename to SimpleChangeSetSummary 2020-01-07 00:09:30 +00:00
xnrand
6315f18503 Base64 is case-sensitive 
Changed Jars.java not to ignore upper/lowercase and updted the included
hashes with their correct casing. This should make hash verification
more secure.
 2020-01-06 12:31:08 +01:00
Jesse Boyd
9623c5cb3f
all hsitory types can summarize 2020-01-06 09:06:38 +00:00
Jesse Boyd
195c4a7647
wip history changes 2020-01-06 08:36:16 +00:00
Jesse Boyd
b173c85c78
Fix for history database 
fix history find y
correct purge time units
injected language is sql (@MattBDev is there a plugin or something for SQLite? I couldn't find any)
 2020-01-05 12:39:58 +00:00
Jesse Boyd
dce9e545ec Fix schem load byte/varint 2020-01-05 18:41:58 +11:00
Jesse Boyd
39b698f67d Remove SkipQueue annotation, and combine with perm condition 
it seems piston only generates one condition, idk why
 2020-01-05 17:35:19 +11:00
Jesse Boyd
27ec3cdc66 idk why we need a lazy reference for an integer here 
when null would work better
 2020-01-05 16:17:17 +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
0bf6cfad8d Debug message for arrayoutofbounds 2020-01-03 16:51:23 -05: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
MattBDev
6cb2d7cd5c Stupid Piston 2020-01-03 12:36:00 -05:00
MattBDev
dfa3f457d6 New debugging to generate less console messages. 2020-01-03 12:30:46 -05:00
MattBDev
fc4847745b Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-03 12:02:35 -05:00
MattBDev
cfb6e3bca4 Various debugging and cleaning 2020-01-03 12:02:18 -05:00
NotMyFault
cd7133b199 Fix up debugpaste spaces 2020-01-03 17:53:22 +01:00
NotMyFault
3fb5ac6be8 Rename debugpaste value names 2020-01-03 14:48:44 +01:00
Matt
a5ee0b197d
Merge pull request #298 from KasaneKona/1.15 
Add LZ4 bindings for AARCH64
 2020-01-02 16:55:15 -05:00
MattBDev
0d1e32efcb Upstream and debugging changes. 2020-01-02 16:30:44 -05:00
KasaneKona
eb94bd1773 Add LZ4 bindings for AARCH64 2019-12-28 22:44:22 +00:00
Jesse Boyd
9efdd886c5
Fix translate args 2019-12-25 02:34:20 +00:00
Jesse Boyd
50c19f5a1c
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2019-12-23 06:04:24 +00:00
Jesse Boyd
7d519ade4a
Fix region containsChunk 2019-12-23 06:04:12 +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
4a4f5bcc74
Fix #288 sphere min/max y 2019-12-21 05:20:17 +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
NotMyFault
e12b26c96c Fix wrong message 2019-12-19 19:00:29 +01:00
NotMyFault
d82a6352b0
Fixes #280 2019-12-19 18:34:14 +01:00
Jesse Boyd
2bd65f6423
Update LegacyMapper.java 2019-12-19 16:58:00 +00:00
Jesse Boyd
c9c602470f
fix indexoutofbounds 2019-12-19 16:48:14 +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
Jesse Boyd
aac30742de
Remove TranslatableComponent override 
use Caption class
 2019-12-16 09:01:41 +00:00
MattBDev
9bef8d5664 Minor changes 2019-12-11 17:46:47 -05:00
MattBDev
50856e1f85 Fix SQL Syntax in RollbackDatabase.java 2019-12-11 17:45:46 -05:00
NotMyFault
c037afaf3a Build 1.15 artifacts 2019-12-11 17:49:17 +01:00
NotMyFault
053b1a20d6 More 1.15 wip 2019-12-11 14:45:27 +01:00
NotMyFault
39b60aa742 Fix legacy id conversion 2019-12-09 22:36:52 +01:00
NotMyFault
b0208e06cd More updates 2019-12-09 21:59:51 +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
NotMyFault
c5a9436174 Update links 2019-12-09 18:08:44 +01: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
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
34afc03443
fix walls 2019-11-25 23:49:16 +00:00
Jesse Boyd
1e9f197035
Fix #263 2019-11-25 17:31:59 +00:00
Jesse Boyd
678f4eb295
Update Confirm.java 2019-11-24 04:18:53 +00:00
Jesse Boyd
00e0ac721f
Fix confirmation 2019-11-24 04:08:17 +00:00
Jesse Boyd
4f34d1b5d1
Fixes #232 dont allow negative brush radius 2019-11-24 01:30:19 +00:00
Jesse Boyd
63839bfdf6
Fixes #261 set bounds 2019-11-24 01:14:12 +00:00
Jesse Boyd
1f19b92b0b
1.13? 2019-11-24 00:57:29 +00:00
NotMyFault
35be4c7fb0
Add //image alias 2019-11-23 20:39:29 +01:00
Jesse Boyd
49d1f6fa88
Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge 2019-11-23 18:41:12 +00:00
NotMyFault
b4a3155ee7 Update translation string matching upstream 2019-11-23 19:34:03 +01:00
NotMyFault
c7acd0fdcd Add missing translation string 2019-11-23 19:26:20 +01:00
Jesse Boyd
edeb285152
Add frb alias 2019-11-23 18:12:27 +00:00
NotMyFault
206f650d7a
Fix prefix 
Test accomplished
 2019-11-23 18:23:38 +01:00
NotMyFault
5a2274b3db Fix debugpaste 2019-11-23 15:41:27 +01:00
Jesse Boyd
21ecd9dc4b
Fix confirm stack 2019-11-23 05:33:46 +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
edcaeb6cfe
conflicting arg 2019-11-22 17:11:20 +00:00
Jesse Boyd
9712aaab7d
remove unfinished testing 2019-11-22 15:37:15 +00:00