eaglercraft/Project164
1
0
Fork 0
mirror of https://git.zelz.net/catfoolyou/Project164.git synced 2025-12-15 22:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some shit for JS compilation

Browse Source
This commit is contained in:
catfoolyou
2025-03-03 13:07:41 -05:00
parent c1863833db
commit 3474a88739
17 changed files with 1552537 additions and 30275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@@ -1,6 +1,5 @@
package net.minecraft.server;
import java.awt.GraphicsEnvironment;
import java.io.File;
import java.io.IOException;
import java.net.Proxy;
@@ -21,7 +20,6 @@ import net.minecraft.src.EnumGameType;
import net.minecraft.src.ICommandManager;
import net.minecraft.src.ICommandSender;
import net.minecraft.src.ILogAgent;
import net.minecraft.src.IPlayerUsage;
import net.minecraft.src.IProgressUpdate;
import net.minecraft.src.ISaveFormat;
import net.minecraft.src.ISaveHandler;
@@ -30,7 +28,6 @@ import net.minecraft.src.MathHelper;
import net.minecraft.src.MinecraftException;
import net.minecraft.src.Packet;
import net.minecraft.src.Packet4UpdateTime;
import net.minecraft.src.PlayerUsageSnooper;
import net.minecraft.src.Profiler;
import net.minecraft.src.RConConsoleSource;
import net.minecraft.src.ReportedException;
@@ -45,14 +42,13 @@ import net.minecraft.src.WorldServerMulti;
import net.minecraft.src.WorldSettings;
import net.minecraft.src.WorldType;
public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage
public abstract class MinecraftServer implements ICommandSender, Runnable
{
/** Instance of Minecraft Server. */
private static MinecraftServer mcServer;
//private final ISaveFormat anvilConverterForAnvilFile;
/** The PlayerUsageSnooper instance. */
private final PlayerUsageSnooper usageSnooper = new PlayerUsageSnooper("server", this, getSystemTimeMillis());
private final File anvilFile;
/**
@@ -392,11 +388,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
WorldServer var2 = this.worldServers[var1];
var2.flush();
}
if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning())
{
this.usageSnooper.stopSnooper();
}
}
}
@@ -575,19 +566,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
this.lastReceivedID = Packet.receivedID;
this.receivedPacketSizeArray[this.tickCounter % 100] = Packet.receivedSize - this.lastReceivedSize;
this.lastReceivedSize = Packet.receivedSize;
this.theProfiler.endSection();
this.theProfiler.startSection("snooper");
if (!this.usageSnooper.isSnooperRunning() && this.tickCounter > 100)
{
this.usageSnooper.startSnooper();
}
if (this.tickCounter % 6000 == 0)
{
this.usageSnooper.addMemoryStatsToSnooper();
}
this.theProfiler.endSection();
this.theProfiler.endSection();
}
@@ -1064,60 +1042,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
this.texturePack = par1Str;
}
public void addServerStatsToSnooper(PlayerUsageSnooper par1PlayerUsageSnooper)
{
par1PlayerUsageSnooper.addData("whitelist_enabled", Boolean.valueOf(false));
par1PlayerUsageSnooper.addData("whitelist_count", Integer.valueOf(0));
par1PlayerUsageSnooper.addData("players_current", Integer.valueOf(this.getCurrentPlayerCount()));
par1PlayerUsageSnooper.addData("players_max", Integer.valueOf(this.getMaxPlayers()));
par1PlayerUsageSnooper.addData("players_seen", Integer.valueOf(this.serverConfigManager.getAvailablePlayerDat().length));
par1PlayerUsageSnooper.addData("uses_auth", Boolean.valueOf(this.onlineMode));
par1PlayerUsageSnooper.addData("gui_state", this.getGuiEnabled() ? "enabled" : "disabled");
par1PlayerUsageSnooper.addData("run_time", Long.valueOf((getSystemTimeMillis() - par1PlayerUsageSnooper.func_130105_g()) / 60L * 1000L));
par1PlayerUsageSnooper.addData("avg_tick_ms", Integer.valueOf((int)(MathHelper.average(this.tickTimeArray) * 1.0E-6D)));
par1PlayerUsageSnooper.addData("avg_sent_packet_count", Integer.valueOf((int)MathHelper.average(this.sentPacketCountArray)));
par1PlayerUsageSnooper.addData("avg_sent_packet_size", Integer.valueOf((int)MathHelper.average(this.sentPacketSizeArray)));
par1PlayerUsageSnooper.addData("avg_rec_packet_count", Integer.valueOf((int)MathHelper.average(this.receivedPacketCountArray)));
par1PlayerUsageSnooper.addData("avg_rec_packet_size", Integer.valueOf((int)MathHelper.average(this.receivedPacketSizeArray)));
int var2 = 0;
for (int var3 = 0; var3 < this.worldServers.length; ++var3)
{
if (this.worldServers[var3] != null)
{
WorldServer var4 = this.worldServers[var3];
WorldInfo var5 = var4.getWorldInfo();
par1PlayerUsageSnooper.addData("world[" + var2 + "][dimension]", Integer.valueOf(var4.provider.dimensionId));
par1PlayerUsageSnooper.addData("world[" + var2 + "][mode]", var5.getGameType());
par1PlayerUsageSnooper.addData("world[" + var2 + "][difficulty]", Integer.valueOf(var4.difficultySetting));
par1PlayerUsageSnooper.addData("world[" + var2 + "][hardcore]", Boolean.valueOf(var5.isHardcoreModeEnabled()));
par1PlayerUsageSnooper.addData("world[" + var2 + "][generator_name]", var5.getTerrainType().getWorldTypeName());
par1PlayerUsageSnooper.addData("world[" + var2 + "][generator_version]", Integer.valueOf(var5.getTerrainType().getGeneratorVersion()));
par1PlayerUsageSnooper.addData("world[" + var2 + "][height]", Integer.valueOf(this.buildLimit));
par1PlayerUsageSnooper.addData("world[" + var2 + "][chunks_loaded]", Integer.valueOf(var4.getChunkProvider().getLoadedChunkCount()));
++var2;
}
}
par1PlayerUsageSnooper.addData("worlds", Integer.valueOf(var2));
}
public void addServerTypeToSnooper(PlayerUsageSnooper par1PlayerUsageSnooper)
{
par1PlayerUsageSnooper.addData("singleplayer", Boolean.valueOf(this.isSinglePlayer()));
par1PlayerUsageSnooper.addData("server_brand", this.getServerModName());
par1PlayerUsageSnooper.addData("gui_supported", GraphicsEnvironment.isHeadless() ? "headless" : "supported");
par1PlayerUsageSnooper.addData("dedicated", Boolean.valueOf(this.isDedicatedServer()));
}
/**
* Returns whether snooping is enabled or not.
*/
public boolean isSnooperEnabled()
{
return true;
}
/**
* This is checked to be 16 upon receiving the packet, otherwise the packet is ignored.
*/
@@ -1254,12 +1178,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
{
this.startProfiling = true;
}
public PlayerUsageSnooper getPlayerUsageSnooper()
{
return this.usageSnooper;
}
/**
* Return the position for this command sender.
*/