diff --git a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index 80411e9..e4b79bd 100644 --- a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -751,7 +751,7 @@ boolean moddedClientAllowed = true; if (!Strings.isNullOrEmpty(serverDescription)) { - moddedClientAllowed = !serverDescription.endsWith(":NOFML§r"); + moddedClientAllowed = !serverDescription.endsWith(":NOFML??r"); } serverDataTag.put(data, new ExtendedServerListData("VANILLA", false, ImmutableMap.of(), !moddedClientAllowed)); } @@ -812,7 +812,7 @@ public String fixDescription(String description) { - return description.endsWith(":NOFML§r") ? description.substring(0, description.length() - 8)+"§r" : description; + return description.endsWith(":NOFML??r") ? description.substring(0, description.length() - 8)+"??r" : description; } public void connectToServerAtStartup(String host, int port) diff --git a/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java b/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java index dbec8ca..d0dae9f 100644 --- a/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java +++ b/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java @@ -68,7 +68,7 @@ * * @see "Versioning" on Maven Wiki * @author Kenney Westerhof - * @author Hervé Boutemy + * @author Herv?? Boutemy */ public class ComparableVersion implements Comparable diff --git a/src/main/java/net/minecraft/item/ItemArmor.java b/src/main/java/net/minecraft/item/ItemArmor.java index c64c4f6..c640c48 100644 --- a/src/main/java/net/minecraft/item/ItemArmor.java +++ b/src/main/java/net/minecraft/item/ItemArmor.java @@ -40,7 +40,7 @@ if (list.size() > 0) { EntityLivingBase entitylivingbase = (EntityLivingBase)list.get(0); - int l = entitylivingbase instanceof EntityPlayer ? 1 : 0; + int l = 0;// Forge: We fix the indexes. Mojang Stop hard coding this! int i1 = EntityLiving.getArmorPosition(p_82487_2_); ItemStack itemstack1 = p_82487_2_.copy(); itemstack1.stackSize = 1; diff --git a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java index f4bc399..c1233eb 100644 --- a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java +++ b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java @@ -1097,20 +1097,20 @@ { itemstack = packetbuffer.readItemStackFromBuffer(); - if (itemstack != null) + if (itemstack == null) { - if (!ItemWritableBook.func_150930_a(itemstack.getTagCompound())) - { - throw new IOException("Invalid book tag!"); - } + return; + } - itemstack1 = this.playerEntity.inventory.getCurrentItem(); + if (!ItemWritableBook.func_150930_a(itemstack.getTagCompound())) + { + throw new IOException("Invalid book tag!"); + } - if (itemstack1 == null) - { - return; - } + itemstack1 = this.playerEntity.inventory.getCurrentItem(); + if (itemstack1 != null) + { if (itemstack.getItem() == Items.writable_book && itemstack.getItem() == itemstack1.getItem()) { itemstack1.setTagInfo("pages", itemstack.getTagCompound().getTagList("pages", 8)); @@ -1139,20 +1139,20 @@ { itemstack = packetbuffer.readItemStackFromBuffer(); - if (itemstack == null) + if (itemstack != null) { - return; - } + if (!ItemEditableBook.validBookTagContents(itemstack.getTagCompound())) + { + throw new IOException("Invalid book tag!"); + } - if (!ItemEditableBook.validBookTagContents(itemstack.getTagCompound())) - { - throw new IOException("Invalid book tag!"); - } + itemstack1 = this.playerEntity.inventory.getCurrentItem(); - itemstack1 = this.playerEntity.inventory.getCurrentItem(); + if (itemstack1 == null) + { + return; + } - if (itemstack1 != null) - { if (itemstack.getItem() == Items.written_book && itemstack1.getItem() == Items.writable_book) { itemstack1.setTagInfo("author", new NBTTagString(this.playerEntity.getCommandSenderName())); diff --git a/src/main/java/net/minecraft/network/PingResponseHandler.java b/src/main/java/net/minecraft/network/PingResponseHandler.java index b4a8440..4c2b9e7 100644 --- a/src/main/java/net/minecraft/network/PingResponseHandler.java +++ b/src/main/java/net/minecraft/network/PingResponseHandler.java @@ -30,68 +30,67 @@ try { - if (bytebuf.readUnsignedByte() != 254) + if (bytebuf.readUnsignedByte() == 254) { + InetSocketAddress inetsocketaddress = (InetSocketAddress)p_channelRead_1_.channel().remoteAddress(); + MinecraftServer minecraftserver = this.field_151257_b.func_151267_d(); + int i = bytebuf.readableBytes(); + String s; + + switch (i) + { + case 0: + logger.debug("Ping: (<1.3.x) from {}:{}", new Object[] {inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())}); + s = String.format("%s\u00a7%d\u00a7%d", new Object[] {minecraftserver.getMOTD(), Integer.valueOf(minecraftserver.getCurrentPlayerCount()), Integer.valueOf(minecraftserver.getMaxPlayers())}); + this.func_151256_a(p_channelRead_1_, this.func_151255_a(s)); + break; + case 1: + if (bytebuf.readUnsignedByte() != 1) + { + return; + } + + logger.debug("Ping: (1.4-1.5.x) from {}:{}", new Object[] {inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())}); + s = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", new Object[] {Integer.valueOf(127), minecraftserver.getMinecraftVersion(), minecraftserver.getMOTD(), Integer.valueOf(minecraftserver.getCurrentPlayerCount()), Integer.valueOf(minecraftserver.getMaxPlayers())}); + this.func_151256_a(p_channelRead_1_, this.func_151255_a(s)); + break; + default: + boolean flag1 = bytebuf.readUnsignedByte() == 1; + flag1 &= bytebuf.readUnsignedByte() == 250; + flag1 &= "MC|PingHost".equals(new String(bytebuf.readBytes(bytebuf.readShort() * 2).array(), Charsets.UTF_16BE)); + int j = bytebuf.readUnsignedShort(); + flag1 &= bytebuf.readUnsignedByte() >= 73; + flag1 &= 3 + bytebuf.readBytes(bytebuf.readShort() * 2).array().length + 4 == j; + flag1 &= bytebuf.readInt() <= 65535; + flag1 &= bytebuf.readableBytes() == 0; + + if (!flag1) + { + return; + } + + logger.debug("Ping: (1.6) from {}:{}", new Object[] {inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())}); + String s1 = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", new Object[] {Integer.valueOf(127), minecraftserver.getMinecraftVersion(), minecraftserver.getMOTD(), Integer.valueOf(minecraftserver.getCurrentPlayerCount()), Integer.valueOf(minecraftserver.getMaxPlayers())}); + ByteBuf bytebuf1 = this.func_151255_a(s1); + + try + { + this.func_151256_a(p_channelRead_1_, bytebuf1); + } + finally + { + bytebuf1.release(); + } + } + + bytebuf.release(); + flag = false; return; } - - InetSocketAddress inetsocketaddress = (InetSocketAddress)p_channelRead_1_.channel().remoteAddress(); - MinecraftServer minecraftserver = this.field_151257_b.func_151267_d(); - int i = bytebuf.readableBytes(); - String s; - - switch (i) - { - case 0: - logger.debug("Ping: (<1.3.x) from {}:{}", new Object[] {inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())}); - s = String.format("%s\u00a7%d\u00a7%d", new Object[] {minecraftserver.getMOTD(), Integer.valueOf(minecraftserver.getCurrentPlayerCount()), Integer.valueOf(minecraftserver.getMaxPlayers())}); - this.func_151256_a(p_channelRead_1_, this.func_151255_a(s)); - break; - case 1: - if (bytebuf.readUnsignedByte() != 1) - { - return; - } - - logger.debug("Ping: (1.4-1.5.x) from {}:{}", new Object[] {inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())}); - s = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", new Object[] {Integer.valueOf(127), minecraftserver.getMinecraftVersion(), minecraftserver.getMOTD(), Integer.valueOf(minecraftserver.getCurrentPlayerCount()), Integer.valueOf(minecraftserver.getMaxPlayers())}); - this.func_151256_a(p_channelRead_1_, this.func_151255_a(s)); - break; - default: - boolean flag1 = bytebuf.readUnsignedByte() == 1; - flag1 &= bytebuf.readUnsignedByte() == 250; - flag1 &= "MC|PingHost".equals(new String(bytebuf.readBytes(bytebuf.readShort() * 2).array(), Charsets.UTF_16BE)); - int j = bytebuf.readUnsignedShort(); - flag1 &= bytebuf.readUnsignedByte() >= 73; - flag1 &= 3 + bytebuf.readBytes(bytebuf.readShort() * 2).array().length + 4 == j; - flag1 &= bytebuf.readInt() <= 65535; - flag1 &= bytebuf.readableBytes() == 0; - - if (!flag1) - { - return; - } - - logger.debug("Ping: (1.6) from {}:{}", new Object[] {inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())}); - String s1 = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", new Object[] {Integer.valueOf(127), minecraftserver.getMinecraftVersion(), minecraftserver.getMOTD(), Integer.valueOf(minecraftserver.getCurrentPlayerCount()), Integer.valueOf(minecraftserver.getMaxPlayers())}); - ByteBuf bytebuf1 = this.func_151255_a(s1); - - try - { - this.func_151256_a(p_channelRead_1_, bytebuf1); - } - finally - { - bytebuf1.release(); - } - } - - bytebuf.release(); - flag = false; } catch (RuntimeException runtimeexception) { - ; + return; } finally { diff --git a/src/main/java/net/minecraft/server/management/PlayerProfileCache.java b/src/main/java/net/minecraft/server/management/PlayerProfileCache.java index b83fb44..29d2372 100644 --- a/src/main/java/net/minecraft/server/management/PlayerProfileCache.java +++ b/src/main/java/net/minecraft/server/management/PlayerProfileCache.java @@ -284,11 +284,11 @@ } catch (FileNotFoundException filenotfoundexception) { - ; + return; } catch (IOException ioexception) { - return; + ; } finally { diff --git a/src/main/java/net/minecraft/util/HttpUtil.java b/src/main/java/net/minecraft/util/HttpUtil.java index 4634195..6721feb 100644 --- a/src/main/java/net/minecraft/util/HttpUtil.java +++ b/src/main/java/net/minecraft/util/HttpUtil.java @@ -143,109 +143,105 @@ try { - try + byte[] abyte = new byte[4096]; + URL url = new URL(p_151223_1_); + urlconnection = url.openConnection(p_151223_6_); + float f = 0.0F; + float f1 = (float)p_151223_3_.entrySet().size(); + Iterator iterator = p_151223_3_.entrySet().iterator(); + + while (iterator.hasNext()) { - byte[] abyte = new byte[4096]; - URL url = new URL(p_151223_1_); - urlconnection = url.openConnection(p_151223_6_); - float f = 0.0F; - float f1 = (float)p_151223_3_.entrySet().size(); - Iterator iterator = p_151223_3_.entrySet().iterator(); - - while (iterator.hasNext()) - { - Entry entry = (Entry)iterator.next(); - urlconnection.setRequestProperty((String)entry.getKey(), (String)entry.getValue()); - - if (p_151223_5_ != null) - { - p_151223_5_.setLoadingProgress((int)(++f / f1 * 100.0F)); - } - } - - inputstream = urlconnection.getInputStream(); - f1 = (float)urlconnection.getContentLength(); - int i = urlconnection.getContentLength(); + Entry entry = (Entry)iterator.next(); + urlconnection.setRequestProperty((String)entry.getKey(), (String)entry.getValue()); if (p_151223_5_ != null) { - p_151223_5_.resetProgresAndWorkingMessage(String.format("Downloading file (%.2f MB)...", new Object[] {Float.valueOf(f1 / 1000.0F / 1000.0F)})); + p_151223_5_.setLoadingProgress((int)(++f / f1 * 100.0F)); } + } - if (p_151223_0_.exists()) + inputstream = urlconnection.getInputStream(); + f1 = (float)urlconnection.getContentLength(); + int i = urlconnection.getContentLength(); + + if (p_151223_5_ != null) + { + p_151223_5_.resetProgresAndWorkingMessage(String.format("Downloading file (%.2f MB)...", new Object[] {Float.valueOf(f1 / 1000.0F / 1000.0F)})); + } + + if (p_151223_0_.exists()) + { + long j = p_151223_0_.length(); + + if (j == (long)i) { - long j = p_151223_0_.length(); + p_151223_2_.func_148522_a(p_151223_0_); - if (j == (long)i) + if (p_151223_5_ != null) { - p_151223_2_.func_148522_a(p_151223_0_); - - if (p_151223_5_ != null) - { - p_151223_5_.func_146586_a(); - } - - return; + p_151223_5_.func_146586_a(); } - HttpUtil.logger.warn("Deleting " + p_151223_0_ + " as it does not match what we currently have (" + i + " vs our " + j + ")."); - p_151223_0_.delete(); + return; } - else if (p_151223_0_.getParentFile() != null) + + HttpUtil.logger.warn("Deleting " + p_151223_0_ + " as it does not match what we currently have (" + i + " vs our " + j + ")."); + p_151223_0_.delete(); + } + else if (p_151223_0_.getParentFile() != null) + { + p_151223_0_.getParentFile().mkdirs(); + } + + dataoutputstream = new DataOutputStream(new FileOutputStream(p_151223_0_)); + + if (p_151223_4_ > 0 && f1 > (float)p_151223_4_) + { + if (p_151223_5_ != null) { - p_151223_0_.getParentFile().mkdirs(); + p_151223_5_.func_146586_a(); } - dataoutputstream = new DataOutputStream(new FileOutputStream(p_151223_0_)); + throw new IOException("Filesize is bigger than maximum allowed (file is " + f + ", limit is " + p_151223_4_ + ")"); + } - if (p_151223_4_ > 0 && f1 > (float)p_151223_4_) + boolean flag = false; + int k; + + while ((k = inputstream.read(abyte)) >= 0) + { + f += (float)k; + + if (p_151223_5_ != null) + { + p_151223_5_.setLoadingProgress((int)(f / f1 * 100.0F)); + } + + if (p_151223_4_ > 0 && f > (float)p_151223_4_) { if (p_151223_5_ != null) { p_151223_5_.func_146586_a(); } - throw new IOException("Filesize is bigger than maximum allowed (file is " + f + ", limit is " + p_151223_4_ + ")"); + throw new IOException("Filesize was bigger than maximum allowed (got >= " + f + ", limit was " + p_151223_4_ + ")"); } - boolean flag = false; - int k; - - while ((k = inputstream.read(abyte)) >= 0) - { - f += (float)k; - - if (p_151223_5_ != null) - { - p_151223_5_.setLoadingProgress((int)(f / f1 * 100.0F)); - } - - if (p_151223_4_ > 0 && f > (float)p_151223_4_) - { - if (p_151223_5_ != null) - { - p_151223_5_.func_146586_a(); - } - - throw new IOException("Filesize was bigger than maximum allowed (got >= " + f + ", limit was " + p_151223_4_ + ")"); - } - - dataoutputstream.write(abyte, 0, k); - } - - p_151223_2_.func_148522_a(p_151223_0_); - - if (p_151223_5_ != null) - { - p_151223_5_.func_146586_a(); - return; - } + dataoutputstream.write(abyte, 0, k); } - catch (Throwable throwable) + + p_151223_2_.func_148522_a(p_151223_0_); + + if (p_151223_5_ != null) { - throwable.printStackTrace(); + p_151223_5_.func_146586_a(); } } + catch (Throwable throwable) + { + throwable.printStackTrace(); + } finally { try diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java index 31aa2fb..925bc56 100644 --- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java @@ -94,7 +94,7 @@ { if (l1 < 3) { - label197: + label101: { i2 = p_76484_3_ + p_76484_2_.nextInt(l * 2 + 1) - l; int j2 = p_76484_5_ + p_76484_2_.nextInt(i1 * 2 + 1) - i1; @@ -133,7 +133,7 @@ WeightedRandomChestContent.generateChestContents(p_76484_2_, ChestGenHooks.getItems(DUNGEON_CHEST, p_76484_2_), tileentitychest, ChestGenHooks.getCount(DUNGEON_CHEST, p_76484_2_)); } - break label197; + break label101; } }