Compare commits
2 Commits
a6719bab9c
...
b2fde94725
Author | SHA1 | Date |
---|---|---|
|
b2fde94725 | |
|
c6b09033ef |
|
@ -40,7 +40,7 @@ def folder = "javascript"
|
||||||
def name = "classes.js"
|
def name = "classes.js"
|
||||||
|
|
||||||
teavm.js {
|
teavm.js {
|
||||||
obfuscated = false
|
obfuscated = true
|
||||||
sourceMap = true
|
sourceMap = true
|
||||||
targetFileName = "../" + name
|
targetFileName = "../" + name
|
||||||
optimization = OptimizationLevel.AGGRESSIVE
|
optimization = OptimizationLevel.AGGRESSIVE
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
801695
javascript/classes.js
801695
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
960556
javascript/classes_server.js
960556
javascript/classes_server.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -518,7 +518,7 @@ public class VirtualFilesystem {
|
||||||
|
|
||||||
private static void readWholeFile(IDBDatabase db, String name, final AsyncCallback<ArrayBuffer> cb) {
|
private static void readWholeFile(IDBDatabase db, String name, final AsyncCallback<ArrayBuffer> cb) {
|
||||||
IDBTransaction tx = db.transaction("filesystem", "readonly");
|
IDBTransaction tx = db.transaction("filesystem", "readonly");
|
||||||
final IDBGetRequest r = tx.objectStore("filesystem").get(makeTheFuckingKeyWork(name));
|
final IDBGetRequest r = tx.objectStore("filesystem").get(makeTheFuckingKeyWork(name)); // problem
|
||||||
r.setOnSuccess(new EventHandler() {
|
r.setOnSuccess(new EventHandler() {
|
||||||
@Override
|
@Override
|
||||||
public void handleEvent() {
|
public void handleEvent() {
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class WorkerListenThread {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean closeChannel(String player) {
|
public boolean closeChannel(String player) {
|
||||||
System.out.println("[Server][CLOSECHANNEL][" + player + "]");
|
System.out.println("[Server][CLOSECHANNEL][" + player + "]"); // called way too damn much
|
||||||
WorkerNetworkManager channel = channels.get(player);
|
WorkerNetworkManager channel = channels.get(player);
|
||||||
if(channel == null) {
|
if(channel == null) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -83,7 +83,7 @@ public class WorkerListenThread {
|
||||||
|
|
||||||
List<NetHandler> conns = new ArrayList<>(this.connections);
|
List<NetHandler> conns = new ArrayList<>(this.connections);
|
||||||
for (NetHandler var2 : conns) {
|
for (NetHandler var2 : conns) {
|
||||||
var2.handlePackets();
|
var2.handlePackets(); // problem
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteDeadConnections();
|
deleteDeadConnections();
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class WorkerNetworkManager implements INetworkManager {
|
||||||
//System.out.println("[Server][" + ipcChannel + "]: packet '" + pkt.getClass().getSimpleName() + "' recieved");
|
//System.out.println("[Server][" + ipcChannel + "]: packet '" + pkt.getClass().getSimpleName() + "' recieved");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
pkt.processPacket(theNetHandler);
|
pkt.processPacket(theNetHandler); // This is a problem, it bitches with the error message below
|
||||||
}catch(Throwable t) {
|
}catch(Throwable t) {
|
||||||
System.err.println("Could not process minecraft packet 0x" + Integer.toHexString(pkt.getPacketId()) + " class '" + pkt.getClass().getSimpleName() + "' on channel 'NET|" + ipcChannel + "'");
|
System.err.println("Could not process minecraft packet 0x" + Integer.toHexString(pkt.getPacketId()) + " class '" + pkt.getClass().getSimpleName() + "' on channel 'NET|" + ipcChannel + "'");
|
||||||
t.printStackTrace();
|
t.printStackTrace();
|
||||||
|
|
|
@ -59,7 +59,7 @@ public class NetLoginHandler extends NetHandler {
|
||||||
if (this.loginTimer++ == 600) {
|
if (this.loginTimer++ == 600) {
|
||||||
this.kickUser("Took too long to log in");
|
this.kickUser("Took too long to log in");
|
||||||
} else {
|
} else {
|
||||||
this.myTCPConnection.processReadPackets();
|
this.myTCPConnection.processReadPackets(); // problem
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -560,7 +560,7 @@ public class NetServerHandler extends NetHandler
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
this.netManager.addToSendQueue(par1Packet);
|
this.netManager.addToSendQueue(par1Packet); // This is a problem
|
||||||
}
|
}
|
||||||
catch (Exception var10)
|
catch (Exception var10)
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,8 +75,7 @@ public class GuiEnchantment extends GuiContainer
|
||||||
/**
|
/**
|
||||||
* Draw the background layer for the GuiContainer (everything behind the items)
|
* Draw the background layer for the GuiContainer (everything behind the items)
|
||||||
*/
|
*/
|
||||||
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
|
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
|
||||||
{
|
|
||||||
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
enchantingTableGuiTextures.bindTexture();
|
enchantingTableGuiTextures.bindTexture();
|
||||||
int var4 = (this.width - this.xSize) / 2;
|
int var4 = (this.width - this.xSize) / 2;
|
||||||
|
@ -87,13 +86,13 @@ public class GuiEnchantment extends GuiContainer
|
||||||
EaglerAdapter.glPushMatrix();
|
EaglerAdapter.glPushMatrix();
|
||||||
EaglerAdapter.glLoadIdentity();
|
EaglerAdapter.glLoadIdentity();
|
||||||
ScaledResolution var6 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight);
|
ScaledResolution var6 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight);
|
||||||
EaglerAdapter.glViewport((var6.getScaledWidth() - 320) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 240) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor());
|
EaglerAdapter.glViewport((var6.getScaledWidth() - 432) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 182) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor());
|
||||||
EaglerAdapter.glTranslatef(-0.34F, 0.23F, 0.0F);
|
EaglerAdapter.glTranslatef(-0.34F, 0.23F, 0.0F);
|
||||||
EaglerAdapter.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
|
EaglerAdapter.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
|
||||||
float var7 = 1.0F;
|
float var7 = 1.0F;
|
||||||
EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW);
|
EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW);
|
||||||
EaglerAdapter.glLoadIdentity();
|
EaglerAdapter.glLoadIdentity();
|
||||||
RenderHelper.enableStandardItemLighting();
|
RenderHelper.enableStandardItemLighting2();
|
||||||
EaglerAdapter.glTranslatef(0.0F, 3.3F, -16.0F);
|
EaglerAdapter.glTranslatef(0.0F, 3.3F, -16.0F);
|
||||||
EaglerAdapter.glScalef(var7, var7, var7);
|
EaglerAdapter.glScalef(var7, var7, var7);
|
||||||
float var8 = 5.0F;
|
float var8 = 5.0F;
|
||||||
|
@ -107,31 +106,27 @@ public class GuiEnchantment extends GuiContainer
|
||||||
EaglerAdapter.glRotatef(180.0F, 1.0F, 0.0F, 0.0F);
|
EaglerAdapter.glRotatef(180.0F, 1.0F, 0.0F, 0.0F);
|
||||||
float var10 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.25F;
|
float var10 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.25F;
|
||||||
float var11 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.75F;
|
float var11 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.75F;
|
||||||
var10 = (var10 - (float)MathHelper.truncateDoubleToInt((double)var10)) * 1.6F - 0.3F;
|
var10 = (var10 - (float) MathHelper.truncateDoubleToInt((double) var10)) * 1.6F - 0.3F;
|
||||||
var11 = (var11 - (float)MathHelper.truncateDoubleToInt((double)var11)) * 1.6F - 0.3F;
|
var11 = (var11 - (float) MathHelper.truncateDoubleToInt((double) var11)) * 1.6F - 0.3F;
|
||||||
|
|
||||||
if (var10 < 0.0F)
|
if (var10 < 0.0F) {
|
||||||
{
|
|
||||||
var10 = 0.0F;
|
var10 = 0.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (var11 < 0.0F)
|
if (var11 < 0.0F) {
|
||||||
{
|
|
||||||
var11 = 0.0F;
|
var11 = 0.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (var10 > 1.0F)
|
if (var10 > 1.0F) {
|
||||||
{
|
|
||||||
var10 = 1.0F;
|
var10 = 1.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (var11 > 1.0F)
|
if (var11 > 1.0F) {
|
||||||
{
|
|
||||||
var11 = 1.0F;
|
var11 = 1.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
|
EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
|
||||||
bookModel.render((Entity)null, 0.0F, var10, var11, var9, 0.0F, 0.0625F);
|
bookModel.render((Entity) null, 0.0F, var10, var11, var9, 0.0F, 0.0625F);
|
||||||
EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
|
EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
|
||||||
RenderHelper.disableStandardItemLighting();
|
RenderHelper.disableStandardItemLighting();
|
||||||
EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION);
|
EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION);
|
||||||
|
@ -141,46 +136,37 @@ public class GuiEnchantment extends GuiContainer
|
||||||
EaglerAdapter.glPopMatrix();
|
EaglerAdapter.glPopMatrix();
|
||||||
RenderHelper.disableStandardItemLighting();
|
RenderHelper.disableStandardItemLighting();
|
||||||
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
enchantingTableBookTextures.bindTexture();
|
||||||
EnchantmentNameParts.instance.setRandSeed(this.containerEnchantment.nameSeed);
|
EnchantmentNameParts.instance.setRandSeed(this.containerEnchantment.nameSeed);
|
||||||
|
|
||||||
for (int var12 = 0; var12 < 3; ++var12)
|
for (int var12 = 0; var12 < 3; ++var12) {
|
||||||
{
|
|
||||||
String var13 = EnchantmentNameParts.instance.generateRandomEnchantName();
|
String var13 = EnchantmentNameParts.instance.generateRandomEnchantName();
|
||||||
this.zLevel = 0.0F;
|
this.zLevel = 0.0F;
|
||||||
enchantingTableGuiTextures.bindTexture();
|
enchantingTableGuiTextures.bindTexture();
|
||||||
int var14 = this.containerEnchantment.enchantLevels[var12];
|
int var14 = this.containerEnchantment.enchantLevels[var12];
|
||||||
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
if (var14 == 0)
|
if (var14 == 0) {
|
||||||
{
|
|
||||||
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 185, 108, 19);
|
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 185, 108, 19);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
String var15 = "" + var14;
|
String var15 = "" + var14;
|
||||||
FontRenderer var16 = this.mc.standardGalacticFontRenderer;
|
FontRenderer var16 = this.mc.standardGalacticFontRenderer;
|
||||||
int var17 = 6839882;
|
int var17 = 6839882;
|
||||||
|
|
||||||
if (this.mc.thePlayer.experienceLevel < var14 && !this.mc.thePlayer.capabilities.isCreativeMode)
|
if (this.mc.thePlayer.experienceLevel < var14 && !this.mc.thePlayer.capabilities.isCreativeMode) {
|
||||||
{
|
|
||||||
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 185, 108, 19);
|
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 185, 108, 19);
|
||||||
var16.drawSplitString(var13, var4 + 62, var5 + 16 + 19 * var12, 104, (var17 & 16711422) >> 1);
|
var16.drawSplitString(var13, var4 + 62, var5 + 16 + 19 * var12, 104, (var17 & 16711422) >> 1);
|
||||||
var16 = this.mc.fontRenderer;
|
var16 = this.mc.fontRenderer;
|
||||||
var17 = 4226832;
|
var17 = 4226832;
|
||||||
var16.drawStringWithShadow(var15, var4 + 62 + 104 - var16.getStringWidth(var15), var5 + 16 + 19 * var12 + 7, var17);
|
var16.drawStringWithShadow(var15, var4 + 62 + 104 - var16.getStringWidth(var15), var5 + 16 + 19 * var12 + 7, var17);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
int var18 = par2 - (var4 + 60);
|
int var18 = par2 - (var4 + 60);
|
||||||
int var19 = par3 - (var5 + 14 + 19 * var12);
|
int var19 = par3 - (var5 + 14 + 19 * var12);
|
||||||
|
|
||||||
if (var18 >= 0 && var19 >= 0 && var18 < 108 && var19 < 19)
|
if (var18 >= 0 && var19 >= 0 && var18 < 108 && var19 < 19) {
|
||||||
{
|
|
||||||
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 204, 108, 19);
|
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 204, 108, 19);
|
||||||
var17 = 16777088;
|
var17 = 16777088;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 166, 108, 19);
|
this.drawTexturedModalRect(var4 + 60, var5 + 14 + 19 * var12, 0, 166, 108, 19);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ public class GuiMainMenu extends GuiScreen {
|
||||||
StringTranslate var2 = StringTranslate.getInstance();
|
StringTranslate var2 = StringTranslate.getInstance();
|
||||||
int var4 = this.height / 4 + 48;
|
int var4 = this.height / 4 + 48;
|
||||||
|
|
||||||
if(false) { // EaglerAdapter.isIntegratedServerAvailable()
|
if(EaglerAdapter.isIntegratedServerAvailable()) { // EaglerAdapter.isIntegratedServerAvailable()
|
||||||
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, var4, var2.translateKey("menu.singleplayer")));
|
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, var4, var2.translateKey("menu.singleplayer")));
|
||||||
this.buttonList.add(new GuiButton(2, this.width / 2 - 100, var4 + 24 * 1, var2.translateKey("menu.multiplayer")));
|
this.buttonList.add(new GuiButton(2, this.width / 2 - 100, var4 + 24 * 1, var2.translateKey("menu.multiplayer")));
|
||||||
this.buttonList.add(new GuiButton(3, this.width / 2 - 100, var4 + 24 * 2, var2.translateKey("menu.forkme")));
|
this.buttonList.add(new GuiButton(3, this.width / 2 - 100, var4 + 24 * 2, var2.translateKey("menu.forkme")));
|
||||||
|
|
Loading…
Reference in New Issue