Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-09 13:00:05 +01:00
Code Issues Projekte Releases Wiki Aktivität
4.756 Commits 27 Branches 43 Tags 68 MiB
525da53462
Commit graph

804 Commits

Autor SHA1 Nachricht Datum
MattBDev
8d1efcfb21 Update Bukkit Interfaces to allow for compilation 2020-04-10 13:25:56 -04: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
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
dordsor21
8ffdd8a9e9 Better reading of schematic biomes. 
Use biomes in the P2 schematic handler and save as a .schem not .schematic (when it's enabled again)
 2020-03-28 10:44:51 +00:00
MattBDev
8d61f84466 Stop messing with the PlotSquared queue system 
Stops synchronized chunk loading on PlotSquared and our queue didn't really do anything better than what PlotSquared did.
 2020-03-27 12:28:09 -04:00
IronApollo
46d24fff0f Update AsyncWorld.java 2020-03-26 17:11:07 -04: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
Octavia Togami
692caeea8a Read WE version from manifest ourselves 
(cherry picked from commit 947775b5e54aa9dd89d68ee0b382939796301902)
 2020-03-23 19:31:56 -04:00
Octavia Togami
989680d159 Only add adapters to dist jar 
(cherry picked from commit 20d630ce5b217799811779d7581d5878ddc83a6d)
 2020-03-23 16:27:03 -04:00
MattBDev
89ee1cb21a Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-22 14:10:13 -04:00
MattBDev
7ef02dfbde Lighting in AyncBlock is set to 15 (at least for now) 2020-03-22 14:05:51 -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
MattBDev
a49a09a042 Added clarification for debugging message because of people thinking it is an error. 2020-03-20 20:04:31 -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
MattBDev
8a70f97445 Mask and Pattern modifications 2020-03-17 23:05:52 -04:00
MattBDev
1df5853f33 Remove unnecessary reflection 2020-03-17 22:27:41 -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
MattBDev
f63782f2f4 Fix Metrics 2020-03-10 17:31:36 -04:00
MattBDev
325d90fe39 Add stubs for new Bukkit API 2020-03-10 17:29:37 -04:00
MattBDev
14d2c9a5c3 Update BlockStateIdAccess and added a debug message 2020-03-10 17:22:53 -04: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
35538e7d61 Update Metrics.java 2020-03-05 19:01:06 -05:00
MattBDev
e32e17b15c Fixed an NullPointerException with PlotSquared 2020-03-05 18:05:33 -05:00
MattBDev
915ab43f6e Cleanup unused code. 2020-03-05 16:07:20 -05:00
Octavia Togami
f18cb1a0e1 Update gradle 2020-03-02 19:40:36 -05:00
IronApollo
d2bcc6dd35 Fix #346 , minor hook changes 
- Removed deprecated FaweMaskManager#getMask(Player)
- Removed deprecated constructor FaweMask(BlockVector3, BlockVector3)
 2020-02-26 10:17:11 -05:00
MattBDev
0918396ab6 Update bukkit gradle 2020-02-25 23:21:01 -05:00
MattBDev
c52db75976 Delete unused file 2020-02-25 18:26:04 -05:00
MattBDev
f3d19cf87d Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-23 12:49:41 -05:00
MattBDev
bfcf24b27b Small quality of code changes 2020-02-23 12:48:22 -05:00
Spottedleaf
7388d3310f Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into workaround-visiblechunks 2020-02-22 20:11:28 -08:00
Spottedleaf
f6675160f1 Also target 1.15 & 1.14 adapters 2020-02-22 20:11:23 -08:00
IronApollo
14ac3205ce Check for PlotSquared before initializing the feature class 
Some users are experiencing issues during startup with FAWE not finding PlotSquared resulting in errors.
 2020-02-22 21:02:12 -05: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
516e7e4ca6 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-02-21 00:00:11 -05:00
MattBDev
99f7b23a8c Changes to API and something else I forgot because I got distracted 2020-02-20 23:59:57 -05:00
IronApollo
c9aebf17d8 Fix #320 ; optimize adapter imports 2020-02-20 21:28:28 -05:00
MattBDev
e0bb1ce853 Revert "More minor cleanup" 
This reverts commit 38435d50
 2020-02-18 18:06:08 -05:00
MattBDev
38435d50b4 More minor cleanup 2020-02-18 18:00:39 -05:00
MattBDev
49dbd4b76b Minor changes 2020-02-14 14:29:08 -05:00
MattBDev
647665c3b0 Upstream is better than downstream 2020-02-13 20:19:45 -05:00
MattBDev
73c5e34040 Fixed AsyncWorld for real 2020-02-13 13:12:11 -05:00
MattBDev
4d4709b2f6 Removed ChunkListener8 and resolved compiling issues 2020-02-13 13:07:30 -05:00
MattBDev
e56e9e39ee Implement new World interface methods 2020-02-12 18:19:12 -05:00
MattBDev
b1c11c9597 Implement new World interface methods 2020-02-12 17:46:07 -05:00
MattBDev
0723620722 Remove remaining BlocksHub references from the code. 2020-02-12 17:09:28 -05:00
MattBDev
ceec0ec0b9 API Breaking 
Removed LoggingChangeSet since it wasn't functional and the majority of it was commented out.
Migrated a lot of RunnableVal implementations to Suppliers for improved readability and a very small speed improvement.
 2020-02-12 17:04:21 -05:00
MattBDev
6dd85e48ba Various changes 
the most notable change is that PlotSquared is being moved to the Bukkit module again to allow for future compatibility with version 5 of the plugin.
 2020-02-12 16:18:36 -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
75653087b9 Remove FAWE-Piston 
Disables a lot of previous functionality in FAWE until replacements can be made. This commit was untested and may cause major issues.
 2020-02-05 00:37:42 -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
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
6c5ac08a3c Minor upstream changes 2020-01-31 17:44:50 -05:00
wizjany
f4d03291c5 Revert "Revert "Add Vault as a softdepend to the Bukkit variant to prevent a warning from Spigot"" 
This reverts commit 376f241b7dfbe3cf221adaae340661d0c9a5c81f.

Spigot bad. Also LP bad. This really shouldn't be necessary but it's
probably safer due to all the weird shit spigot and LP do.

(cherry picked from commit 68d48148d3df6e01815d05c462ba22498734fdc4)
 2020-01-31 14:41:22 -05:00
MattBDev
7236b0a026 Minor code changes 2020-01-29 17:10:59 -05:00
MattBDev
2cc66b0d98 Minor upstream file changes 2020-01-29 16:13:28 -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
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
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
MattBDev
8078cf077a consistency changes 2020-01-26 13:01:16 -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
MattBDev
da7c21d32a Removed metrics from API 
We shouldn't have exposed it in the first place.
 2020-01-15 17:20:40 -05:00
MattBDev
2fb1c3bdbc Remove factions due to maven repo being down 2020-01-13 21:02:31 -05:00
MattBDev
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
MattBDev
b2be1ea9fb Remove duplicated methods 2020-01-10 19:26:26 -05:00
MattBDev
86a55b7bf0 Merge remote-tracking branch 'origin/wip' into 1.15 2020-01-10 19:22:23 -05:00
MattBDev
98d0420c08 Minor tweaks 2020-01-10 13:29:20 -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
900268633d
Fix compile 2020-01-07 00:41:41 +00: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
Jesse Boyd
5abf6ce2a5
Update Metrics.java 2020-01-07 11:07:03 +11: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
c05cdd8faa
Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-01-04 10:12:33 +00:00
Jesse Boyd
88a95221a8
Make masks more stateless 2020-01-04 10:11:13 +00:00
MattBDev
05760c49cd Fixed compile issues and disabled plotsquared hook 2020-01-03 16:05:25 -05:00
MattBDev
f3e0109be2 A lot of small changes 2020-01-03 15:38:30 -05:00
NotMyFault
3fb5ac6be8 Rename debugpaste value names 2020-01-03 14:48:44 +01:00
Jesse Boyd
9efdd886c5
Fix translate args 2019-12-25 02:34:20 +00: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
8c1a379575
Hide adapter stacktrace 2019-12-19 17:01:22 +00:00
Jesse Boyd
5d039c0e2b
Update plugin.yml 2019-12-19 16:51:54 +00:00
Jesse Boyd
1a64976195
load 1.15 adapter 2019-12-19 16:33:08 +00:00
Jesse Boyd
6a49b71cf2
Fix compile 2019-12-19 16:19:46 +00:00
Jesse Boyd
ea5f7a77be
Merge branch 'merge' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into merge 2019-12-16 09:08:28 +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
053b1a20d6 More 1.15 wip 2019-12-11 14:45:27 +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
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
21d736cd1d
Merge pull request #275 from IntellectualSites/dependency-cleanup 
Cleanup outdated/eol dependencies
 2019-12-03 11:40:52 +11:00
NotMyFault
0f1715ea9f Revert "Merge pull request #274 from IntellectualSites/api" 
This reverts commit 79d9bda912, reversing
changes made to 0fcac39592.
 2019-11-29 14:28:06 +01:00
Jesse Boyd
a36778794b
fix paste tile npe 2019-11-29 02:56:07 +00:00
Jesse Boyd
79d9bda912
Merge pull request #274 from IntellectualSites/api 
Generate maven artifacts
 2019-11-29 13:49:03 +11:00
NotMyFault
0fcac39592 Add more information to plugin.yml 2019-11-28 16:58:03 +01:00
NotMyFault
32880e520b Remove Regios - Outdated since CB 1.6.2 2019-11-28 16:34:53 +01:00
NotMyFault
1b2710f823 Remove ASkyBlock 
ASkyBlock does only exist up to 1.12 and won't be continued to higher versions.
 2019-11-27 23:50:32 +01:00
NotMyFault
38bdb929f4 Generate maven artifacts 
I'm not a kotlin dsl expert, but that seems to work.
 2019-11-27 23:33:42 +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
174b3ec573
Delete worldedit-adapters.jar 2019-11-24 11:58:33 +11: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
444aa0dda7
adapter jar ? 
It doesn't have a maven repo, so idk?
Might be worth making one, or using a url for the dependency
 2019-11-20 03:54:34 +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
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