diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java index 2fc57b7a58..d67679d779 100644 --- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -22,6 +22,7 @@ import java.util.logging.Logger; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; +import net.minecraft.dispenser.BehaviorSnowballDispense; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -177,7 +178,8 @@ public class FMLCommonHandler public Side getEffectiveSide() { Thread thr = Thread.currentThread(); - if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread)) + // totally temporary! + if ((thr instanceof BehaviorSnowballDispense) || (thr instanceof ServerListenThread)) { return Side.SERVER; } diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch index e89366e475..d13ad8203f 100644 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -21,7 +21,7 @@ @SideOnly(Side.CLIENT) public abstract class Minecraft implements Runnable, IPlayerUsage { -@@ -296,6 +304,8 @@ +@@ -297,6 +305,8 @@ this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false); this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false); @@ -30,7 +30,7 @@ if (this.field_71474_y.field_74363_ab != null) { StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab, false); -@@ -332,6 +342,8 @@ +@@ -333,6 +343,8 @@ GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d); this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); @@ -39,7 +39,7 @@ try { this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this); -@@ -360,6 +372,8 @@ +@@ -361,6 +373,8 @@ { this.func_71352_k(); } @@ -48,7 +48,7 @@ } private void func_71357_I() throws LWJGLException -@@ -724,9 +738,11 @@ +@@ -725,9 +739,11 @@ if (!this.field_71454_w) { @@ -60,7 +60,7 @@ } GL11.glFlush(); -@@ -1256,10 +1272,14 @@ +@@ -1257,10 +1273,14 @@ public void func_71407_l() { @@ -75,7 +75,7 @@ this.field_71424_I.func_76320_a("stats"); this.field_71413_E.func_77449_e(); -@@ -1717,6 +1737,8 @@ +@@ -1718,6 +1738,8 @@ this.field_71453_ak.func_74428_b(); } @@ -84,7 +84,7 @@ this.field_71424_I.func_76319_b(); this.field_71423_H = func_71386_F(); } -@@ -1755,8 +1777,27 @@ +@@ -1756,8 +1778,27 @@ } this.field_71413_E.func_77450_a(StatList.field_75936_f, 1); @@ -112,7 +112,7 @@ this.field_71455_al = true; this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel")); -@@ -1978,6 +2019,12 @@ +@@ -1979,6 +2020,12 @@ public static void main(String[] p_main_0_) { diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch index 00c588dab1..c15d1aeefa 100644 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch @@ -16,7 +16,7 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -@@ -22,6 +25,9 @@ +@@ -24,6 +27,9 @@ import net.minecraft.world.storage.WorldInfo; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.GLU; @@ -26,17 +26,16 @@ @SideOnly(Side.CLIENT) public class GuiMainMenu extends GuiScreen -@@ -140,7 +146,8 @@ - this.func_73969_a(i, 24, stringtranslate); - } +@@ -148,6 +154,8 @@ -- this.field_73887_h.add(new GuiButton(3, this.field_73880_f / 2 - 100, i + 48, stringtranslate.func_74805_b("menu.mods"))); -+ this.field_73887_h.add(new GuiButton(3, this.field_73880_f / 2 - 100, i + 48, 98, 20, stringtranslate.func_74805_b("menu.mods"))); -+ this.field_73887_h.add(new GuiButton(6, this.field_73880_f / 2 + 2, i + 48, 98, 20, "Mods")); + this.func_96137_a(stringtranslate, i, 24); ++ this.field_73887_h.add(new GuiButton(6, this.field_73880_f / 2 - 100, i + 49, "Mods")); ++ if (this.field_73882_e.field_71448_m) { -@@ -224,6 +231,11 @@ + this.field_73887_h.add(new GuiButton(0, this.field_73880_f / 2 - 100, i + 72, stringtranslate.func_74805_b("menu.options"))); +@@ -264,6 +272,11 @@ if (p_73875_1_.field_73741_f == 4) { this.field_73882_e.func_71400_g(); @@ -48,7 +47,7 @@ } if (p_73875_1_.field_73741_f == 11) -@@ -460,7 +472,16 @@ +@@ -500,7 +513,16 @@ s = s + " Demo"; } diff --git a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index 4bc873ef40..213dc7591e 100644 --- a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; -@@ -175,11 +176,14 @@ +@@ -186,11 +187,14 @@ public int field_72556_d = 20; Random field_72557_e = new Random(); @@ -22,7 +22,7 @@ } public NetClientHandler(Minecraft p_i3104_1_, IntegratedServer p_i3104_2_) throws IOException -@@ -187,6 +191,7 @@ +@@ -198,6 +202,7 @@ this.field_72563_h = p_i3104_1_; this.field_72555_g = new MemoryConnection(this); p_i3104_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i3104_1_.field_71449_j.field_74286_b); @@ -30,7 +30,7 @@ } public void func_72547_c() -@@ -257,6 +262,7 @@ +@@ -268,6 +273,7 @@ public void func_72513_a(Packet252SharedKey p_72513_1_) { @@ -38,7 +38,7 @@ this.func_72552_c(new Packet205ClientCommand(0)); } -@@ -272,6 +278,7 @@ +@@ -283,6 +289,7 @@ this.field_72563_h.field_71439_g.field_70157_k = p_72455_1_.field_73561_a; this.field_72556_d = p_72455_1_.field_73562_h; this.field_72563_h.field_71442_b.func_78746_a(p_72455_1_.field_73557_d); @@ -46,7 +46,7 @@ this.field_72563_h.field_71474_y.func_82879_c(); } -@@ -704,6 +711,7 @@ +@@ -715,6 +722,7 @@ { this.field_72555_g.func_74429_a(p_72546_1_); this.field_72555_g.func_74423_d(); @@ -54,7 +54,7 @@ } } -@@ -743,6 +751,7 @@ +@@ -754,6 +762,7 @@ public void func_72481_a(Packet3Chat p_72481_1_) { @@ -62,7 +62,7 @@ this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(p_72481_1_.field_73476_b); } -@@ -1268,6 +1277,11 @@ +@@ -1299,6 +1308,11 @@ public void func_72494_a(Packet131MapData p_72494_1_) { @@ -74,7 +74,7 @@ if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT) { ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c); -@@ -1377,6 +1391,11 @@ +@@ -1408,6 +1422,11 @@ public void func_72501_a(Packet250CustomPayload p_72501_1_) { @@ -86,7 +86,7 @@ if ("MC|TPack".equals(p_72501_1_.field_73630_a)) { String[] astring = (new String(p_72501_1_.field_73629_c)).split("\u0000"); -@@ -1421,4 +1440,20 @@ +@@ -1561,4 +1580,20 @@ { return this.field_72555_g; } diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch index d165c7a48f..14ed860767 100644 --- a/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch @@ -8,16 +8,17 @@ import net.minecraft.util.Direction; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; -@@ -231,7 +232,49 @@ +@@ -231,7 +232,50 @@ int l = p_78612_1_.func_71857_b(); p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_); this.func_83018_a(p_78612_1_); -- return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 36 ? this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 37 ? this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 38 ? this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))))))); +- return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 39 ? this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 36 ? this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 37 ? this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 38 ? this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false)))))))))))))))))))))))))))))))))))))); + switch (l) + { + // regex: \(l == ([\d]+) \? (.*) replace: case \1: return \2; -+ case 0: return this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ; ++ case 0 : this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_); + case 31: return this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ; ++ case 39: return this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ; + case 4: return this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ; + case 13: return this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ; + case 1: return this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) ; @@ -59,9 +60,9 @@ } public boolean func_78567_v(BlockEndPortalFrame p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_) -@@ -6623,6 +6666,10 @@ - this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); - this.func_78595_a(); +@@ -6805,6 +6849,10 @@ + this.func_96447_a((BlockHopper)p_78600_1_, 0, 0, 0, 0, true); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); } + else + { @@ -70,42 +71,30 @@ } else { -@@ -6681,7 +6728,37 @@ +@@ -6863,7 +6911,25 @@ public static boolean func_78597_b(int p_78597_0_) { -- return p_78597_0_ == 0 ? true : (p_78597_0_ == 31 ? true : (p_78597_0_ == 13 ? true : (p_78597_0_ == 10 ? true : (p_78597_0_ == 11 ? true : (p_78597_0_ == 27 ? true : (p_78597_0_ == 22 ? true : (p_78597_0_ == 21 ? true : (p_78597_0_ == 16 ? true : (p_78597_0_ == 26 ? true : (p_78597_0_ == 32 ? true : (p_78597_0_ == 34 ? true : p_78597_0_ == 35))))))))))); +- return p_78597_0_ == 0 ? true : (p_78597_0_ == 31 ? true : (p_78597_0_ == 39 ? true : (p_78597_0_ == 13 ? true : (p_78597_0_ == 10 ? true : (p_78597_0_ == 11 ? true : (p_78597_0_ == 27 ? true : (p_78597_0_ == 22 ? true : (p_78597_0_ == 21 ? true : (p_78597_0_ == 16 ? true : (p_78597_0_ == 26 ? true : (p_78597_0_ == 32 ? true : (p_78597_0_ == 34 ? true : p_78597_0_ == 35)))))))))))); + switch (p_78597_0_) + { -+ case 0: -+ return true; -+ case 31: -+ return true; -+ case 13: -+ return true; -+ case 10: -+ return true; -+ case 11: -+ return true; -+ case 27: -+ return true; -+ case 22: -+ return true; -+ case 21: -+ return true; -+ case 16: -+ return true; -+ case 26: -+ return true; -+ case 32: -+ return true; -+ case 34: -+ return true; -+ case 35: -+ return true; -+ default: -+ return FMLRenderAccessLibrary.renderItemAsFull3DBlock(p_78597_0_); ++ case 0: return true; ++ case 31: return true ; ++ case 39: return true ; ++ case 13: return true ; ++ case 10: return true ; ++ case 11: return true ; ++ case 27: return true ; ++ case 22: return true ; ++ case 21: return true ; ++ case 16: return true ; ++ case 26: return true ; ++ case 32: return true ; ++ case 34: return true ; ++ case 35: return true ; ++ default: return FMLRenderAccessLibrary.renderItemAsFull3DBlock(p_78597_0_); + } ++ } public Icon func_94170_a(Block p_94170_1_, IBlockAccess p_94170_2_, int p_94170_3_, int p_94170_4_, int p_94170_5_, int p_94170_6_) diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch index 6b4cda608d..b363ab3f34 100644 --- a/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch @@ -22,7 +22,7 @@ import javax.imageio.ImageIO; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings; -@@ -39,6 +45,8 @@ +@@ -40,6 +46,8 @@ private final TextureMap field_94155_m; private int field_94153_n; @@ -31,7 +31,7 @@ public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_) { this.field_78366_k = p_i3192_1_; -@@ -117,8 +125,9 @@ +@@ -118,8 +126,9 @@ this.field_78359_d.put(p_78346_1_, aint1); return aint1; } @@ -43,7 +43,7 @@ ioexception.printStackTrace(); int[] aint2 = this.func_78348_b(this.field_78364_l); this.field_78359_d.put(p_78346_1_, aint2); -@@ -505,8 +514,9 @@ +@@ -506,8 +515,9 @@ this.field_78361_b = false; this.field_78363_a = false; } @@ -55,7 +55,7 @@ ioexception.printStackTrace(); } } -@@ -542,8 +552,9 @@ +@@ -543,8 +553,9 @@ this.field_78361_b = false; this.field_78363_a = false; } diff --git a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch index afaf013cfa..5284e69b4e 100644 --- a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; -@@ -625,6 +626,7 @@ +@@ -675,6 +676,7 @@ public void func_74303_b() { diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch index a3a2f7f8c2..7c3d793d2f 100644 --- a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch @@ -6,10 +6,10 @@ import java.util.Set; + +import cpw.mods.fml.common.registry.EntityRegistry; + import net.minecraft.crash.CrashReport; + import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.boss.EntityDragon; - import net.minecraft.entity.boss.EntityWither; - import net.minecraft.entity.item.EntityBoat; -@@ -50,6 +52,11 @@ +@@ -53,6 +55,11 @@ public void func_72786_a(Entity p_72786_1_) { diff --git a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index c43b914e27..e9245e59fc 100644 --- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -7,8 +7,8 @@ +import cpw.mods.fml.common.network.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import java.util.Iterator; -@@ -175,6 +177,7 @@ + import java.util.Collection; +@@ -182,6 +184,7 @@ public void func_70071_h_() { @@ -16,7 +16,7 @@ if (this.field_71074_e != null) { ItemStack itemstack = this.field_71071_by.func_70448_g(); -@@ -298,6 +301,7 @@ +@@ -305,6 +308,7 @@ { this.field_71100_bB.func_75118_a(this); } @@ -24,9 +24,9 @@ } public int func_82145_z() -@@ -1839,4 +1843,9 @@ +@@ -1852,4 +1856,9 @@ { - return this.func_82241_s(1); + return ScorePlayerTeam.func_96667_a(this.func_96124_cp(), this.field_71092_bJ); } + + public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) diff --git a/fml/patches/minecraft/net/minecraft/item/Item.java.patch b/fml/patches/minecraft/net/minecraft/item/Item.java.patch index 13bec4a5bc..9e1822617d 100644 --- a/fml/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/fml/patches/minecraft/net/minecraft/item/Item.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.util.List; -@@ -214,6 +215,8 @@ +@@ -215,6 +216,8 @@ } field_77698_e[256 + p_i3659_1_] = this; diff --git a/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch b/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch index 437b12b11f..af735b8e30 100644 --- a/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch @@ -17,7 +17,7 @@ import net.minecraft.network.packet.Packet13PlayerLookMove; import net.minecraft.network.packet.Packet14BlockDig; import net.minecraft.network.packet.Packet15Place; -@@ -627,6 +630,7 @@ +@@ -604,6 +607,7 @@ public void func_72481_a(Packet3Chat p_72481_1_) { @@ -25,7 +25,7 @@ if (this.field_72574_e.func_71126_v() == 2) { this.func_72567_b(new Packet3Chat("Cannot send chat message.")); -@@ -992,6 +996,11 @@ +@@ -969,6 +973,11 @@ } public void func_72501_a(Packet250CustomPayload p_72501_1_) @@ -37,7 +37,7 @@ { DataInputStream datainputstream; ItemStack itemstack; -@@ -1156,4 +1165,18 @@ +@@ -1133,4 +1142,18 @@ } } } diff --git a/fml/patches/minecraft/net/minecraft/network/packet/NetHandler.java.patch b/fml/patches/minecraft/net/minecraft/network/packet/NetHandler.java.patch index 9d31fec67f..e893da6350 100644 --- a/fml/patches/minecraft/net/minecraft/network/packet/NetHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/network/packet/NetHandler.java.patch @@ -7,9 +7,9 @@ public abstract class NetHandler { -@@ -340,4 +342,8 @@ +@@ -360,4 +362,8 @@ { - return false; + this.func_72509_a(p_96435_1_); } + + public abstract void handleVanilla250Packet(Packet250CustomPayload payload); diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index fa71f79941..f65f6d9830 100644 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -9,7 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.awt.GraphicsEnvironment; -@@ -379,7 +382,11 @@ +@@ -357,7 +360,11 @@ { if (this.func_71197_b()) { @@ -21,7 +21,7 @@ for (long k0 = 0L; this.field_71317_u; this.field_71296_Q = true) { -@@ -418,6 +425,7 @@ +@@ -396,6 +403,7 @@ Thread.sleep(1L); } @@ -29,7 +29,7 @@ } else { -@@ -426,6 +434,10 @@ +@@ -404,6 +412,10 @@ } catch (Throwable throwable) { @@ -40,7 +40,7 @@ throwable.printStackTrace(); field_71306_a.log(Level.SEVERE, "Encountered an unexpected exception " + throwable.getClass().getSimpleName(), throwable); CrashReport crashreport = null; -@@ -456,6 +468,10 @@ +@@ -434,6 +446,10 @@ { try { @@ -51,7 +51,7 @@ this.func_71260_j(); this.field_71316_v = true; } -@@ -465,6 +481,7 @@ +@@ -443,6 +459,7 @@ } finally { @@ -59,7 +59,7 @@ this.func_71240_o(); } } -@@ -481,8 +498,10 @@ +@@ -459,8 +476,10 @@ public void func_71217_p() { @@ -70,7 +70,7 @@ ++this.field_71315_w; if (this.field_71295_T) -@@ -528,6 +547,7 @@ +@@ -506,6 +525,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76319_b(); @@ -78,7 +78,7 @@ } public void func_71190_q() -@@ -555,6 +575,7 @@ +@@ -533,6 +553,7 @@ } this.field_71304_b.func_76320_a("tick"); @@ -86,7 +86,7 @@ CrashReport crashreport; try -@@ -579,6 +600,7 @@ +@@ -557,6 +578,7 @@ throw new ReportedException(crashreport); } @@ -94,7 +94,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76320_a("tracker"); worldserver.func_73039_n().func_72788_a(); -@@ -706,7 +728,7 @@ +@@ -684,7 +706,7 @@ public String getServerModName() { @@ -103,7 +103,7 @@ } public CrashReport func_71230_b(CrashReport p_71230_1_) -@@ -1147,6 +1169,13 @@ +@@ -1130,6 +1152,13 @@ @SideOnly(Side.SERVER) public static void main(String[] p_main_0_) { diff --git a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch index e8b009a128..5485c4ae52 100644 --- a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.File; -@@ -57,6 +58,8 @@ +@@ -60,6 +61,8 @@ field_71306_a.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } @@ -16,7 +16,7 @@ field_71306_a.info("Loading properties"); this.field_71340_o = new PropertyManager(new File("server.properties")); -@@ -125,6 +128,8 @@ +@@ -128,6 +131,8 @@ field_71306_a.warning("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); field_71306_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file."); } @@ -25,7 +25,7 @@ this.func_71210_a(new DedicatedPlayerList(this)); long j = System.nanoTime(); -@@ -167,6 +172,7 @@ +@@ -170,6 +175,7 @@ this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16); this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256)); this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z())); @@ -33,7 +33,7 @@ field_71306_a.info("Preparing level \"" + this.func_71270_I() + "\""); this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2); long i1 = System.nanoTime() - j; -@@ -187,7 +193,7 @@ +@@ -190,7 +196,7 @@ this.field_71339_n.func_72602_a(); } diff --git a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index a0041873d3..473cd781fe 100644 --- a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.File; -@@ -109,6 +111,8 @@ +@@ -119,6 +121,8 @@ } p_72355_2_.func_71116_b(); @@ -16,8 +16,8 @@ + FMLNetworkHandler.handlePlayerLogin(p_72355_2_, netserverhandler, p_72355_1_); } - public void func_72364_a(WorldServer[] p_72364_1_) -@@ -175,6 +179,7 @@ + protected void func_96456_a(ServerScoreboard p_96456_1_, EntityPlayerMP p_96456_2_) +@@ -216,6 +220,7 @@ public void func_72367_e(EntityPlayerMP p_72367_1_) { @@ -25,15 +25,15 @@ this.func_72391_b(p_72367_1_); WorldServer worldserver = p_72367_1_.func_71121_q(); worldserver.func_72900_e(p_72367_1_); -@@ -324,6 +329,7 @@ - worldserver.func_72838_d(entityplayermp1); +@@ -366,6 +371,7 @@ this.field_72404_b.add(entityplayermp1); entityplayermp1.func_71116_b(); + entityplayermp1.func_70606_j(entityplayermp1.func_70630_aN()); + GameRegistry.onPlayerRespawn(entityplayermp1); return entityplayermp1; } -@@ -349,6 +355,8 @@ +@@ -391,6 +397,8 @@ PotionEffect potioneffect = (PotionEffect)iterator.next(); p_72356_1_.field_71135_a.func_72567_b(new Packet41EntityEffect(p_72356_1_.field_70157_k, potioneffect)); } diff --git a/fml/patches/minecraft/net/minecraft/stats/StatFileWriter.java.patch b/fml/patches/minecraft/net/minecraft/stats/StatFileWriter.java.patch index f548f75bcb..7e22823af6 100644 --- a/fml/patches/minecraft/net/minecraft/stats/StatFileWriter.java.patch +++ b/fml/patches/minecraft/net/minecraft/stats/StatFileWriter.java.patch @@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.File; -@@ -16,6 +17,7 @@ +@@ -17,6 +18,7 @@ import net.minecraft.util.MD5String; import net.minecraft.util.Session; diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index 2da97b5ba6..b5b66ecfde 100644 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -13,7 +13,7 @@ import net.minecraft.block.Block; import net.minecraft.block.TileEntityRecordPlayer; import net.minecraft.crash.CrashReportCategory; -@@ -82,9 +85,11 @@ +@@ -81,9 +84,11 @@ { TileEntity tileentity = null; @@ -26,7 +26,7 @@ if (oclass != null) { -@@ -98,7 +103,17 @@ +@@ -97,7 +102,17 @@ if (tileentity != null) { diff --git a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch index beb777c8dc..ddc27745a1 100644 --- a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch +++ b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; -@@ -93,6 +94,7 @@ +@@ -92,6 +93,7 @@ } } } @@ -15,7 +15,7 @@ } public synchronized void func_74810_a(String p_74810_1_, boolean p_74810_2_) -@@ -170,7 +172,6 @@ +@@ -169,7 +171,6 @@ } } diff --git a/fml/patches/minecraft/net/minecraft/world/World.java.patch b/fml/patches/minecraft/net/minecraft/world/World.java.patch index 3d4ec82e01..92bf0e371e 100644 --- a/fml/patches/minecraft/net/minecraft/world/World.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/World.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/World.java +++ ../src-work/minecraft/net/minecraft/world/World.java -@@ -1754,13 +1754,14 @@ +@@ -1810,13 +1810,14 @@ } } @@ -16,7 +16,7 @@ this.field_72984_F.func_76318_c("pendingTileEntities"); -@@ -3673,7 +3674,7 @@ +@@ -3729,7 +3730,7 @@ @SideOnly(Side.CLIENT) public double func_72919_O() {