mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-08-14 02:05:28 +02:00
Compare commits
13 Commits
6.6.3
...
fix/v6/aug
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f515ce2cc1 | ||
![]() |
b3c67b55d5 | ||
![]() |
13d7357c85 | ||
![]() |
16e26b910c | ||
![]() |
faadebd30e | ||
![]() |
2aeacb3dcf | ||
![]() |
9db7791835 | ||
![]() |
f49ddb819d | ||
![]() |
d71c62771e | ||
![]() |
a6aaa9538f | ||
![]() |
0974fb2834 | ||
![]() |
8982b33b6c | ||
![]() |
a7b3b3b7df |
6
.github/workflows/codeql.yml
vendored
6
.github/workflows/codeql.yml
vendored
@@ -26,12 +26,12 @@ jobs:
|
|||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@v1
|
uses: github/codeql-action/init@v2
|
||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
|
|
||||||
- name: Autobuild
|
- name: Autobuild
|
||||||
uses: github/codeql-action/autobuild@v1
|
uses: github/codeql-action/autobuild@v2
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@v1
|
uses: github/codeql-action/analyze@v2
|
||||||
|
@@ -25,7 +25,11 @@
|
|||||||
*/
|
*/
|
||||||
package com.plotsquared.bukkit.generator;
|
package com.plotsquared.bukkit.generator;
|
||||||
|
|
||||||
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.generator.AugmentedUtils;
|
import com.plotsquared.core.generator.AugmentedUtils;
|
||||||
|
import com.plotsquared.core.queue.QueueCoordinator;
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.generator.BlockPopulator;
|
import org.bukkit.generator.BlockPopulator;
|
||||||
@@ -52,7 +56,14 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
|
public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
|
||||||
AugmentedUtils.generate(source, world.getName(), source.getX(), source.getZ(), null);
|
QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(BukkitAdapter.adapt(world));
|
||||||
|
// The chunk is already loaded and we do not want to load the chunk in "fully" by using any PaperLib methods.
|
||||||
|
queue.setForceSync(true);
|
||||||
|
queue.setSideEffectSet(SideEffectSet.none());
|
||||||
|
queue.setBiomesEnabled(false);
|
||||||
|
queue.setChunkObject(source);
|
||||||
|
AugmentedUtils.generateChunk(world.getName(), source.getX(), source.getZ(), queue);
|
||||||
|
queue.enqueue();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -80,7 +80,8 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
|
|||||||
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
||||||
}
|
}
|
||||||
|
|
||||||
//do not annotate with Override until we discontinue support for 1.4.4
|
//do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4)
|
||||||
|
@Override
|
||||||
public void setBiome(int x, int y, int z, @NonNull Biome biome) {
|
public void setBiome(int x, int y, int z, @NonNull Biome biome) {
|
||||||
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
||||||
|
|
||||||
|
@@ -44,6 +44,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
|||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||||
|
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.minimessage.Template;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
@@ -352,13 +353,15 @@ public class PaperListener implements Listener {
|
|||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
} else if (!plot.isAdded(pp.getUUID())) {
|
} else if (!plot.isAdded(pp.getUUID())) {
|
||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
if (!plot.getFlag(ProjectilesFlag.class)) {
|
||||||
pp.sendMessage(
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
pp.sendMessage(
|
||||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
);
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
||||||
entity.remove();
|
);
|
||||||
event.setCancelled(true);
|
entity.remove();
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,6 +35,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
|||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.PlotHandler;
|
import com.plotsquared.core.plot.PlotHandler;
|
||||||
|
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.minimessage.Template;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
@@ -128,13 +129,15 @@ public class ProjectileEventListener implements Listener {
|
|||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
} else if (!plot.isAdded(pp.getUUID())) {
|
} else if (!plot.isAdded(pp.getUUID())) {
|
||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
if (!plot.getFlag(ProjectilesFlag.class)) {
|
||||||
pp.sendMessage(
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
pp.sendMessage(
|
||||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
);
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
||||||
entity.remove();
|
);
|
||||||
event.setCancelled(true);
|
entity.remove();
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -162,7 +165,7 @@ public class ProjectileEventListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (plot.isAdded(pp.getUUID()) || Permissions
|
if (plot.isAdded(pp.getUUID()) || Permissions
|
||||||
.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(ProjectilesFlag.class)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
entity.remove();
|
entity.remove();
|
||||||
|
@@ -76,10 +76,11 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
private final int totalSize;
|
private final int totalSize;
|
||||||
private final AtomicInteger expectedSize;
|
private final AtomicInteger expectedSize;
|
||||||
private final AtomicInteger loadingChunks = new AtomicInteger();
|
private final AtomicInteger loadingChunks = new AtomicInteger();
|
||||||
|
private final boolean forceSync;
|
||||||
|
|
||||||
private int batchSize;
|
private int batchSize;
|
||||||
private PlotSquaredTask task;
|
private PlotSquaredTask task;
|
||||||
private boolean shouldCancel;
|
private volatile boolean shouldCancel;
|
||||||
private boolean finished;
|
private boolean finished;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@@ -92,7 +93,8 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
@Assisted final @NonNull Runnable whenDone,
|
@Assisted final @NonNull Runnable whenDone,
|
||||||
@Assisted final @NonNull Consumer<Throwable> throwableConsumer,
|
@Assisted final @NonNull Consumer<Throwable> throwableConsumer,
|
||||||
@Assisted final boolean unloadAfter,
|
@Assisted final boolean unloadAfter,
|
||||||
@Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers
|
@Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
|
||||||
|
@Assisted final boolean forceSync
|
||||||
) {
|
) {
|
||||||
this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
|
this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
|
||||||
this.availableChunks = new LinkedBlockingQueue<>();
|
this.availableChunks = new LinkedBlockingQueue<>();
|
||||||
@@ -107,14 +109,27 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
this.plugin = JavaPlugin.getPlugin(BukkitPlatform.class);
|
this.plugin = JavaPlugin.getPlugin(BukkitPlatform.class);
|
||||||
this.bukkitWorld = Bukkit.getWorld(world.getName());
|
this.bukkitWorld = Bukkit.getWorld(world.getName());
|
||||||
this.progressSubscribers.addAll(progressSubscribers);
|
this.progressSubscribers.addAll(progressSubscribers);
|
||||||
|
this.forceSync = forceSync;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start() {
|
public void start() {
|
||||||
// Request initial batch
|
if (!forceSync) {
|
||||||
this.requestBatch();
|
// Request initial batch
|
||||||
// Wait until next tick to give the chunks a chance to be loaded
|
this.requestBatch();
|
||||||
TaskManager.runTaskLater(() -> task = TaskManager.runTaskRepeat(this, TaskTime.ticks(1)), TaskTime.ticks(1));
|
// Wait until next tick to give the chunks a chance to be loaded
|
||||||
|
TaskManager.runTaskLater(() -> task = TaskManager.runTaskRepeat(this, TaskTime.ticks(1)), TaskTime.ticks(1));
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
while (!shouldCancel && !requestedChunks.isEmpty()) {
|
||||||
|
chunkConsumer.accept(requestedChunks.poll());
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
throwableConsumer.accept(t);
|
||||||
|
} finally {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -131,7 +146,9 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
for (final ProgressSubscriber subscriber : this.progressSubscribers) {
|
for (final ProgressSubscriber subscriber : this.progressSubscribers) {
|
||||||
subscriber.notifyEnd();
|
subscriber.notifyEnd();
|
||||||
}
|
}
|
||||||
task.cancel();
|
if (task != null) {
|
||||||
|
task.cancel();
|
||||||
|
}
|
||||||
finished = true;
|
finished = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -62,10 +62,27 @@ import java.util.function.Consumer;
|
|||||||
|
|
||||||
public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
||||||
|
|
||||||
private final SideEffectSet noSideEffectSet;
|
private static final SideEffectSet NO_SIDE_EFFECT_SET;
|
||||||
private final SideEffectSet lightingSideEffectSet;
|
private static final SideEffectSet EDGE_SIDE_EFFECT_SET;
|
||||||
private final SideEffectSet edgeSideEffectSet;
|
private static final SideEffectSet LIGHTING_SIDE_EFFECT_SET;
|
||||||
private final SideEffectSet edgeLightingSideEffectSet;
|
private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;
|
||||||
|
|
||||||
|
static {
|
||||||
|
NO_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
|
||||||
|
SideEffect.NEIGHBORS,
|
||||||
|
SideEffect.State.OFF
|
||||||
|
);
|
||||||
|
EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
|
||||||
|
SideEffect.NEIGHBORS,
|
||||||
|
SideEffect.State.ON
|
||||||
|
);
|
||||||
|
LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
|
||||||
|
EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
|
||||||
|
SideEffect.NEIGHBORS,
|
||||||
|
SideEffect.State.ON
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private org.bukkit.World bukkitWorld;
|
private org.bukkit.World bukkitWorld;
|
||||||
@Inject
|
@Inject
|
||||||
private ChunkCoordinatorBuilderFactory chunkCoordinatorBuilderFactory;
|
private ChunkCoordinatorBuilderFactory chunkCoordinatorBuilderFactory;
|
||||||
@@ -76,19 +93,6 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
@Inject
|
@Inject
|
||||||
public BukkitQueueCoordinator(@NonNull World world) {
|
public BukkitQueueCoordinator(@NonNull World world) {
|
||||||
super(world);
|
super(world);
|
||||||
noSideEffectSet = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
|
|
||||||
SideEffect.NEIGHBORS,
|
|
||||||
SideEffect.State.OFF
|
|
||||||
);
|
|
||||||
lightingSideEffectSet = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
|
|
||||||
edgeSideEffectSet = noSideEffectSet.with(SideEffect.UPDATE, SideEffect.State.ON).with(
|
|
||||||
SideEffect.NEIGHBORS,
|
|
||||||
SideEffect.State.ON
|
|
||||||
);
|
|
||||||
edgeLightingSideEffectSet = noSideEffectSet.with(SideEffect.UPDATE, SideEffect.State.ON).with(
|
|
||||||
SideEffect.NEIGHBORS,
|
|
||||||
SideEffect.State.ON
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -201,7 +205,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
localChunk.getTiles().forEach((blockVector3, tag) -> {
|
localChunk.getTiles().forEach((blockVector3, tag) -> {
|
||||||
try {
|
try {
|
||||||
BaseBlock block = getWorld().getBlock(blockVector3).toBaseBlock(tag);
|
BaseBlock block = getWorld().getBlock(blockVector3).toBaseBlock(tag);
|
||||||
getWorld().setBlock(blockVector3, block, noSideEffectSet);
|
getWorld().setBlock(blockVector3, block, getSideEffectSet(SideEffectState.NONE));
|
||||||
} catch (WorldEditException ignored) {
|
} catch (WorldEditException ignored) {
|
||||||
StateWrapper sw = new StateWrapper(tag);
|
StateWrapper sw = new StateWrapper(tag);
|
||||||
sw.restoreTag(getWorld().getName(), blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
|
sw.restoreTag(getWorld().getName(), blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
|
||||||
@@ -258,9 +262,9 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
}
|
}
|
||||||
SideEffectSet sideEffectSet;
|
SideEffectSet sideEffectSet;
|
||||||
if (lighting) {
|
if (lighting) {
|
||||||
sideEffectSet = edge ? edgeLightingSideEffectSet : lightingSideEffectSet;
|
sideEffectSet = getSideEffectSet(edge ? SideEffectState.EDGE_LIGHTING : SideEffectState.LIGHTING);
|
||||||
} else {
|
} else {
|
||||||
sideEffectSet = edge ? edgeSideEffectSet : noSideEffectSet;
|
sideEffectSet = getSideEffectSet(edge ? SideEffectState.EDGE : SideEffectState.NONE);
|
||||||
}
|
}
|
||||||
getWorld().setBlock(loc, block, sideEffectSet);
|
getWorld().setBlock(loc, block, sideEffectSet);
|
||||||
} catch (WorldEditException ignored) {
|
} catch (WorldEditException ignored) {
|
||||||
@@ -375,4 +379,23 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private SideEffectSet getSideEffectSet(SideEffectState state) {
|
||||||
|
if (getSideEffectSet() != null) {
|
||||||
|
return getSideEffectSet();
|
||||||
|
}
|
||||||
|
return switch (state) {
|
||||||
|
case NONE -> NO_SIDE_EFFECT_SET;
|
||||||
|
case EDGE -> EDGE_SIDE_EFFECT_SET;
|
||||||
|
case LIGHTING -> LIGHTING_SIDE_EFFECT_SET;
|
||||||
|
case EDGE_LIGHTING -> EDGE_LIGHTING_SIDE_EFFECT_SET;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum SideEffectState {
|
||||||
|
NONE,
|
||||||
|
EDGE,
|
||||||
|
LIGHTING,
|
||||||
|
EDGE_LIGHTING
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -889,8 +889,8 @@ public class PlotSquared {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
|
LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
|
||||||
LOGGER.info("| plot world: {}", pa);
|
LOGGER.info("| plot world: {}", pa.getClass().getCanonicalName());
|
||||||
LOGGER.info("| manager: {}", pa);
|
LOGGER.info("| manager: {}", pa.getPlotManager().getClass().getCanonicalName());
|
||||||
LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
|
LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
|
||||||
areaGen.getPlotGenerator().initialize(pa);
|
areaGen.getPlotGenerator().initialize(pa);
|
||||||
areaGen.augment(pa);
|
areaGen.augment(pa);
|
||||||
@@ -906,6 +906,13 @@ public class PlotSquared {
|
|||||||
throw new IllegalArgumentException("Invalid Generator: " + gen_string);
|
throw new IllegalArgumentException("Invalid Generator: " + gen_string);
|
||||||
}
|
}
|
||||||
PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
|
PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
|
||||||
|
LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
|
||||||
|
LOGGER.info("- plot world: {}", pa.getClass().getCanonicalName());
|
||||||
|
LOGGER.info("- plot area manager: {}", pa.getPlotManager().getClass().getCanonicalName());
|
||||||
|
if (!this.worldConfiguration.contains(path)) {
|
||||||
|
this.worldConfiguration.createSection(path);
|
||||||
|
worldSection = this.worldConfiguration.getConfigurationSection(path);
|
||||||
|
}
|
||||||
pa.saveConfiguration(worldSection);
|
pa.saveConfiguration(worldSection);
|
||||||
pa.loadDefaultConfiguration(worldSection);
|
pa.loadDefaultConfiguration(worldSection);
|
||||||
try {
|
try {
|
||||||
@@ -913,9 +920,6 @@ public class PlotSquared {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
|
|
||||||
LOGGER.info("- plot world: {}", pa);
|
|
||||||
LOGGER.info("- plot area manager: {}", pa.getPlotManager());
|
|
||||||
areaGen.getPlotGenerator().initialize(pa);
|
areaGen.getPlotGenerator().initialize(pa);
|
||||||
areaGen.augment(pa);
|
areaGen.augment(pa);
|
||||||
addPlotArea(pa);
|
addPlotArea(pa);
|
||||||
|
@@ -54,12 +54,23 @@ public class AugmentedUtils {
|
|||||||
enabled = true;
|
enabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean generate(
|
/**
|
||||||
@Nullable Object chunkObject,
|
* Generate an augmented world chunk at the given location. If a queue is given, the data will be written to it, else a new
|
||||||
|
* queue will be created and written to world. Returns true if generation occurred.
|
||||||
|
*
|
||||||
|
* @param world World name to generate data for. Must be a PlotSquared world containing one or more areas else nothing will
|
||||||
|
* happen.
|
||||||
|
* @param chunkX Chunk X position
|
||||||
|
* @param chunkZ Chunk Z position
|
||||||
|
* @param queue Queue to write to, if desired.
|
||||||
|
* @return true if generation occurred.
|
||||||
|
* @since TODO
|
||||||
|
*/
|
||||||
|
public static boolean generateChunk(
|
||||||
final @NonNull String world,
|
final @NonNull String world,
|
||||||
final int chunkX,
|
final int chunkX,
|
||||||
final int chunkZ,
|
final int chunkZ,
|
||||||
QueueCoordinator queue
|
@Nullable QueueCoordinator queue
|
||||||
) {
|
) {
|
||||||
if (!enabled) {
|
if (!enabled) {
|
||||||
return false;
|
return false;
|
||||||
@@ -97,9 +108,6 @@ public class AugmentedUtils {
|
|||||||
.platform()
|
.platform()
|
||||||
.worldUtil()
|
.worldUtil()
|
||||||
.getWeWorld(world));
|
.getWeWorld(world));
|
||||||
if (chunkObject != null) {
|
|
||||||
queue.setChunkObject(chunkObject);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
QueueCoordinator primaryMask;
|
QueueCoordinator primaryMask;
|
||||||
// coordinates
|
// coordinates
|
||||||
@@ -157,13 +165,9 @@ public class AugmentedUtils {
|
|||||||
}
|
}
|
||||||
generationResult = true;
|
generationResult = true;
|
||||||
}
|
}
|
||||||
if (chunkObject != null) {
|
|
||||||
primaryMask.setChunkObject(chunkObject);
|
|
||||||
}
|
|
||||||
if (chunkObject != null) {
|
|
||||||
secondaryMask.setChunkObject(chunkObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// This queue should not be enqueued as it is simply used to restrict block setting, and then delegate to the
|
||||||
|
// actual queue
|
||||||
ScopedQueueCoordinator scoped =
|
ScopedQueueCoordinator scoped =
|
||||||
new ScopedQueueCoordinator(
|
new ScopedQueueCoordinator(
|
||||||
secondaryMask,
|
secondaryMask,
|
||||||
@@ -172,8 +176,6 @@ public class AugmentedUtils {
|
|||||||
);
|
);
|
||||||
generator.generateChunk(scoped, area);
|
generator.generateChunk(scoped, area);
|
||||||
generator.populateChunk(scoped, area);
|
generator.populateChunk(scoped, area);
|
||||||
scoped.setForceSync(true);
|
|
||||||
scoped.enqueue();
|
|
||||||
}
|
}
|
||||||
if (enqueue) {
|
if (enqueue) {
|
||||||
queue.enqueue();
|
queue.enqueue();
|
||||||
@@ -181,4 +183,19 @@ public class AugmentedUtils {
|
|||||||
return generationResult;
|
return generationResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use {@link AugmentedUtils#generateChunk(String, int, int, QueueCoordinator)} as chunkObject is not required
|
||||||
|
* in the above method
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "TODO")
|
||||||
|
public static boolean generate(
|
||||||
|
@Nullable Object chunkObject,
|
||||||
|
final @NonNull String world,
|
||||||
|
final int chunkX,
|
||||||
|
final int chunkZ,
|
||||||
|
QueueCoordinator queue
|
||||||
|
) {
|
||||||
|
return generateChunk(world, chunkX, chunkZ, queue);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -93,6 +93,7 @@ import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag;
|
|||||||
import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
|
import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
|
import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
|
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
|
||||||
|
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.PveFlag;
|
import com.plotsquared.core.plot.flag.implementations.PveFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.PvpFlag;
|
import com.plotsquared.core.plot.flag.implementations.PvpFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
|
import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
|
||||||
@@ -198,6 +199,7 @@ public final class GlobalFlagContainer extends FlagContainer {
|
|||||||
this.addFlag(VehicleUseFlag.VEHICLE_USE_FALSE);
|
this.addFlag(VehicleUseFlag.VEHICLE_USE_FALSE);
|
||||||
this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE);
|
this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE);
|
||||||
this.addFlag(VineGrowFlag.VINE_GROW_TRUE);
|
this.addFlag(VineGrowFlag.VINE_GROW_TRUE);
|
||||||
|
this.addFlag(ProjectilesFlag.PROJECTILES_FALSE);
|
||||||
|
|
||||||
// Double flags
|
// Double flags
|
||||||
this.addFlag(PriceFlag.PRICE_NOT_BUYABLE);
|
this.addFlag(PriceFlag.PRICE_NOT_BUYABLE);
|
||||||
|
@@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* _____ _ _ _____ _
|
||||||
|
* | __ \| | | | / ____| | |
|
||||||
|
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
|
||||||
|
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
|
||||||
|
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
|
||||||
|
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
|
||||||
|
* | |
|
||||||
|
* |_|
|
||||||
|
* PlotSquared plot management system for Minecraft
|
||||||
|
* Copyright (C) 2014 - 2022 IntellectualSites
|
||||||
|
*
|
||||||
|
* 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.plotsquared.core.plot.flag.implementations;
|
||||||
|
|
||||||
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
|
import com.plotsquared.core.plot.flag.types.BooleanFlag;
|
||||||
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
|
public class ProjectilesFlag extends BooleanFlag<ProjectilesFlag> {
|
||||||
|
|
||||||
|
public static final ProjectilesFlag PROJECTILES_TRUE = new ProjectilesFlag(true);
|
||||||
|
public static final ProjectilesFlag PROJECTILES_FALSE = new ProjectilesFlag(false);
|
||||||
|
|
||||||
|
private ProjectilesFlag(boolean value){
|
||||||
|
super(value, TranslatableCaption.of("flags.flag_description_projectiles"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ProjectilesFlag flagOf(@NonNull final Boolean value) {
|
||||||
|
return value ? PROJECTILES_TRUE : PROJECTILES_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -34,6 +34,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
|
|||||||
import com.sk89q.worldedit.math.BlockVector2;
|
import com.sk89q.worldedit.math.BlockVector2;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.util.Location;
|
import com.sk89q.worldedit.util.Location;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
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;
|
||||||
@@ -61,6 +62,7 @@ public abstract class BasicQueueCoordinator extends QueueCoordinator {
|
|||||||
private int lastX = Integer.MIN_VALUE;
|
private int lastX = Integer.MIN_VALUE;
|
||||||
private int lastZ = Integer.MIN_VALUE;
|
private int lastZ = Integer.MIN_VALUE;
|
||||||
private boolean settingBiomes = false;
|
private boolean settingBiomes = false;
|
||||||
|
private boolean disableBiomes = false;
|
||||||
private boolean settingTiles = false;
|
private boolean settingTiles = false;
|
||||||
private boolean regen = false;
|
private boolean regen = false;
|
||||||
private int[] regenStart;
|
private int[] regenStart;
|
||||||
@@ -68,7 +70,8 @@ public abstract class BasicQueueCoordinator extends QueueCoordinator {
|
|||||||
private CuboidRegion regenRegion = null;
|
private CuboidRegion regenRegion = null;
|
||||||
private Consumer<BlockVector2> consumer = null;
|
private Consumer<BlockVector2> consumer = null;
|
||||||
private boolean unloadAfter = true;
|
private boolean unloadAfter = true;
|
||||||
private Runnable whenDone;
|
private Runnable whenDone = null;
|
||||||
|
private SideEffectSet sideEffectSet = null;
|
||||||
@Nullable
|
@Nullable
|
||||||
private LightingMode lightingMode = LightingMode.valueOf(Settings.QUEUE.LIGHTING_MODE);
|
private LightingMode lightingMode = LightingMode.valueOf(Settings.QUEUE.LIGHTING_MODE);
|
||||||
|
|
||||||
@@ -120,6 +123,9 @@ public abstract class BasicQueueCoordinator extends QueueCoordinator {
|
|||||||
@SuppressWarnings("removal")
|
@SuppressWarnings("removal")
|
||||||
@Override
|
@Override
|
||||||
public boolean setBiome(int x, int z, @NonNull BiomeType biomeType) {
|
public boolean setBiome(int x, int z, @NonNull BiomeType biomeType) {
|
||||||
|
if (disableBiomes) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
LocalChunk chunk = getChunk(x >> 4, z >> 4);
|
LocalChunk chunk = getChunk(x >> 4, z >> 4);
|
||||||
for (int y = world.getMinY(); y <= world.getMaxY(); y++) {
|
for (int y = world.getMinY(); y <= world.getMaxY(); y++) {
|
||||||
chunk.setBiome(x & 15, y, z & 15, biomeType);
|
chunk.setBiome(x & 15, y, z & 15, biomeType);
|
||||||
@@ -130,6 +136,9 @@ public abstract class BasicQueueCoordinator extends QueueCoordinator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final boolean setBiome(int x, int y, int z, @NonNull BiomeType biomeType) {
|
public final boolean setBiome(int x, int y, int z, @NonNull BiomeType biomeType) {
|
||||||
|
if (disableBiomes) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
LocalChunk chunk = getChunk(x >> 4, z >> 4);
|
LocalChunk chunk = getChunk(x >> 4, z >> 4);
|
||||||
chunk.setBiome(x & 15, y, z & 15, biomeType);
|
chunk.setBiome(x & 15, y, z & 15, biomeType);
|
||||||
settingBiomes = true;
|
settingBiomes = true;
|
||||||
@@ -141,6 +150,12 @@ public abstract class BasicQueueCoordinator extends QueueCoordinator {
|
|||||||
return this.settingBiomes;
|
return this.settingBiomes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setBiomesEnabled(boolean settingBiomes) {
|
||||||
|
this.settingBiomes = settingBiomes;
|
||||||
|
this.disableBiomes = true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setTile(int x, int y, int z, @NonNull CompoundTag tag) {
|
public boolean setTile(int x, int y, int z, @NonNull CompoundTag tag) {
|
||||||
LocalChunk chunk = getChunk(x >> 4, z >> 4);
|
LocalChunk chunk = getChunk(x >> 4, z >> 4);
|
||||||
@@ -315,6 +330,29 @@ public abstract class BasicQueueCoordinator extends QueueCoordinator {
|
|||||||
this.whenDone = whenDone;
|
this.whenDone = whenDone;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SideEffectSet getSideEffectSet() {
|
||||||
|
return sideEffectSet;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setSideEffectSet(SideEffectSet sideEffectSet) {
|
||||||
|
this.sideEffectSet = sideEffectSet;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't ask about the @NonNull placement. That's how it needs to be else it errors.
|
||||||
|
@Override
|
||||||
|
public void setBiomeCuboid(
|
||||||
|
final com.plotsquared.core.location.@NonNull Location pos1,
|
||||||
|
final com.plotsquared.core.location.@NonNull Location pos2,
|
||||||
|
@NonNull final BiomeType biome
|
||||||
|
) {
|
||||||
|
if (disableBiomes) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
super.setBiomeCuboid(pos1, pos2, biome);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the {@link LocalChunk} from the queue at the given chunk coordinates. Returns a new instance if one doesn't exist
|
* Get the {@link LocalChunk} from the queue at the given chunk coordinates. Returns a new instance if one doesn't exist
|
||||||
*/
|
*/
|
||||||
|
@@ -32,6 +32,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.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
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;
|
||||||
@@ -135,6 +136,13 @@ public class DelegateQueueCoordinator extends QueueCoordinator {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setBiomesEnabled(final boolean enabled) {
|
||||||
|
if (parent != null) {
|
||||||
|
parent.setBiomesEnabled(enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setEntity(@NonNull Entity entity) {
|
public boolean setEntity(@NonNull Entity entity) {
|
||||||
if (parent != null) {
|
if (parent != null) {
|
||||||
@@ -248,6 +256,21 @@ public class DelegateQueueCoordinator extends QueueCoordinator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SideEffectSet getSideEffectSet() {
|
||||||
|
if (parent != null) {
|
||||||
|
return parent.getSideEffectSet();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setSideEffectSet(final SideEffectSet sideEffectSet) {
|
||||||
|
if (parent != null) {
|
||||||
|
parent.setSideEffectSet(sideEffectSet);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull List<BlockVector2> getReadChunks() {
|
public @NonNull List<BlockVector2> getReadChunks() {
|
||||||
if (parent != null) {
|
if (parent != null) {
|
||||||
|
@@ -35,6 +35,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.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
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;
|
||||||
@@ -247,6 +248,14 @@ public abstract class QueueCoordinator {
|
|||||||
*/
|
*/
|
||||||
public abstract boolean isSettingBiomes();
|
public abstract boolean isSettingBiomes();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the queue should accept biome placement
|
||||||
|
*
|
||||||
|
* @param enabled If biomes should be enabled
|
||||||
|
* @since TODO
|
||||||
|
*/
|
||||||
|
public abstract void setBiomesEnabled(boolean enabled);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add entities to be created
|
* Add entities to be created
|
||||||
*
|
*
|
||||||
@@ -412,6 +421,20 @@ public abstract class QueueCoordinator {
|
|||||||
*/
|
*/
|
||||||
public abstract void setLightingMode(@Nullable LightingMode mode);
|
public abstract void setLightingMode(@Nullable LightingMode mode);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the overriding {@link SideEffectSet} to be used by the queue if it exists, else null
|
||||||
|
*
|
||||||
|
* @return Overriding {@link SideEffectSet} or null
|
||||||
|
*/
|
||||||
|
public abstract @Nullable SideEffectSet getSideEffectSet();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the overriding {@link SideEffectSet} to be used by the queue. Null to use default side effects.
|
||||||
|
*
|
||||||
|
* @param sideEffectSet side effects to override with, or null to use default
|
||||||
|
*/
|
||||||
|
public abstract void setSideEffectSet(@Nullable SideEffectSet sideEffectSet);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fill a cuboid between two positions with a BlockState
|
* Fill a cuboid between two positions with a BlockState
|
||||||
*
|
*
|
||||||
|
@@ -35,22 +35,20 @@ import org.checkerframework.checker.nullness.qual.NonNull;
|
|||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Queue that only sets blocks with a designated area
|
* Queue that only sets blocks with a designated X-Z area, will accept any Y values. Requires all blocks be set normalized in
|
||||||
|
* the x and z directions, i.e. starting from 0,0. An offset of the minimum point of the region will then be applied to x and z.
|
||||||
*/
|
*/
|
||||||
public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
|
public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
|
||||||
|
|
||||||
private final Location min;
|
private final Location min;
|
||||||
private final Location max;
|
private final Location max;
|
||||||
private final int minX;
|
private final int minX;
|
||||||
private final int minY;
|
|
||||||
private final int minZ;
|
private final int minZ;
|
||||||
|
|
||||||
private final int maxX;
|
private final int maxX;
|
||||||
private final int maxY;
|
|
||||||
private final int maxZ;
|
private final int maxZ;
|
||||||
|
|
||||||
private final int dx;
|
private final int dx;
|
||||||
private final int dy;
|
|
||||||
private final int dz;
|
private final int dz;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -61,15 +59,12 @@ public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
|
|||||||
this.min = min;
|
this.min = min;
|
||||||
this.max = max;
|
this.max = max;
|
||||||
this.minX = min.getX();
|
this.minX = min.getX();
|
||||||
this.minY = min.getY();
|
|
||||||
this.minZ = min.getZ();
|
this.minZ = min.getZ();
|
||||||
|
|
||||||
this.maxX = max.getX();
|
this.maxX = max.getX();
|
||||||
this.maxY = max.getY();
|
|
||||||
this.maxZ = max.getZ();
|
this.maxZ = max.getZ();
|
||||||
|
|
||||||
this.dx = maxX - minX;
|
this.dx = maxX - minX;
|
||||||
this.dy = maxY - minY;
|
|
||||||
this.dz = maxZ - minZ;
|
this.dz = maxZ - minZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,11 +75,11 @@ public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBiome(int x, int y, int z, @NonNull BiomeType biome) {
|
public boolean setBiome(int x, int y, int z, @NonNull BiomeType biome) {
|
||||||
return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super.setBiome(x + minX, y + minY, z + minZ, biome);
|
return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setBiome(x + minX, y, z + minZ, biome);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void fillBiome(BiomeType biome) {
|
public void fillBiome(BiomeType biome) {
|
||||||
for (int y = 0; y <= dy; y++) {
|
for (int y = min.getY(); y <= max.getY(); y++) {
|
||||||
for (int x = 0; x <= dx; x++) {
|
for (int x = 0; x <= dx; x++) {
|
||||||
for (int z = 0; z < dz; z++) {
|
for (int z = 0; z < dz; z++) {
|
||||||
setBiome(x, y, z, biome);
|
setBiome(x, y, z, biome);
|
||||||
@@ -95,27 +90,22 @@ public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBlock(int x, int y, int z, @NonNull BaseBlock id) {
|
public boolean setBlock(int x, int y, int z, @NonNull BaseBlock id) {
|
||||||
return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super.setBlock(x + minX, y + minY, z + minZ, id);
|
return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setBlock(x + minX, y, z + minZ, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBlock(int x, int y, int z, @NonNull BlockState id) {
|
public boolean setBlock(int x, int y, int z, @NonNull BlockState id) {
|
||||||
return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super.setBlock(x + minX, y + minY, z + minZ, id);
|
return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setBlock(x + minX, y, z + minZ, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setBlock(int x, int y, int z, @NonNull Pattern pattern) {
|
public boolean setBlock(int x, int y, int z, @NonNull Pattern pattern) {
|
||||||
return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super.setBlock(
|
return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setBlock(x + minX, y, z + minZ, pattern);
|
||||||
x + minX,
|
|
||||||
y + minY,
|
|
||||||
z + minZ,
|
|
||||||
pattern
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setTile(int x, int y, int z, @NonNull CompoundTag tag) {
|
public boolean setTile(int x, int y, int z, @NonNull CompoundTag tag) {
|
||||||
return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super.setTile(x + minX, y + minY, z + minZ, tag);
|
return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setTile(x + minX, y, z + minZ, tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NonNull Location getMin() {
|
public @NonNull Location getMin() {
|
||||||
|
@@ -409,13 +409,26 @@ public abstract class RegionManager {
|
|||||||
) {
|
) {
|
||||||
final QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
|
final QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
|
||||||
queue.addReadChunks(region.getChunks());
|
queue.addReadChunks(region.getChunks());
|
||||||
queue.setChunkConsumer(blockVector2 -> {
|
final BlockVector3 regionMin = region.getMinimumPoint();
|
||||||
|
final BlockVector3 regionMax = region.getMaximumPoint();
|
||||||
|
queue.setChunkConsumer(chunkPos -> {
|
||||||
|
BlockVector3 chunkMin = BlockVector3.at(
|
||||||
|
Math.max(chunkPos.getX() << 4, regionMin.getBlockX()),
|
||||||
|
regionMin.getBlockY(),
|
||||||
|
Math.max(chunkPos.getZ() << 4, regionMin.getBlockZ())
|
||||||
|
);
|
||||||
|
BlockVector3 chunkMax = BlockVector3.at(
|
||||||
|
Math.min((chunkPos.getX() << 4) + 15, regionMax.getBlockX()),
|
||||||
|
regionMax.getBlockY(),
|
||||||
|
Math.min((chunkPos.getZ() << 4) + 15, regionMax.getBlockZ())
|
||||||
|
);
|
||||||
|
CuboidRegion chunkRegion = new CuboidRegion(region.getWorld(), chunkMin, chunkMax);
|
||||||
WorldUtil.setBiome(
|
WorldUtil.setBiome(
|
||||||
area.getWorldName(),
|
area.getWorldName(),
|
||||||
region,
|
chunkRegion,
|
||||||
biome
|
biome
|
||||||
);
|
);
|
||||||
worldUtil.refreshChunk(blockVector2.getBlockX(), blockVector2.getBlockZ(), area.getWorldName());
|
worldUtil.refreshChunk(chunkPos.getBlockX(), chunkPos.getBlockZ(), area.getWorldName());
|
||||||
});
|
});
|
||||||
queue.setCompleteTask(whenDone);
|
queue.setCompleteTask(whenDone);
|
||||||
queue.enqueue();
|
queue.enqueue();
|
||||||
|
@@ -613,6 +613,7 @@
|
|||||||
"flags.flag_description_lectern_read_book": "<gray>Prevent players taking books from lecterns.</gray>",
|
"flags.flag_description_lectern_read_book": "<gray>Prevent players taking books from lecterns.</gray>",
|
||||||
"flags.flag_description_prevent_creative_copy": "<gray>Prevents people from copying item NBT data in the plot unless they're added as members.</gray>",
|
"flags.flag_description_prevent_creative_copy": "<gray>Prevents people from copying item NBT data in the plot unless they're added as members.</gray>",
|
||||||
"flags.flag_description_leaf_decay": "<gray>Set to `false` to prevent leaves from decaying.",
|
"flags.flag_description_leaf_decay": "<gray>Set to `false` to prevent leaves from decaying.",
|
||||||
|
"flags.flag_description_projectiles": "<gray>Prevents guests from shooting projectiles on the plot when set to false.</gray>",
|
||||||
"flags.flag_error_boolean": "Flag value must be a boolean (true | false).",
|
"flags.flag_error_boolean": "Flag value must be a boolean (true | false).",
|
||||||
"flags.flag_error_enum": "Must be one of: <list>",
|
"flags.flag_error_enum": "Must be one of: <list>",
|
||||||
"flags.flag_error_integer": "Flag value must be a whole positive number.",
|
"flags.flag_error_integer": "Flag value must be a whole positive number.",
|
||||||
|
@@ -18,7 +18,7 @@ plugins {
|
|||||||
idea
|
idea
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "6.6.3"
|
version = "6.7.1-SNAPSHOT"
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
@@ -140,7 +140,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
developer {
|
developer {
|
||||||
id.set("NotMyFault")
|
id.set("NotMyFault")
|
||||||
name.set("NotMyFault")
|
name.set("Alexander Brandes")
|
||||||
organization.set("IntellectualSites")
|
organization.set("IntellectualSites")
|
||||||
email.set("contact@notmyfault.dev")
|
email.set("contact@notmyfault.dev")
|
||||||
}
|
}
|
||||||
|
@@ -6,9 +6,9 @@ guava = "31.0.1-jre" # Version set by Minecraft
|
|||||||
|
|
||||||
# Platform expectations
|
# Platform expectations
|
||||||
paper = "1.18.1-R0.1-SNAPSHOT"
|
paper = "1.18.1-R0.1-SNAPSHOT"
|
||||||
checker-qual = "3.21.4"
|
checker-qual = "3.22.0"
|
||||||
guice = "5.1.0"
|
guice = "5.1.0"
|
||||||
spotbugs = "4.6.0"
|
spotbugs = "4.7.0"
|
||||||
snakeyaml = "1.30" # Version set by Bukkit
|
snakeyaml = "1.30" # Version set by Bukkit
|
||||||
|
|
||||||
# Adventure & MiniMessage
|
# Adventure & MiniMessage
|
||||||
@@ -18,7 +18,7 @@ adventure-platform-bukkit = "4.0.1"
|
|||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.10"
|
worldedit = "7.2.10"
|
||||||
fawe = "2.1.1"
|
fawe = "2.1.2"
|
||||||
vault = "1.7.1"
|
vault = "1.7.1"
|
||||||
placeholderapi = "2.11.1"
|
placeholderapi = "2.11.1"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
|
Reference in New Issue
Block a user