Fix some shit for JS compilation
This commit is contained in:
parent
c1863833db
commit
3474a88739
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
|
||||||
</project>
|
</project>
|
|
@ -40,7 +40,7 @@ def folder = "javascript"
|
||||||
def name = "classes.js"
|
def name = "classes.js"
|
||||||
|
|
||||||
teavm.js {
|
teavm.js {
|
||||||
obfuscated = true
|
obfuscated = false
|
||||||
sourceMap = true
|
sourceMap = true
|
||||||
targetFileName = "../" + name
|
targetFileName = "../" + name
|
||||||
optimization = OptimizationLevel.AGGRESSIVE
|
optimization = OptimizationLevel.AGGRESSIVE
|
||||||
|
|
1582292
javascript/classes.js
1582292
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -7,55 +7,7 @@
|
||||||
<!--script type="text/javascript" src="music.js"></script-->
|
<!--script type="text/javascript" src="music.js"></script-->
|
||||||
<script type="text/javascript" src="classes.js"></script>
|
<script type="text/javascript" src="classes.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
if(document.location.href.startsWith("file:")) {
|
|
||||||
alert("You're not supposed to 'open' this file in your browser. Please upload this folder to your HTTP(s) server and access it via the internet. This is not a bug, please read the documentation");
|
|
||||||
}else {
|
|
||||||
window.addEventListener("load", async function(){
|
|
||||||
/*
|
|
||||||
let wardUrl = "";
|
|
||||||
try {
|
|
||||||
wardUrl = (await (await fetch("https://pipedapi.tokhmi.xyz/streams/5VuDwU4bW8Q")).json()).audioStreams[0].url;
|
|
||||||
} catch (e) {}
|
|
||||||
*/
|
|
||||||
const relayId = Math.floor(Math.random() * 3);
|
|
||||||
window.eaglercraftOpts = {
|
|
||||||
container: "game_frame", assetsURI: "assets.epk", serverWorkerURI: null, worldsFolder: "TEST",
|
|
||||||
assetOverrides: {
|
|
||||||
// "title/no-pano-blur.flag": "",
|
|
||||||
"records/wait.mp3": "wait.mp3",
|
|
||||||
"records/mellohi.mp3": "https://stream.nightride.fm/chillsynth.m4a",
|
|
||||||
"records/far.mp3": "https://stream.nightride.fm/nightride.m4a",
|
|
||||||
"records/cat.mp3": "http://usa9.fastcast4u.com/proxy/jamz?mp=/1",
|
|
||||||
"records/ward.mp3": "http://fr4.1mix.co.uk:8000/192h",
|
|
||||||
"records/strad.mp3": "http://listen.011fm.com:8028/stream15",
|
|
||||||
"records/blocks.mp3": "https://www.ophanim.net:8444/s/9780",
|
|
||||||
"records/13.mp3": "https://s2.radio.co/s2b2b68744/listen"
|
|
||||||
// "sounds/gta.mp3": "https://invidious.zapashcanon.fr/latest_version?itag=251&id=YRlIl6K6S88"
|
|
||||||
// "records/ward.mp3": wardUrl
|
|
||||||
// "sounds/gta.mp3": ""
|
|
||||||
},
|
|
||||||
servers: [
|
|
||||||
{ serverName: "Local Test Server", serverAddress: "localhost:25565", hideAddress: false }
|
|
||||||
],
|
|
||||||
relays: [
|
|
||||||
{ addr: "wss://relay.deev.is/", name: "lax1dude relay #1", primary: relayId == 0 },
|
|
||||||
{ addr: "wss://relay.lax1dude.net/", name: "lax1dude relay #2", primary: relayId == 1 },
|
|
||||||
{ addr: "wss://relay.shhnowisnottheti.me/", name: "ayunami relay #1", primary: relayId == 2 }
|
|
||||||
],
|
|
||||||
mainMenu: { splashes: [
|
|
||||||
"Darviglet!", "eaglerenophile!", "You Eagler!", "Yeeeeeee!", "yeee",
|
|
||||||
"EEEEEEEEE!", "You Darvig!", "You Vigg!", ":>", "|>", "You Yumpster!"
|
|
||||||
], eaglerLogo: false }};
|
|
||||||
(function(){
|
|
||||||
var q = window.location.search;
|
|
||||||
if(typeof q === 'string' && q.startsWith("?")) {
|
|
||||||
q = new URLSearchParams(q);
|
|
||||||
var s = q.get("server");
|
|
||||||
if(s) window.eaglercraftOpts.joinServer = s;
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
main();
|
main();
|
||||||
});}
|
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body style="margin:0px;width:100vw;height:100vh;" id="game_frame">
|
<body style="margin:0px;width:100vw;height:100vh;" id="game_frame">
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,6 +1,5 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
import java.awt.GraphicsEnvironment;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.Proxy;
|
import java.net.Proxy;
|
||||||
|
@ -21,7 +20,6 @@ import net.minecraft.src.EnumGameType;
|
||||||
import net.minecraft.src.ICommandManager;
|
import net.minecraft.src.ICommandManager;
|
||||||
import net.minecraft.src.ICommandSender;
|
import net.minecraft.src.ICommandSender;
|
||||||
import net.minecraft.src.ILogAgent;
|
import net.minecraft.src.ILogAgent;
|
||||||
import net.minecraft.src.IPlayerUsage;
|
|
||||||
import net.minecraft.src.IProgressUpdate;
|
import net.minecraft.src.IProgressUpdate;
|
||||||
import net.minecraft.src.ISaveFormat;
|
import net.minecraft.src.ISaveFormat;
|
||||||
import net.minecraft.src.ISaveHandler;
|
import net.minecraft.src.ISaveHandler;
|
||||||
|
@ -30,7 +28,6 @@ import net.minecraft.src.MathHelper;
|
||||||
import net.minecraft.src.MinecraftException;
|
import net.minecraft.src.MinecraftException;
|
||||||
import net.minecraft.src.Packet;
|
import net.minecraft.src.Packet;
|
||||||
import net.minecraft.src.Packet4UpdateTime;
|
import net.minecraft.src.Packet4UpdateTime;
|
||||||
import net.minecraft.src.PlayerUsageSnooper;
|
|
||||||
import net.minecraft.src.Profiler;
|
import net.minecraft.src.Profiler;
|
||||||
import net.minecraft.src.RConConsoleSource;
|
import net.minecraft.src.RConConsoleSource;
|
||||||
import net.minecraft.src.ReportedException;
|
import net.minecraft.src.ReportedException;
|
||||||
|
@ -45,14 +42,13 @@ import net.minecraft.src.WorldServerMulti;
|
||||||
import net.minecraft.src.WorldSettings;
|
import net.minecraft.src.WorldSettings;
|
||||||
import net.minecraft.src.WorldType;
|
import net.minecraft.src.WorldType;
|
||||||
|
|
||||||
public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage
|
public abstract class MinecraftServer implements ICommandSender, Runnable
|
||||||
{
|
{
|
||||||
/** Instance of Minecraft Server. */
|
/** Instance of Minecraft Server. */
|
||||||
private static MinecraftServer mcServer;
|
private static MinecraftServer mcServer;
|
||||||
//private final ISaveFormat anvilConverterForAnvilFile;
|
//private final ISaveFormat anvilConverterForAnvilFile;
|
||||||
|
|
||||||
/** The PlayerUsageSnooper instance. */
|
/** The PlayerUsageSnooper instance. */
|
||||||
private final PlayerUsageSnooper usageSnooper = new PlayerUsageSnooper("server", this, getSystemTimeMillis());
|
|
||||||
private final File anvilFile;
|
private final File anvilFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -392,11 +388,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
|
||||||
WorldServer var2 = this.worldServers[var1];
|
WorldServer var2 = this.worldServers[var1];
|
||||||
var2.flush();
|
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.lastReceivedID = Packet.receivedID;
|
||||||
this.receivedPacketSizeArray[this.tickCounter % 100] = Packet.receivedSize - this.lastReceivedSize;
|
this.receivedPacketSizeArray[this.tickCounter % 100] = Packet.receivedSize - this.lastReceivedSize;
|
||||||
this.lastReceivedSize = Packet.receivedSize;
|
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();
|
||||||
this.theProfiler.endSection();
|
this.theProfiler.endSection();
|
||||||
}
|
}
|
||||||
|
@ -1064,60 +1042,6 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlay
|
||||||
this.texturePack = par1Str;
|
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.
|
* 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;
|
this.startProfiling = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayerUsageSnooper getPlayerUsageSnooper()
|
|
||||||
{
|
|
||||||
return this.usageSnooper;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the position for this command sender.
|
* Return the position for this command sender.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.net.URI;
|
|
||||||
|
|
||||||
public class GuiButtonLink extends GuiButton
|
|
||||||
{
|
|
||||||
public GuiButtonLink(int par1, int par2, int par3, int par4, int par5, String par6Str)
|
|
||||||
{
|
|
||||||
super(par1, par2, par3, par4, par5, par6Str);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_96135_a(String par1Str)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
URI var2 = new URI(par1Str);
|
|
||||||
Class var3 = Class.forName("java.awt.Desktop");
|
|
||||||
Object var4 = var3.getMethod("getDesktop", new Class[0]).invoke((Object)null, new Object[0]);
|
|
||||||
var3.getMethod("browse", new Class[] {URI.class}).invoke(var4, new Object[] {var2});
|
|
||||||
}
|
|
||||||
catch (Throwable var5)
|
|
||||||
{
|
|
||||||
var5.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,8 +0,0 @@
|
||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
|
|
||||||
public interface IImageBuffer
|
|
||||||
{
|
|
||||||
BufferedImage parseUserSkin(BufferedImage var1);
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
public interface IPlayerUsage
|
|
||||||
{
|
|
||||||
void addServerStatsToSnooper(PlayerUsageSnooper var1);
|
|
||||||
|
|
||||||
void addServerTypeToSnooper(PlayerUsageSnooper var1);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether snooping is enabled or not.
|
|
||||||
*/
|
|
||||||
boolean isSnooperEnabled();
|
|
||||||
|
|
||||||
ILogAgent getLogAgent();
|
|
||||||
}
|
|
|
@ -1,89 +0,0 @@
|
||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.awt.Graphics;
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.awt.image.DataBufferInt;
|
|
||||||
import java.awt.image.ImageObserver;
|
|
||||||
|
|
||||||
public class ImageBufferDownload implements IImageBuffer
|
|
||||||
{
|
|
||||||
private int[] imageData;
|
|
||||||
private int imageWidth;
|
|
||||||
private int imageHeight;
|
|
||||||
|
|
||||||
public BufferedImage parseUserSkin(BufferedImage par1BufferedImage)
|
|
||||||
{
|
|
||||||
if (par1BufferedImage == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this.imageWidth = 64;
|
|
||||||
this.imageHeight = 32;
|
|
||||||
BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageHeight, 2);
|
|
||||||
Graphics var3 = var2.getGraphics();
|
|
||||||
var3.drawImage(par1BufferedImage, 0, 0, (ImageObserver)null);
|
|
||||||
var3.dispose();
|
|
||||||
this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData();
|
|
||||||
this.setAreaOpaque(0, 0, 32, 16);
|
|
||||||
this.setAreaTransparent(32, 0, 64, 32);
|
|
||||||
this.setAreaOpaque(0, 16, 64, 32);
|
|
||||||
return var2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Makes the given area of the image transparent if it was previously completely opaque (used to remove the outer
|
|
||||||
* layer of a skin around the head if it was saved all opaque; this would be redundant so it's assumed that the skin
|
|
||||||
* maker is just using an image editor without an alpha channel)
|
|
||||||
*/
|
|
||||||
private void setAreaTransparent(int par1, int par2, int par3, int par4)
|
|
||||||
{
|
|
||||||
if (!this.hasTransparency(par1, par2, par3, par4))
|
|
||||||
{
|
|
||||||
for (int var5 = par1; var5 < par3; ++var5)
|
|
||||||
{
|
|
||||||
for (int var6 = par2; var6 < par4; ++var6)
|
|
||||||
{
|
|
||||||
this.imageData[var5 + var6 * this.imageWidth] &= 16777215;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Makes the given area of the image opaque
|
|
||||||
*/
|
|
||||||
private void setAreaOpaque(int par1, int par2, int par3, int par4)
|
|
||||||
{
|
|
||||||
for (int var5 = par1; var5 < par3; ++var5)
|
|
||||||
{
|
|
||||||
for (int var6 = par2; var6 < par4; ++var6)
|
|
||||||
{
|
|
||||||
this.imageData[var5 + var6 * this.imageWidth] |= -16777216;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the given area of the image contains transparent pixels
|
|
||||||
*/
|
|
||||||
private boolean hasTransparency(int par1, int par2, int par3, int par4)
|
|
||||||
{
|
|
||||||
for (int var5 = par1; var5 < par3; ++var5)
|
|
||||||
{
|
|
||||||
for (int var6 = par2; var6 < par4; ++var6)
|
|
||||||
{
|
|
||||||
int var7 = this.imageData[var5 + var6 * this.imageWidth];
|
|
||||||
|
|
||||||
if ((var7 >> 24 & 255) < 128)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,7 +4,6 @@ import net.lax1dude.eaglercraft.*;
|
||||||
import net.lax1dude.eaglercraft.IntegratedServer;
|
import net.lax1dude.eaglercraft.IntegratedServer;
|
||||||
import net.lax1dude.eaglercraft.adapter.Tessellator;
|
import net.lax1dude.eaglercraft.adapter.Tessellator;
|
||||||
import net.lax1dude.eaglercraft.glemu.FixedFunctionShader;
|
import net.lax1dude.eaglercraft.glemu.FixedFunctionShader;
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
@ -462,24 +461,6 @@ public class Minecraft
|
||||||
EaglerAdapter.optimize();
|
EaglerAdapter.optimize();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ByteBuffer readImage(File par1File) throws IOException
|
|
||||||
{
|
|
||||||
BufferedImage var2 = ImageIO.read(par1File);
|
|
||||||
int[] var3 = var2.getRGB(0, 0, var2.getWidth(), var2.getHeight(), (int[])null, 0, var2.getWidth());
|
|
||||||
ByteBuffer var4 = ByteBuffer.allocate(4 * var3.length);
|
|
||||||
int[] var5 = var3;
|
|
||||||
int var6 = var3.length;
|
|
||||||
|
|
||||||
for (int var7 = 0; var7 < var6; ++var7)
|
|
||||||
{
|
|
||||||
int var8 = var5[var7];
|
|
||||||
var4.putInt(var8 << 8 | var8 >> 24 & 255);
|
|
||||||
}
|
|
||||||
|
|
||||||
var4.flip();
|
|
||||||
return var4;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateDisplayMode()
|
private void updateDisplayMode()
|
||||||
{
|
{
|
||||||
this.updateDisplay();
|
this.updateDisplay();
|
||||||
|
|
|
@ -3,23 +3,15 @@ package net.minecraft.src;
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.PrivateKey;
|
|
||||||
import java.security.PublicKey;
|
|
||||||
import javax.crypto.SecretKey;
|
|
||||||
|
|
||||||
public class Packet252SharedKey extends Packet
|
public class Packet252SharedKey extends Packet
|
||||||
{
|
{
|
||||||
private byte[] sharedSecret = new byte[0];
|
private byte[] sharedSecret = new byte[0];
|
||||||
private byte[] verifyToken = new byte[0];
|
private byte[] verifyToken = new byte[0];
|
||||||
|
|
||||||
/**
|
|
||||||
* Secret AES key decrypted from sharedSecret via the server's private RSA key
|
|
||||||
*/
|
|
||||||
private SecretKey sharedKey;
|
|
||||||
|
|
||||||
public Packet252SharedKey() {}
|
public Packet252SharedKey() {}
|
||||||
|
|
||||||
public Packet252SharedKey(SecretKey par1SecretKey, PublicKey par2PublicKey, byte[] par3ArrayOfByte)
|
public Packet252SharedKey(Object par1SecretKey, Object par2PublicKey, byte[] par3ArrayOfByte)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,183 +0,0 @@
|
||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.lang.management.ManagementFactory;
|
|
||||||
import java.lang.management.RuntimeMXBean;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import net.lax1dude.eaglercraft.ProfileUUID;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
|
|
||||||
public class PlayerUsageSnooper
|
|
||||||
{
|
|
||||||
/** String map for report data */
|
|
||||||
private Map dataMap = new HashMap();
|
|
||||||
private final String uniqueID = ProfileUUID.randomUUID().toString();
|
|
||||||
|
|
||||||
/** URL of the server to send the report to */
|
|
||||||
private final URL serverUrl;
|
|
||||||
private final IPlayerUsage playerStatsCollector;
|
|
||||||
|
|
||||||
/** set to fire the snooperThread every 15 mins */
|
|
||||||
private final java.util.Timer threadTrigger = new java.util.Timer("Snooper Timer", true);
|
|
||||||
private final Object syncLock = new Object();
|
|
||||||
private final long field_98224_g;
|
|
||||||
private boolean isRunning;
|
|
||||||
|
|
||||||
/** incremented on every getSelfCounterFor */
|
|
||||||
private int selfCounter;
|
|
||||||
|
|
||||||
public PlayerUsageSnooper(String par1Str, IPlayerUsage par2IPlayerUsage, long par3)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
this.serverUrl = new URL("http://snoop.minecraft.net/" + par1Str + "?version=" + 1);
|
|
||||||
}
|
|
||||||
catch (MalformedURLException var6)
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException();
|
|
||||||
}
|
|
||||||
|
|
||||||
this.playerStatsCollector = par2IPlayerUsage;
|
|
||||||
this.field_98224_g = par3;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Note issuing start multiple times is not an error.
|
|
||||||
*/
|
|
||||||
public void startSnooper()
|
|
||||||
{
|
|
||||||
if (!this.isRunning)
|
|
||||||
{
|
|
||||||
this.isRunning = true;
|
|
||||||
this.addBaseDataToSnooper();
|
|
||||||
this.threadTrigger.schedule(new PlayerUsageSnooperThread(this), 0L, 900000L);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addBaseDataToSnooper()
|
|
||||||
{
|
|
||||||
this.addJvmArgsToSnooper();
|
|
||||||
this.addData("snooper_token", this.uniqueID);
|
|
||||||
this.addData("os_name", System.getProperty("os.name"));
|
|
||||||
this.addData("os_version", System.getProperty("os.version"));
|
|
||||||
this.addData("os_architecture", System.getProperty("os.arch"));
|
|
||||||
this.addData("java_version", System.getProperty("java.version"));
|
|
||||||
this.addData("version", "1.6.4");
|
|
||||||
this.playerStatsCollector.addServerTypeToSnooper(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addJvmArgsToSnooper()
|
|
||||||
{
|
|
||||||
RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
|
|
||||||
List var2 = var1.getInputArguments();
|
|
||||||
int var3 = 0;
|
|
||||||
Iterator var4 = var2.iterator();
|
|
||||||
|
|
||||||
while (var4.hasNext())
|
|
||||||
{
|
|
||||||
String var5 = (String)var4.next();
|
|
||||||
|
|
||||||
if (var5.startsWith("-X"))
|
|
||||||
{
|
|
||||||
this.addData("jvm_arg[" + var3++ + "]", var5);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.addData("jvm_args", Integer.valueOf(var3));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addMemoryStatsToSnooper()
|
|
||||||
{
|
|
||||||
this.addData("memory_total", Long.valueOf(Runtime.getRuntime().totalMemory()));
|
|
||||||
this.addData("memory_max", Long.valueOf(Runtime.getRuntime().maxMemory()));
|
|
||||||
this.addData("memory_free", Long.valueOf(Runtime.getRuntime().freeMemory()));
|
|
||||||
this.addData("cpu_cores", Integer.valueOf(Runtime.getRuntime().availableProcessors()));
|
|
||||||
this.playerStatsCollector.addServerStatsToSnooper(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds information to the report
|
|
||||||
*/
|
|
||||||
public void addData(String par1Str, Object par2Obj)
|
|
||||||
{
|
|
||||||
Object var3 = this.syncLock;
|
|
||||||
|
|
||||||
synchronized (this.syncLock)
|
|
||||||
{
|
|
||||||
this.dataMap.put(par1Str, par2Obj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map getCurrentStats()
|
|
||||||
{
|
|
||||||
LinkedHashMap var1 = new LinkedHashMap();
|
|
||||||
Object var2 = this.syncLock;
|
|
||||||
|
|
||||||
synchronized (this.syncLock)
|
|
||||||
{
|
|
||||||
this.addMemoryStatsToSnooper();
|
|
||||||
Iterator var3 = this.dataMap.entrySet().iterator();
|
|
||||||
|
|
||||||
while (var3.hasNext())
|
|
||||||
{
|
|
||||||
Entry var4 = (Entry)var3.next();
|
|
||||||
var1.put(var4.getKey(), var4.getValue().toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
return var1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isSnooperRunning()
|
|
||||||
{
|
|
||||||
return this.isRunning;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void stopSnooper()
|
|
||||||
{
|
|
||||||
this.threadTrigger.cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUniqueID()
|
|
||||||
{
|
|
||||||
return this.uniqueID;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long func_130105_g()
|
|
||||||
{
|
|
||||||
return this.field_98224_g;
|
|
||||||
}
|
|
||||||
|
|
||||||
static IPlayerUsage getStatsCollectorFor(PlayerUsageSnooper par0PlayerUsageSnooper)
|
|
||||||
{
|
|
||||||
return par0PlayerUsageSnooper.playerStatsCollector;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Object getSyncLockFor(PlayerUsageSnooper par0PlayerUsageSnooper)
|
|
||||||
{
|
|
||||||
return par0PlayerUsageSnooper.syncLock;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Map getDataMapFor(PlayerUsageSnooper par0PlayerUsageSnooper)
|
|
||||||
{
|
|
||||||
return par0PlayerUsageSnooper.dataMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a value indicating how many times this function has been run on the snooper
|
|
||||||
*/
|
|
||||||
static int getSelfCounterFor(PlayerUsageSnooper par0PlayerUsageSnooper)
|
|
||||||
{
|
|
||||||
return par0PlayerUsageSnooper.selfCounter++;
|
|
||||||
}
|
|
||||||
|
|
||||||
static URL getServerUrlFor(PlayerUsageSnooper par0PlayerUsageSnooper)
|
|
||||||
{
|
|
||||||
return par0PlayerUsageSnooper.serverUrl;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,31 +0,0 @@
|
||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.TimerTask;
|
|
||||||
|
|
||||||
class PlayerUsageSnooperThread extends TimerTask
|
|
||||||
{
|
|
||||||
/** The PlayerUsageSnooper object. */
|
|
||||||
final PlayerUsageSnooper snooper;
|
|
||||||
|
|
||||||
PlayerUsageSnooperThread(PlayerUsageSnooper par1PlayerUsageSnooper)
|
|
||||||
{
|
|
||||||
this.snooper = par1PlayerUsageSnooper;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void run()
|
|
||||||
{
|
|
||||||
if (PlayerUsageSnooper.getStatsCollectorFor(this.snooper).isSnooperEnabled())
|
|
||||||
{
|
|
||||||
HashMap var1;
|
|
||||||
|
|
||||||
synchronized (PlayerUsageSnooper.getSyncLockFor(this.snooper))
|
|
||||||
{
|
|
||||||
var1 = new HashMap(PlayerUsageSnooper.getDataMapFor(this.snooper));
|
|
||||||
var1.put("snooper_count", Integer.valueOf(PlayerUsageSnooper.getSelfCounterFor(this.snooper)));
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpUtil.sendPost(PlayerUsageSnooper.getStatsCollectorFor(this.snooper).getLogAgent(), PlayerUsageSnooper.getServerUrlFor(this.snooper), var1, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -72,7 +72,6 @@ public class RenderItem extends Render
|
||||||
if (var10.getItemSpriteNumber() == 0 && Block.blocksList[var10.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) {
|
if (var10.getItemSpriteNumber() == 0 && Block.blocksList[var10.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) {
|
||||||
Block var22 = Block.blocksList[var10.itemID];
|
Block var22 = Block.blocksList[var10.itemID];
|
||||||
EaglerAdapter.glRotatef(var12, 0.0F, 1.0F, 0.0F);
|
EaglerAdapter.glRotatef(var12, 0.0F, 1.0F, 0.0F);
|
||||||
//RenderHelper.enableStandardItemLighting();
|
|
||||||
|
|
||||||
if (renderInFrame) {
|
if (renderInFrame) {
|
||||||
EaglerAdapter.glScalef(1.25F, 1.25F, 1.25F);
|
EaglerAdapter.glScalef(1.25F, 1.25F, 1.25F);
|
||||||
|
|
Loading…
Reference in New Issue