IronApollo
9431f7c189
Fix Vault integration + remove DummyFAWE
2020-09-14 21:18:06 -04:00
dordsor21
3d2052b0c8
Better skylight handling and fix opacity on materials
2020-09-14 18:33:35 +01:00
Matt
d00899e177
More support for 3D biomes ( #608 )
...
* More support for 3D biomes
* Resolved merge conflicts
2020-09-12 15:31:42 +02:00
Aurora
dd85fc254f
actually do the file path stuff how it's supposed to work
2020-08-30 11:45:37 +02:00
Aurora
add1d96313
Update WorldEditPlugin.java
2020-08-25 21:36:19 +02:00
Aurora
38007ed1d5
reimplement 1.16.1 support
2020-08-25 17:09:31 +02:00
MattBDev
48d9044366
Fix ItemTypes
2020-08-24 23:01:45 -04:00
MattBDev
02886b0387
Updated the WorldEdit license using find and replace
2020-08-24 21:31:47 -04:00
MattBDev
ce078aad70
Updated many exception classes
2020-08-24 21:29:34 -04:00
MattBDev
75a18b9d5b
Update BukkitImplLoader
2020-08-24 21:20:18 -04:00
MattBDev
fd8cf1ebba
Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16
2020-08-24 21:17:53 -04:00
N0tMyFaultOG
91c7390734
Fix paperlib
2020-08-24 19:53:51 +02:00
MattBDev
525da53462
Update WorldEditPlugin
2020-08-24 12:54:22 -04:00
MattBDev
fd336feb46
Upstream merge of TranslationManager and ResourceLoader
2020-08-24 12:38:30 -04:00
Aurora
07c5e65166
fix critical error
2020-08-23 18:31:33 +02:00
Aurora
7cf88aff65
fix 1.16.2 support
2020-08-23 18:28:51 +02:00
N0tMyFaultOG
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
NotMyFault
1e070b3a71
Merge pull request #518 from aurorasmiles/fixEntities
...
start reimplementing entities
2020-08-21 18:27:25 +02:00
aurorasmiles
7f0fd182bb
Add comment regarding createentitiy
2020-08-19 11:06:04 +02:00
MattBDev
79b5612311
Upstream merge of the region package and things that may have broken with it.
2020-08-18 15:48:31 -04:00
Aurora
3aa041aa7e
Merge remote-tracking branch 'upstream/1.16' into fixEntities
2020-08-16 17:01:45 +02:00
N0tMyFaultOG
bbff5c60b2
Fix metrics
2020-08-14 15:04:06 -04:00
wea_ondara
ae23794b43
fix //cut -e
2020-07-29 22:43:52 +02:00
Aurora
b411ea9af4
Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities
2020-07-26 19:03:46 +02:00
dordsor21
72269e08e6
Force sync teleports with trySetPosition
...
Fixes #542
2020-07-24 20:29:08 +01:00
MattBDev
3bc692ff11
Part 1 of upstream merge and format
2020-07-13 22:50:59 -04:00
MattBDev
2a493ac9c6
Update trySetPosition
2020-07-13 13:09:03 -04:00
Octavia Togami
4c299bc0b8
Replace setPosition with trySetPosition ( #1403 )
...
Allows cancellation information to be fed back into the ascend/descend
algorithms.
(cherry picked from commit 71e104bcb187a5313e88dda5df79059c8ffbc1fe)
2020-07-10 13:22:48 -04:00
Aurora
bc45a112ee
Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities
2020-07-03 19:54:08 +02:00
Aurora
94b1233d98
implement entities in paste -e
2020-07-03 19:52:55 +02:00
dordsor21
63bc151f6c
Hopefully allow for unloaded world to be referenced after GC.
...
Possibly fixes #504
2020-07-03 13:27:26 +01:00
Aurora
34298f7dee
Add back the getEntity Stuff since it seems to work fine
2020-07-01 19:28:38 +02:00
Aurora
9fc2387f11
Revert "start reimplementing entities"
...
This reverts commit aac02ceea1
.
2020-07-01 14:54:11 +02:00
Aurora
6fc68da2ce
Revert "got paste -e working, still throws IllegalStateException but idc"
...
This reverts commit 54008be1a2
.
2020-07-01 14:52:50 +02:00
Aurora
b96d45e4e6
merge 1.16
2020-07-01 14:46:25 +02:00
Octavia Togami
d232dc28e3
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:08:16 -04:00
Matthew Miller
4604aa5920
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-29 22:08:16 -04:00
IronApollo
68679e007e
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-29 22:08:16 -04: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
b7debce4d4
1.16.1 Prep work
2020-06-25 20:29:09 -04:00
Aurora
aac02ceea1
start reimplementing entities
2020-06-25 22:13:34 +02:00
IronApollo
238c56a3c6
Revert "Revert matt's changes"
...
This reverts commit bfcc6184ad
.
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
7cc1994e20
Use StandardCharsets
2020-06-12 21:45:49 -04:00
MattBDev
3265a9e794
Remove unused regenerate method
2020-04-28 11:16:51 -04:00
dordsor21
318e367cf0
Correctly unregister player on quit and close clipboard if using disk.
2020-03-30 17:41:41 +01:00
Marco
342da647d7
Fixing that the PlayerDropItemEvent was not fired
2020-03-29 11:53:31 +02:00
IronApollo
fa738504a8
Fix some important chunk issues
...
This commit should properly synchronize the initialization of the adapter's ibdToStateOrdinal (the char array FAWE uses to convert NMS IBlockData objects to an internal ordinal for chunk operations) so references to this array do not push incorrect characters down the line.
Potentially fixes #373
Fixes #363
Fixes #332
2020-03-26 16:08:36 -04:00
MattBDev
e648b35b95
Small code quality changes
2020-03-24 12:32:36 -04:00
Matt
8f2c3df61b
Merge pull request #359 from tsao-chi-fork/patch-1
...
use JavaPlugin.getResource() instead of JarFile.getEntry()
2020-03-21 17:32:14 -04:00
MattBDev
45ac55185f
Merge remote-tracking branch 'origin/1.15' into 1.15
2020-03-20 21:19:37 -04:00
thislooksfun
a22bcb1c2a
Fix tab completion
2020-03-19 17:23:11 -05:00
MattBDev
9f07894f28
Performance improvement based on case study by @me4502
2020-03-19 13:08:25 -04:00
ㄗㄠˋ ㄑㄧˊ
dcee873b57
fix typo
2020-03-11 13:35:37 +08:00
ㄗㄠˋ ㄑㄧˊ
39e1026400
use try-with-resources
2020-03-11 13:34:11 +08:00
ㄗㄠˋ ㄑㄧˊ
bd692917e6
remove unnecessary import
2020-03-10 12:36:16 +08:00
ㄗㄠˋ ㄑㄧˊ
fbb1078569
use JavaPlugin.getResource() instead of JarFile.getEntry()
2020-03-09 13:14:16 +08:00
MattBDev
915ab43f6e
Cleanup unused code.
2020-03-05 16:07:20 -05:00
IronApollo
c9aebf17d8
Fix #320 ; optimize adapter imports
2020-02-20 21:28:28 -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
MattBDev
5feac07bf0
Revert "Fixed commands not working"
...
This reverts commit 0b5eb903
2020-02-06 20:33:19 -05:00
MattBDev
f9e7b7300e
Minor changes
2020-02-05 16:27:50 -05:00
MattBDev
3452fd5a63
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15
2020-02-04 17:59:08 -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
6c5ac08a3c
Minor upstream changes
2020-01-31 17:44:50 -05:00
MattBDev
7236b0a026
Minor code changes
2020-01-29 17:10:59 -05:00
MattBDev
d381617f11
Revert "Using an array instead of an EnumMap isn't necessary here"
...
This reverts commit 240a817e
2020-01-29 16:03:02 -05:00
MattBDev
020c674c01
Revert migration of FaweCache to Kotlin
2020-01-29 15:01:38 -05:00
MattBDev
cb6359f010
Removed 1.13.2 support.
2020-01-27 18:54:31 -05:00
MattBDev
240a817e6e
Using an array instead of an EnumMap isn't necessary here
2020-01-26 16:45:07 -05:00
MattBDev
5d5ee7e61e
Merge remote-tracking branch 'origin/1.15' into 1.15
2020-01-26 13:10:18 -05:00
NotMyFault
93ebd21a61
Update bStats adding ID
2020-01-25 02:26:49 +01:00
MattBDev
e0f6869573
Revert "More code quality fixes"
...
This reverts commit 2d6957ce
2020-01-23 14:41:57 -05:00
MattBDev
37003ec089
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15
2020-01-22 21:15:58 -05:00
MattBDev
2d6957ce1c
More code quality fixes
2020-01-22 21:15:52 -05:00
NotMyFault
8b69767cd8
Add support for 1.15.2 and some minors
...
- Removed duplicated dependencies
- Credited important contributors
- Updated website with an actual website
- Update DummyFawe internal version to 1.15.2
2020-01-22 01:09:07 +01: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
NotMyFault
b88d7b3e60
Don't send bad packets
2020-01-10 14:26:24 +01:00
NotMyFault
3ee920f9e6
Update upstream
2020-01-08 19:36:12 +01:00
Jesse Boyd
e69ea37665
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15
2020-01-07 00:09:49 +00:00
NotMyFault
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
Jesse Boyd
88a95221a8
Make masks more stateless
2020-01-04 10:11:13 +00:00
Jesse Boyd
9efdd886c5
Fix translate args
2019-12-25 02:34:20 +00: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
8c1a379575
Hide adapter stacktrace
2019-12-19 17:01:22 +00:00
Jesse Boyd
1a64976195
load 1.15 adapter
2019-12-19 16:33:08 +00:00
MattBDev
ee94bc2ddb
More work to get 1.15 working
2019-12-11 17:47:34 -05: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
NotMyFault
a058f13d6e
Updates
2019-12-09 21:34:26 +01:00
NotMyFault
80d7b0582f
i18n upstream merge
2019-12-09 20:07:57 +01:00
Jesse Boyd
913ada31fb
Fix lighting 1.14
2019-11-24 02:26:52 +00:00
Jesse Boyd
ee54dcd809
wip generatebiome
...
will finish later
2019-11-24 01:50:05 +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
2fcd375912
potentially fix regen
2019-11-23 17:50:38 +00:00
Jesse Boyd
944c8c5521
Fixes #255 compass exceptipn
2019-11-23 05:15:48 +00:00
Jesse Boyd
97a4d2e103
Fixed regen
2019-11-23 04:45:43 +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
85382ad109
Fix permissions
2019-11-22 15:30:45 +00:00
Jesse Boyd
0c85db920c
save strings.json
2019-11-21 20:37:56 +00:00
Jesse Boyd
1341e38a90
fix compile
2019-11-21 19:56:10 +00:00
Jesse Boyd
66744bfaa4
Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge
2019-11-21 13:50:05 +00:00
Jesse Boyd
37b6c406ac
reduce diff
2019-11-21 07:57:32 +00:00
Jesse Boyd
52a502a1c6
Refactor confirmation
2019-11-21 06:50:37 +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
60759934a3
Fix some merge issues
2019-11-20 00:11:54 +00:00
Jesse Boyd
0e22d4718a
fix some merge issues
2019-11-19 22:07:30 +00:00
Jesse Boyd
5d8adbc10c
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:25:36 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge
2019-11-19 21:23:47 +00:00
Kenzie Togami
122f3b2562
8af68fc884
2019-11-19 04:43:30 +00:00
Jesse Boyd
1b07846746
some adapter refactoring
2019-11-19 04:40:40 +00:00
Matthew Miller
ded86d4872
Fixed issues brought up in review
2019-11-18 19:50:52 +10:00
Matthew Miller
96e56bdd0c
Rebase translation work for easier rebasing
2019-11-16 22:42:14 +10:00
Jesse Boyd
0b1a36bb7d
WIP VisualExtent
2019-11-16 00:20:14 +00:00
Matthew Miller
77ef0ae417
Bypass Bukkit in more situations ( #532 )
...
* Bypass Bukkit in more situations
* Use orElseGet
* Apply the same optimisation in the reverse BlockData adapter, and use lambdas instead of AIC
* Remove bukkit type checks
* Improve reliability of fallbacks
2019-11-15 12:02:46 +10: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
92b34e4fa9
Regen using EditSession
2019-11-05 08:03:00 +00:00
MattBDev
d8d7c8c53f
Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline
...
Conflicts:
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
2019-11-02 15:58:46 -04:00
MattBDev
f262271519
Message updates
2019-11-02 15:53:25 -04:00
Jesse Boyd
32d837414b
static blocktype initialization
...
instead of using hacky reflection
2019-11-02 20:35:51 +01:00
Jesse Boyd
b97b40e413
various
...
use vector.add for compatibility with vs-flattened
flush before remember
share meta objects across players
fix wg compatibility
2019-11-02 19:31:32 +01:00
Jesse Boyd
df9e9e510a
Limit processing
2019-11-02 12:13:42 +01:00
Jesse Boyd
9cf02fe654
WIP Anvil API
2019-10-31 21:04:02 +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
MattBDev
ca843f1b90
Minor changes for readability
2019-10-23 22:34:44 -04:00
Jesse Boyd
2080e9786b
commanding-pipeline diff
2019-10-23 05:23:52 +01:00
MattBDev
ccd8f2c2a9
Attempt to fix command execution.
2019-10-09 20:43:28 -04:00
MattBDev
11d30d2f94
Disabled FAWE commands until the plugin can actually set a block again
2019-10-07 15:09:52 -04:00
Kenzie Togami
0767f56711
Update to Piston 0.5.2 + Doctools/Deprecation improvements ( #523 )
...
* Update to Piston 0.5.2
* [Doctools] Fix output, be verbose about deprecations
* Improve deprecation system, doctools output
(cherry picked from commit 03c0cce53e
)
2019-10-07 12:57:47 -04:00
Kenzie Togami
03c0cce53e
Update to Piston 0.5.2 + Doctools/Deprecation improvements ( #523 )
...
* Update to Piston 0.5.2
* [Doctools] Fix output, be verbose about deprecations
* Improve deprecation system, doctools output
2019-10-05 19:06:18 +10:00
MattBDev
51a5c22677
I hope these are the last few errors
2019-10-03 20:37:19 -04:00
Kenzie Togami
8af68fc884
Initial watchdog setup. Bukkit needs adapters, everything needs testing.
2019-09-29 22:09:55 -07:00
MattBDev
24a147465d
Fixed a bunch of extends and removed slottableblockbag
2019-09-21 21:00:45 -04:00
MattBDev
8b96cdc9a5
*
...
A tribute to Jesse
2019-09-20 21:52:35 -04:00
MattBDev
c926cddbd6
Item Registry Test is now functional
2019-09-19 14:56:03 -04:00
MattBDev
3bcfcd3008
Fixed bug with wands and updated tests
2019-09-18 15:09:04 -04:00
MattBDev
4357c4b049
Fixed not being able to login.
2019-09-15 12:50:37 -04:00
MattBDev
14ed3f1d9c
Remove FawePlayer and API modifications
2019-09-13 23:05:16 -04:00
MattBDev
ae2d765533
Removed duplicated method and implemented missing ones
2019-09-03 12:17:21 -04:00
MattBDev
06a92d29b1
Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
# worldedit-libs/core/build.gradle.kts
2019-09-02 15:24:53 -04:00
MattBDev
c20f4c6b7f
Fixed a null pointer. Merged in a bunch of CLI stuff.
2019-09-02 15:22:43 -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