Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-07 02:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,640 Commits 1 Branch 0 Tags
Commit Graph

4640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurora
94b1233d98
implement entities in paste -e 2020-07-03 19:52:55 +02:00
Aurora
34298f7dee
Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +02:00
Aurora
8b3479d477 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-01 19:09:05 +02:00
dordsor21
3e40f82d9a
fix error on loading for some versions 2020-07-01 15:05:38 +01:00
Aurora
9fc2387f11
Revert "start reimplementing entities" 
This reverts commit aac02ceea167a47ec8fd449c60a972af2bf67080.
 2020-07-01 14:54:11 +02:00
Aurora
6fc68da2ce
Revert "got paste -e working, still throws IllegalStateException but idc" 
This reverts commit 54008be1a2440c54583150d96deeb1eb70de4813.
 2020-07-01 14:52:50 +02:00
Aurora
b96d45e4e6
merge 1.16 2020-07-01 14:46:25 +02:00
N0tMyFaultOG
fdbef4e12c Update DummyFawe.src 2020-07-01 14:22:04 +02:00
dordsor21
efc1a888d8
update links, versions, etc 2020-07-01 13:17:19 +01:00
Hannes Greule
0bb6bc3563
Start reimplementation of simplex pattern (#520) 
* Start reimplementation of simplex pattern

* Fix suggestions

* Allow nested weighted patterns

* Add documentation and improve error handling

* Remove unnecessary code and obsolete TODOs
 2020-07-01 13:01:39 +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
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
Aurora
54008be1a2
got paste -e working, still throws IllegalStateException but idc 2020-06-26 13:52:18 +02: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
9cb24bc37d Merge remote-tracking branch 'origin/1.16' into 1.16 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitAdapter_1_16_1.java
#	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/adapter/mc1_16_1/MapChunkUtil_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/nbt/LazyCompoundTag_1_16_1.java
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java
 2020-06-25 20:29:42 -04:00
MattBDev
b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
MattBDev
7d9dd3b15f 1.16.1 Prep work 2020-06-25 19:56:10 -04:00
Aurora
aac02ceea1
start reimplementing entities 2020-06-25 22:13:34 +02:00
wizjany
6d056847c1 Update adapter jar. 
(cherry picked from commit 9e186225bd25f4805d09081f8b8ca717f61a73a4)
 2020-06-25 15:41:49 -04:00
NotMyFault
3d40336045
Fixes #500, Fixes #513 2020-06-19 09:12:58 +02: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
MattBDev
437d5a2a43 Minor image brush changes 2020-06-17 22:34:55 -04:00
IronApollo
33c3cb2f33 Revert portion of "Minor cleanup" to fix history bugs 2020-06-13 14:54:07 -04:00
IronApollo
238c56a3c6 Revert "Revert matt's changes" 
This reverts commit bfcc6184ad646f9097658021ad8431c79f9515dc.
 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
56f29a3962 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-06-12 21:46:03 -04:00
MattBDev
8105088d60 Minor cleanup 2020-06-12 21:45:49 -04:00
MattBDev
1eacb91267 Make extent public (unsafe) 2020-06-12 21:45:49 -04:00
MattBDev
7cc1994e20 Use StandardCharsets 2020-06-12 21:45:49 -04:00
MattBDev
8a5899459f Use Integer.compare() instead of if statements. 2020-06-12 21:45:49 -04:00
MattBDev
9ce4a415cb Fix errors while using the broken commands 2020-06-12 21:45:49 -04:00
MattBDev
35c2a74c52 Implement more masks 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
Octavia Togami
a23b182de5 Fix vector gen, always enable BlockMap tests 
The BlockMap tests got much faster, so there's no need to hide them
behind a flag.

(cherry picked from commit 1e2496af552891e3b43c5703bda8dc4129bbcc5d)
 2020-06-12 21:45:49 -04:00
Octavia Togami
9b7f61a2de Add import to checkstyle 
(cherry picked from commit 68be2b3443fc2e7351999bab54dd14c5e972d993)
 2020-06-12 21:45:49 -04:00
Octavia Togami
8d6db82764 Add licenses for test files 
(cherry picked from commit 300aad3530400124d88c0416afa6c5ddb715d717)
 2020-06-12 21:45:49 -04:00
Octavia Togami
518f52ea6e Test more of the math/collections, fix VectorPList 
Fixes #1291

(cherry picked from commit e0346ff53b8629a368cdbf62cbd347caecfae5fd)
 2020-06-12 21:45:49 -04:00
MattBDev
63b81b801b Implement remove on set/iter views of BlockMap 
Fixes #1354.

(cherry picked from commit 637da62e34e676015aa7fbad490cf6f033e55b89)
 2020-06-12 21:45:48 -04:00
Matthew Miller
c72f3eeb58 Bump text versions for 1.16 and action bar fixes 
(cherry picked from commit 5132c5e8a83812e2341df87e0ac239cc948a0b5f)
 2020-06-12 21:45:48 -04:00
MattBDev
9f6e0ebd5c Minor changes to NMS logic 2020-06-12 21:45:48 -04:00
MattBDev
3caf53987f Minor upstream changes 2020-06-12 21:45:48 -04:00
Luracasmus
a4802c57ae Change HTTP to HTTPS in License (#1335) 
Change HTTP to HTTPS in LICENSE.

(cherry picked from commit 2363440fb11405dc10a87147bf7c0effa08dc10c)
 2020-06-12 21:45:48 -04:00
NotMyFault
e35a1b80c9
Merge pull request #494 from aurorasmiles/updateLinks 
Fix a few links
 2020-05-30 10:48:20 +02:00
aurorasmiles
6965fe2b90
Update PlotSquaredFeature.java 2020-05-30 10:46:05 +02:00