mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-22 17:27:38 +00:00
Feature/propagate diff and object cleanup (#1190)
* Feature/main/propagate diff annotations (#1187) * 25% done * More work * More work * 50% * More work * 75% * 100% & cleanup * Update adapters * Squish squash, applesauce commit275ba9bd84
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 17 01:10:20 2021 +0200 Update dependency com.comphenix.protocol:ProtocolLib to v4.7.0 (#1173) Co-authored-by: Renovate Bot <bot@renovateapp.com> commit9fd8984804
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 17 01:09:29 2021 +0200 Update dependency org.checkerframework:checker-qual to v3.16.0 (#1184) Co-authored-by: Renovate Bot <bot@renovateapp.com> commit861fb45e5c
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 19:07:02 2021 +0100 Fix #1075 commit420c45a29a
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 18:48:21 2021 +0100 Entity removal should be on the main thread as we're just passing through rather than doing chunk operations - Fixes #1164 - Not working: butcher/remove history commit4d4db7dcd0
Author: SirYwell <hannesgreule@outlook.de> Date: Fri Jul 16 17:52:44 2021 +0200 Make sure leaves category is loaded for heightmaps (fixes #1176) commitc98f6e4f37
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 10:44:52 2021 +0100 Do not allow generation commands to generate outside selection commit2485f5eccc
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 10:43:15 2021 +0100 EditSession needs to override some Extent methods to ensure block changes are correctly set through the various extents Fixes #1152 commitd9418ec8ae
Author: dordsor21 <dordsor21@gmail.com> Date: Fri Jul 16 09:52:44 2021 +0100 Undo part of41073bb1a0
Fixes #1178 * Update Upstream fb1fb84 Fixed typo and grammar * We don't support custom heights yet * Casing inconsistency * Address a few comments * Address comments * Don't refactor to AP classpath * Document annotation style * Refactoring & shade cleanup * Address a few comments * More work * Resolve comments not being resolved yet * Feature/main/propagate diff annotations (#1187) (#1194) * Remove beta package, fix history packages, move classes out of object package * Resolve comments not being resolved yet * Remove beta package, fix history packages, move classes out of object package Co-authored-by: NotMyFault <mc.cache@web.de> * brushes should be under brush * More refactoring - Filters/processors should be in the same place and are related to extents - Transforms are in `extent.transform` in upstream * Move history classes under history * Update adapters Co-authored-by: dordsor21 <dordsor21@gmail.com>
This commit is contained in:
parent
ad102ab7a9
commit
50ab8ad5c7
@ -5,9 +5,6 @@ Thank you for your interest in contributing to FastAsyncWorldEdit! We appreciate
|
|||||||
effort, but to make sure that the inclusion of your patch is a smooth process, we
|
effort, but to make sure that the inclusion of your patch is a smooth process, we
|
||||||
ask that you make note of the following guidelines.
|
ask that you make note of the following guidelines.
|
||||||
|
|
||||||
* **Follow the [Oracle coding conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html).**
|
|
||||||
We can't stress this enough; if your code has notable issues, it may delay
|
|
||||||
the process significantly.
|
|
||||||
* **Target Java 11 for source and compilation.** Make sure to mark methods with
|
* **Target Java 11 for source and compilation.** Make sure to mark methods with
|
||||||
` @Override` that override methods of parent classes, or that implement
|
` @Override` that override methods of parent classes, or that implement
|
||||||
methods of interfaces.
|
methods of interfaces.
|
||||||
@ -24,6 +21,8 @@ ask that you make note of the following guidelines.
|
|||||||
around ten minutes to think about what the code is doing and whether it
|
around ten minutes to think about what the code is doing and whether it
|
||||||
seems awfully roundabout. If you had to copy the same large piece of
|
seems awfully roundabout. If you had to copy the same large piece of
|
||||||
code in several places, that's bad.
|
code in several places, that's bad.
|
||||||
|
* **Annotate modified upstream (WorldEdit) code.** Doing so makes it easier to differentiate
|
||||||
|
between modifications. Take a look at the [Examples](#example) how that's been done.
|
||||||
* **Keep commit summaries under 70 characters.** For more details, place two
|
* **Keep commit summaries under 70 characters.** For more details, place two
|
||||||
new lines after the summary line and write away!
|
new lines after the summary line and write away!
|
||||||
* **Test your code.** We're not interested in broken code, for the obvious reasons.
|
* **Test your code.** We're not interested in broken code, for the obvious reasons.
|
||||||
@ -60,15 +59,33 @@ adjust past changes.
|
|||||||
Example
|
Example
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
### Code style
|
||||||
This is **GOOD:**
|
This is **GOOD:**
|
||||||
|
|
||||||
|
```java
|
||||||
if (var.func(param1, param2)) {
|
if (var.func(param1, param2)) {
|
||||||
// do things
|
// do things
|
||||||
}
|
}
|
||||||
|
```
|
||||||
|
|
||||||
This is **VERY BAD:**
|
This is **VERY BAD:**
|
||||||
|
```java
|
||||||
if(var.func( param1, param2 ))
|
if(var.func( param1, param2 ))
|
||||||
{
|
{
|
||||||
// do things
|
// do things
|
||||||
}
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Diff Annotations
|
||||||
|
```java
|
||||||
|
//FAWE start
|
||||||
|
public Region[] getCurrentRegions(FaweMaskManager.MaskType type) {
|
||||||
|
return WEManager.IMP.getMask(this, type);
|
||||||
|
}
|
||||||
|
//FAWE end
|
||||||
|
```
|
||||||
|
```java
|
||||||
|
//FAWE start - extends PassthroughExtent > implements Extent
|
||||||
|
public class EditSession extends PassthroughExtent implements AutoCloseable {
|
||||||
|
//FAWE end
|
||||||
|
```
|
||||||
|
@ -99,6 +99,8 @@ dependencies {
|
|||||||
api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")
|
api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")
|
||||||
api("org.lz4:lz4-java:1.8.0")
|
api("org.lz4:lz4-java:1.8.0")
|
||||||
api("net.jpountz:lz4-java-stream:1.0.0") { isTransitive = false }
|
api("net.jpountz:lz4-java-stream:1.0.0") { isTransitive = false }
|
||||||
|
api("com.zaxxer:SparseBitSet:1.2") { isTransitive = false }
|
||||||
|
api("org.anarres:parallelgzip:1.0.5") { isTransitive = false }
|
||||||
// Third party
|
// Third party
|
||||||
implementation("org.bstats:bstats-bukkit:2.2.1")
|
implementation("org.bstats:bstats-bukkit:2.2.1")
|
||||||
implementation("org.bstats:bstats-base:2.2.1")
|
implementation("org.bstats:bstats-base:2.2.1")
|
||||||
@ -179,7 +181,14 @@ tasks.named<ShadowJar>("shadowJar") {
|
|||||||
relocate("net.kyori", "com.fastasyncworldedit.core.adventure") {
|
relocate("net.kyori", "com.fastasyncworldedit.core.adventure") {
|
||||||
include(dependency("net.kyori:adventure-nbt:4.8.1"))
|
include(dependency("net.kyori:adventure-nbt:4.8.1"))
|
||||||
}
|
}
|
||||||
|
relocate("com.zaxxer", "com.fastasyncworldedit.core.math") {
|
||||||
|
include(dependency("com.zaxxer:SparseBitSet:1.2"))
|
||||||
}
|
}
|
||||||
|
relocate("org.anarres", "com.fastasyncworldedit.core.internal.io") {
|
||||||
|
include(dependency("org.anarres:parallelgzip:1.0.5"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
minimize()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("assemble").configure {
|
tasks.named("assemble").configure {
|
||||||
|
@ -4,9 +4,9 @@ import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
|
|||||||
import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
|
import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.IFawe;
|
import com.fastasyncworldedit.core.IFawe;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.preloader.AsyncPreloader;
|
import com.fastasyncworldedit.core.queue.implementation.preloader.AsyncPreloader;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.preloader.Preloader;
|
import com.fastasyncworldedit.core.queue.implementation.preloader.Preloader;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
|
||||||
import com.fastasyncworldedit.bukkit.adapter.BukkitQueueHandler;
|
import com.fastasyncworldedit.bukkit.adapter.BukkitQueueHandler;
|
||||||
import com.fastasyncworldedit.bukkit.adapter.NMSAdapter;
|
import com.fastasyncworldedit.bukkit.adapter.NMSAdapter;
|
||||||
import com.fastasyncworldedit.bukkit.listener.BrushListener;
|
import com.fastasyncworldedit.bukkit.listener.BrushListener;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.bukkit.adapter;
|
package com.fastasyncworldedit.bukkit.adapter;
|
||||||
|
|
||||||
import co.aikar.timings.Timings;
|
import co.aikar.timings.Timings;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
|
||||||
import com.fastasyncworldedit.bukkit.listener.ChunkListener;
|
import com.fastasyncworldedit.bukkit.listener.ChunkListener;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package com.fastasyncworldedit.bukkit.adapter;
|
package com.fastasyncworldedit.bukkit.adapter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.packet.ChunkPacket;
|
import com.fastasyncworldedit.core.queue.implementation.packet.ChunkPacket;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
|
||||||
import com.sk89q.jnbt.Tag;
|
import com.sk89q.jnbt.Tag;
|
||||||
import com.sk89q.worldedit.blocks.BaseItem;
|
import com.sk89q.worldedit.blocks.BaseItem;
|
||||||
import com.sk89q.worldedit.blocks.BaseItemStack;
|
import com.sk89q.worldedit.blocks.BaseItemStack;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.bukkit.adapter;
|
package com.fastasyncworldedit.bukkit.adapter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.packet.ChunkPacket;
|
import com.fastasyncworldedit.core.queue.implementation.packet.ChunkPacket;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
|
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package com.fastasyncworldedit.bukkit.adapter;
|
package com.fastasyncworldedit.bukkit.adapter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
|
import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
|
||||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.world.block.BlockID;
|
import com.fastasyncworldedit.core.world.block.BlockID;
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
package com.fastasyncworldedit.bukkit.adapter;
|
package com.fastasyncworldedit.bukkit.adapter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
import com.fastasyncworldedit.core.queue.IQueueChunk;
|
||||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
import com.fastasyncworldedit.core.queue.IQueueExtent;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.NMSRelighter;
|
import com.fastasyncworldedit.core.extent.processor.lighting.NMSRelighter;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.Relighter;
|
import com.fastasyncworldedit.core.extent.processor.lighting.Relighter;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.RelighterFactory;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelighterFactory;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.object.RelightMode;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
|
||||||
import com.sk89q.worldedit.world.World;
|
import com.sk89q.worldedit.world.World;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
package com.fastasyncworldedit.bukkit.adapter;
|
package com.fastasyncworldedit.bukkit.adapter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.IChunkCache;
|
import com.fastasyncworldedit.core.queue.IChunkCache;
|
||||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.SingleThreadQueueExtent;
|
import com.fastasyncworldedit.core.queue.implementation.SingleThreadQueueExtent;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.extent.Extent;
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.bukkit.filter;
|
package com.fastasyncworldedit.bukkit.filter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.regions.general.CuboidRegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.CuboidRegionFilter;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
import com.sk89q.worldedit.math.BlockVector2;
|
import com.sk89q.worldedit.math.BlockVector2;
|
||||||
import com.griefdefender.api.claim.Claim;
|
import com.griefdefender.api.claim.Claim;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.bukkit.filter;
|
package com.fastasyncworldedit.bukkit.filter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.regions.general.CuboidRegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.CuboidRegionFilter;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
import com.sk89q.worldedit.math.BlockVector2;
|
import com.sk89q.worldedit.math.BlockVector2;
|
||||||
import me.ryanhamshire.GriefPrevention.Claim;
|
import me.ryanhamshire.GriefPrevention.Claim;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.bukkit.filter;
|
package com.fastasyncworldedit.bukkit.filter;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.regions.general.CuboidRegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.CuboidRegionFilter;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
package com.fastasyncworldedit.bukkit.listener;
|
package com.fastasyncworldedit.bukkit.listener;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.MovableTool;
|
import com.fastasyncworldedit.core.command.tool.MovableTool;
|
||||||
import com.fastasyncworldedit.core.object.brush.ResettableTool;
|
import com.fastasyncworldedit.core.command.tool.ResettableTool;
|
||||||
import com.fastasyncworldedit.core.object.brush.scroll.ScrollTool;
|
import com.fastasyncworldedit.core.command.tool.scroll.ScrollTool;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitPlayer;
|
import com.sk89q.worldedit.bukkit.BukkitPlayer;
|
||||||
|
@ -2,7 +2,7 @@ package com.fastasyncworldedit.bukkit.regions;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.bukkit.filter.GriefDefenderFilter;
|
import com.fastasyncworldedit.bukkit.filter.GriefDefenderFilter;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMask;
|
import com.fastasyncworldedit.core.regions.FaweMask;
|
||||||
import com.fastasyncworldedit.core.regions.general.RegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.RegionFilter;
|
||||||
import com.flowpowered.math.vector.Vector3i;
|
import com.flowpowered.math.vector.Vector3i;
|
||||||
import com.griefdefender.api.GriefDefender;
|
import com.griefdefender.api.GriefDefender;
|
||||||
import com.griefdefender.api.claim.Claim;
|
import com.griefdefender.api.claim.Claim;
|
||||||
|
@ -2,7 +2,7 @@ package com.fastasyncworldedit.bukkit.regions;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.bukkit.filter.GriefPreventionFilter;
|
import com.fastasyncworldedit.bukkit.filter.GriefPreventionFilter;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMask;
|
import com.fastasyncworldedit.core.regions.FaweMask;
|
||||||
import com.fastasyncworldedit.core.regions.general.RegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.RegionFilter;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
package com.fastasyncworldedit.bukkit.regions;
|
package com.fastasyncworldedit.bukkit.regions;
|
||||||
|
|
||||||
import com.fastasyncworldedit.bukkit.filter.WorldGuardFilter;
|
import com.fastasyncworldedit.bukkit.filter.WorldGuardFilter;
|
||||||
import com.fastasyncworldedit.core.object.RegionWrapper;
|
import com.fastasyncworldedit.core.regions.RegionWrapper;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMask;
|
import com.fastasyncworldedit.core.regions.FaweMask;
|
||||||
import com.fastasyncworldedit.core.regions.general.RegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.RegionFilter;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.FaweAPI;
|
import com.fastasyncworldedit.core.FaweAPI;
|
||||||
import com.fastasyncworldedit.core.object.RelightMode;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
|
||||||
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
|
@ -3,7 +3,6 @@ package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
|||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.FaweAPI;
|
import com.fastasyncworldedit.core.FaweAPI;
|
||||||
import com.fastasyncworldedit.core.FaweCache;
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
import com.fastasyncworldedit.core.object.io.PGZIPOutputStream;
|
|
||||||
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
||||||
import com.fastasyncworldedit.core.util.IOUtil;
|
import com.fastasyncworldedit.core.util.IOUtil;
|
||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
@ -16,22 +15,23 @@ import com.plotsquared.core.util.SchematicHandler;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
import com.sk89q.jnbt.CompressedCompoundTag;
|
import com.fastasyncworldedit.core.jnbt.CompressedCompoundTag;
|
||||||
import com.sk89q.jnbt.NBTInputStream;
|
import com.sk89q.jnbt.NBTInputStream;
|
||||||
import com.sk89q.jnbt.NBTOutputStream;
|
import com.sk89q.jnbt.NBTOutputStream;
|
||||||
import com.sk89q.jnbt.Tag;
|
import com.sk89q.jnbt.Tag;
|
||||||
import com.sk89q.jnbt.fawe.CompressedSchematicTag;
|
import com.fastasyncworldedit.core.jnbt.CompressedSchematicTag;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
|
import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.FastSchematicReader;
|
import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReader;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.FastSchematicWriter;
|
import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicWriter;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
|
import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicReader;
|
import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicReader;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import net.jpountz.lz4.LZ4BlockInputStream;
|
import net.jpountz.lz4.LZ4BlockInputStream;
|
||||||
|
import org.anarres.parallelgzip.ParallelGZIPOutputStream;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
@ -136,19 +136,19 @@ public class FaweDelegateSchematicHandler {
|
|||||||
Clipboard clipboard = (Clipboard) cTag.getSource();
|
Clipboard clipboard = (Clipboard) cTag.getSource();
|
||||||
try (OutputStream stream = new FileOutputStream(tmp);
|
try (OutputStream stream = new FileOutputStream(tmp);
|
||||||
NBTOutputStream output = new NBTOutputStream(
|
NBTOutputStream output = new NBTOutputStream(
|
||||||
new BufferedOutputStream(new PGZIPOutputStream(stream)))) {
|
new BufferedOutputStream(new ParallelGZIPOutputStream(stream)))) {
|
||||||
new FastSchematicWriter(output).write(clipboard);
|
new FastSchematicWriter(output).write(clipboard);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try (OutputStream stream = new FileOutputStream(tmp);
|
try (OutputStream stream = new FileOutputStream(tmp);
|
||||||
BufferedOutputStream output = new BufferedOutputStream(new PGZIPOutputStream(stream))) {
|
BufferedOutputStream output = new BufferedOutputStream(new ParallelGZIPOutputStream(stream))) {
|
||||||
LZ4BlockInputStream is = cTag.adapt(cTag.getSource());
|
LZ4BlockInputStream is = cTag.adapt(cTag.getSource());
|
||||||
IOUtil.copy(is, output);
|
IOUtil.copy(is, output);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try (OutputStream stream = new FileOutputStream(tmp);
|
try (OutputStream stream = new FileOutputStream(tmp);
|
||||||
NBTOutputStream output = new NBTOutputStream(new PGZIPOutputStream(stream))) {
|
NBTOutputStream output = new NBTOutputStream(new ParallelGZIPOutputStream(stream))) {
|
||||||
Map<String, Tag> map = tag.getValue();
|
Map<String, Tag> map = tag.getValue();
|
||||||
output.writeNamedTag("Schematic", map.getOrDefault("Schematic", tag));
|
output.writeNamedTag("Schematic", map.getOrDefault("Schematic", tag));
|
||||||
}
|
}
|
||||||
@ -177,7 +177,7 @@ public class FaweDelegateSchematicHandler {
|
|||||||
BuiltInClipboardFormat.SPONGE_SCHEMATIC.write(output, clipboard);
|
BuiltInClipboardFormat.SPONGE_SCHEMATIC.write(output, clipboard);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
try (PGZIPOutputStream gzip = new PGZIPOutputStream(output)) {
|
try (ParallelGZIPOutputStream gzip = new ParallelGZIPOutputStream(output)) {
|
||||||
try (NBTOutputStream nos = new NBTOutputStream(gzip)) {
|
try (NBTOutputStream nos = new NBTOutputStream(gzip)) {
|
||||||
Map<String, Tag> map = weTag.getValue();
|
Map<String, Tag> map = weTag.getValue();
|
||||||
nos.writeNamedTag("Schematic", map.getOrDefault("Schematic", weTag));
|
nos.writeNamedTag("Schematic", map.getOrDefault("Schematic", weTag));
|
||||||
|
@ -2,8 +2,8 @@ package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.FaweCache;
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
import com.fastasyncworldedit.core.queue.IQueueChunk;
|
||||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
import com.fastasyncworldedit.core.queue.IQueueExtent;
|
||||||
import com.plotsquared.core.queue.LightingMode;
|
import com.plotsquared.core.queue.LightingMode;
|
||||||
import com.plotsquared.core.queue.QueueCoordinator;
|
import com.plotsquared.core.queue.QueueCoordinator;
|
||||||
import com.plotsquared.core.queue.subscriber.ProgressSubscriber;
|
import com.plotsquared.core.queue.subscriber.ProgressSubscriber;
|
||||||
@ -12,7 +12,7 @@ import com.sk89q.worldedit.entity.Entity;
|
|||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
import com.sk89q.worldedit.math.BlockVector2;
|
import com.sk89q.worldedit.math.BlockVector2;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableBlockVector3;
|
import com.fastasyncworldedit.core.math.MutableBlockVector3;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.world.World;
|
import com.sk89q.worldedit.world.World;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.regions.general.CuboidRegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.CuboidRegionFilter;
|
||||||
import com.plotsquared.core.location.Location;
|
import com.plotsquared.core.location.Location;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
|
@ -3,7 +3,7 @@ package com.fastasyncworldedit.bukkit.regions.plotsquared;
|
|||||||
import com.fastasyncworldedit.core.FaweAPI;
|
import com.fastasyncworldedit.core.FaweAPI;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMask;
|
import com.fastasyncworldedit.core.regions.FaweMask;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
||||||
import com.fastasyncworldedit.core.regions.general.RegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.RegionFilter;
|
||||||
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
|
import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
|
||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.command.MainCommand;
|
import com.plotsquared.core.command.MainCommand;
|
||||||
|
@ -3,13 +3,13 @@ package com.fastasyncworldedit.bukkit.regions.plotsquaredv4;
|
|||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.FaweAPI;
|
import com.fastasyncworldedit.core.FaweAPI;
|
||||||
import com.fastasyncworldedit.core.FaweCache;
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
import com.fastasyncworldedit.core.queue.IQueueChunk;
|
||||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
import com.fastasyncworldedit.core.queue.IQueueExtent;
|
||||||
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
|
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableBlockVector3;
|
import com.fastasyncworldedit.core.math.MutableBlockVector3;
|
||||||
import com.sk89q.worldedit.world.World;
|
import com.sk89q.worldedit.world.World;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||||
|
@ -2,8 +2,7 @@ package com.fastasyncworldedit.bukkit.regions.plotsquaredv4;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.core.FaweAPI;
|
import com.fastasyncworldedit.core.FaweAPI;
|
||||||
import com.fastasyncworldedit.core.FaweCache;
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
import com.fastasyncworldedit.core.object.clipboard.ReadOnlyClipboard;
|
import com.fastasyncworldedit.core.extent.clipboard.ReadOnlyClipboard;
|
||||||
import com.fastasyncworldedit.core.object.io.PGZIPOutputStream;
|
|
||||||
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
||||||
import com.fastasyncworldedit.core.util.IOUtil;
|
import com.fastasyncworldedit.core.util.IOUtil;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
@ -14,8 +13,8 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
|
|||||||
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
|
import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
|
||||||
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
|
import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
import com.sk89q.jnbt.CompressedCompoundTag;
|
import com.fastasyncworldedit.core.jnbt.CompressedCompoundTag;
|
||||||
import com.sk89q.jnbt.fawe.CompressedSchematicTag;
|
import com.fastasyncworldedit.core.jnbt.CompressedSchematicTag;
|
||||||
import com.sk89q.jnbt.NBTOutputStream;
|
import com.sk89q.jnbt.NBTOutputStream;
|
||||||
import com.sk89q.jnbt.Tag;
|
import com.sk89q.jnbt.Tag;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
@ -23,11 +22,12 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
|||||||
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
|
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
|
import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.FastSchematicWriter;
|
import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicWriter;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.world.World;
|
import com.sk89q.worldedit.world.World;
|
||||||
import net.jpountz.lz4.LZ4BlockInputStream;
|
import net.jpountz.lz4.LZ4BlockInputStream;
|
||||||
|
import org.anarres.parallelgzip.ParallelGZIPOutputStream;
|
||||||
|
|
||||||
import java.io.BufferedOutputStream;
|
import java.io.BufferedOutputStream;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -84,17 +84,17 @@ public class FaweSchematicHandler extends SchematicHandler {
|
|||||||
CompressedCompoundTag cTag = (CompressedCompoundTag) tag;
|
CompressedCompoundTag cTag = (CompressedCompoundTag) tag;
|
||||||
if (cTag instanceof CompressedSchematicTag) {
|
if (cTag instanceof CompressedSchematicTag) {
|
||||||
Clipboard clipboard = (Clipboard) cTag.getSource();
|
Clipboard clipboard = (Clipboard) cTag.getSource();
|
||||||
try (OutputStream stream = new FileOutputStream(tmp); NBTOutputStream output = new NBTOutputStream(new BufferedOutputStream(new PGZIPOutputStream(stream)))) {
|
try (OutputStream stream = new FileOutputStream(tmp); NBTOutputStream output = new NBTOutputStream(new BufferedOutputStream(new ParallelGZIPOutputStream(stream)))) {
|
||||||
new FastSchematicWriter(output).write(clipboard);
|
new FastSchematicWriter(output).write(clipboard);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try (OutputStream stream = new FileOutputStream(tmp); BufferedOutputStream output = new BufferedOutputStream(new PGZIPOutputStream(stream))) {
|
try (OutputStream stream = new FileOutputStream(tmp); BufferedOutputStream output = new BufferedOutputStream(new ParallelGZIPOutputStream(stream))) {
|
||||||
LZ4BlockInputStream is = cTag.adapt(cTag.getSource());
|
LZ4BlockInputStream is = cTag.adapt(cTag.getSource());
|
||||||
IOUtil.copy(is, stream);
|
IOUtil.copy(is, stream);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try (OutputStream stream = new FileOutputStream(tmp); NBTOutputStream output = new NBTOutputStream(new PGZIPOutputStream(stream))) {
|
try (OutputStream stream = new FileOutputStream(tmp); NBTOutputStream output = new NBTOutputStream(new ParallelGZIPOutputStream(stream))) {
|
||||||
Map<String, Tag> map = tag.getValue();
|
Map<String, Tag> map = tag.getValue();
|
||||||
output.writeNamedTag("Schematic", map.getOrDefault("Schematic", tag));
|
output.writeNamedTag("Schematic", map.getOrDefault("Schematic", tag));
|
||||||
}
|
}
|
||||||
@ -126,7 +126,7 @@ public class FaweSchematicHandler extends SchematicHandler {
|
|||||||
@Override
|
@Override
|
||||||
public void run(OutputStream output) {
|
public void run(OutputStream output) {
|
||||||
try {
|
try {
|
||||||
try (PGZIPOutputStream gzip = new PGZIPOutputStream(output)) {
|
try (ParallelGZIPOutputStream gzip = new ParallelGZIPOutputStream(output)) {
|
||||||
try (NBTOutputStream nos = new NBTOutputStream(gzip)) {
|
try (NBTOutputStream nos = new NBTOutputStream(gzip)) {
|
||||||
Map<String, Tag> map = weTag.getValue();
|
Map<String, Tag> map = weTag.getValue();
|
||||||
nos.writeNamedTag("Schematic", map.getOrDefault("Schematic", weTag));
|
nos.writeNamedTag("Schematic", map.getOrDefault("Schematic", weTag));
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.bukkit.regions.plotsquaredv4;
|
package com.fastasyncworldedit.bukkit.regions.plotsquaredv4;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.regions.general.CuboidRegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.CuboidRegionFilter;
|
||||||
import com.github.intellectualsites.plotsquared.plot.object.Location;
|
import com.github.intellectualsites.plotsquared.plot.object.Location;
|
||||||
import com.github.intellectualsites.plotsquared.plot.object.Plot;
|
import com.github.intellectualsites.plotsquared.plot.object.Plot;
|
||||||
import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
|
import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
package com.fastasyncworldedit.bukkit.regions.plotsquaredv4;
|
package com.fastasyncworldedit.bukkit.regions.plotsquaredv4;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.FaweAPI;
|
import com.fastasyncworldedit.core.FaweAPI;
|
||||||
import com.fastasyncworldedit.core.object.RegionWrapper;
|
import com.fastasyncworldedit.core.regions.RegionWrapper;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMask;
|
import com.fastasyncworldedit.core.regions.FaweMask;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
||||||
import com.fastasyncworldedit.core.regions.general.RegionFilter;
|
import com.fastasyncworldedit.core.regions.filter.RegionFilter;
|
||||||
import com.github.intellectualsites.plotsquared.plot.PlotSquared;
|
import com.github.intellectualsites.plotsquared.plot.PlotSquared;
|
||||||
import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
|
import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
|
||||||
import com.github.intellectualsites.plotsquared.plot.config.Settings;
|
import com.github.intellectualsites.plotsquared.plot.config.Settings;
|
||||||
|
@ -1,22 +1,3 @@
|
|||||||
/*
|
|
||||||
* WorldEdit, a Minecraft world manipulation toolkit
|
|
||||||
* Copyright (C) sk89q <http://www.sk89q.com>
|
|
||||||
* Copyright (C) WorldEdit team and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.fastasyncworldedit.bukkit.util;
|
package com.fastasyncworldedit.bukkit.util;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
|
@ -21,7 +21,7 @@ package com.sk89q.worldedit.bukkit;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.object.RunnableVal;
|
import com.fastasyncworldedit.core.util.task.RunnableVal;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
import com.sk89q.util.StringUtil;
|
import com.sk89q.util.StringUtil;
|
||||||
import com.sk89q.wepif.VaultResolver;
|
import com.sk89q.wepif.VaultResolver;
|
||||||
|
@ -25,7 +25,7 @@ import com.sk89q.worldedit.extent.inventory.BlockBag;
|
|||||||
import com.sk89q.worldedit.extent.inventory.BlockBagException;
|
import com.sk89q.worldedit.extent.inventory.BlockBagException;
|
||||||
import com.sk89q.worldedit.extent.inventory.OutOfBlocksException;
|
import com.sk89q.worldedit.extent.inventory.OutOfBlocksException;
|
||||||
import com.sk89q.worldedit.extent.inventory.OutOfSpaceException;
|
import com.sk89q.worldedit.extent.inventory.OutOfSpaceException;
|
||||||
import com.sk89q.worldedit.extent.inventory.SlottableBlockBag;
|
import com.fastasyncworldedit.core.extent.inventory.SlottableBlockBag;
|
||||||
import com.sk89q.worldedit.util.Location;
|
import com.sk89q.worldedit.util.Location;
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package com.sk89q.worldedit.bukkit;
|
package com.sk89q.worldedit.bukkit;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.RelighterFactory;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelighterFactory;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
import com.sk89q.bukkit.util.CommandInfo;
|
import com.sk89q.bukkit.util.CommandInfo;
|
||||||
import com.sk89q.bukkit.util.CommandRegistration;
|
import com.sk89q.bukkit.util.CommandRegistration;
|
||||||
|
@ -21,8 +21,8 @@ package com.sk89q.worldedit.bukkit;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.bukkit.util.WorldUnloadedException;
|
import com.fastasyncworldedit.bukkit.util.WorldUnloadedException;
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.packet.ChunkPacket;
|
import com.fastasyncworldedit.core.queue.implementation.packet.ChunkPacket;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
|
@ -23,9 +23,9 @@ import com.fastasyncworldedit.bukkit.FaweBukkit;
|
|||||||
import com.fastasyncworldedit.bukkit.adapter.IBukkitAdapter;
|
import com.fastasyncworldedit.bukkit.adapter.IBukkitAdapter;
|
||||||
import com.fastasyncworldedit.bukkit.adapter.NMSRelighterFactory;
|
import com.fastasyncworldedit.bukkit.adapter.NMSRelighterFactory;
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.RelighterFactory;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelighterFactory;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.packet.ChunkPacket;
|
import com.fastasyncworldedit.core.queue.implementation.packet.ChunkPacket;
|
||||||
import com.sk89q.jnbt.AdventureNBTConverter;
|
import com.sk89q.jnbt.AdventureNBTConverter;
|
||||||
import com.sk89q.jnbt.Tag;
|
import com.sk89q.jnbt.Tag;
|
||||||
import com.sk89q.worldedit.blocks.BaseItem;
|
import com.sk89q.worldedit.blocks.BaseItem;
|
||||||
|
Binary file not shown.
@ -19,8 +19,8 @@
|
|||||||
|
|
||||||
package com.sk89q.worldedit.cli;
|
package com.sk89q.worldedit.cli;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.NullRelighter;
|
import com.fastasyncworldedit.core.extent.processor.lighting.NullRelighter;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.RelighterFactory;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelighterFactory;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import com.sk89q.worldedit.entity.Player;
|
import com.sk89q.worldedit.entity.Player;
|
||||||
import com.sk89q.worldedit.extension.platform.AbstractPlatform;
|
import com.sk89q.worldedit.extension.platform.AbstractPlatform;
|
||||||
|
@ -19,8 +19,8 @@
|
|||||||
|
|
||||||
package com.sk89q.worldedit.cli.schematic;
|
package com.sk89q.worldedit.cli.schematic;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.packet.ChunkPacket;
|
import com.fastasyncworldedit.core.queue.implementation.packet.ChunkPacket;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
|
@ -51,6 +51,8 @@ dependencies {
|
|||||||
api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")
|
api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")
|
||||||
compileOnly("net.jpountz:lz4-java-stream:1.0.0") { isTransitive = false }
|
compileOnly("net.jpountz:lz4-java-stream:1.0.0") { isTransitive = false }
|
||||||
compileOnly("org.lz4:lz4-java:1.8.0")
|
compileOnly("org.lz4:lz4-java:1.8.0")
|
||||||
|
compileOnly("com.zaxxer:SparseBitSet:1.2")
|
||||||
|
compileOnly("org.anarres:parallelgzip:1.0.5")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named<Test>("test") {
|
tasks.named<Test>("test") {
|
||||||
|
@ -40,7 +40,7 @@ import java.util.Map;
|
|||||||
* @deprecated WorldEdit does not handle interpreting NBT,
|
* @deprecated WorldEdit does not handle interpreting NBT,
|
||||||
* deprecated for removal without replacement
|
* deprecated for removal without replacement
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated(forRemoval = true)
|
||||||
public class MobSpawnerBlock extends BaseBlock {
|
public class MobSpawnerBlock extends BaseBlock {
|
||||||
|
|
||||||
private String mobType;
|
private String mobType;
|
||||||
|
@ -35,7 +35,7 @@ import java.util.Map;
|
|||||||
* @deprecated WorldEdit does not handle interpreting NBT,
|
* @deprecated WorldEdit does not handle interpreting NBT,
|
||||||
* deprecated for removal without replacement
|
* deprecated for removal without replacement
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated(forRemoval = true)
|
||||||
public class SignBlock extends BaseBlock {
|
public class SignBlock extends BaseBlock {
|
||||||
|
|
||||||
private String[] text;
|
private String[] text;
|
||||||
|
@ -35,7 +35,7 @@ import java.util.Map;
|
|||||||
* @deprecated WorldEdit does not handle interpreting NBT,
|
* @deprecated WorldEdit does not handle interpreting NBT,
|
||||||
* deprecated for removal without replacement
|
* deprecated for removal without replacement
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated(forRemoval = true)
|
||||||
public class SkullBlock extends BaseBlock {
|
public class SkullBlock extends BaseBlock {
|
||||||
|
|
||||||
private String owner = ""; // notchian
|
private String owner = ""; // notchian
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core;
|
package com.fastasyncworldedit.core;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
|
|
||||||
public interface FAWEPlatformAdapterImpl {
|
public interface FAWEPlatformAdapterImpl {
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core;
|
package com.fastasyncworldedit.core;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.util.CachedTextureUtil;
|
import com.fastasyncworldedit.core.util.CachedTextureUtil;
|
||||||
import com.fastasyncworldedit.core.util.CleanTextureUtil;
|
import com.fastasyncworldedit.core.util.CleanTextureUtil;
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
package com.fastasyncworldedit.core;
|
package com.fastasyncworldedit.core;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
import com.fastasyncworldedit.core.queue.IQueueChunk;
|
||||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
import com.fastasyncworldedit.core.queue.IQueueExtent;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.lighting.Relighter;
|
import com.fastasyncworldedit.core.extent.processor.lighting.Relighter;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.ParallelQueueExtent;
|
import com.fastasyncworldedit.core.queue.implementation.ParallelQueueExtent;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.object.RegionWrapper;
|
import com.fastasyncworldedit.core.regions.RegionWrapper;
|
||||||
import com.fastasyncworldedit.core.object.RelightMode;
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
|
||||||
import com.fastasyncworldedit.core.object.changeset.DiskStorageHistory;
|
import com.fastasyncworldedit.core.history.DiskStorageHistory;
|
||||||
import com.fastasyncworldedit.core.object.changeset.SimpleChangeSetSummary;
|
import com.fastasyncworldedit.core.history.changeset.SimpleChangeSetSummary;
|
||||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
import com.fastasyncworldedit.core.internal.exception.FaweException;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
||||||
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
||||||
import com.fastasyncworldedit.core.util.MainUtil;
|
import com.fastasyncworldedit.core.util.MainUtil;
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
package com.fastasyncworldedit.core;
|
package com.fastasyncworldedit.core;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
import com.fastasyncworldedit.core.queue.IChunkSet;
|
||||||
import com.fastasyncworldedit.core.beta.Trimable;
|
import com.fastasyncworldedit.core.queue.Trimable;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.Pool;
|
import com.fastasyncworldedit.core.queue.Pool;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueuePool;
|
import com.fastasyncworldedit.core.queue.implementation.QueuePool;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.object.collection.BitArray;
|
import com.fastasyncworldedit.core.math.BitArray;
|
||||||
import com.fastasyncworldedit.core.object.collection.BitArrayUnstretched;
|
import com.fastasyncworldedit.core.math.BitArrayUnstretched;
|
||||||
import com.fastasyncworldedit.core.object.collection.CleanableThreadLocal;
|
import com.fastasyncworldedit.core.util.collection.CleanableThreadLocal;
|
||||||
import com.fastasyncworldedit.core.object.exception.FaweBlockBagException;
|
import com.fastasyncworldedit.core.internal.exception.FaweBlockBagException;
|
||||||
import com.fastasyncworldedit.core.object.exception.FaweChunkLoadException;
|
import com.fastasyncworldedit.core.internal.exception.FaweChunkLoadException;
|
||||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
import com.fastasyncworldedit.core.internal.exception.FaweException;
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.google.common.cache.CacheBuilder;
|
import com.google.common.cache.CacheBuilder;
|
||||||
import com.google.common.cache.CacheLoader;
|
import com.google.common.cache.CacheLoader;
|
||||||
@ -31,8 +31,8 @@ import com.sk89q.jnbt.ShortTag;
|
|||||||
import com.sk89q.jnbt.StringTag;
|
import com.sk89q.jnbt.StringTag;
|
||||||
import com.sk89q.jnbt.Tag;
|
import com.sk89q.jnbt.Tag;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import com.sk89q.worldedit.math.MutableBlockVector3;
|
import com.fastasyncworldedit.core.math.MutableBlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableVector3;
|
import com.fastasyncworldedit.core.math.MutableVector3;
|
||||||
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core;
|
package com.fastasyncworldedit.core;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.preloader.Preloader;
|
import com.fastasyncworldedit.core.queue.implementation.preloader.Preloader;
|
||||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
|
||||||
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
import com.fastasyncworldedit.core.util.image.ImageViewer;
|
import com.fastasyncworldedit.core.util.image.ImageViewer;
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
package com.fastasyncworldedit.core.beta;
|
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
|
||||||
|
|
||||||
public interface FilterBlockMask {
|
|
||||||
|
|
||||||
boolean applyBlock(FilterBlock block);
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.sk89q.worldedit.command;
|
package com.fastasyncworldedit.core.command;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.util.StringMan;
|
import com.fastasyncworldedit.core.util.StringMan;
|
||||||
@ -13,7 +13,6 @@ import java.util.UUID;
|
|||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.regex.PatternSyntaxException;
|
import java.util.regex.PatternSyntaxException;
|
||||||
|
|
||||||
//TODO This class breaks compilation
|
|
||||||
//@CommandContainer
|
//@CommandContainer
|
||||||
public class ListFilters {
|
public class ListFilters {
|
||||||
public class Filter {
|
public class Filter {
|
@ -1,5 +1,5 @@
|
|||||||
// TODO: Ping @MattBDev to reimplement (or remove because this class is stupid) 2020-02-04
|
// TODO: Ping @MattBDev to reimplement (or remove because this class is stupid) 2020-02-04
|
||||||
//package com.sk89q.worldedit.command;
|
//package com.fastasyncworldedit.core.command;
|
||||||
//
|
//
|
||||||
//import com.boydti.fawe.object.mask.AdjacentAnyMask;
|
//import com.boydti.fawe.object.mask.AdjacentAnyMask;
|
||||||
//import com.boydti.fawe.object.mask.AdjacentMask;
|
//import com.boydti.fawe.object.mask.AdjacentMask;
|
@ -1,4 +1,4 @@
|
|||||||
package com.sk89q.worldedit.command;
|
package com.fastasyncworldedit.core.command;
|
||||||
|
|
||||||
import com.sk89q.worldedit.command.argument.Arguments;
|
import com.sk89q.worldedit.command.argument.Arguments;
|
||||||
import org.enginehub.piston.inject.InjectedValueAccess;
|
import org.enginehub.piston.inject.InjectedValueAccess;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool;
|
||||||
|
|
||||||
import com.sk89q.worldedit.entity.Player;
|
import com.sk89q.worldedit.entity.Player;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool;
|
||||||
|
|
||||||
public interface ResettableTool {
|
public interface ResettableTool {
|
||||||
boolean reset();
|
boolean reset();
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool;
|
||||||
|
|
||||||
public enum TargetMode {
|
public enum TargetMode {
|
||||||
TARGET_BLOCK_RANGE,
|
TARGET_BLOCK_RANGE,
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.mask.RadiusMask;
|
import com.fastasyncworldedit.core.function.mask.RadiusMask;
|
||||||
import com.fastasyncworldedit.core.object.mask.SurfaceMask;
|
import com.fastasyncworldedit.core.function.mask.SurfaceMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
@ -1,13 +1,13 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.random.SimplexNoise;
|
import com.fastasyncworldedit.core.math.random.SimplexNoise;
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableVector3;
|
import com.fastasyncworldedit.core.math.MutableVector3;
|
||||||
import com.sk89q.worldedit.math.Vector3;
|
import com.sk89q.worldedit.math.Vector3;
|
||||||
import com.sk89q.worldedit.math.transform.AffineTransform;
|
import com.sk89q.worldedit.math.transform.AffineTransform;
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.scroll.Scroll;
|
import com.fastasyncworldedit.core.command.tool.scroll.Scroll;
|
||||||
import com.fastasyncworldedit.core.object.extent.ResettableExtent;
|
import com.fastasyncworldedit.core.extent.ResettableExtent;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
||||||
import com.sk89q.worldedit.extension.platform.Actor;
|
import com.sk89q.worldedit.extension.platform.Actor;
|
||||||
import com.sk89q.worldedit.function.mask.Mask;
|
import com.sk89q.worldedit.function.mask.Mask;
|
||||||
@ -15,7 +15,7 @@ import java.util.Map;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
import static com.fastasyncworldedit.core.object.brush.BrushSettings.SettingType.BRUSH;
|
import static com.fastasyncworldedit.core.command.tool.brush.BrushSettings.SettingType.BRUSH;
|
||||||
import static com.google.common.base.Preconditions.checkNotNull;
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
public class BrushSettings {
|
public class BrushSettings {
|
@ -1,5 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.command.tool.ResettableTool;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.StringMan;
|
import com.fastasyncworldedit.core.util.StringMan;
|
||||||
import com.fastasyncworldedit.core.wrappers.AsyncPlayer;
|
import com.fastasyncworldedit.core.wrappers.AsyncPlayer;
|
@ -1,9 +1,10 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.command.tool.ResettableTool;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.object.clipboard.ResizableClipboardBuilder;
|
import com.fastasyncworldedit.core.extent.clipboard.ResizableClipboardBuilder;
|
||||||
import com.fastasyncworldedit.core.object.function.NullRegionFunction;
|
import com.fastasyncworldedit.core.function.NullRegionFunction;
|
||||||
import com.fastasyncworldedit.core.object.function.mask.AbstractDelegateMask;
|
import com.fastasyncworldedit.core.function.mask.AbstractDelegateMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.clipboard.CPUOptimizedClipboard;
|
import com.fastasyncworldedit.core.extent.clipboard.CPUOptimizedClipboard;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.heightmap.HeightMap;
|
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
|
||||||
import com.fastasyncworldedit.core.object.brush.heightmap.ScalableHeightMap;
|
import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
@ -1,10 +1,10 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.object.brush.heightmap.HeightMap;
|
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
|
||||||
import com.fastasyncworldedit.core.object.brush.heightmap.RotatableHeightMap;
|
import com.fastasyncworldedit.core.extent.processor.heightmap.RotatableHeightMap;
|
||||||
import com.fastasyncworldedit.core.object.brush.heightmap.ScalableHeightMap;
|
import com.fastasyncworldedit.core.extent.processor.heightmap.ScalableHeightMap;
|
||||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
import com.fastasyncworldedit.core.internal.exception.FaweException;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,8 +1,8 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.mask.ImageBrushMask;
|
import com.fastasyncworldedit.core.function.mask.ImageBrushMask;
|
||||||
import com.fastasyncworldedit.core.object.collection.SummedColorTable;
|
import com.fastasyncworldedit.core.util.collection.SummedColorTable;
|
||||||
import com.fastasyncworldedit.core.object.mask.SurfaceMask;
|
import com.fastasyncworldedit.core.function.mask.SurfaceMask;
|
||||||
import com.fastasyncworldedit.core.util.TextureUtil;
|
import com.fastasyncworldedit.core.util.TextureUtil;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
@ -1,12 +1,12 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.database.DBHandler;
|
import com.fastasyncworldedit.core.database.DBHandler;
|
||||||
import com.fastasyncworldedit.core.database.RollbackDatabase;
|
import com.fastasyncworldedit.core.database.RollbackDatabase;
|
||||||
import com.fastasyncworldedit.core.logging.RollbackOptimizedHistory;
|
import com.fastasyncworldedit.core.history.RollbackOptimizedHistory;
|
||||||
import com.fastasyncworldedit.core.object.change.MutableFullBlockChange;
|
import com.fastasyncworldedit.core.history.change.MutableFullBlockChange;
|
||||||
import com.fastasyncworldedit.core.util.MainUtil;
|
import com.fastasyncworldedit.core.util.MainUtil;
|
||||||
import com.sk89q.worldedit.LocalConfiguration;
|
import com.sk89q.worldedit.LocalConfiguration;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
@ -1,9 +1,9 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.mask.LayerBrushMask;
|
import com.fastasyncworldedit.core.function.mask.LayerBrushMask;
|
||||||
import com.fastasyncworldedit.core.object.collection.BlockVectorSet;
|
import com.fastasyncworldedit.core.math.BlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.object.mask.AdjacentAnyMask;
|
import com.fastasyncworldedit.core.function.mask.AdjacentAnyMask;
|
||||||
import com.fastasyncworldedit.core.object.mask.RadiusMask;
|
import com.fastasyncworldedit.core.function.mask.RadiusMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,5 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.command.tool.ResettableTool;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.MaskTraverser;
|
import com.fastasyncworldedit.core.util.MaskTraverser;
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
public class RaiseBrush extends ErodeBrush {
|
public class RaiseBrush extends ErodeBrush {
|
||||||
public RaiseBrush() {
|
public RaiseBrush() {
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.mask.RadiusMask;
|
import com.fastasyncworldedit.core.function.mask.RadiusMask;
|
||||||
import com.fastasyncworldedit.core.object.visitor.DFSRecursiveVisitor;
|
import com.fastasyncworldedit.core.function.visitor.DFSRecursiveVisitor;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.random.SimplexNoise;
|
import com.fastasyncworldedit.core.math.random.SimplexNoise;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,10 +1,10 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.collection.BlockVectorSet;
|
import com.fastasyncworldedit.core.math.BlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.object.mask.AdjacentAnyMask;
|
import com.fastasyncworldedit.core.function.mask.AdjacentAnyMask;
|
||||||
import com.fastasyncworldedit.core.object.mask.RadiusMask;
|
import com.fastasyncworldedit.core.function.mask.RadiusMask;
|
||||||
import com.fastasyncworldedit.core.object.mask.SurfaceMask;
|
import com.fastasyncworldedit.core.function.mask.SurfaceMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.util.StringMan;
|
import com.fastasyncworldedit.core.util.StringMan;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.object.mask.SurfaceMask;
|
import com.fastasyncworldedit.core.function.mask.SurfaceMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.function.mask.Mask;
|
import com.sk89q.worldedit.function.mask.Mask;
|
||||||
@ -9,7 +9,7 @@ import com.sk89q.worldedit.function.mask.Masks;
|
|||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
import com.sk89q.worldedit.function.visitor.BreadthFirstSearch;
|
import com.sk89q.worldedit.function.visitor.BreadthFirstSearch;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableBlockVector3;
|
import com.fastasyncworldedit.core.math.MutableBlockVector3;
|
||||||
|
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
import java.util.concurrent.ThreadLocalRandom;
|
||||||
|
|
@ -1,8 +1,8 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.mask.SplatterBrushMask;
|
import com.fastasyncworldedit.core.function.mask.SplatterBrushMask;
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.object.mask.SurfaceMask;
|
import com.fastasyncworldedit.core.function.mask.SurfaceMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.function.operation.Operations;
|
import com.sk89q.worldedit.function.operation.Operations;
|
@ -1,9 +1,10 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.FaweCache;
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
|
import com.fastasyncworldedit.core.command.tool.ResettableTool;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.object.mask.IdMask;
|
import com.fastasyncworldedit.core.function.mask.IdMask;
|
||||||
import com.fastasyncworldedit.core.object.visitor.DFSRecursiveVisitor;
|
import com.fastasyncworldedit.core.function.visitor.DFSRecursiveVisitor;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.WorldEditException;
|
import com.sk89q.worldedit.WorldEditException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
||||||
@ -13,7 +14,7 @@ import com.sk89q.worldedit.function.mask.MaskIntersection;
|
|||||||
import com.sk89q.worldedit.function.operation.Operations;
|
import com.sk89q.worldedit.function.operation.Operations;
|
||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableVector3;
|
import com.fastasyncworldedit.core.math.MutableVector3;
|
||||||
import com.sk89q.worldedit.math.Vector3;
|
import com.sk89q.worldedit.math.Vector3;
|
||||||
import com.sk89q.worldedit.math.interpolation.Node;
|
import com.sk89q.worldedit.math.interpolation.Node;
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.heightmap.HeightMap;
|
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMap;
|
||||||
import com.fastasyncworldedit.core.object.brush.mask.StencilBrushMask;
|
import com.fastasyncworldedit.core.function.mask.StencilBrushMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.mask.RadiusMask;
|
import com.fastasyncworldedit.core.function.mask.RadiusMask;
|
||||||
import com.fastasyncworldedit.core.object.mask.SurfaceMask;
|
import com.fastasyncworldedit.core.function.mask.SurfaceMask;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush;
|
package com.fastasyncworldedit.core.command.tool.brush;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
@ -9,7 +9,7 @@ import com.sk89q.worldedit.WorldEditException;
|
|||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
||||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.math.MutableBlockVector3;
|
import com.fastasyncworldedit.core.math.MutableBlockVector3;
|
||||||
import com.sk89q.worldedit.math.Vector3;
|
import com.sk89q.worldedit.math.Vector3;
|
||||||
import com.sk89q.worldedit.math.interpolation.KochanekBartelsInterpolation;
|
import com.sk89q.worldedit.math.interpolation.KochanekBartelsInterpolation;
|
||||||
import com.sk89q.worldedit.math.interpolation.Node;
|
import com.sk89q.worldedit.math.interpolation.Node;
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.object.clipboard.MultiClipboardHolder;
|
import com.fastasyncworldedit.core.extent.clipboard.MultiClipboardHolder;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.brush.TargetMode;
|
import com.fastasyncworldedit.core.command.tool.TargetMode;
|
||||||
import com.fastasyncworldedit.core.util.MathMan;
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
||||||
import com.sk89q.worldedit.entity.Player;
|
import com.sk89q.worldedit.entity.Player;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.scroll;
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
||||||
import com.sk89q.worldedit.entity.Player;
|
import com.sk89q.worldedit.entity.Player;
|
@ -0,0 +1,7 @@
|
|||||||
|
package com.fastasyncworldedit.core.command.tool.scroll;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.entity.Player;
|
||||||
|
|
||||||
|
public interface ScrollTool {
|
||||||
|
boolean increment(Player player, int amount);
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.sweep;
|
package com.fastasyncworldedit.core.command.tool.sweep;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.object.collection.LocalBlockVectorSet;
|
import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||||
@ -11,7 +11,7 @@ import com.sk89q.worldedit.math.BlockVector3;
|
|||||||
import com.sk89q.worldedit.math.Vector3;
|
import com.sk89q.worldedit.math.Vector3;
|
||||||
import com.sk89q.worldedit.math.interpolation.Interpolation;
|
import com.sk89q.worldedit.math.interpolation.Interpolation;
|
||||||
import com.sk89q.worldedit.math.transform.AffineTransform;
|
import com.sk89q.worldedit.math.transform.AffineTransform;
|
||||||
import com.sk89q.worldedit.math.transform.RoundedTransform;
|
import com.fastasyncworldedit.core.math.transform.RoundedTransform;
|
||||||
import com.sk89q.worldedit.math.transform.Transform;
|
import com.sk89q.worldedit.math.transform.Transform;
|
||||||
import com.sk89q.worldedit.regions.Region;
|
import com.sk89q.worldedit.regions.Region;
|
||||||
import com.sk89q.worldedit.session.ClipboardHolder;
|
import com.sk89q.worldedit.session.ClipboardHolder;
|
@ -1,4 +1,4 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.sweep;
|
package com.fastasyncworldedit.core.command.tool.sweep;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
@ -1,7 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.object.brush.sweep;
|
package com.fastasyncworldedit.core.command.tool.sweep;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.command.tool.ResettableTool;
|
||||||
import com.fastasyncworldedit.core.configuration.Caption;
|
import com.fastasyncworldedit.core.configuration.Caption;
|
||||||
import com.fastasyncworldedit.core.object.brush.ResettableTool;
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.EmptyClipboardException;
|
import com.sk89q.worldedit.EmptyClipboardException;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
@ -13,7 +13,7 @@ public class DBHandler {
|
|||||||
|
|
||||||
public static final DBHandler IMP = new DBHandler();
|
public static final DBHandler IMP = new DBHandler();
|
||||||
|
|
||||||
private Map<World, RollbackDatabase> databases = new ConcurrentHashMap<>(8, 0.9f, 1);
|
private final Map<World, RollbackDatabase> databases = new ConcurrentHashMap<>(8, 0.9f, 1);
|
||||||
|
|
||||||
public RollbackDatabase getDatabase(World world) {
|
public RollbackDatabase getDatabase(World world) {
|
||||||
RollbackDatabase database = databases.get(world);
|
RollbackDatabase database = databases.get(world);
|
||||||
|
@ -2,9 +2,9 @@ package com.fastasyncworldedit.core.database;
|
|||||||
|
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.configuration.Settings;
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
import com.fastasyncworldedit.core.logging.RollbackOptimizedHistory;
|
import com.fastasyncworldedit.core.history.RollbackOptimizedHistory;
|
||||||
import com.fastasyncworldedit.core.object.collection.YieldIterable;
|
import com.fastasyncworldedit.core.util.collection.YieldIterable;
|
||||||
import com.fastasyncworldedit.core.object.task.AsyncNotifyQueue;
|
import com.fastasyncworldedit.core.util.task.AsyncNotifyQueue;
|
||||||
import com.fastasyncworldedit.core.util.MainUtil;
|
import com.fastasyncworldedit.core.util.MainUtil;
|
||||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
package com.sk89q.worldedit.entity;
|
package com.fastasyncworldedit.core.entity;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.Fawe;
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
import com.fastasyncworldedit.core.util.TaskManager;
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
|
import com.sk89q.worldedit.entity.BaseEntity;
|
||||||
import com.sk89q.worldedit.world.entity.EntityType;
|
import com.sk89q.worldedit.world.entity.EntityType;
|
||||||
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
@ -1,4 +1,4 @@
|
|||||||
package com.sk89q.worldedit.entity;
|
package com.fastasyncworldedit.core.entity;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.sk89q.worldedit.entity;
|
package com.fastasyncworldedit.core.entity;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
@ -1,4 +1,4 @@
|
|||||||
package com.sk89q.worldedit.event.extent;
|
package com.fastasyncworldedit.core.event.extent;
|
||||||
|
|
||||||
import com.sk89q.worldedit.event.Cancellable;
|
import com.sk89q.worldedit.event.Cancellable;
|
||||||
import com.sk89q.worldedit.event.Event;
|
import com.sk89q.worldedit.event.Event;
|
@ -1,23 +1,4 @@
|
|||||||
/*
|
package com.fastasyncworldedit.core.event.extent;
|
||||||
* WorldEdit, a Minecraft world manipulation toolkit
|
|
||||||
* Copyright (C) sk89q <http://www.sk89q.com>
|
|
||||||
* Copyright (C) WorldEdit team and contributors
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.sk89q.worldedit.event.extent;
|
|
||||||
|
|
||||||
import com.sk89q.worldedit.event.Cancellable;
|
import com.sk89q.worldedit.event.Cancellable;
|
||||||
import com.sk89q.worldedit.event.Event;
|
import com.sk89q.worldedit.event.Event;
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user