SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose server build information

Browse Source 
Co-authored-by: Zach Brown <1254957+zachbr@users.noreply.github.com>
Co-authored-by: Kyle Wood <kyle@denwav.dev>
Co-authored-by: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: masmc05 <masmc05@gmail.com>
This commit is contained in:
Zach Brown
2016-03-01 14:32:43 -06:00
parent 560b13ca08
commit f41436f787
13 changed files with 581 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch
View File

@@ -1,6 +1,14 @@
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -84,17 +84,6 @@
@@ -45,7 +45,6 @@
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport;
import java.util.function.BooleanSupplier;
@@ -84,17 +83,6 @@
import net.minecraft.obfuscate.DontObfuscate;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
@@ -18,7 +26,7 @@
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.repository.Pack;
import net.minecraft.server.packs.repository.PackRepository;
@@ -116,6 +105,7 @@
@@ -116,6 +104,7 @@
import net.minecraft.util.RandomSource;
import net.minecraft.util.SignatureValidator;
import net.minecraft.util.TimeUtil;
@@ -26,7 +34,7 @@
import net.minecraft.util.debugchart.RemoteDebugSampleType;
import net.minecraft.util.debugchart.SampleLogger;
import net.minecraft.util.debugchart.TpsDebugDimensions;
@@ -156,37 +146,72 @@
@@ -156,37 +145,70 @@
import net.minecraft.world.level.biome.BiomeManager;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.FuelValues;
@@ -89,8 +97,6 @@
-import org.slf4j.Logger;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.CraftRegistry;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.Main;
+import org.bukkit.event.server.ServerLoadEvent;
+// CraftBukkit end
@@ -107,7 +113,7 @@
private static final int OVERLOADED_TICKS_THRESHOLD = 20;
private static final long OVERLOADED_WARNING_INTERVAL_NANOS = 10L * TimeUtil.NANOSECONDS_PER_SECOND;
private static final int OVERLOADED_TICKS_WARNING_INTERVAL = 100;
@@ -232,8 +257,7 @@
@@ -232,8 +254,7 @@
private boolean preventProxyConnections;
private boolean pvp;
private boolean allowFlight;
@@ -117,7 +123,7 @@
private int playerIdleTimeout;
private final long[] tickTimesNanos;
private long aggregatedTickTimesNanos;
@@ -277,6 +301,26 @@
@@ -277,6 +298,26 @@
private final SuppressedExceptionCollector suppressedExceptions;
private final DiscontinuousFrame tickFrame;
@@ -144,7 +150,7 @@
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
Thread thread = new Thread(() -> {
@@ -290,14 +334,14 @@
@@ -290,14 +331,14 @@
thread.setPriority(8);
}
@@ -161,7 +167,7 @@
super("Server");
this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
this.onMetricsRecordingStopped = (methodprofilerresults) -> {
@@ -319,36 +363,68 @@
@@ -319,36 +360,68 @@
this.scoreboard = new ServerScoreboard(this);
this.customBossEvents = new CustomBossEvents();
this.suppressedExceptions = new SuppressedExceptionCollector();
@@ -245,7 +251,7 @@
}
private void readScoreboard(DimensionDataStorage persistentStateManager) {
@@ -357,7 +433,7 @@
@@ -357,7 +430,7 @@
protected abstract boolean initServer() throws IOException;
@@ -254,7 +260,7 @@
if (!JvmProfiler.INSTANCE.isRunning()) {
;
}
@@ -365,12 +441,8 @@
@@ -365,12 +438,8 @@
boolean flag = false;
ProfiledDuration profiledduration = JvmProfiler.INSTANCE.onWorldLoadedStarted();
@@ -268,7 +274,7 @@
if (profiledduration != null) {
profiledduration.finish(true);
}
@@ -387,23 +459,218 @@
@@ -387,23 +456,218 @@
protected void forceDifficulty() {}
@@ -292,12 +298,12 @@
+ Registry<LevelStem> dimensions = iregistrycustom_dimension.lookupOrThrow(Registries.LEVEL_STEM);
+ for (LevelStem worldDimension : dimensions) {
+ ResourceKey<LevelStem> dimensionKey = dimensions.getResourceKey(worldDimension).get();
+
+ ServerLevel world;
+ int dimension = 0;
- this.readScoreboard(worldpersistentdata);
- this.commandStorage = new CommandStorage(worldpersistentdata);
+ ServerLevel world;
+ int dimension = 0;
+
+ if (dimensionKey == LevelStem.NETHER) {
+ if (this.server.getAllowNether()) {
+ dimension = -1;
@@ -501,7 +507,7 @@
if (!iworlddataserver.isInitialized()) {
try {
@@ -427,30 +694,8 @@
@@ -427,30 +691,8 @@
iworlddataserver.setInitialized(true);
}
@@ -533,7 +539,7 @@
private static void setInitialSpawn(ServerLevel world, ServerLevelData worldProperties, boolean bonusChest, boolean debugWorld) {
if (debugWorld) {
@@ -458,6 +703,21 @@
@@ -458,6 +700,21 @@
} else {
ServerChunkCache chunkproviderserver = world.getChunkSource();
ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition());
@@ -555,7 +561,7 @@
int i = chunkproviderserver.getGenerator().getSpawnHeight(world);
if (i < world.getMinY()) {
@@ -516,31 +776,36 @@
@@ -516,31 +773,36 @@
iworlddataserver.setGameType(GameType.SPECTATOR);
}
@@ -603,7 +609,7 @@
ForcedChunksSavedData forcedchunk = (ForcedChunksSavedData) worldserver1.getDataStorage().get(ForcedChunksSavedData.factory(), "chunks");
if (forcedchunk != null) {
@@ -555,10 +820,17 @@
@@ -555,10 +817,17 @@
}
}
@@ -625,7 +631,7 @@
}
public GameType getDefaultGameType() {
@@ -588,12 +860,16 @@
@@ -588,12 +857,16 @@
worldserver.save((ProgressListener) null, flush, worldserver.noSave && !force);
}
@@ -644,7 +650,7 @@
if (flush) {
Iterator iterator1 = this.getAllLevels().iterator();
@@ -628,18 +904,41 @@
@@ -628,18 +901,41 @@
this.stopServer();
}
@@ -686,7 +692,7 @@
}
MinecraftServer.LOGGER.info("Saving worlds");
@@ -693,6 +992,15 @@
@@ -693,6 +989,15 @@
} catch (IOException ioexception1) {
MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), ioexception1);
}
@@ -702,15 +708,10 @@
}
@@ -715,10 +1023,68 @@
this.serverThread.join();
} catch (InterruptedException interruptedexception) {
MinecraftServer.LOGGER.error("Error while shutting down", interruptedexception);
+ }
+ }
+
+ }
+
@@ -720,6 +1025,64 @@
}
+ // Spigot Start
+ private static double calcTps(double avg, double exp, double tps)
+ {
@@ -743,9 +744,9 @@
+ for (int i = 0; i < size; i++) {
+ this.samples[i] = dec(TPS);
+ this.times[i] = SEC_IN_NANO;
}
}
+ }
+ }
+
+ private static java.math.BigDecimal dec(long t) {
+ return new java.math.BigDecimal(t);
+ }
@@ -764,14 +765,15 @@
+ public double getAverage() {
+ return total.divide(dec(time), 30, java.math.RoundingMode.HALF_UP).doubleValue();
+ }
}
+ }
+ private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
+ // Paper end
+ // Spigot End
+
protected void runServer() {
try {
@@ -727,9 +1093,15 @@
if (!this.initServer()) {
@@ -727,9 +1090,15 @@
}
this.nextTickTimeNanos = Util.getNanos();
@@ -788,7 +790,7 @@
while (this.running) {
long i;
@@ -744,11 +1116,30 @@
@@ -744,11 +1113,30 @@
if (j > MinecraftServer.OVERLOADED_THRESHOLD_NANOS + 20L * i && this.nextTickTimeNanos - this.lastOverloadWarningNanos >= MinecraftServer.OVERLOADED_WARNING_INTERVAL_NANOS + 100L * i) {
long k = j / i;
@@ -819,7 +821,7 @@
boolean flag = i == 0L;
@@ -757,6 +1148,8 @@
@@ -757,6 +1145,8 @@
this.debugCommandProfiler = new MinecraftServer.TimeProfiler(Util.getNanos(), this.tickCount);
}
@@ -828,7 +830,7 @@
this.nextTickTimeNanos += i;
try {
@@ -830,6 +1223,13 @@
@@ -830,6 +1220,13 @@
this.services.profileCache().clearExecutor();
}
@@ -842,7 +844,7 @@
this.onServerExit();
}
@@ -889,9 +1289,16 @@
@@ -889,9 +1286,16 @@
}
private boolean haveTime() {
@@ -860,7 +862,7 @@
public static boolean throwIfFatalException() {
RuntimeException runtimeexception = (RuntimeException) MinecraftServer.fatalException.get();
@@ -903,7 +1310,7 @@
@@ -903,7 +1307,7 @@
}
public static void setFatalException(RuntimeException exception) {
@@ -869,7 +871,7 @@
}
@Override
@@ -977,7 +1384,7 @@
@@ -977,7 +1381,7 @@
}
}
@@ -878,7 +880,7 @@
Profiler.get().incrementCounter("runTask");
super.doRunTask(ticktask);
}
@@ -1025,6 +1432,7 @@
@@ -1025,6 +1429,7 @@
}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -886,7 +888,7 @@
long i = Util.getNanos();
int j = this.pauseWhileEmptySeconds() * 20;
@@ -1041,6 +1449,7 @@
@@ -1041,6 +1446,7 @@
this.autoSave();
}
@@ -894,7 +896,7 @@
this.tickConnection();
return;
}
@@ -1055,12 +1464,13 @@
@@ -1055,12 +1461,13 @@
}
--this.ticksUntilAutosave;
@@ -909,7 +911,7 @@
gameprofilerfiller.push("tallying");
long k = Util.getNanos() - i;
int l = this.tickCount % 100;
@@ -1074,7 +1484,7 @@
@@ -1074,7 +1481,7 @@
}
private void autoSave() {
@@ -918,7 +920,7 @@
MinecraftServer.LOGGER.debug("Autosave started");
ProfilerFiller gameprofilerfiller = Profiler.get();
@@ -1123,7 +1533,7 @@
@@ -1123,7 +1530,7 @@
private ServerStatus buildServerStatus() {
ServerStatus.Players serverping_serverpingplayersample = this.buildPlayerStatus();
@@ -927,7 +929,7 @@
}
private ServerStatus.Players buildPlayerStatus() {
@@ -1154,11 +1564,27 @@
@@ -1154,11 +1561,27 @@
this.getPlayerList().getPlayers().forEach((entityplayer) -> {
entityplayer.connection.suspendFlushing();
});
@@ -955,7 +957,7 @@
while (iterator.hasNext()) {
ServerLevel worldserver = (ServerLevel) iterator.next();
@@ -1167,11 +1593,13 @@
@@ -1167,11 +1590,13 @@
return s + " " + String.valueOf(worldserver.dimension().location());
});
@@ -969,7 +971,7 @@
gameprofilerfiller.push("tick");
@@ -1265,7 +1693,23 @@
@@ -1265,7 +1690,23 @@
@Nullable
public ServerLevel getLevel(ResourceKey<Level> key) {
return (ServerLevel) this.levels.get(key);
@@ -993,16 +995,16 @@
public Set<ResourceKey<Level>> levelKeys() {
return this.levels.keySet();
@@ -1296,7 +1740,7 @@
@@ -1296,7 +1737,7 @@
@DontObfuscate
public String getServerModName() {
- return "vanilla";
+ return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
}
public SystemReport fillSystemReport(SystemReport details) {
@@ -1347,7 +1791,7 @@
@@ -1347,7 +1788,7 @@
@Override
public void sendSystemMessage(Component message) {
@@ -1011,7 +1013,7 @@
}
public KeyPair getKeyPair() {
@@ -1481,10 +1925,20 @@
@@ -1481,10 +1922,20 @@
@Override
public String getMotd() {
@@ -1033,7 +1035,7 @@
this.motd = motd;
}
@@ -1507,7 +1961,7 @@
@@ -1507,7 +1958,7 @@
}
public ServerConnectionListener getConnection() {
@@ -1042,7 +1044,7 @@
}
public boolean isReady() {
@@ -1634,11 +2088,11 @@
@@ -1634,11 +2085,11 @@
public CompletableFuture<Void> reloadResources(Collection<String> dataPacks) {
CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
@@ -1056,7 +1058,7 @@
}, this).thenCompose((immutablelist) -> {
MultiPackResourceManager resourcemanager = new MultiPackResourceManager(PackType.SERVER_DATA, immutablelist);
List<Registry.PendingTags<?>> list = TagLoader.loadTagsForExistingRegistries(resourcemanager, this.registries.compositeAccess());
@@ -1654,6 +2108,7 @@
@@ -1654,6 +2105,7 @@
}).thenAcceptAsync((minecraftserver_reloadableresources) -> {
this.resources.close();
this.resources = minecraftserver_reloadableresources;
@@ -1064,7 +1066,7 @@
this.packRepository.setSelected(dataPacks);
WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(MinecraftServer.getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures());
@@ -1952,7 +2407,7 @@
@@ -1952,7 +2404,7 @@
final List<String> list = Lists.newArrayList();
final GameRules gamerules = this.getGameRules();
@@ -1073,7 +1075,7 @@
@Override
public <T extends GameRules.Value<T>> void visit(GameRules.Key<T> key, GameRules.Type<T> type) {
list.add(String.format(Locale.ROOT, "%s=%s\n", key.getId(), gamerules.getRule(key)));
@@ -2058,7 +2513,7 @@
@@ -2058,7 +2510,7 @@
try {
label51:
{
@@ -1082,7 +1084,7 @@
try {
arraylist = Lists.newArrayList(NativeModuleLister.listModules());
@@ -2108,6 +2563,22 @@
@@ -2108,6 +2560,22 @@
}
@@ -1105,7 +1107,7 @@
private ProfilerFiller createProfiler() {
if (this.willStartRecordingMetrics) {
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
@@ -2225,18 +2696,24 @@
@@ -2225,18 +2693,24 @@
}
public void logChatMessage(Component message, ChatType.Bound params, @Nullable String prefix) {