mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-09-27 04:12:40 +02:00
9f632af0ae
* Begin to implement extended world heights: - Implemented in Bukkit module (and where required in Core module) * Implement extended world heights into core module * Add min gen height to setup, * Default gen/build heights based on minecraft version * Few fixes * Fix up queues * Address comments * Make road schematic stuff slightly more efficient by sharing queues * Minor fixes, don't overlay error many times for the same y * Fix incorrect schematic paste height, undo changes to HybridUtils * Overhall regenallroads method to make it work, make sure BukkitChunkCoordinator can/will finish * Process chunks in order when regenerating all roads * Address comments * Address comments * Ground level//bedrock is at min gen height - Add comment on == rather than <= being used - It's because it's only checking for the bedrock layer being broken if that's disabled * Fix offset for min build height in SchematicHandler * Better javadoc Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com> * Address inclusivity issues for max world height * Javadocs/comments/deprecation * Use world min/max heights if present in QueueCoordinator * Address some deprecations for regions and biome setting * Add a count for chunks we're currently trying to load to not skip chunks at the end of a queue's edit * Use minGenHeight + 1 rather than build height in AugmentedUtils * Create utility method for layer index in GenChunk * Correct height in HybridUtils, also use minGenHeight + 1 * Don't magically split to 128 height in regeneration * Add utility methods for world height in QueueCoordinator * Clean up ClassicPlotManager road creation/removal * Start generation at min gen height if bedrock is disabled * min gen height is set in PlotArea * Add note on schem y normalisation * Improve plot getVolume method readability * Don't overly extend height when regenerating road region * y index utility method in ChunknQueueCoordinator * Layer index utility method in LocalChunk * Use version min/max heights if world not present in QueueCoordinator * Fix min -> max * Don't allow players to modify outside build height when using plot set / schematics. - Also fixes schematic height issues * Remove debug * Address comments * Switch loadingChunks to AtomicInteger to be safe (in case of multi-threaded) * Fix "security" issue that was already present * Ensure sign isn't physicsed Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
106 lines
4.3 KiB
Java
106 lines
4.3 KiB
Java
/*
|
|
* _____ _ _ _____ _
|
|
* | __ \| | | | / ____| | |
|
|
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
|
|
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
|
|
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
|
|
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
|
|
* | |
|
|
* |_|
|
|
* 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.util;
|
|
|
|
import com.plotsquared.core.PlotSquared;
|
|
import com.plotsquared.core.location.Location;
|
|
import com.plotsquared.core.queue.QueueCoordinator;
|
|
import com.plotsquared.core.queue.ScopedQueueCoordinator;
|
|
import com.plotsquared.core.util.task.RunnableVal;
|
|
import com.sk89q.worldedit.math.BlockVector2;
|
|
import com.sk89q.worldedit.world.World;
|
|
|
|
import java.util.Map;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
|
public abstract class ChunkManager {
|
|
|
|
private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> forceChunks = new ConcurrentHashMap<>();
|
|
private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>();
|
|
|
|
public static void setChunkInPlotArea(
|
|
RunnableVal<ScopedQueueCoordinator> force,
|
|
RunnableVal<ScopedQueueCoordinator> add,
|
|
String world,
|
|
BlockVector2 loc
|
|
) {
|
|
World weWorld = PlotSquared.platform().worldUtil().getWeWorld(world);
|
|
QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(weWorld);
|
|
if (PlotSquared.get().getPlotAreaManager().isAugmented(world) && PlotSquared.get().isNonStandardGeneration(world, loc)) {
|
|
int blockX = loc.getX() << 4;
|
|
int blockZ = loc.getZ() << 4;
|
|
ScopedQueueCoordinator scoped =
|
|
new ScopedQueueCoordinator(
|
|
queue,
|
|
Location.at(world, blockX, weWorld.getMinY(), blockZ),
|
|
Location.at(world, blockX + 15, weWorld.getMaxY(), blockZ + 15)
|
|
);
|
|
if (force != null) {
|
|
force.run(scoped);
|
|
} else {
|
|
scoped.regenChunk(loc.getX(), loc.getZ());
|
|
if (add != null) {
|
|
add.run(scoped);
|
|
}
|
|
}
|
|
queue.enqueue();
|
|
} else {
|
|
if (force != null) {
|
|
forceChunks.put(loc, force);
|
|
}
|
|
addChunks.put(loc, add);
|
|
queue.regenChunk(loc.getX(), loc.getZ());
|
|
forceChunks.remove(loc);
|
|
addChunks.remove(loc);
|
|
}
|
|
}
|
|
|
|
public static boolean preProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) {
|
|
final RunnableVal<ScopedQueueCoordinator> forceChunk = forceChunks.get(loc);
|
|
if (forceChunk != null) {
|
|
forceChunk.run(queue);
|
|
forceChunks.remove(loc);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public static boolean postProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) {
|
|
final RunnableVal<ScopedQueueCoordinator> addChunk = forceChunks.get(loc);
|
|
if (addChunk != null) {
|
|
addChunk.run(queue);
|
|
addChunks.remove(loc);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
@Deprecated
|
|
public abstract CompletableFuture<?> loadChunk(String world, BlockVector2 loc, boolean force);
|
|
|
|
}
|