Commit Graph

1648 Commits

Author SHA1 Message Date
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