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
5,213 Commits 1 Branch 0 Tags 50 MiB
71f7103edd
Commit Graph

1943 Commits

Author SHA1 Message Date
dordsor21
287aa9dd8b
Remove bad default copy method in AbstractMask 2021-01-28 14:23:00 +00:00
dordsor21
485781f711
Merge branch 'main' of github.com:IntellectualSites/FastAsyncWorldEdit 2021-01-28 13:13:10 +00:00
dordsor21
781f39f71a
Properly define /ore arguments 
Fix #885
 2021-01-28 12:54:55 +00:00
N0tMyFaultOG
9cfcaa7605
Improve texture util if version is missing 
This could defo be done cleaner, but it works for now.
 2021-01-21 20:20:09 +01:00
N0tMyFaultOG
1c4339ce1c
Replace dead links 2021-01-20 13:56:19 +01:00
dordsor21
c218743fa8
Fix some coordinate errors 
- Fixes WorldGuard weirdness
 - Fixes #860
 2021-01-18 15:37:14 +00:00
dordsor21
798b4cdd4e
Fix #806 2021-01-15 20:16:46 +00:00
dordsor21
b450a0af80
Fix confirm for some commands that give AutoValue_CommandParametersImpl from the getgo 2021-01-14 20:08:43 +00:00
dordsor21
b18c646bce
AbstractExtentMasks should have the correct extent. 
- Fixes #843
 2021-01-14 16:54:38 +00:00
dordsor21
fa69c79160
lock when editing the chunks cache in SingletThreadQueueExtent 
- Long2ObjectLinkedOpenHashMap is not thread-safe and should not be used from multiple threads at once
 - Fixes #851
 2021-01-14 15:42:38 +00:00
dordsor21
3034419918
Send before history is safe 2021-01-14 14:48:13 +00:00
dordsor21
3136fb460b
Revert "actually delegate in AbstractDelegateExtent" 
This reverts commit 761d05ac19.
 2021-01-14 14:39:50 +00:00
dordsor21
761d05ac19
actually delegate in AbstractDelegateExtent 
fixes #843
 2021-01-14 14:38:37 +00:00
dordsor21
af34bd4e57
the material seems to hold state data for some reason. 
- This requires a more complicated fix. Reverting this change for now
 2021-01-14 13:42:37 +00:00
dordsor21
5e1289494e
Delegate to blocktype for obtaining a BlockState's material 2021-01-14 12:45:11 +00:00
dordsor21
ac73478827
Fix bad/needless code 
- Fixes #852
 2021-01-14 12:39:57 +00:00
dordsor21
fd1ed63703
Don't confirm twice every time 
- I channelled my inner Jesse on this one.
 2021-01-13 23:50:29 +00:00
dordsor21
05d7558873
Don't print stack trace of FaweExceptions from submitted chunks 
Addresses #353
 2021-01-13 20:30:22 +00:00
dordsor21
be9866ddb3
Fix a lot of FAWE-freezing properly 
- Add a "loadPrivately" method to be used when GetChunks are called to avoid synchronocity issues with super classes being used on different threads
 - Synchronise the call method so we're not attempting to call whilst also loading/updating
 2021-01-13 19:02:51 +00:00
dordsor21
e94e3b7b05
Only forcefully submit a chunk if we hold the monitor. 
- Properly ensures we don't try to submit chunks that already have a monitor (prevent the FAWE-freezing)
 - We can't detect if "no" threads hold the chunk's monitor, but equally that would also be kinda very bad practice.
 2021-01-13 18:18:25 +00:00
dordsor21
eaa9872294
Revert this for now as it had unintended consquences 2021-01-13 17:36:50 +00:00
dordsor21
97209d5680
better locking of lighting and use correct method for relight without removing first 
Fixes #847
 2021-01-13 17:24:14 +00:00
dordsor21
b066ca8349
only relight blocks that have light 2021-01-13 17:10:08 +00:00
dordsor21
b1e8c6c3ba
Synchronizing on accessing a lock is pointless. 2021-01-13 17:09:44 +00:00
dordsor21
b4d7562b87
Looks like automagical relighting (#838) 
Fixes #686
 2021-01-11 19:29:16 +00:00
dordsor21
74a2f02003
put MCEdit before sponge and query by file extension. 
Massively reduces loading time a few addon plugins that are literally only trying to get the format of a schematic
 2021-01-11 16:02:50 +00:00
dordsor21
ddb41a9669
With "queueing" enabled, FAWE may start attempting to place chunks before the operation is finished. 
This is unnacceptable for recursive operations, thus the queue should be disable in these cases
Fixes #842
 2021-01-11 15:06:55 +00:00
dordsor21
fa8660c7a9
More verbosely check for "scaled" in AffineTransform and override all required methods in BlockTransformExtent 
- fixes #462
 2021-01-11 14:21:56 +00:00
dordsor21
5903178c53
Fix rotate/flip applying in the wrong order 
- pretty cheat fix, but it reverts to legacy FAWE behaviour
 2021-01-11 13:18:24 +00:00
dordsor21
ae6a1f1be4
Correct rounding bevhaviour for Vector3 -> BlockVector3 
- fixes #512
 2021-01-10 20:49:38 +00:00
dordsor21
0b727d9760
Fix for OPs when "not in a region" 2021-01-10 18:51:07 +00:00
dordsor21
831c6f6854
fix NPE with null sourcemask on move 2021-01-10 17:36:41 +00:00
dordsor21
846443291f
allowed regions can be null 2021-01-10 17:14:40 +00:00
dordsor21
278e9d5991
Set source masks that include the editsession's allowed regions to ForwardExtentCopies 
Fixes #710
 2021-01-10 14:59:21 +00:00
dordsor21
edc7e9028b
disableQueue stops buffering, switch to enableQueue to buffer when "//move"ing 
fixes #738
 2021-01-10 13:22:47 +00:00
dordsor21
aab9958932
Fixes #221 
If WE wants to add it as well, it's up to them. I asked but wiz was hostile about it.
 2021-01-09 21:52:50 +00:00
dordsor21
6bc3dd2293
Fix wna when used internally 2021-01-09 21:27:55 +00:00
dordsor21
6f0180447f
Don't ParallelQueueExtent if the editsession is created on the main thread. 2021-01-09 17:48:57 +00:00
dordsor21
31542ed4fa
Add 3D biomes to clipboards properly 
- Also fix disk clipboard's size check, allowing for larger clipboards but with disabled biomes
 2021-01-09 16:40:41 +00:00
dordsor21
3accbb84dd
Don't talk about CP 2021-01-08 14:38:41 +00:00
dordsor21
febcf5f76f
display potentially unsafe extent message in console if no Actor 2021-01-08 14:28:09 +00:00
dordsor21
9d2c631035
**BaseBlocks are immutable 2021-01-06 21:13:32 +00:00
dordsor21
8f74186e14
*BaseBlocks are immutable 2021-01-06 18:15:59 +00:00
dordsor21
7afddcc411
Fix more NBT mutability issues 2021-01-06 18:00:40 +00:00
Aurora
1b870c5d78
Upstream/add missing y variable to generate biome (#824) 
* Add the missing y variable to generate biome

* Remove unused imports

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-01-06 16:57:59 +00:00
dordsor21
e40e86df5f
Add some more __internal__ <-> air logi 
Fixes #831
 2021-01-06 16:40:28 +00:00
dordsor21
336b90be15
Also fix CPUOptimizedClipboard 2021-01-06 13:39:25 +00:00
dordsor21
280ade9994
fix NBT in memory optimized clipboard 2021-01-06 13:29:52 +00:00
dordsor21
91de441403
No need to check WorldEdit schematics for bad entities 2021-01-05 17:21:35 +00:00
dordsor21
6db588a19f
Don't allow FAWE to "deadlock" itself when post-processing history by switching to the primary ForkJoinPool 
- With enough chunks waiting to write to history, it's possible to fill the secondary fork pool up with locked threads, and thus prevent any threads from actually writing their history.
 2021-01-05 16:42:53 +00:00
dordsor21
89cc2f9d9f
Large memory use reduction when PostProcessing history 2021-01-05 15:03:47 +00:00
dordsor21
7c174ee6b3
Return to static "sections" in CharBlocks. 
- Synchronise (lock) outside the static object
 - Reduces object creation
 2021-01-05 13:51:26 +00:00
Hannes Greule
aece0229c4
Properly repeat extents for negative coordinates (#825) 
An extent's content was returned flipped when applied for negative positions, as e.g. `Math.abs(-2) % 3` returns 2 instead of 1 (as 1 + -1 * 3 = -2)

(cherry picked from commit b0cf5dd2bf1b9bcbf1c7efff0fe25de7ee9a2090)
 2021-01-05 14:01:11 +01:00
dordsor21
bfd04e4155
Revert "~1/3 faster history writing with small caching" 
This reverts commit 836b7a9750.
 2021-01-05 00:50:26 +00:00
dordsor21
836b7a9750
~1/3 faster history writing with small caching 2021-01-04 21:25:29 +00:00
dordsor21
916c080310
5000th commit: Fix //download 2021-01-04 19:10:10 +00:00
Alexander Söderberg
3f0b9a2a92
Reorder BuildInClipboardFormat and document changed JNBT classes (#807) 
* Get rid of FastSchematicReader/Writer and document changed JNBT classes

This commit includes changes from upstream to the schematic classes
(`com.sk89q.worldedit.extent.clipboard.io`). It also documents the JNBT
classes, specifying what has been changed in FAWE. This was done in preparation
for the upcoming move to adventure-nbt.

The PlotSquared schematic handler classes will now use SpongeSchematicReader/Writer rather than FastSchematicReader/Writer.

This is yet untested and the entire branch is a W.I.P.

* Fix JNBT mutability misuse in FAWE

FAWE previously had mutable compound and list tags. The previous commit changed that, and this commit will fix misuse of the tag API.

I've tried to identify the places where mutability was assumed, but I might have missed something. This needs quite extensive testing.

This is yet another change which increases upstream compatibility in FAWE.

* Fix FAWE_Spigot_<..>#getEntity

* Fix JNBT usage in the AsyncBlockState code

* Readd FastSchematicReader/Writer and add a new schematic format (`FAST`)

* Update dead repository

* Implement missing AsyncChunk#getTileEntities

* handle entities properly and add "brokenentity" format

* Fix fast schematic reader
lazily reading means it's read in order of appearance in the inputstream so we need to read schematic version first (skip past everything) and then reset the stream

* Fix p2 FAWE

* Go back to fast schematics in P2/CompressedSchematicTag (#819)

* Fix compile

Co-authored-by: N0tMyFaultOG <mc.cache@web.de>
Co-authored-by: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Co-authored-by: Aurora <aurora@relanet.eu>
 2021-01-04 19:18:23 +01:00
dordsor21
39b0da2b99
we do want to synchronise across the chunk when loading sections 2021-01-01 17:19:14 +00:00
dordsor21
42346b429b
Don't synchronise across the entire edit for a single ChunkSection load (speed boost) 2021-01-01 16:48:17 +00:00
dordsor21
fbfe3221d7
Fix fast schematic reader/writer 
- Have both sponge and fast r/w available but default to "fast"
 - Correctly "offset" entities in the schematic, and add a legacy mode for loading old FAWE schematics with entities required.
 - Lazily reading means it's read in order of appearance in the inputstream so we need to read schematic version first (skip past everything) and then reset the stream. Fixes #740
 - Add an FAWEVersion to the metadata
 - Correctly actually return a BlockArrayClipboard when required. Fixes #454
 2021-01-01 15:01:35 +00:00
dordsor21
82f640d132
fix loading Fawe.properties 2020-12-31 17:45:07 +00:00
dordsor21
df48b7e81d
stop bottling clipboard sizes for no reason 2020-12-31 15:01:54 +00:00
dordsor21
b60d9ef6d5
Fix #787 2020-12-23 17:26:26 +00:00
dordsor21
7444c643a1
Switch to IncendoPaster "library" 2020-12-19 16:18:57 +00:00
dordsor21
e8f0c0e6ea
allow count to access "full" chunks if counting air 2020-12-17 22:05:32 +00:00
dordsor21
d379b0af9b
fix //image ane image brush 
fixes #208 and fixes #698
 2020-12-17 20:19:54 +00:00
dordsor21
94a14b03b6
fix brush size 0/1 2020-12-17 15:26:17 +00:00
dordsor21
236e3c3f6f
correctly set changes to editsession for line/spline 
fixes #696
 2020-12-17 15:02:49 +00:00
dordsor21
b57c472b86
Save the get blocks to the set chunk after history is written when post-processing 2020-12-17 14:09:54 +00:00
dordsor21
f347e0f5f5
update some utility commands 
fixes #557
 2020-12-16 19:23:41 +00:00
dordsor21
d5005a04e3
Return air if attempt to retrieve block from outside range 
Fixes #682
 2020-12-16 19:08:00 +00:00
dordsor21
aeccce24a9
fix #550 2020-12-16 17:38:15 +00:00
dordsor21
3a3bf7382d
Update block NBT to include the coordinates when saving to history 
fixes #708 and fixes #655
 2020-12-16 16:59:16 +00:00
dordsor21
e4709eb6dc
idk why I did &3 
half fixes #769
 2020-12-16 12:34:54 +00:00
dordsor21
6676d77aaa
Stop writing corrupt tile entities to schematics 
also make some stuff definitely immutable.
 2020-12-13 21:06:36 +00:00
Ivan Volkov
04ba545aa2
NullPointer fix for /schematic list (#781) 
* fixed null pointer

* fixed rest of similarly caused null pointers

* checkstyle
 2020-12-13 15:20:10 +01:00
Ivan Volkov
bfc657d3f6
Schem file limits (#773) 
* added filesize/file count checks for /schematic save

* fixed /schematic save, added filesize component to /schematic list

* improved /schematics list total filesize output
need to add automatic conversion into Mb in the future

* temporary fix for page wrap from MessageBox

* reverted changed to MessageBox

* applied FAWE's checkstyle where applicable

* crude fix for worldedit MessageBox line wrapping happening sometimes

* small visual adjustments

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

Co-authored-by: NotMyFault <mc.cache@web.de>

* fixed settings variable names

* Improved `/schematic save` success/error notifications
fixed local variable names

* removed unneeded comment

* fixed typo

* made schematics in subdirectories count towards file limit

Co-authored-by: NotMyFault <mc.cache@web.de>
 2020-12-12 23:38:44 +01:00
dordsor21
26e3e56988
Don't allow blocks as brushes 
fixes #748
 2020-12-11 17:02:54 +00:00
dordsor21
ae39f7bba3
use full chunks for distr and account for __RESERVED__ blocks 
fixes #759
 2020-12-11 16:13:09 +00:00
dordsor21
3717351d61
//setbiome should be 3D as well 2020-12-11 12:55:49 +00:00
dordsor21
ff7c972ea6
Don't try to be clever with bitwise 
Fixes #769
 2020-12-11 12:55:38 +00:00
dordsor21
be44e1449c
remove mutability in clipboards (particularly clipboard pattern) 
fixes #776
 2020-12-11 11:34:56 +00:00
Aurora
11f50f8b53
Add 1.16 tree types (#757) 2020-11-23 18:04:34 +00:00
libraryaddict
2ccc234608
Correct typo from max world height of 265 to 256 2020-11-17 21:06:03 +13:00
NotMyFault
2a5b385578
Fix missing stacker tool message 2020-11-16 13:31:49 +01:00
N0tMyFaultOG
60f3224318 Deprecate the non-Pattern methods in EditSession and fix a recursion loop 
eca310cf8f16240fabc0259f4f615cfa2d37909a

Co-Authored-By: Matthew Miller <mnmiller1@me.com>
 2020-11-13 22:42:03 +01:00
N0tMyFaultOG
5d283e1a17 Fix variable argument functions in expressions 
204ef7a708466d8739e5dcbfbc4794b57cabab0f

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 22:35:53 +01:00
N0tMyFaultOG
a32b4a1345 Fixed undo/redo not working from console/commandblock 
65fbe09c35e9affa71d0ce7c20fa5ebd0f1c8365

Co-Authored-By: Matthew Miller <mnmiller1@me.com>
 2020-11-13 22:25:47 +01:00
N0tMyFaultOG
cb088ff3e5 Remove Y limits if a region has no world 
0cb1eea55b311473c9468f608a0090b93cf5de91

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 22:10:43 +01:00
N0tMyFaultOG
197389bd32 Improve requireTag exception messages 
e15d7993ada7b26784471bdb0e9550228724d900

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 22:09:36 +01:00
N0tMyFaultOG
d44cceb1e9 Fix //chunk text and clarify the y-index in the help text. 
e0b8b4856d22bc3edc7879e291a5502b79664fc3

Co-Authored-By: wizjany <568161+wizjany@users.noreply.github.com>
 2020-11-13 22:01:12 +01:00
N0tMyFaultOG
560ab289a7 Move connections to neighbors update 
e575ffef2c790ec2eb6f3fe121d44ddca850914c

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 22:00:01 +01:00
N0tMyFaultOG
d2fbd40021 Lower-case registry arguments in converter 
8377a6bdacb4d5e0b0af2d97e097e3d946cf1a0d

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 21:56:27 +01:00
N0tMyFaultOG
0d2c4c0825 Make block positions copy on click for //size 
6925d3715a6c6992d01ab1d4b5564bb9535b6711

Co-Authored-By: Lewis B <17665267+lewisjb@users.noreply.github.com>
 2020-11-13 21:54:46 +01:00
N0tMyFaultOG
679b9d203d Add -w flag to butcher for water mobs 
beb784e0ffe1d8a8cf678912dbd6207e96afcfc8

Co-Authored-By: Lewis B <17665267+lewisjb@users.noreply.github.com>
 2020-11-13 21:46:11 +01:00
N0tMyFaultOG
9cd05bc5a1 Use /tool in /toggleeditwand description 
e320833961734c68a9d783bc9e3e77458e4c54d3

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 21:37:36 +01:00
Octavia Togami
9fbbcdb3f7 Make /toggleeditwand translatable 
56182ad0793b79fe53927c1363be92a42e3af14d

Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>
 2020-11-13 21:36:38 +01:00
N0tMyFaultOG
0ee1321546 Add missing permissions 2020-11-13 21:08:57 +01:00
Hannes Greule
6ae2275990 Register GenerationCommands 2020-11-09 11:51:36 +01:00
Hannes Greule
428f8e201d
Upstream changes (#717) 
* Perform part of the move of //fast to //perf (#1377)

This re-adds a deprecated `//fast` and moves the current logic to
`//perf`. Later `//perf` will have its syntax reworked, when Piston
finally supports sub-commands properly!

* Names via Translation (#1268)

* Deprecate BiomeRegistry, etc.

* Update some libraries, e.g. text

* Move to new translation renderer

* Revert "Deprecate BiomeRegistry, etc."

This reverts commit 59a5d6c92aec52739a8dc68ac3d23898af7593dd.

This was not a good idea for potential mod shenanigans.

* Move BiomeData#getName to BiomeRegistry, use i18n

* Use getRichName instead of getName

* Implement getRichName for NullBiomeRegistry

* Add getRichName for blocks

* Relocate net.kyori.minecraft

* Update adapters for getRichBlockName

* Add getRichName for items

* Update adapters for getRichItemName

* Update adapters JAR for merge

(cherry picked from commit cfd26253b6fb59ff6c65a0157a6780be7db4ea5a)

* Follow-up fixes for 92f877679622a27b16b9e5cd61cfec1a6545be33

* Don't send deprecation warning and improve info message

* Fix click command for perf box

(cherry picked from commit 7ee60060c31df2f8b41212b430a0875312189339)

* update R3 adapter§

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: Aurora <aurora@relanet.eu>
 2020-11-09 10:38:10 +01:00