Commit Graph

521 Commits

Author SHA1 Message Date
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
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
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