Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-24 18:10:08 +01:00
Small quality of code changes
Dieser Commit ist enthalten in:
Ursprung
62cb04b8ca
Commit
bfcf24b27b
@ -27,7 +27,6 @@ import com.boydti.fawe.util.Jars;
|
|||||||
import com.boydti.fawe.util.TaskManager;
|
import com.boydti.fawe.util.TaskManager;
|
||||||
import com.boydti.fawe.util.WEManager;
|
import com.boydti.fawe.util.WEManager;
|
||||||
import com.boydti.fawe.util.image.ImageViewer;
|
import com.boydti.fawe.util.image.ImageViewer;
|
||||||
import com.boydti.fawe.util.task.Task;
|
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitPlayer;
|
import com.sk89q.worldedit.bukkit.BukkitPlayer;
|
||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
@ -38,7 +37,6 @@ import java.util.Collection;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.ConsoleCommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
@ -159,24 +157,6 @@ public class FaweBukkit implements IFawe, Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public com.sk89q.worldedit.entity.Player wrap(final Object obj) {
|
|
||||||
Player player = null;
|
|
||||||
if (obj.getClass() == Player.class) {
|
|
||||||
player = (Player) obj;
|
|
||||||
} else if (obj.getClass() == String.class) {
|
|
||||||
String name = (String) obj;
|
|
||||||
player = Bukkit.getPlayer(name);
|
|
||||||
} else if (obj.getClass() == UUID.class) {
|
|
||||||
UUID uuid = (UUID) obj;
|
|
||||||
player = Bukkit.getPlayer(uuid);
|
|
||||||
}
|
|
||||||
if (player == null) {
|
|
||||||
throw new IllegalArgumentException("Unknown player type: " + obj);
|
|
||||||
}
|
|
||||||
return BukkitAdapter.adapt(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemUtil getItemUtil() {
|
public ItemUtil getItemUtil() {
|
||||||
ItemUtil tmp = itemUtil;
|
ItemUtil tmp = itemUtil;
|
||||||
if (tmp == null) {
|
if (tmp == null) {
|
||||||
|
@ -18,21 +18,21 @@ import com.sk89q.worldedit.world.block.BlockState;
|
|||||||
// TODO FIXME
|
// TODO FIXME
|
||||||
public class FaweLocalBlockQueue extends LocalBlockQueue {
|
public class FaweLocalBlockQueue extends LocalBlockQueue {
|
||||||
|
|
||||||
public final IQueueExtent<IQueueChunk> IMP;
|
public final IQueueExtent<IQueueChunk> instance;
|
||||||
private final World world;
|
private final World world;
|
||||||
private BlockVector3 mutable = new MutableBlockVector3();
|
private BlockVector3 mutable = new MutableBlockVector3();
|
||||||
|
|
||||||
public FaweLocalBlockQueue(String worldName) {
|
public FaweLocalBlockQueue(String worldName) {
|
||||||
super(worldName);
|
super(worldName);
|
||||||
this.world = FaweAPI.getWorld(worldName);
|
this.world = FaweAPI.getWorld(worldName);
|
||||||
IMP = Fawe.get().getQueueHandler().getQueue(world);
|
instance = Fawe.get().getQueueHandler().getQueue(world);
|
||||||
Fawe.get().getQueueHandler().unCache();
|
Fawe.get().getQueueHandler().unCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean next() {
|
public boolean next() {
|
||||||
if (!IMP.isEmpty()) {
|
if (!instance.isEmpty()) {
|
||||||
IMP.flush();
|
instance.flush();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -49,7 +49,7 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int size() {
|
public int size() {
|
||||||
return IMP.isEmpty() ? 0 : 1;
|
return instance.isEmpty() ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -62,33 +62,33 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getModified() {
|
public long getModified() {
|
||||||
return IMP.size();
|
return instance.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBlock(final int x, final int y, final int z, final BlockState id) {
|
public boolean setBlock(final int x, final int y, final int z, final BlockState id) {
|
||||||
return IMP.setBlock(x, y, z, id);
|
return instance.setBlock(x, y, z, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBlock(int x, int y, int z, Pattern pattern) {
|
public boolean setBlock(int x, int y, int z, Pattern pattern) {
|
||||||
mutable.setComponents(x, y, z);
|
mutable.setComponents(x, y, z);
|
||||||
return pattern.apply(IMP, mutable, mutable);
|
return pattern.apply(instance, mutable, mutable);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBlock(final int x, final int y, final int z, final BaseBlock id) {
|
public boolean setBlock(final int x, final int y, final int z, final BaseBlock id) {
|
||||||
return IMP.setBlock(x, y, z, id);
|
return instance.setBlock(x, y, z, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BlockState getBlock(int x, int y, int z) {
|
public BlockState getBlock(int x, int y, int z) {
|
||||||
return IMP.getBlock(x, y, z);
|
return instance.getBlock(x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBiome(int x, int z, BiomeType biomeType) {
|
public boolean setBiome(int x, int z, BiomeType biomeType) {
|
||||||
return IMP.setBiome(x, 0, z, biomeType);
|
return instance.setBiome(x, 0, z, biomeType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -98,13 +98,13 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void flush() {
|
public void flush() {
|
||||||
IMP.flush();
|
instance.flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean enqueue() {
|
public boolean enqueue() {
|
||||||
boolean val = super.enqueue();
|
boolean val = super.enqueue();
|
||||||
IMP.enableQueue();
|
instance.enableQueue();
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -119,12 +119,12 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void regenChunk(int x, int z) {
|
public void regenChunk(int x, int z) {
|
||||||
IMP.regenerateChunk(x, z, null, null);
|
instance.regenerateChunk(x, z, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setTile(int x, int y, int z, CompoundTag tag) {
|
public boolean setTile(int x, int y, int z, CompoundTag tag) {
|
||||||
IMP.setTile(x, y, z, (com.sk89q.jnbt.CompoundTag) FaweCache.IMP.asTag(tag));
|
instance.setTile(x, y, z, (com.sk89q.jnbt.CompoundTag) FaweCache.IMP.asTag(tag));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
|
|||||||
import com.github.intellectualsites.plotsquared.plot.util.StringMan;
|
import com.github.intellectualsites.plotsquared.plot.util.StringMan;
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.EditSession;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.extension.platform.Capability;
|
import com.sk89q.worldedit.extension.platform.Capability;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
@ -29,6 +30,7 @@ import java.util.Collection;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
import java.util.concurrent.ThreadLocalRandom;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
|
||||||
@CommandDeclaration(
|
@CommandDeclaration(
|
||||||
command = "generatebiome",
|
command = "generatebiome",
|
||||||
@ -71,11 +73,11 @@ public class PlotSetBiome extends Command {
|
|||||||
}
|
}
|
||||||
plot.addRunning();
|
plot.addRunning();
|
||||||
TaskManager.IMP.async(() -> {
|
TaskManager.IMP.async(() -> {
|
||||||
EditSession session = new EditSessionBuilder(FaweAPI.getWorld(plot.getArea().worldname))
|
EditSession session = new EditSessionBuilder(BukkitAdapter.adapt(Bukkit.getWorld(plot.getArea().worldname)))
|
||||||
.autoQueue(false)
|
.autoQueue(false)
|
||||||
.checkMemory(false)
|
.checkMemory(false)
|
||||||
.allowedRegionsEverywhere()
|
.allowedRegionsEverywhere()
|
||||||
.player(Fawe.imp().wrap(player.getUUID()))
|
.player(BukkitAdapter.adapt(Bukkit.getPlayer(player.getUUID())))
|
||||||
.limitUnlimited()
|
.limitUnlimited()
|
||||||
.build();
|
.build();
|
||||||
long seed = ThreadLocalRandom.current().nextLong();
|
long seed = ThreadLocalRandom.current().nextLong();
|
||||||
|
@ -292,11 +292,11 @@ public class Fawe {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setupConfigs() {
|
public void setupConfigs() {
|
||||||
MainUtil.copyFile(MainUtil.getJarFile(), "lang/strings.json", null);
|
MainUtil.copyFile(MainUtil.getJarFile(), "lang" + File.separator + "strings.json", null);
|
||||||
// Setting up config.yml
|
// Setting up config.yml
|
||||||
File file = new File(this.IMP.getDirectory(), "config.yml");
|
File file = new File(this.IMP.getDirectory(), "config.yml");
|
||||||
Settings.IMP.PLATFORM = IMP.getPlatform().replace("\"", "");
|
Settings.IMP.PLATFORM = IMP.getPlatform().replace("\"", "");
|
||||||
try (InputStream stream = getClass().getResourceAsStream("/fawe.properties");
|
try (InputStream stream = getClass().getResourceAsStream(File.separator + "fawe.properties");
|
||||||
BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
|
BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
|
||||||
String versionString = br.readLine();
|
String versionString = br.readLine();
|
||||||
String commitString = br.readLine();
|
String commitString = br.readLine();
|
||||||
|
@ -17,8 +17,6 @@ public interface IFawe {
|
|||||||
|
|
||||||
File getDirectory();
|
File getDirectory();
|
||||||
|
|
||||||
Player wrap(final Object obj);
|
|
||||||
|
|
||||||
TaskManager getTaskManager();
|
TaskManager getTaskManager();
|
||||||
|
|
||||||
Collection<FaweMaskManager> getMaskManagers();
|
Collection<FaweMaskManager> getMaskManagers();
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.boydti.fawe.beta.implementation.queue;
|
package com.boydti.fawe.beta.implementation.queue;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
public interface Pool<T> {
|
public interface Pool<T> {
|
||||||
T poll();
|
T poll();
|
||||||
default boolean offer(T recycle) {
|
default boolean offer(T recycle) {
|
||||||
|
@ -188,13 +188,13 @@ public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implemen
|
|||||||
* Get a new IChunk from either the pool, or create a new one<br> + Initialize it at the
|
* Get a new IChunk from either the pool, or create a new one<br> + Initialize it at the
|
||||||
* coordinates
|
* coordinates
|
||||||
*
|
*
|
||||||
* @param X
|
* @param chunkX
|
||||||
* @param Z
|
* @param chunkZ
|
||||||
* @return IChunk
|
* @return IChunk
|
||||||
*/
|
*/
|
||||||
private ChunkHolder poolOrCreate(int X, int Z) {
|
private ChunkHolder poolOrCreate(int chunkX, int chunkZ) {
|
||||||
ChunkHolder next = create(false);
|
ChunkHolder next = create(false);
|
||||||
next.init(this, X, Z);
|
next.init(this, chunkX, chunkZ);
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ public class Settings extends Config {
|
|||||||
" - Use a shared directory or NFS/Samba"
|
" - Use a shared directory or NFS/Samba"
|
||||||
})
|
})
|
||||||
public String CLIPBOARD = "clipboard";
|
public String CLIPBOARD = "clipboard";
|
||||||
@Comment("Each player has their own sub directory for schematics")
|
@Comment("Each player has his or her own sub directory for schematics")
|
||||||
public boolean PER_PLAYER_SCHEMATICS = true;
|
public boolean PER_PLAYER_SCHEMATICS = true;
|
||||||
public String COMMANDS = "commands";
|
public String COMMANDS = "commands";
|
||||||
}
|
}
|
||||||
@ -288,7 +288,7 @@ public class Settings extends Config {
|
|||||||
"Increase or decrease queue intensity (ms) [-50,50]:",
|
"Increase or decrease queue intensity (ms) [-50,50]:",
|
||||||
" 0 = balance of performance / stability",
|
" 0 = balance of performance / stability",
|
||||||
" -10 = Allocate 10ms less for chunk placement",
|
" -10 = Allocate 10ms less for chunk placement",
|
||||||
"Too high will can cause lag spikes (you might be okay with this)",
|
"Too high can cause lag spikes (you might be okay with this)",
|
||||||
"Too low will result in slow edits",
|
"Too low will result in slow edits",
|
||||||
})
|
})
|
||||||
public int EXTRA_TIME_MS = 0;
|
public int EXTRA_TIME_MS = 0;
|
||||||
|
@ -31,7 +31,7 @@ import java.util.Iterator;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class InspectBrush extends BrushTool implements DoubleActionTraceTool {
|
public class InspectBrush extends BrushTool {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct the tool.
|
* Construct the tool.
|
||||||
@ -61,13 +61,14 @@ public class InspectBrush extends BrushTool implements DoubleActionTraceTool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean perform(final Player player, LocalSession session, boolean rightClick) {
|
public boolean perform(final Player player, LocalSession session, boolean rightClick) {
|
||||||
if (!session.isToolControlEnabled() || !player.hasPermission("worldedit.tool.inspect")) {
|
if (!player.hasPermission("worldedit.tool.inspect")) {
|
||||||
player.print(Caption.of("", "worldedit.tool.inspect"));
|
player.print(Caption.of("", "worldedit.tool.inspect"));
|
||||||
System.out.println("No tool control");
|
System.out.println("No tool control");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!Settings.IMP.HISTORY.USE_DATABASE) {
|
if (!Settings.IMP.HISTORY.USE_DATABASE) {
|
||||||
player.print(Caption.of("fawe.error.setting.disable", ("history.use-database (Import with /history import )")));
|
player.print(Caption.of("fawe.error.setting.disable",
|
||||||
|
"history.use-database (Import with /history import )"));
|
||||||
System.out.println("No db");
|
System.out.println("No db");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1493,9 +1493,7 @@ public class LocalSession implements TextureHolder {
|
|||||||
|
|
||||||
private void prepareEditingExtents(EditSession editSession, Actor actor) {
|
private void prepareEditingExtents(EditSession editSession, Actor actor) {
|
||||||
editSession.setFastMode(fastMode);
|
editSession.setFastMode(fastMode);
|
||||||
/*
|
|
||||||
editSession.setReorderMode(reorderMode);
|
editSession.setReorderMode(reorderMode);
|
||||||
*/
|
|
||||||
if (editSession.getSurvivalExtent() != null) {
|
if (editSession.getSurvivalExtent() != null) {
|
||||||
editSession.getSurvivalExtent().setStripNbt(!actor.hasPermission("worldedit.setnbt"));
|
editSession.getSurvivalExtent().setStripNbt(!actor.hasPermission("worldedit.setnbt"));
|
||||||
}
|
}
|
||||||
@ -1526,7 +1524,6 @@ public class LocalSession implements TextureHolder {
|
|||||||
* @return The reorder mode
|
* @return The reorder mode
|
||||||
*/
|
*/
|
||||||
public EditSession.ReorderMode getReorderMode() {
|
public EditSession.ReorderMode getReorderMode() {
|
||||||
// return reorderMode;
|
|
||||||
return EditSession.ReorderMode.FAST;
|
return EditSession.ReorderMode.FAST;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1536,7 +1533,6 @@ public class LocalSession implements TextureHolder {
|
|||||||
* @param reorderMode The reorder mode
|
* @param reorderMode The reorder mode
|
||||||
*/
|
*/
|
||||||
public void setReorderMode(EditSession.ReorderMode reorderMode) {
|
public void setReorderMode(EditSession.ReorderMode reorderMode) {
|
||||||
// this.reorderMode = reorderMode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren