Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2026-07-15 10:55:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,674 Commits 1 Branch 0 Tags
1e80c0429a1d023a934adb8006e8874fcfbe6401
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dordsor21 33b2b634ac Allow specific P2 queue hooks to be disabled 2020-07-09 22:14:24 +01:00
dordsor21 704e76eb6d Fixes #519 
Use regex for finding colour codes
Merge styles rather than replacing and undoing our work sometimes.
 2020-07-04 14:15:49 +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
dordsor21 77204df3f0 prevent players being teleported down a single block after some edits 2020-07-03 16:56:20 +01:00
dordsor21 e2ab87cc07 lazy //deform AIOOB fix. 
Fixes #495
 2020-07-03 16:45:28 +01:00
dordsor21 f7d375c76c Lazy heightmap range fix 2020-07-03 16:29:27 +01:00
dordsor21 9e25c736a0 Add new blocks to BlockTypes 2020-07-03 14:12:43 +01:00
dordsor21 2812841481 Add -p flag to //drain to allow kelp and watergrass to be removed. 
properly fixed #464
 2020-07-03 14:01:16 +01:00
dordsor21 ea7897934f Implement ability to use -w flag on //drain 
fixes #464
 2020-07-03 13:49:17 +01: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 fae528ab64 add a couple more changes++ 
Fixes #508
 2020-07-03 13:18:09 +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
dordsor21 3e40f82d9a fix error on loading for some versions 2020-07-01 15:05:38 +01:00
dordsor21 efc1a888d8 update links, versions, etc 2020-07-01 13:17:19 +01: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
dordsor21 75153d8da8 Fix getLightOpacity 2020-05-27 17:25:03 +01:00
dordsor21andGitHub 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
dordsor21 1ff5e7761b Comment out not working and add TODO 2020-05-27 11:39:23 +01:00
dordsor21andGitHub c478e5d4a3 Add built jar location 2020-05-24 13:35:07 +01:00
dordsor21 b1b591f288 PlotSquared-Core again 2020-05-20 09:49:38 +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 2ccda85772 Fix #468 
That's not how it works
 2020-05-13 22:36:08 +01:00
dordsor21 32c30f45fe don't read __reserved__ 2020-05-12 11:00:54 +01:00
dordsor21 999b063762 Don't write reserved to schematics 2020-05-12 10:58:43 +01: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
dordsor21 8c38ac0fbc Fix #460 2020-05-11 13:38:06 +01:00
dordsor21 0dee452e1a Don't attempt to set field on null ChunkSection 2020-05-09 17:42:40 +01:00
dordsor21 cb20cef0e6 Fix loading schematic from URLs 2020-05-09 16:45:42 +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 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 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
dordsor21andGitHub 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
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
dordsor21andGitHub 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
dordsor21 a6f2cd0fb5 add // to mask and range 2020-05-02 18:34:49 +01: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
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
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
dordsor21 058990f6fe schem.intellectualsites.com (points to athion.net but cnamed) 2020-04-28 11:25:24 +01: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
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 273e8cfb8e Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-04-23 17:07:38 +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
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
dordsor21 97d73889cc Remove _ from tree type as easy fix for actually typing the correct tree type 2020-04-16 17:22:22 +01:00
dordsor21 391fdcb91a Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-03-31 10:26:36 +01: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
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
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
dordsor21 18925df124 Fix aggregatedJavadocs task 2019-07-10 13:56:34 +01:00
dordsor21 3492ac63c7 Fix aggregatedJavadocs task 2019-07-10 13:55:54 +01:00
dordsor21andGitHub 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
dordsor21 03f3b09ca9 allow input of build number 2019-04-22 15:11:43 +01:00
dordsor21andGitHub 5af506de02 Update offset to match CI 2019-04-11 12:42:10 +01:00
dordsor21 e21614caf8 Fix build number not showing in jar 2019-04-09 16:03:39 +01:00
dordsor21andGitHub 98446f32d7 Update build.gradle 2018-12-23 23:29:30 +00:00
dordsor21andGitHub 850ac10101 Merge pull request #1 from IntellectualSites/master 
h
 2018-12-23 23:29:11 +00:00
dordsor21 07c86f32ae Definitely fix build 2018-12-17 13:47:29 +00:00
dordsor21 6d40fd88e9 Add mavenLocal high up 2018-12-17 12:48:52 +00:00
dordsor21 5be8d83ce4 Add local repo 2018-12-17 11:54:09 +00:00