Commit Graph
100 Commits
Author SHA1 Message Date
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 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 f9e7b7300e Minor changes 2020-02-05 16:27:50 -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
MattandGitHub 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
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 15e7c6734b Added a COMPILING.md file 2020-01-29 17:10:00 -05:00
MattBDev 566702d0eb Removed two files that were accidentally committed 2020-01-29 16:14:20 -05:00
MattBDev 2cc66b0d98 Minor upstream file changes 2020-01-29 16:13:28 -05:00
MattBDev bef69b5be3 Minor language changes 2020-01-29 16:11:52 -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 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 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 995e1261e5 Removed some redundant code 2020-01-26 16:03:10 -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
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
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 2fb1c3bdbc Remove factions due to maven repo being down 2020-01-13 21:02:31 -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 4b7dfe9774 Revert "Upgrade gradle"
This reverts commit e9289d71
2020-01-13 17:02:54 -05:00
MattBDev c4f376a2e5 Add some debug messages to aid in future coding decisions. 2020-01-13 16:54:29 -05:00
MattBDev c6f51f54a4 Revert "Upgrade gradle"
This reverts commit e9289d71
2020-01-13 16:34:55 -05:00
MattBDev e9289d718c Upgrade gradle 2020-01-12 20:25:34 -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
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
MattandGitHub 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
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
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
MattBDev 599a4dfebc Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline 2019-11-11 16:23:46 -05:00
MattBDev 630245bb9f Attempt to fix compile and other small changes 2019-11-11 16:22:03 -05:00
MattBDev 1ffe05464f Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline 2019-11-11 16:02:41 -05:00
MattBDev a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
MattBDev 3212f32b01 Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline 2019-11-02 15:59:57 -04: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
MattBDev 678a99667d Replaced an empty for loop with a while loop for better readability. 2019-10-25 13:40:56 -04:00
MattBDev d20b8ddb2a Fixed/Removed some wrong JavaDocs 2019-10-25 13:40:13 -04:00
MattBDev ca843f1b90 Minor changes for readability 2019-10-23 22:34:44 -04:00
MattBDev 1b28dcda40 Minor changes to match upstream more closely 2019-10-23 14:29:37 -04:00
MattBDev c050132737 Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline
 Conflicts:
	worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
2019-10-23 13:40:45 -04:00
MattBDev fd408c64ed Selective merge of commanding branch. 2019-10-23 12:58:36 -04:00
MattandGitHub ffbb25f1ea Fixed snapshot typo 2019-10-11 13:42:07 -04:00
MattBDev fb91456bdd Some changes to make the diff between 1.14-snapshot and commanding branch smaller. 2019-10-11 10:34:56 -04:00
MattBDev 0d794c1004 Minor annotation change. 2019-10-10 20:30:51 -04:00
MattBDev c9aa6816df Limit shouldn't ever be null. 2019-10-09 23:01:51 -04:00
MattBDev 7d60053aaf Fixed the mixup of backslash and forward slash 2019-10-09 21:51:37 -04:00
MattBDev f5ded1e50b New command fix attempt 2019-10-09 21:43:14 -04:00
MattBDev e0895ef042 New command fix attempt 2019-10-09 21:05:47 -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 67b3fa054a Allow Actors to use generation commands 2019-10-07 15:23:40 -04:00
MattBDev 11d30d2f94 Disabled FAWE commands until the plugin can actually set a block again 2019-10-07 15:09:52 -04:00
MattBDev 7ac29d6173 Merge remote-tracking branch 'origin/commanding' into commanding 2019-10-07 12:58:10 -04:00
MattBDev 3431bd0644 Remove old plugin support and migrate to Piston (non-FAWE) 2019-10-07 12:27:18 -04:00
MattBDev 78872719f3 Remove old Plugin compat. 2019-10-07 12:26:29 -04:00
MattBDev a8511d4a63 Merge remote-tracking branch 'origin/commanding' into commanding 2019-10-03 20:37:27 -04:00
MattBDev 51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
MattBDev 3ed9bdc7c9 I hope these are the last few errors 2019-10-03 20:27:19 -04:00
MattBDev f963e63f58 Attempt to fix compiling 2019-10-03 19:35:55 -04:00
MattBDev e5c1d9e6cf Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-21 21:21:15 -04:00
MattBDev 94e4fb089a Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:20:59 -04:00
MattBDev 1e08e9678e Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:14:36 -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 68c8fca672 Fixed PlotSquared compiling issues 2019-09-19 16:43:21 -04:00
MattBDev c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00