Commit Graph

190 Commits

Author SHA1 Message Date
7ef8b2f95e Create default TileEntity data where required.
Fixes #1093
Fixes #1042
2021-06-10 13:39:36 +01:00
71130025e8 Allow ^ mask to be used between blocks that may have different properties, only keeping the shared properties
Fixes #1092
2021-06-10 12:46:19 +01:00
ff728478c6 Relight using starlight engine on Tuinity & perform heightmap updates (#1023)
* Relight using starlight engine on Tuinity

* Make use of invokeExact

* Cache MethodHandle

* Address some requested changes

* Remove random *

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

* Simplify and clean up sendChunk
Hopefully, that doesn't cause any issues

* Add naive HeightmapProcessor

* Make HeightmapProcessor more efficient

* Remove heightmap code from NMSRelighter

* Recognize fluid for waterlogged blocks

* Remove config option for heightmaps as they should always be updated

* Batch relighting for Starlight

* Dirty workaround for CharBlocks blocks NPE

* Revert "Dirty workaround for CharBlocks blocks NPE"

This reverts commit 737606a7
It only caused the heightmap to be wrong again and didn't help much with the original issue

* Adapt better chunk sending on older versions

* Adapt requested changes for HeightMapType

* Relight all changed chunks, batched
Also, address some requested changes

* Avoid deadlocks

* Clean up tuinity relighter and add some comments

* Minor changes to HeightmapProcessor

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
2021-05-13 11:29:11 -04:00
1c9015531f Keep order of block properties (#1053) 2021-05-07 13:12:58 +02:00
b96cea75b8 Update Upstream
609c7b8 Scrapped Logging Framework 4 Java

Closes #997
Closes #998
Closes #999
Closes #1000
Closes #1001
Closes #1002
2021-03-29 15:29:16 +02:00
d974164204 Switch from PropertyKey enum to class (#971)
* Switch from PropertyKey enum to class

* Fix generic toArray
2021-03-14 19:38:11 +00:00
eead11f32a Fixes #265 2021-02-08 13:20:56 +01:00
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
5e1289494e Delegate to blocktype for obtaining a BlockState's material 2021-01-14 12:45:11 +00:00
6676d77aaa Stop writing corrupt tile entities to schematics
also make some stuff definitely immutable.
2020-12-13 21:06:36 +00:00
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
f5a42c63a7 Better logger support 2020-10-06 14:44:33 -04:00
96dcb95b7c Javadoc and Formatting fixes. (#619)
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
2020-10-05 13:41:41 -04:00
1d05da75d8 Regenerate list classes from MCUtils
(cherry picked from commit da4d70fab5c5e5efe242260b5d09ca273f944c55)
2020-09-03 12:46:17 +01:00
a9d37fc6e5 Added BiomeMask.java and updated minor parts of miscellaneous files 2020-08-24 22:04:56 -04:00
02886b0387 Updated the WorldEdit license using find and replace 2020-08-24 21:31:47 -04:00
6cb8352686 1.16.2
- My IJ is broke but this should work. Dunno if I got all nms changes, but we will see.
2020-08-23 17:18:29 +02:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
9e25c736a0 Add new blocks to BlockTypes 2020-07-03 14:12:43 +01:00
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
0c539b4e84 Fix replace patterns
Fixes #445 #440 #372
2020-05-06 15:50:57 +01:00
e7df3177cc Upstream merge 2020-03-23 20:47:30 -04:00
9f07894f28 Performance improvement based on case study by @me4502 2020-03-19 13:08:25 -04:00
df60e50c96 Revert more changes 2020-01-29 15:32:51 -05:00
8078cf077a consistency changes 2020-01-26 13:01:16 -05:00
88359f0215 More Kotlin 2020-01-21 14:30:13 -05:00
e69ea37665 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-07 00:09:49 +00:00
27ec3cdc66 idk why we need a lazy reference for an integer here
when null would work better
2020-01-05 16:17:17 +11:00
b292416496 Upstream and some refactoring
Note: Maybe this doesn't compile, ij is broken af smh, let's give it a try...
2020-01-04 18:34:30 +01:00
88a95221a8 Make masks more stateless 2020-01-04 10:11:13 +00:00
39faa740a2 Fix some adapter issues
regen 1.13, tile get npe, null block type values
2019-12-21 09:45:59 +00:00
c2cc4f5aeb Fix craftbook 2019-12-20 05:54:03 +00:00
c9c602470f fix indexoutofbounds 2019-12-19 16:48:14 +00:00
053b1a20d6 More 1.15 wip 2019-12-11 14:45:27 +01:00
144ea2ef34 Lazy tags + get / set tiles
Lazy tags means tiles/ents are not translated into the nms NBTBase until it is needed. Should be faster in cases where getFullBlock is called, but nbt is not always needed.
Commands like Copy and Paste, where the input/output are both nms worlds, can entirely bypass WorldEdit translating to and from the WorldEdit JNBT classes.
2019-11-20 03:40:52 +00:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
1b07846746 some adapter refactoring 2019-11-19 04:40:40 +00:00
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05:00
930dfb7f7c Various minor
thread local cleans on close
remove unnecessary loop on set
remove unnecessary get on set
clean CFI cache on generate
2019-11-03 16:59:11 +00:00
32d837414b static blocktype initialization
instead of using hacky reflection
2019-11-02 20:35:51 +01:00
df9e9e510a Limit processing 2019-11-02 12:13:42 +01:00
e1b9b9e3e8 Revert "Like this @mattbdev ?"
This reverts commit bddf92cd9b.
2019-10-31 00:41:36 +01:00
ef47ea74df Revert "Or this?"
This reverts commit 558144696a.
2019-10-31 00:41:15 +01:00
558144696a Or this? 2019-10-30 20:03:38 +01:00
bddf92cd9b Like this @mattbdev ? 2019-10-30 20:01:18 +01:00
2080e9786b commanding-pipeline diff 2019-10-23 05:23:52 +01:00
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00
16e24a2400 Created an Item Registry Test (non-functional) 2019-09-19 11:30:22 -04:00