Initial watchdog setup. Bukkit needs adapters, everything needs testing.

Dieser Commit ist enthalten in:
Kenzie Togami 2019-09-04 20:55:47 -07:00
Ursprung a515ed0a30
Commit 8af68fc884
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 5D200B325E157A81
15 geänderte Dateien mit 293 neuen und 1 gelöschten Zeilen

Datei anzeigen

@ -28,6 +28,8 @@ import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.MultiUserPlatform; import com.sk89q.worldedit.extension.platform.MultiUserPlatform;
import com.sk89q.worldedit.extension.platform.Preference; import com.sk89q.worldedit.extension.platform.Preference;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.util.concurrency.LazyReference;
import com.sk89q.worldedit.world.DataFixer; import com.sk89q.worldedit.world.DataFixer;
import com.sk89q.worldedit.world.registry.Registries; import com.sk89q.worldedit.world.registry.Registries;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -52,6 +54,14 @@ public class BukkitServerInterface implements MultiUserPlatform {
public WorldEditPlugin plugin; public WorldEditPlugin plugin;
private CommandRegistration dynamicCommands; private CommandRegistration dynamicCommands;
private boolean hookingEvents; private boolean hookingEvents;
private final LazyReference<Watchdog> watchdog = LazyReference.from(() -> {
if (plugin.getBukkitImplAdapter() != null) {
return plugin.getBukkitImplAdapter().supportsWatchdog()
? new BukkitWatchdog(plugin.getBukkitImplAdapter())
: null;
}
return null;
});
public BukkitServerInterface(WorldEditPlugin plugin, Server server) { public BukkitServerInterface(WorldEditPlugin plugin, Server server) {
this.plugin = plugin; this.plugin = plugin;
@ -103,6 +113,11 @@ public class BukkitServerInterface implements MultiUserPlatform {
return Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay, period); return Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay, period);
} }
@Override
public Watchdog getWatchdog() {
return watchdog.getValue();
}
@Override @Override
public List<com.sk89q.worldedit.world.World> getWorlds() { public List<com.sk89q.worldedit.world.World> getWorlds() {
List<World> worlds = server.getWorlds(); List<World> worlds = server.getWorlds();

Datei anzeigen

@ -0,0 +1,38 @@
/*
* 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 Lesser 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 Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.bukkit;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.extension.platform.Watchdog;
class BukkitWatchdog implements Watchdog {
private final BukkitImplAdapter adapter;
BukkitWatchdog(BukkitImplAdapter adapter) {
this.adapter = adapter;
}
@Override
public void tick() {
adapter.tickWatchdog();
}
}

Datei anzeigen

@ -62,6 +62,19 @@ public interface BukkitImplAdapter {
@Nullable @Nullable
DataFixer getDataFixer(); DataFixer getDataFixer();
/**
* @return {@code true} if {@link #tickWatchdog()} is implemented
*/
default boolean supportsWatchdog() {
return false;
}
/**
* Tick the server watchdog, if possible.
*/
default void tickWatchdog() {
}
/** /**
* Get the block at the given location. * Get the block at the given location.
* *

Datei anzeigen

@ -22,6 +22,8 @@ package com.sk89q.worldedit;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.event.extent.EditSessionEvent; import com.sk89q.worldedit.event.extent.EditSessionEvent;
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.extent.ChangeSetExtent; import com.sk89q.worldedit.extent.ChangeSetExtent;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.MaskingExtent; import com.sk89q.worldedit.extent.MaskingExtent;
@ -38,6 +40,7 @@ import com.sk89q.worldedit.extent.world.BlockQuirkExtent;
import com.sk89q.worldedit.extent.world.ChunkLoadingExtent; import com.sk89q.worldedit.extent.world.ChunkLoadingExtent;
import com.sk89q.worldedit.extent.world.FastModeExtent; import com.sk89q.worldedit.extent.world.FastModeExtent;
import com.sk89q.worldedit.extent.world.SurvivalModeExtent; import com.sk89q.worldedit.extent.world.SurvivalModeExtent;
import com.sk89q.worldedit.extent.world.WatchdogTickingExtent;
import com.sk89q.worldedit.function.GroundFunction; import com.sk89q.worldedit.function.GroundFunction;
import com.sk89q.worldedit.function.RegionMaskingFilter; import com.sk89q.worldedit.function.RegionMaskingFilter;
import com.sk89q.worldedit.function.biome.BiomeReplace; import com.sk89q.worldedit.function.biome.BiomeReplace;
@ -214,10 +217,16 @@ public class EditSession implements Extent, AutoCloseable {
this.world = world; this.world = world;
if (world != null) { if (world != null) {
Watchdog watchdog = WorldEdit.getInstance().getPlatformManager()
.queryCapability(Capability.GAME_HOOKS).getWatchdog();
Extent extent; Extent extent;
// These extents are ALWAYS used // These extents are ALWAYS used
extent = fastModeExtent = new FastModeExtent(world, false); extent = fastModeExtent = new FastModeExtent(world, false);
if (watchdog != null) {
// Reset watchdog before world placement
extent = new WatchdogTickingExtent(extent, watchdog);
}
extent = survivalExtent = new SurvivalModeExtent(extent, world); extent = survivalExtent = new SurvivalModeExtent(extent, world);
extent = new BlockQuirkExtent(extent, world); extent = new BlockQuirkExtent(extent, world);
extent = new ChunkLoadingExtent(extent, world); extent = new ChunkLoadingExtent(extent, world);
@ -230,6 +239,11 @@ public class EditSession implements Extent, AutoCloseable {
extent = reorderExtent = new MultiStageReorder(extent, false); extent = reorderExtent = new MultiStageReorder(extent, false);
extent = chunkBatchingExtent = new ChunkBatchingExtent(extent); extent = chunkBatchingExtent = new ChunkBatchingExtent(extent);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_REORDER); extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_REORDER);
if (watchdog != null) {
// reset before buffering extents, since they may buffer all changes
// before the world-placement reset can happen, and still cause halts
extent = new WatchdogTickingExtent(extent, watchdog);
}
this.bypassHistory = new DataValidatorExtent(extent, world); this.bypassHistory = new DataValidatorExtent(extent, world);
// These extents can be skipped by calling smartSetBlock() // These extents can be skipped by calling smartSetBlock()

Datei anzeigen

@ -83,6 +83,15 @@ public interface Platform {
*/ */
int schedule(long delay, long period, Runnable task); int schedule(long delay, long period, Runnable task);
/**
* Get the watchdog service.
*
* @return the watchdog service, or {@code null} if none
*/
default @Nullable Watchdog getWatchdog() {
return null;
}
/** /**
* Get a list of available or loaded worlds. * Get a list of available or loaded worlds.
* *

Datei anzeigen

@ -0,0 +1,29 @@
/*
* 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 Lesser 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 Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.extension.platform;
/**
* Interface to a {@link Platform}'s watchdog service.
*/
public interface Watchdog {
void tick();
}

Datei anzeigen

@ -0,0 +1,72 @@
/*
* 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 Lesser 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 Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.extent.world;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nullable;
/**
* Extent that ticks the watchdog before every world-affecting action.
*/
public class WatchdogTickingExtent extends AbstractDelegateExtent {
private final Watchdog watchdog;
/**
* Create a new instance.
*
* @param extent the extent
* @param watchdog the watchdog to reset
*/
public WatchdogTickingExtent(Extent extent, Watchdog watchdog) {
super(extent);
this.watchdog = watchdog;
}
@Override
public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 location, T block) throws WorldEditException {
watchdog.tick();
return super.setBlock(location, block);
}
@Nullable
@Override
public Entity createEntity(Location location, BaseEntity entity) {
watchdog.tick();
return super.createEntity(location, entity);
}
@Override
public boolean setBiome(BlockVector2 position, BiomeType biome) {
watchdog.tick();
return super.setBiome(position, biome);
}
}

Datei anzeigen

@ -26,12 +26,14 @@ import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.MultiUserPlatform; import com.sk89q.worldedit.extension.platform.MultiUserPlatform;
import com.sk89q.worldedit.extension.platform.Preference; import com.sk89q.worldedit.extension.platform.Preference;
import com.sk89q.worldedit.fabric.mixin.MixinMinecraftServer;
import com.sk89q.worldedit.world.DataFixer; import com.sk89q.worldedit.world.DataFixer;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.registry.Registries; import com.sk89q.worldedit.world.registry.Registries;
import net.minecraft.SharedConstants; import net.minecraft.SharedConstants;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PlayerManager; import net.minecraft.server.PlayerManager;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -55,12 +57,15 @@ class FabricPlatform extends AbstractPlatform implements MultiUserPlatform {
private final FabricWorldEdit mod; private final FabricWorldEdit mod;
private final MinecraftServer server; private final MinecraftServer server;
private final FabricDataFixer dataFixer; private final FabricDataFixer dataFixer;
private final @Nullable FabricWatchdog watchdog;
private boolean hookingEvents = false; private boolean hookingEvents = false;
FabricPlatform(FabricWorldEdit mod, MinecraftServer server) { FabricPlatform(FabricWorldEdit mod, MinecraftServer server) {
this.mod = mod; this.mod = mod;
this.server = server; this.server = server;
this.dataFixer = new FabricDataFixer(getDataVersion()); this.dataFixer = new FabricDataFixer(getDataVersion());
this.watchdog = server instanceof DedicatedServer
? new FabricWatchdog((MixinMinecraftServer) (Object) server) : null;
} }
boolean isHookingEvents() { boolean isHookingEvents() {
@ -97,6 +102,12 @@ class FabricPlatform extends AbstractPlatform implements MultiUserPlatform {
return -1; return -1;
} }
@Override
@Nullable
public FabricWatchdog getWatchdog() {
return watchdog;
}
@Override @Override
public List<? extends World> getWorlds() { public List<? extends World> getWorlds() {
Iterable<ServerWorld> worlds = server.getWorlds(); Iterable<ServerWorld> worlds = server.getWorlds();

Datei anzeigen

@ -0,0 +1,19 @@
package com.sk89q.worldedit.fabric;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.fabric.mixin.MixinMinecraftServer;
import net.minecraft.util.SystemUtil;
class FabricWatchdog implements Watchdog {
private final MixinMinecraftServer server;
FabricWatchdog(MixinMinecraftServer server) {
this.server = server;
}
@Override
public void tick() {
server.timeReference = SystemUtil.getMeasuringTimeMs();
}
}

Datei anzeigen

@ -0,0 +1,20 @@
package com.sk89q.worldedit.fabric.mixin;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask;
import net.minecraft.server.command.CommandOutput;
import net.minecraft.util.NonBlockingThreadExecutor;
import net.minecraft.util.snooper.SnooperListener;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(MinecraftServer.class)
public abstract class MixinMinecraftServer extends NonBlockingThreadExecutor<ServerTask> implements SnooperListener, CommandOutput, AutoCloseable, Runnable {
public MixinMinecraftServer(String string_1) {
super(string_1);
}
@Shadow
public long timeReference;
}

Datei anzeigen

@ -3,7 +3,8 @@
"package": "com.sk89q.worldedit.fabric.mixin", "package": "com.sk89q.worldedit.fabric.mixin",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",
"mixins": [ "mixins": [
"MixinServerPlayerEntity" "MixinServerPlayerEntity",
"MixinMinecraftServer"
], ],
"server": [ "server": [
], ],

Datei anzeigen

@ -34,6 +34,8 @@ configure<UserDevExtension> {
"version" to "20190913-$mappingsMinecraftVersion" "version" to "20190913-$mappingsMinecraftVersion"
)) ))
accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg"))
runs { runs {
val runConfig = Action<RunConfig> { val runConfig = Action<RunConfig> {
properties(mapOf( properties(mapOf(

Datei anzeigen

@ -32,6 +32,7 @@ import com.sk89q.worldedit.world.registry.Registries;
import net.minecraft.command.Commands; import net.minecraft.command.Commands;
import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.management.PlayerList; import net.minecraft.server.management.PlayerList;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SharedConstants; import net.minecraft.util.SharedConstants;
@ -56,12 +57,15 @@ class ForgePlatform extends AbstractPlatform implements MultiUserPlatform {
private final ForgeWorldEdit mod; private final ForgeWorldEdit mod;
private final MinecraftServer server; private final MinecraftServer server;
private final ForgeDataFixer dataFixer; private final ForgeDataFixer dataFixer;
private final @Nullable ForgeWatchdog watchdog;
private boolean hookingEvents = false; private boolean hookingEvents = false;
ForgePlatform(ForgeWorldEdit mod) { ForgePlatform(ForgeWorldEdit mod) {
this.mod = mod; this.mod = mod;
this.server = ServerLifecycleHooks.getCurrentServer(); this.server = ServerLifecycleHooks.getCurrentServer();
this.dataFixer = new ForgeDataFixer(getDataVersion()); this.dataFixer = new ForgeDataFixer(getDataVersion());
this.watchdog = server instanceof DedicatedServer
? new ForgeWatchdog((DedicatedServer) server) : null;
} }
boolean isHookingEvents() { boolean isHookingEvents() {
@ -98,6 +102,12 @@ class ForgePlatform extends AbstractPlatform implements MultiUserPlatform {
return -1; return -1;
} }
@Override
@Nullable
public ForgeWatchdog getWatchdog() {
return watchdog;
}
@Override @Override
public List<? extends World> getWorlds() { public List<? extends World> getWorlds() {
Iterable<ServerWorld> worlds = server.getWorlds(); Iterable<ServerWorld> worlds = server.getWorlds();

Datei anzeigen

@ -0,0 +1,38 @@
/*
* 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 Lesser 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 Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.forge;
import com.sk89q.worldedit.extension.platform.Watchdog;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.util.Util;
class ForgeWatchdog implements Watchdog {
private final DedicatedServer server;
ForgeWatchdog(DedicatedServer server) {
this.server = server;
}
@Override
public void tick() {
server.serverTime = Util.milliTime();
}
}

Datei anzeigen

@ -0,0 +1 @@
public net.minecraft.server.MinecraftServer field_211151_aa # serverTime