MattBDev
5fb18259d5
Merge remote-tracking branch 'origin/1.15' into 1.15
2020-04-30 16:27:08 -04:00
MattBDev
ef3642d521
Small spring cleaning
...
I changed really small bits and pieces of code. If you have questions just comment and I'll answer them.
2020-04-30 16:26:52 -04: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
Pierre Grimaud
f9a40599fb
Fix typos
2020-04-29 19:36:34 +02: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
MattBDev
600a1a5daa
Implement previously unsupported methods in DelegateLock
2020-04-29 11:29:02 -04:00
Alexander Söderberg
c478dbd249
Backport changes
2020-04-21 23:58:14 +02:00
Alexander Söderberg
8a19c4c38c
Don't mark the chunk as dirty.
2020-04-21 15:40:53 +02:00
Alexander Söderberg
2c85ff1673
Properly remove tile entities in BukkitGetBlocks_1_15_2
2020-04-21 15:23:23 +02:00
IronApollo
16df4abd18
Reflection field name changes
...
Old ones were outdated. Brush visualization is still WIP and can result in client being kicked from the server for bad packets.
2020-04-01 00:20:25 -04:00
MattBDev
6e1cb4cfbc
Remove more useless messages
2020-03-31 19:39:37 -04:00
dordsor21
a6a4400317
Port fixed for #389 from 1.15.2 adapter to other adapters.
2020-03-31 10:26:23 +01:00
MattBDev
a49a09a042
Added clarification for debugging message because of people thinking it is an error.
2020-03-20 20:04:31 -04:00
MattBDev
1df5853f33
Remove unnecessary reflection
2020-03-17 22:27:41 -04:00
MattBDev
14d2c9a5c3
Update BlockStateIdAccess and added a debug message
2020-03-10 17:22:53 -04:00
MattBDev
c52db75976
Delete unused file
2020-02-25 18:26:04 -05:00
Spottedleaf
f6675160f1
Also target 1.15 & 1.14 adapters
2020-02-22 20:11:23 -08:00
Spottedleaf
0d18b15393
Workaround for replacing PlayerChunkMap#visibleChunks field
...
I run a fork of paper which replaces the visibleChunks and updatingChunks
field for gc performance reasons - visibleChunks is updated via
cloning updatingChunks, and at high chunk counts this causes gc issues
due to the humongous allocation. Unfortunately the only solution is to
not clone the map - which is why the field is removed.
Instead of BukkitAdapter#getPlayerChunk using the visibleChunks field,
it now uses a MethodHandle for PlayerChunkMap#getVisibleChunk. This method is
present on spigot & paper (only protected on spigot - which is why reflection is required),
and I preserve the same thread-safety it provides in my fork - so this solution
will not break compatibility with craftbukkit, spigot, and paper.
2020-02-22 07:07:40 -08:00
MattBDev
62cb04b8ca
Remove CFI redirect and other minor changes.
2020-02-21 14:56:21 -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
IronApollo
4f3db6f3da
Attempted fix for #329
...
Removing this code seemed to fix the issue while not breaking general editing abilities. Needs testing to determine any unintended side effects!
2020-02-01 20:28:48 -05:00
IronApollo
83bb3966ca
Update adapter to 1.15.2
...
Adapter updated to 1.15.2, mostly a clone of 1.15 / 1.15.1's adapter. I encountered no issues from this, but the field names for our reflections may need to be double-checked for accuracy in this Minecraft version.
2020-02-01 20:11:02 -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
e0f6869573
Revert "More code quality fixes"
...
This reverts commit 2d6957ce
2020-01-23 14:41:57 -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
f3e0109be2
A lot of small changes
2020-01-03 15:38:30 -05:00
KennyTV
8569359d8f
Fix Java 12+ compatibility
2019-12-21 21:21:25 +01:00
Jesse Boyd
39faa740a2
Fix some adapter issues
...
regen 1.13, tile get npe, null block type values
2019-12-21 09:45:59 +00:00
Jesse Boyd
c2cc4f5aeb
Fix craftbook
2019-12-20 05:54:03 +00:00
NotMyFault
f37bc9417c
Merge branch 'merge' into 1.15
2019-12-19 19:05:27 +01:00
Jesse Boyd
6a49b71cf2
Fix compile
2019-12-19 16:19:46 +00:00
Jesse Boyd
6ddeb2ebf5
Various minor
...
refactor some region dependencies
swithc masking extent to a filter (so it can be parallelized)
Some unfinished refactoring of the filters
remove piston messages from strings.json
2019-12-16 09:07:51 +00: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
NotMyFault
68144232ba
More 1.15 wip No.2
2019-12-11 17:06:05 +01:00
NotMyFault
5358c51011
1.15 (wip)
...
Adapters and nms needs updating still, alongside some other fixes and changes, but I'm too tired for that now
2019-12-11 02:11:52 +01:00
Jesse Boyd
a36778794b
fix paste tile npe
2019-11-29 02:56:07 +00:00
Jesse Boyd
913ada31fb
Fix lighting 1.14
2019-11-24 02:26:52 +00:00
Jesse Boyd
1f19b92b0b
1.13?
2019-11-24 00:57:29 +00:00
Jesse Boyd
50c9a2c2d2
Fxi regen (again)
2019-11-23 18:41:05 +00:00
Jesse Boyd
1844d4dba7
Various major
...
Add regen
Add //history [find|restore|rollback|summary|clear]
- history commands are interactable
- inspect brush info is interactable
Commands are now logged to a searchable database
Fix some cases of id/ordinal mismatch
2019-11-23 04:31:48 +00:00
Jesse Boyd
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
Jesse Boyd
1b07846746
some adapter refactoring
2019-11-19 04:40:40 +00:00
Jesse Boyd
0087a0d6ab
Various minor
...
fix undo null sections
fix cancel for certain parallel jobs
optimize schem paste
2019-11-17 22:47:56 +00:00
Jesse Boyd
329df8d33b
various minor
...
Increase target size
remove unnecessary brush sync
send chunk on biome change
2019-11-17 20:29:25 +00:00
Jesse Boyd
3f92f12e89
synchronize char blocks
2019-11-17 20:02:33 +00:00
Jesse Boyd
e661652c12
Fix setting blocks in null sections
2019-11-17 19:30:28 +00:00
Jesse Boyd
69c225c00f
Fix //vis
2019-11-17 17:22:21 +00:00
Jesse Boyd
601890fe64
Fix biome sending
2019-11-14 19:21:28 +00:00
MattBDev
a23a4e5496
misc changes.
2019-11-11 16:02:28 -05:00
Jesse Boyd
d61dac5aa5
Fix CFI generation
2019-11-08 22:30:39 +00:00
Jesse Boyd
faa63b0c35
CFI changeset
2019-11-08 05:27:04 +00:00
Jesse Boyd
82f5c4ebed
Fix compile
2019-11-07 10:28:17 +00:00
Jesse Boyd
1e16095cba
Fix palette / region iteration
2019-11-04 07:47:31 +00:00
Jesse Boyd
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
Jesse Boyd
32d837414b
static blocktype initialization
...
instead of using hacky reflection
2019-11-02 20:35:51 +01:00
Jesse Boyd
f8e1654a4e
Update BukkitGetBlocks_1_14.java
2019-11-02 18:37:17 +01:00
Jesse Boyd
df9e9e510a
Limit processing
2019-11-02 12:13:42 +01:00
Jesse Boyd
0c1fdcc498
remove broken debug
2019-11-01 22:56:07 +01:00
Jesse Boyd
9cf02fe654
WIP Anvil API
2019-10-31 21:04:02 +01:00
Jesse Boyd
c383fab2c2
cfi packet listener
2019-10-30 12:58:21 +01:00
Jesse Boyd
72951cdf23
Various
...
fake chunk packet
aliases
cfi wip
2019-10-30 12:26:52 +01:00
Jesse Boyd
8356004ec9
chunk sending / cfi
2019-10-26 14:21:49 +01:00
Jesse Boyd
938dde68b2
Don't force load
...
didn't realize this loads the chunk, I just need to delay unloading until the operation is complete
2019-10-23 16:44:36 +01:00
Jesse Boyd
2080e9786b
commanding-pipeline diff
2019-10-23 05:23:52 +01:00
MattBDev
8b96cdc9a5
*
...
A tribute to Jesse
2019-09-20 21:52:35 -04:00
Jesse Boyd
68eea925e1
update adapter and platform manager
2019-08-29 13:57:03 +01:00
Jesse Boyd
4e49d16505
fix dependencies
2019-08-26 05:45:03 +01:00
Jesse Boyd
21caf0cf94
delete some classes
2019-08-18 01:59:07 +01:00
MattBDev
46f5b12b36
Convert tabs to whitespace.
2019-07-22 16:42:40 -04:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114
2019-07-11 08:08:55 +10:00
Jesse Boyd
cafd4bfece
use Locale.ROOT for uppercase as well
2019-07-10 22:26:31 +10:00
Jesse Boyd
f99d6e7478
wip on 1.14
2019-07-09 17:18:51 +10:00
Jesse Boyd
a4344fb2df
add 1.14 depend (non functional)
2019-06-29 14:06:19 +10:00
MattBDev
8c9090a21d
I changed stuff. That's all I remember
2019-06-23 13:27:34 -04:00
MattBDev
1e02560039
Remove BukkitMask
2019-06-21 19:58:40 -04:00
MattBDev
6c94cca15e
Selective upstream merge
...
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
Jesse Boyd
f5944fbcaf
filter set
2019-05-03 00:45:03 +10:00
Jesse Boyd
33e119ccb6
implement block get
2019-05-01 02:19:10 +10:00
Jesse Boyd
274c52163b
Fix setting the same block multiple times sequencially
2019-04-17 01:12:09 +10:00
Jesse Boyd
110f782a5c
Optimize entity get (lazy nbt)
2019-04-14 00:00:38 +10:00
Jesse Boyd
f9f6aead0f
Some optimizations for 1.13
2019-04-13 16:44:23 +10:00
Jesse Boyd
2143b9b5b7
finish block registry
2019-04-05 17:51:42 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +11:00
Jesse Boyd
33f5322fda
WIP merge (i'll finish this later)
2019-04-05 01:24:47 +11:00
Jesse Boyd
8897109dc4
wip upstream merge
2019-04-04 00:25:16 +11:00
matt
29692f3fbe
Migrate to SLF4J
2019-04-02 18:21:02 -04:00
Sauilitired
4137d0a91a
Fix the tile entity deal-io only
2019-03-31 10:45:42 +02:00
Sauilitired
6dd7190fc5
Fix the tile entity deal-io only, and also took the liberty to make
...
sure that the splash file doesn't prevent building. xoxo.
2019-03-31 10:39:52 +02:00
matt
0d88a6bce2
Merging upstream changes
2019-03-26 13:27:09 -04:00
IronApollo
3236bdd78e
Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup
2019-03-25 13:42:11 -04:00
matt
456f821ce0
Revert "Make end tag singleton"
...
This reverts commit 13d2ae20
Why was this changed. I doubt it did much in terms of performance. It's better to stay as close as we can to the worldedit repo.
2019-03-22 12:51:44 -04:00
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -05:00
Matthew Miller
bc3562eb57
Few fixes for FastModeExtent.
2019-02-02 09:26:18 -05:00
IronApollo
e53535319d
Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!)
2019-01-31 10:08:58 -05:00
IronApollo
271b45f3ba
Final changes for the Vector update (probable fix for the "copying player entity" bug)
2019-01-17 05:23:47 -05:00