From 2df8e7ba5df7a0db7be19cf9d69bce139695eeae Mon Sep 17 00:00:00 2001 From: catfoolyou Date: Wed, 29 Jan 2025 18:26:58 -0500 Subject: [PATCH] 54 errors --- .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.0/fileHashes/fileHashes.bin | Bin 1960373 -> 1960423 bytes .gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.0/fileHashes/resourceHashesCache.bin | Bin 883150 -> 883898 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .../lax1dude/eaglercraft/MinecraftMain.java | 2 +- .../eaglercraft/TextureTerrainMap.java | 22 ++++-- .../eaglercraft/WorkerNetworkManager.java | 1 - .../eaglercraft/glemu/EffectPipeline.java | 2 +- .../minecraft/src/CompressedStreamTools.java | 26 +++++++ .../java/net/minecraft/src/GameSettings.java | 2 + .../net/minecraft/src/GuiScreenBackup.java | 2 +- .../src/GuiScreenConfigureWorld.java | 2 +- .../minecraft/src/GuiScreenConfirmation.java | 66 ++++++------------ .../minecraft/src/GuiScreenOnlineServers.java | 2 +- .../minecraft/src/GuiScreenResetWorld.java | 2 +- .../net/minecraft/src/GuiTexturePacks.java | 2 +- .../java/net/minecraft/src/Minecraft.java | 5 ++ .../net/minecraft/src/NBTTagCompound.java | 2 +- .../net/minecraft/src/NetClientHandler.java | 66 ++++-------------- src/main/java/net/minecraft/src/Request.java | 23 +----- .../net/minecraft/src/TextureManager.java | 10 +++ .../src/ThreadDownloadImageDataINNER1.java | 39 +---------- .../java/net/minecraft/src/WorldSettings.java | 4 ++ 25 files changed, 110 insertions(+), 170 deletions(-) diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index cac8ac25ced9770e0b53a3e3fa57b9ffd1ab7d85..c178cf1bfed99f833d165110a1d9c9622bd6b5b1 100644 GIT binary patch literal 17 VcmZQJ@DbZG(fUj^0~oNr0stta1WW(` literal 17 VcmZQJ@DbZG(fUj^0~oNr001bW1WEt^ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index e6a08fa9f211afb6bd9b5cdae9f70e55348c211f..983a6c784705e1423f03567084717db30725e721 100644 GIT binary patch delta 2626 zcmYLK3s6&M7UuE{5Ju|O~+^ax#*N)V^zm?iIaPG z80^kqA~qzd*R6@z`Mc0UU5@W}*5tmD5A*hL5@*%jbl`rAd6t!{pZC^$?j!EpG$Ye% zNmP5-tcTGjB~Et99H}4911h4Fym+=!ye^4$nZDjln=}2z`a1O|UYfv$0!P8?LO{d*k|Q59?88A}GntcHrlU+Y!iz-> z>URP){jo(ejkPb`K9uq>ps~5DM4}q`Qc8^j!)Z@mjQc{JzeO{<>*y%l4!UKosT!5t zcAk=`&uy?$svPvQLwM*B$d(BI`g`l4*mp}zz=77$wB zQ)ugu%_=%|v@1R9xcYmElbcG1;E@en8g};P9P+ABGdbKmbvbb$Ro#~o5*wi1L8%+7 zXki_2rD|Rb`2+bfQq#Yqv`omG)p?~n^cDF>%PvdQTb}E%J_3OV)N424Az4R?@7baDYjQc&3m}|EdNKDQE&S-yLJXb=v9hwD~nnHfiS>BshcTn@^O{wQ4YR-j~ zG-)Vk4{^MB{|Omci<@9c5qmNs&qf8Jn@kyzkb8vVYpU}jLtTW`uqy)3ON%w~NFBvm zQ!pv9EQ}H@3x#XDG^4dI&72$VbZm-dO9iLdhX-q&kmB96y5TTn zb%qcatrI#lFLwRDJ<_|q&-l}W*A9g?k4S-rAD^Lt^P$4%#f$cO;i_MRp{63HHgLtq zo2KIS{0*9v&oEe~n z2VfXISJrNt)eoGVp*+O?i)OtArWG;*xd>gPOO&*hk}4T#017ivZaahL;fyStzyyQe zKKX^< z=K%!PQHV+NuhWLcp^ABrpoe-EJ(RWKRtYz#0wbh#_z_rx5VzYxA9W8|4yd{mJiL8F z+HOlSWb3egBMb6`v{$_G&@)Kj$qm{C2eCJ)$3rf9t}*>W#}o?IA5=Uv+@zX+0edVq zXm`V&OL&b`x29Lul;D_*Zm29p&2Lg@iH7%Y(JBhiowV{j6xYw_kb{|a@e zaLi41yo2qkM`-L6=tt=JnV4?ZQH;5FvGoa%^qh9n_wcC4fzWm4*jw!f+CpC*_|a)S zYc}J{AEarW5^ zt~}^OSrrT|hy6FA$eia#^5(67@b1al{}o-&t)G0)^`}y-eEmg9mgi@#Ke;9U2atW> At^fc4 delta 2571 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 F{{oG7Lva8A diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index 36269b26a99a958f0482af2de073c5c2c9fd2c4c..95864d353bad5ffe16c6521a5be99dd03cd7aa80 100644 GIT binary patch literal 17 VcmZS1Y(A6~(`3WW00Qh*l>jUL1NQ&` literal 17 VcmZS1Y(A6~(`3WW00QjhO#mzb1N{I1 diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin index 9aef1036d8b31b1807aeb0b55ffff371b99993da..fcb621f33727d422ceb76789df18963b69880334 100644 GIT binary patch delta 1337 zcmZXReNa?Y7{)n!@9y2ZE_)X4q9`COj$lf`E-s2jih$^nix^`-4S^G_jd=4;> z3o&LOcm!c&O-;xIM0r7Ngv`|)P$39oCP{@Tj(uh#w5K5?##If2S3|9v1+@@bv(fvrP^~Gj z9PuN9z;bHH5nTn3`s z9ITOa8W0UzMG1{2FD0$qzf?kKj2 z8EG&$z<8)c-s(p6DD@g*(miHC_gGpTftsLaHJilXV~0k&14Kf*j7sn`uxb~K!#*n9 zTI?>6&O>+-%l{l*w|%^Rx7DU*DarRsXf+%$vS$(MZ&WX3fG@gqJ~|4{RcrvlC!zMv zWj4yfcVxZM=o6SKll9B-Ti#WZ zZzc%q%}RyqW?8-pf(-U%#cMm^*Xsc_e^FXwGFoK(%mAZBp3vmx$7jsu$Kll|-)qPV zPAWZBb~$8X+{ti~bnmq1uypFQ|A?OQ8t%GK*0kvg8S`g295T7h-hI(ACj8IT-`760 z5{FTW!*=;;MN2}?1w)zdLj^n|2^~@nR}RJ2Pg1?@y6cA|&FZ(wSR2D>JiBH^d==rm zy=9_qeMZJlT0VX5|EnaoMQ-rYCbTRlm6%2!d`H^j5U1Ii?!G*(_3u9Kwz3NAHeJ>9 zYf&4FK8rF7uJ5AXU7g(QKs2B7FYtR25E!PL?UXy#Kcn(yC^6sX%PzQa+PH6Qp}fV> z_$=|To;al1bDG#p<*kLFShBy5+%8@mb#8iqohEA8kL=YaJ=NoL+*MmhLXwQbb9NR^ z{#M=K+_yL~KYLFlNpPCMX^vPsI`%$-lwmnG?3&tNGo3Xtb5?uvbN{xk^rPxE{)41M z&$BMZ`>-+ohP}Qkn>LmbH5u~}aT;vt&CT{(Rr*2mi;GQ%gNCQG-Uw=27Z>*;H7jKO zs=(%MVm2ZU$LtEFpGvpviRP@5?(i>(L$;X1t(z?e&kQ9he|3(K94*68d8{=F zyP&1wMCxyZ?@^^FH&JP61&bb_WiXE%53;l$Cn8M7=(Oq-L{jC7!o;~WJ9v@i)bly! z;%SrJ-r^NU8^&gpYZ%+re8VWJ$|IwQtjlUMG>p!qUJRgcO<(b0WJ(_j(p6kJ))OJS zTGvsn`#Xn7!^toHybkxL|4$#~k=nU#m_UMuFVK5LZN9<8{<~a8XseU>=u^vQL@(0d zD?w@__KZ)4u<(XwIr^8m8TM`a<|H<PY;c`iMU$o2O zHPMulsB(DFOp@-yyd#DPrD>t!Fc-xoL3t75bvY64LVCNl@|F+a-e+x)?DCTI)PwR;U}XM3b0f74 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 62f4ed0e98de37be7cb6574b467c70c2c0a3bf1f..7f1a96e221d7c0ff10a4b52768af9318795c08d6 100644 GIT binary patch literal 17 VcmZSH;5Bjcn=huq3}C<}3;;O?1cLwo literal 17 VcmZSH;5Bjcn=huq3}C?e6#zNs1!MpK diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 7ac30fceecd5a5d073c8302db4d9cefb98a93f9c..7bfbb6c218cdc18df6bba93e3865ccba7ab6dc82 100644 GIT binary patch literal 8 PcmZQzV4SkWBHR`L2UP+V literal 8 PcmZQzV4SjU;+-7;3C#m( diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java b/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java index 4195f47..80892e9 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java @@ -18,7 +18,7 @@ public class MinecraftMain { byte[] b = EaglerAdapter.loadLocalStorage("forced"); if(b != null) { - ServerList.loadDefaultServers(Base64.encodeBase64String(b)); + //ServerList.loadDefaultServers(Base64.encodeBase64String(b)); // FIX THIS } if(par0ArrayOfStr.length > 0) { EaglerAdapter.setServerToJoinOnLaunch(par0ArrayOfStr[0]); diff --git a/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java b/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java index d800476..30f0749 100644 --- a/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java +++ b/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java @@ -81,12 +81,10 @@ public class TextureTerrainMap implements IconRegister { } } - @Override public int getOriginX() { return originX_center; } - @Override public int getOriginY() { return originY_center; } @@ -128,12 +126,10 @@ public class TextureTerrainMap implements IconRegister { return name == null ? "missingno" : name; } - @Override public int getSheetWidth() { return map.width; } - @Override public int getSheetHeight() { return map.height; } @@ -241,6 +237,18 @@ public class TextureTerrainMap implements IconRegister { } } } + + @Override + public int getIconWidth() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getIconWidth'"); + } + + @Override + public int getIconHeight() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getIconHeight'"); + } } @@ -556,4 +564,10 @@ public class TextureTerrainMap implements IconRegister { public Icon getMissingIcon() { return missingImage; } + + @Override + public Icon registerIcon(String var1) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'registerIcon'"); + } } diff --git a/src/main/java/net/lax1dude/eaglercraft/WorkerNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/WorkerNetworkManager.java index 8f75837..7c0f10e 100644 --- a/src/main/java/net/lax1dude/eaglercraft/WorkerNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/WorkerNetworkManager.java @@ -113,7 +113,6 @@ public class WorkerNetworkManager implements INetworkManager { } } - @Override public String getServerURI() { return "[integrated]"; } diff --git a/src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipeline.java b/src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipeline.java index 77a637c..fcc3d6a 100644 --- a/src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipeline.java +++ b/src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipeline.java @@ -177,7 +177,7 @@ public class EffectPipeline { float bb = 3.0f * intensity; float intensityModifier = 0.0f; - EntityLiving lv = Minecraft.getMinecraft().renderViewEntity; + EntityLiving lv = (EntityLiving) Minecraft.getMinecraft().renderViewEntity; if(lv != null) { int j = lv.getBrightnessForRender(0.0f); intensityModifier = Math.min(1.0f - ((j / 65536) / 256.0f), 1.0f - ((j % 65536) / 256.0f)) * 3.0f; diff --git a/src/main/java/net/minecraft/src/CompressedStreamTools.java b/src/main/java/net/minecraft/src/CompressedStreamTools.java index 985d08f..eabe70c 100644 --- a/src/main/java/net/minecraft/src/CompressedStreamTools.java +++ b/src/main/java/net/minecraft/src/CompressedStreamTools.java @@ -89,6 +89,32 @@ public class CompressedStreamTools return var1.toByteArray(); } + public static NBTTagCompound readUncompressed(byte[] par0ArrayOfByte) throws IOException { + DataInputStream var1 = new DataInputStream(new BufferedInputStream(new ByteArrayInputStream(par0ArrayOfByte))); + NBTTagCompound var2; + + try { + var2 = read(var1); + } finally { + var1.close(); + } + + return var2; + } + + public static byte[] writeUncompressed(NBTTagCompound par0NBTTagCompound) throws IOException { + ByteArrayOutputStream var1 = new ByteArrayOutputStream(); + DataOutputStream var2 = new DataOutputStream(var1); + + try { + write(par0NBTTagCompound, var2); + } finally { + var2.close(); + } + + return var1.toByteArray(); + } + public static void safeWrite(NBTTagCompound par0NBTTagCompound, File par1File) throws IOException { File var2 = new File(par1File.getAbsolutePath() + "_tmp"); diff --git a/src/main/java/net/minecraft/src/GameSettings.java b/src/main/java/net/minecraft/src/GameSettings.java index 0ed40b0..802ac70 100644 --- a/src/main/java/net/minecraft/src/GameSettings.java +++ b/src/main/java/net/minecraft/src/GameSettings.java @@ -53,6 +53,7 @@ public class GameSettings public boolean snooperEnabled = true; public boolean fullScreen; public boolean enableVsync = true; + public boolean hideVsyncWarning = false; public boolean hideServerAddress; /** @@ -66,6 +67,7 @@ public class GameSettings /** Whether to show your cape */ public boolean showCape = true; public boolean touchscreen; + public int antialiasMode = 1; public int overrideWidth; public int overrideHeight; public boolean heldItemTooltips = true; diff --git a/src/main/java/net/minecraft/src/GuiScreenBackup.java b/src/main/java/net/minecraft/src/GuiScreenBackup.java index b18a792..76c8a84 100644 --- a/src/main/java/net/minecraft/src/GuiScreenBackup.java +++ b/src/main/java/net/minecraft/src/GuiScreenBackup.java @@ -56,7 +56,7 @@ public class GuiScreenBackup extends GuiScreen { String var2 = I18n.getString("mco.configure.world.restore.question.line1"); String var3 = I18n.getString("mco.configure.world.restore.question.line2"); - this.mc.displayGuiScreen(new GuiScreenConfirmation(this, GuiScreenConfirmationType.Warning, var2, var3, 1)); + this.mc.displayGuiScreen(new GuiScreenConfirmation(this, "Warning!", var2, var3, 1)); } else if (par1GuiButton.id == 0) { diff --git a/src/main/java/net/minecraft/src/GuiScreenConfigureWorld.java b/src/main/java/net/minecraft/src/GuiScreenConfigureWorld.java index 32449d2..e78cb8d 100644 --- a/src/main/java/net/minecraft/src/GuiScreenConfigureWorld.java +++ b/src/main/java/net/minecraft/src/GuiScreenConfigureWorld.java @@ -108,7 +108,7 @@ public class GuiScreenConfigureWorld extends GuiScreen { String var2 = I18n.getString("mco.configure.world.close.question.line1"); String var3 = I18n.getString("mco.configure.world.close.question.line2"); - this.mc.displayGuiScreen(new GuiScreenConfirmation(this, GuiScreenConfirmationType.Info, var2, var3, 1)); + this.mc.displayGuiScreen(new GuiScreenConfirmation(this, "Warning!", var2, var3, 1)); } else if (par1GuiButton.id == 0) { diff --git a/src/main/java/net/minecraft/src/GuiScreenConfirmation.java b/src/main/java/net/minecraft/src/GuiScreenConfirmation.java index 174804d..5524765 100644 --- a/src/main/java/net/minecraft/src/GuiScreenConfirmation.java +++ b/src/main/java/net/minecraft/src/GuiScreenConfirmation.java @@ -1,52 +1,26 @@ package net.minecraft.src; -public class GuiScreenConfirmation extends GuiScreen -{ - private final GuiScreenConfirmationType field_140045_e; - private final String field_140049_p; - private final String field_96288_n; - protected final GuiScreen field_140048_a; - protected final String field_140046_b; - protected final String field_140047_c; - protected final int field_140044_d; +public class GuiScreenConfirmation extends GuiYesNo { + private String field_96288_n; - public GuiScreenConfirmation(GuiScreen par1GuiScreen, GuiScreenConfirmationType par2GuiScreenConfirmationType, String par3Str, String par4Str, int par5) - { - this.field_140048_a = par1GuiScreen; - this.field_140044_d = par5; - this.field_140045_e = par2GuiScreenConfirmationType; - this.field_140049_p = par3Str; - this.field_96288_n = par4Str; - this.field_140046_b = I18n.getString("gui.yes"); - this.field_140047_c = I18n.getString("gui.no"); - } + public GuiScreenConfirmation(GuiScreen par1GuiScreen, String par2Str, String par3Str, String par4Str, int par5) { + super(par1GuiScreen, par2Str, par3Str, par5); + this.field_96288_n = par4Str; + } - /** - * Adds the buttons (and other controls) to the screen in question. - */ - public void initGui() - { - this.buttonList.add(new GuiSmallButton(0, this.width / 2 - 155, this.height / 6 + 112, this.field_140046_b)); - this.buttonList.add(new GuiSmallButton(1, this.width / 2 - 155 + 160, this.height / 6 + 112, this.field_140047_c)); - } + /** + * Adds the buttons (and other controls) to the screen in question. + */ + public void initGui() { + this.buttonList.add(new GuiSmallButton(0, this.width / 2 - 155, this.height / 6 + 112, this.buttonText1)); + this.buttonList.add(new GuiSmallButton(1, this.width / 2 - 155 + 160, this.height / 6 + 112, this.buttonText2)); + } - /** - * Fired when a control is clicked. This is the equivalent of ActionListener.actionPerformed(ActionEvent e). - */ - protected void actionPerformed(GuiButton par1GuiButton) - { - this.field_140048_a.confirmClicked(par1GuiButton.id == 0, this.field_140044_d); - } - - /** - * Draws the screen and all the components in it. - */ - public void drawScreen(int par1, int par2, float par3) - { - this.drawDefaultBackground(); - this.drawCenteredString(this.fontRenderer, this.field_140045_e.field_140072_d, this.width / 2, 70, this.field_140045_e.field_140075_c); - this.drawCenteredString(this.fontRenderer, this.field_140049_p, this.width / 2, 90, 16777215); - this.drawCenteredString(this.fontRenderer, this.field_96288_n, this.width / 2, 110, 16777215); - super.drawScreen(par1, par2, par3); - } + /** + * Draws the screen and all the components in it. + */ + public void drawScreen(int par1, int par2, float par3) { + super.drawScreen(par1, par2, par3); + this.drawCenteredString(this.fontRenderer, this.field_96288_n, this.width / 2, 110, 16777215); + } } diff --git a/src/main/java/net/minecraft/src/GuiScreenOnlineServers.java b/src/main/java/net/minecraft/src/GuiScreenOnlineServers.java index fa5f582..943ce53 100644 --- a/src/main/java/net/minecraft/src/GuiScreenOnlineServers.java +++ b/src/main/java/net/minecraft/src/GuiScreenOnlineServers.java @@ -184,7 +184,7 @@ public class GuiScreenOnlineServers extends GuiScreen { String var4 = I18n.getString("mco.configure.world.leave.question.line1"); String var3 = I18n.getString("mco.configure.world.leave.question.line2"); - this.mc.displayGuiScreen(new GuiScreenConfirmation(this, GuiScreenConfirmationType.Info, var4, var3, 3)); + this.mc.displayGuiScreen(new GuiScreenConfirmation(this, "Warning!", var4, var3, 3)); } } } diff --git a/src/main/java/net/minecraft/src/GuiScreenResetWorld.java b/src/main/java/net/minecraft/src/GuiScreenResetWorld.java index daccdb7..fa71934 100644 --- a/src/main/java/net/minecraft/src/GuiScreenResetWorld.java +++ b/src/main/java/net/minecraft/src/GuiScreenResetWorld.java @@ -90,7 +90,7 @@ public class GuiScreenResetWorld extends ScreenWithCallback { String var2 = I18n.getString("mco.configure.world.reset.question.line1"); String var3 = I18n.getString("mco.configure.world.reset.question.line2"); - this.mc.displayGuiScreen(new GuiScreenConfirmation(this, GuiScreenConfirmationType.Warning, var2, var3, 1)); + this.mc.displayGuiScreen(new GuiScreenConfirmation(this, "Warning!", var2, var3, 1)); } else if (par1GuiButton.id == field_110360_p) { diff --git a/src/main/java/net/minecraft/src/GuiTexturePacks.java b/src/main/java/net/minecraft/src/GuiTexturePacks.java index e483c1a..ad022bd 100644 --- a/src/main/java/net/minecraft/src/GuiTexturePacks.java +++ b/src/main/java/net/minecraft/src/GuiTexturePacks.java @@ -44,7 +44,7 @@ public class GuiTexturePacks extends GuiScreen { this.mc.texturePackList.updateAvaliableTexturePacks(); this.fileLocation = "texturepacks"; this.guiTexturePackSlot = new GuiTexturePackSlot(this); - this.guiTexturePackSlot.registerScrollButtons(this.buttonList, 7, 8); + this.guiTexturePackSlot.registerScrollButtons(7, 8); } /** diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index c919c24..90db003 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -126,6 +126,7 @@ public class Minecraft implements IPlayerUsage /** Mouse helper instance. */ public MouseHelper mouseHelper; + public TexturePackList texturePackList; public final File mcDataDir; private final File fileAssets; private final String launchedVersion; @@ -1963,6 +1964,10 @@ public class Minecraft implements IPlayerUsage this.systemTime = 0L; } + public void setNetManager(INetworkManager nm) { + this.myNetworkManager = nm; + } + /** * A String of renderGlobal.getDebugInfoRenders */ diff --git a/src/main/java/net/minecraft/src/NBTTagCompound.java b/src/main/java/net/minecraft/src/NBTTagCompound.java index ec07483..cc5a654 100644 --- a/src/main/java/net/minecraft/src/NBTTagCompound.java +++ b/src/main/java/net/minecraft/src/NBTTagCompound.java @@ -451,7 +451,7 @@ public class NBTTagCompound extends NBTBase /** * Return the tag map for this compound. */ - static Map getTagMap(NBTTagCompound par0NBTTagCompound) + public static Map getTagMap(NBTTagCompound par0NBTTagCompound) { return par0NBTTagCompound.tagMap; } diff --git a/src/main/java/net/minecraft/src/NetClientHandler.java b/src/main/java/net/minecraft/src/NetClientHandler.java index 7ac20d0..a4b2473 100644 --- a/src/main/java/net/minecraft/src/NetClientHandler.java +++ b/src/main/java/net/minecraft/src/NetClientHandler.java @@ -1,25 +1,19 @@ package net.minecraft.src; import com.google.common.base.Charsets; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.math.BigInteger; import java.net.InetAddress; import java.net.Socket; -import java.net.URL; -import java.net.URLEncoder; -import java.security.PublicKey; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Random; -import javax.crypto.SecretKey; + +import net.lax1dude.eaglercraft.WebsocketNetworkManager; import net.minecraft.client.ClientBrandRetriever; import org.lwjgl.input.Keyboard; @@ -78,6 +72,17 @@ public class NetClientHandler extends NetHandler par2IntegratedServer.getServerListeningThread().func_71754_a((MemoryConnection)this.netManager, par1Minecraft.getSession().getUsername()); } + public NetClientHandler(Minecraft par1Minecraft, INetworkManager mgr) throws IOException { + this.mc = par1Minecraft; + this.netManager = mgr; + } + + public NetClientHandler(Minecraft par1Minecraft, String channel) throws IOException { + this.mc = par1Minecraft; + this.netManager = IntegratedServer.openConnection(channel, this); + } + + /** * sets netManager and worldClient to null */ @@ -110,52 +115,9 @@ public class NetClientHandler extends NetHandler public void handleServerAuthData(Packet253ServerAuthData par1Packet253ServerAuthData) { - String var2 = par1Packet253ServerAuthData.getServerId().trim(); - PublicKey var3 = par1Packet253ServerAuthData.getPublicKey(); - SecretKey var4 = CryptManager.createNewSharedKey(); - - if (!"-".equals(var2)) - { - String var5 = (new BigInteger(CryptManager.getServerIdHash(var2, var3, var4))).toString(16); - String var6 = this.sendSessionRequest(this.mc.getSession().getUsername(), this.mc.getSession().getSessionID(), var5); - - if (!"ok".equalsIgnoreCase(var6)) - { - this.netManager.networkShutdown("disconnect.loginFailedInfo", new Object[] {var6}); - return; - } - } - - this.addToSendQueue(new Packet252SharedKey(var4, var3, par1Packet253ServerAuthData.getVerifyToken())); + this.addToSendQueue(new Packet252SharedKey()); } - /** - * Send request to http://session.minecraft.net with user's sessionId and serverId hash - */ - private String sendSessionRequest(String par1Str, String par2Str, String par3Str) - { - try - { - URL var4 = new URL("http://session.minecraft.net/game/joinserver.jsp?user=" + urlEncode(par1Str) + "&sessionId=" + urlEncode(par2Str) + "&serverId=" + urlEncode(par3Str)); - InputStream var5 = var4.openConnection(this.mc.getProxy()).getInputStream(); - BufferedReader var6 = new BufferedReader(new InputStreamReader(var5)); - String var7 = var6.readLine(); - var6.close(); - return var7; - } - catch (IOException var8) - { - return var8.toString(); - } - } - - /** - * Encode the given string for insertion into a URL - */ - private static String urlEncode(String par0Str) throws IOException - { - return URLEncoder.encode(par0Str, "UTF-8"); - } public void handleSharedKey(Packet252SharedKey par1Packet252SharedKey) { diff --git a/src/main/java/net/minecraft/src/Request.java b/src/main/java/net/minecraft/src/Request.java index 9aa8b31..af0113f 100644 --- a/src/main/java/net/minecraft/src/Request.java +++ b/src/main/java/net/minecraft/src/Request.java @@ -13,31 +13,12 @@ public abstract class Request public Request(String par1Str, int par2, int par3) { - try - { - this.field_96365_b = par1Str; - this.field_96367_a = (HttpURLConnection)(new URL(par1Str)).openConnection(Minecraft.getMinecraft().getProxy()); - this.field_96367_a.setConnectTimeout(par2); - this.field_96367_a.setReadTimeout(par3); - } - catch (Exception var5) - { - throw new ExceptionMcoHttp("Failed URL: " + par1Str, var5); - } + } public void func_100006_a(String par1Str, String par2Str) { - String var3 = this.field_96367_a.getRequestProperty("Cookie"); - - if (var3 == null) - { - this.field_96367_a.setRequestProperty("Cookie", par1Str + "=" + par2Str); - } - else - { - this.field_96367_a.setRequestProperty("Cookie", var3 + ";" + par1Str + "=" + par2Str); - } + } public int func_96362_a() diff --git a/src/main/java/net/minecraft/src/TextureManager.java b/src/main/java/net/minecraft/src/TextureManager.java index e1d9fad..03c3aac 100644 --- a/src/main/java/net/minecraft/src/TextureManager.java +++ b/src/main/java/net/minecraft/src/TextureManager.java @@ -10,6 +10,8 @@ import java.util.Map.Entry; public class TextureManager implements Tickable, ResourceManagerReloadListener { + private static TextureManager instance; + private int nextTextureID = 0; private final Map mapTextureObjects = Maps.newHashMap(); private final Map mapResourceLocations = Maps.newHashMap(); private final List listTickables = Lists.newArrayList(); @@ -21,6 +23,14 @@ public class TextureManager implements Tickable, ResourceManagerReloadListener this.theResourceManager = par1ResourceManager; } + public static TextureManager instance() { + return instance; + } + + public int getNextTextureId() { + return this.nextTextureID++; + } + public void bindTexture(ResourceLocation par1ResourceLocation) { Object var2 = (TextureObject)this.mapTextureObjects.get(par1ResourceLocation); diff --git a/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java b/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java index c4cbaa2..cd70ce4 100644 --- a/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java +++ b/src/main/java/net/minecraft/src/ThreadDownloadImageDataINNER1.java @@ -1,9 +1,5 @@ package net.minecraft.src; -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; class ThreadDownloadImageDataINNER1 extends Thread { @@ -16,39 +12,6 @@ class ThreadDownloadImageDataINNER1 extends Thread public void run() { - HttpURLConnection var1 = null; - - try - { - var1 = (HttpURLConnection)(new URL(ThreadDownloadImageData.getImageUrl(this.theThreadDownloadImageData))).openConnection(Minecraft.getMinecraft().getProxy()); - var1.setDoInput(true); - var1.setDoOutput(false); - var1.connect(); - - if (var1.getResponseCode() / 100 != 2) - { - return; - } - - BufferedImage var2 = ImageIO.read(var1.getInputStream()); - - if (ThreadDownloadImageData.getImageBuffer(this.theThreadDownloadImageData) != null) - { - var2 = ThreadDownloadImageData.getImageBuffer(this.theThreadDownloadImageData).parseUserSkin(var2); - } - - this.theThreadDownloadImageData.getBufferedImage(var2); - } - catch (Exception var6) - { - var6.printStackTrace(); - } - finally - { - if (var1 != null) - { - var1.disconnect(); - } - } + } } diff --git a/src/main/java/net/minecraft/src/WorldSettings.java b/src/main/java/net/minecraft/src/WorldSettings.java index d51b764..996c952 100644 --- a/src/main/java/net/minecraft/src/WorldSettings.java +++ b/src/main/java/net/minecraft/src/WorldSettings.java @@ -128,4 +128,8 @@ public final class WorldSettings { return this.field_82751_h; } + + public int getIPCGamemode() { + return this.hardcoreEnabled ? 2 : (this.getGameType().isCreative() ? 1 : 0); + } }