3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-10-03 20:21:05 +02:00

Fix port for folia

Dieser Commit ist enthalten in:
Phillip Glanz 2023-04-02 17:34:48 +02:00 committet von Phillipp Glanz
Ursprung 46bcbc8e63
Commit cebaaea153
3 geänderte Dateien mit 44 neuen und 26 gelöschten Zeilen

Datei anzeigen

@ -488,26 +488,47 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
} }
@Override @Override
protected void preCaptureStates(final ServerLevel serverLevel) { public boolean generateTree(
TreeGenerator.TreeType treeType, EditSession editSession, BlockVector3 blockVector3,
org.bukkit.World bukkitWorld
) {
TreeType bukkitType = BukkitWorld.toBukkitTreeType(treeType);
if (bukkitType == TreeType.CHORUS_PLANT) {
blockVector3 = blockVector3.add(
0,
1,
0
); // bukkit skips the feature gen which does this offset normally, so we have to add it back
}
ServerLevel serverLevel = ((CraftWorld) bukkitWorld).getHandle();
final BlockVector3 finalBlockVector = blockVector3;
// Sync to main thread to ensure no clashes occur
Map<BlockPos, CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
serverLevel.captureTreeGeneration = true; serverLevel.captureTreeGeneration = true;
serverLevel.captureBlockStates = true; serverLevel.captureBlockStates = true;
try {
if (!bukkitWorld.generateTree(BukkitAdapter.adapt(bukkitWorld, finalBlockVector), bukkitType)) {
return null;
} }
return ImmutableMap.copyOf(serverLevel.capturedBlockStates);
@Override } finally {
protected List<org.bukkit.block.BlockState> getCapturedBlockStatesCopy(final ServerLevel serverLevel) {
return new ArrayList<>(serverLevel.capturedBlockStates.values());
}
@Override
protected void postCaptureBlockStates(final ServerLevel serverLevel) {
serverLevel.captureBlockStates = false; serverLevel.captureBlockStates = false;
serverLevel.captureTreeGeneration = false; serverLevel.captureTreeGeneration = false;
serverLevel.capturedBlockStates.clear(); serverLevel.capturedBlockStates.clear();
} }
});
@Override if (placed == null || placed.isEmpty()) {
protected ServerLevel getServerLevel(final World world) { return false;
return ((CraftWorld) world).getHandle(); }
for (CraftBlockState craftBlockState : placed.values()) {
if (craftBlockState == null || craftBlockState.getType() == Material.AIR) {
continue;
}
editSession.setBlock(craftBlockState.getX(), craftBlockState.getY(), craftBlockState.getZ(),
BukkitAdapter.adapt(((org.bukkit.block.BlockState) craftBlockState).getBlockData())
);
}
return true;
} }
@Override @Override

Datei anzeigen

@ -11,10 +11,10 @@ import com.sk89q.worldedit.util.SideEffect;
import com.sk89q.worldedit.util.SideEffectSet; import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag; import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import io.papermc.paper.threadedregions.RegionizedServer;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ChunkHolder; import net.minecraft.server.level.ChunkHolder;
import net.minecraft.server.level.ServerChunkCache; import net.minecraft.server.level.ServerChunkCache;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
@ -58,7 +58,7 @@ public class PaperweightFaweWorldNativeAccess implements WorldNativeAccess<Level
this.level = level; this.level = level;
// Use the actual tick as minecraft-defined so we don't try to force blocks into the world when the server's already lagging. // Use the actual tick as minecraft-defined so we don't try to force blocks into the world when the server's already lagging.
// - With the caveat that we don't want to have too many cached changed (1024) so we'd flush those at 1024 anyway. // - With the caveat that we don't want to have too many cached changed (1024) so we'd flush those at 1024 anyway.
this.lastTick = new AtomicInteger(MinecraftServer.currentTick); this.lastTick = new AtomicInteger((int) RegionizedServer.getGlobalTickData().getCurrentTick());
} }
private Level getLevel() { private Level getLevel() {
@ -94,7 +94,7 @@ public class PaperweightFaweWorldNativeAccess implements WorldNativeAccess<Level
LevelChunk levelChunk, BlockPos blockPos, LevelChunk levelChunk, BlockPos blockPos,
net.minecraft.world.level.block.state.BlockState blockState net.minecraft.world.level.block.state.BlockState blockState
) { ) {
int currentTick = MinecraftServer.currentTick; int currentTick = (int) RegionizedServer.getGlobalTickData().getCurrentTick();
if (Fawe.isMainThread()) { if (Fawe.isMainThread()) {
return levelChunk.setBlockState(blockPos, blockState, return levelChunk.setBlockState(blockPos, blockState,
this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE) this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)

Datei anzeigen

@ -271,9 +271,6 @@ public class PaperweightRegen extends Regenerator<ChunkAccess, ProtoChunk, Level
WorldEditPlugin.getInstance().getBukkitImplAdapter().getInternalBiomeId(options.getBiomeType()) WorldEditPlugin.getInstance().getBukkitImplAdapter().getInternalBiomeId(options.getBiomeType())
) : null; ) : null;
@Override
public void tick(BooleanSupplier shouldKeepTicking) { //no ticking
}
@Override @Override
public Holder<Biome> getUncachedNoiseBiome(int biomeX, int biomeY, int biomeZ) { public Holder<Biome> getUncachedNoiseBiome(int biomeX, int biomeY, int biomeZ) {