keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Patch line number update. Ignore this.

Browse source
This commit is contained in:
Lex Manos 2015-06-18 18:02:22 -07:00
parent 94dc49e522
commit ed09a25c65
6 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -8,7 +8,7 @@
this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
@@ -449,7 +448,7 @@
@@ -450,7 +449,7 @@
}
});
this.field_71417_B = new MouseHelper();
@ -17,7 +17,7 @@
bar.step("GL Setup");
this.func_71361_d("Pre startup");
GlStateManager.func_179098_w();
@@ -491,7 +490,7 @@
@@ -492,7 +491,7 @@
net.minecraftforge.fml.common.ProgressManager.pop(bar);
net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
this.func_71361_d("Post startup");
@ -26,7 +26,7 @@
if (this.field_71475_ae != null)
{
@@ -898,11 +897,6 @@
@@ -899,11 +898,6 @@
public void func_147108_a(GuiScreen p_147108_1_)
{
@ -38,7 +38,7 @@
if (p_147108_1_ == null && this.field_71441_e == null)
{
p_147108_1_ = new GuiMainMenu();
@@ -912,6 +906,17 @@
@@ -913,6 +907,17 @@
p_147108_1_ = new GuiGameOver();
}
@ -56,7 +56,7 @@
if (p_147108_1_ instanceof GuiMainMenu)
{
this.field_71474_y.field_74330_P = false;
@@ -1395,7 +1400,7 @@
@@ -1396,7 +1401,7 @@
if (this.field_71441_e.func_180495_p(blockpos).func_177230_c().func_149688_o() != Material.field_151579_a && this.field_71442_b.func_180512_c(blockpos, this.field_71476_x.field_178784_b))
{
@ -65,7 +65,7 @@
this.field_71439_g.func_71038_i();
}
}
@@ -1475,15 +1480,19 @@
@@ -1476,15 +1481,19 @@
case 2:
BlockPos blockpos = this.field_71476_x.func_178782_a();
@ -86,7 +86,7 @@
if (itemstack == null)
{
@@ -1506,7 +1515,8 @@
@@ -1507,7 +1516,8 @@
{
ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g();
@ -96,7 +96,7 @@
{
this.field_71460_t.field_78516_c.func_78445_c();
}
@@ -1704,6 +1714,8 @@
@@ -1705,6 +1715,8 @@
while (Mouse.next())
{
@ -105,7 +105,7 @@
i = Mouse.getEventButton();
KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
@@ -2213,7 +2225,13 @@
@@ -2214,7 +2226,13 @@
NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
@ -120,7 +120,7 @@
this.field_71453_ak = networkmanager;
}
@@ -2224,6 +2242,8 @@
@@ -2225,6 +2243,8 @@
public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
{
@ -129,7 +129,7 @@
if (p_71353_1_ == null)
{
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
@@ -2237,6 +2257,18 @@
@@ -2238,6 +2258,18 @@
{
this.field_71437_Z.func_71263_m();
this.field_71437_Z.func_175592_a();
@ -148,7 +148,7 @@
}
this.field_71437_Z = null;
@@ -2368,134 +2400,11 @@
@@ -2369,134 +2401,11 @@
if (this.field_71476_x != null)
{
boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d;
@ -285,7 +285,7 @@
if (flag)
{
int j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + inventoryplayer.field_70461_c;
@@ -2751,8 +2660,11 @@
@@ -2752,8 +2661,11 @@
p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N()));
}
@ -297,7 +297,7 @@
for (int i = 16384; i > 0; i >>= 1)
{
GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
@@ -2760,6 +2672,7 @@
@@ -2761,6 +2673,7 @@
if (j != 0)
{

4
patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
View file

@ -91,7 +91,7 @@
}
public void func_73866_w_() {}
@@ -246,7 +265,9 @@
@@ -494,7 +513,9 @@
{
while (Mouse.next())
{
@ -101,7 +101,7 @@
}
}
@@ -254,7 +275,9 @@
@@ -502,7 +523,9 @@
{
while (Keyboard.next())
{

2
patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
View file

@ -46,7 +46,7 @@
Slot slot = this.func_146975_c(p_146286_1_, p_146286_2_);
int l = this.field_147003_i;
int i1 = this.field_147009_r;
@@ -691,4 +702,16 @@
@@ -698,4 +702,16 @@
this.field_146297_k.field_71439_g.func_71053_j();
}
}

14
patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
View file

@ -397,7 +397,7 @@
}
protected void func_71061_d_()
@@ -1839,6 +1947,8 @@
@@ -1840,6 +1948,8 @@
{
if (p_71008_1_ != this.field_71074_e)
{
@ -406,7 +406,7 @@
this.field_71074_e = p_71008_1_;
this.field_71072_f = p_71008_2_;
@@ -1908,6 +2018,10 @@
@@ -1909,6 +2019,10 @@
this.field_71106_cc = p_71049_1_.field_71106_cc;
this.func_85040_s(p_71049_1_.func_71037_bA());
this.field_82152_aq = p_71049_1_.field_82152_aq;
@ -417,7 +417,7 @@
}
else if (this.field_70170_p.func_82736_K().func_82766_b("keepInventory"))
{
@@ -1920,6 +2034,18 @@
@@ -1921,6 +2035,18 @@
this.field_71078_a = p_71049_1_.field_71078_a;
this.func_70096_w().func_75692_b(10, Byte.valueOf(p_71049_1_.func_70096_w().func_75683_a(10)));
@ -436,7 +436,7 @@
}
protected boolean func_70041_e_()
@@ -1953,7 +2079,14 @@
@@ -1954,7 +2080,14 @@
public void func_70062_b(int p_70062_1_, ItemStack p_70062_2_)
{
@ -452,7 +452,7 @@
}
@SideOnly(Side.CLIENT)
@@ -1998,7 +2131,10 @@
@@ -1999,7 +2132,10 @@
public IChatComponent func_145748_c_()
{
@ -464,7 +464,7 @@
chatcomponenttext.func_150256_b().func_150241_a(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.func_70005_c_() + " "));
chatcomponenttext.func_150256_b().func_150209_a(this.func_174823_aP());
chatcomponenttext.func_150256_b().func_179989_a(this.func_70005_c_());
@@ -2007,7 +2143,7 @@
@@ -2008,7 +2144,7 @@
public float func_70047_e()
{
@ -473,7 +473,7 @@
if (this.func_70608_bn())
{
@@ -2157,6 +2293,120 @@
@@ -2158,6 +2294,120 @@
net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
}

2
patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
View file

@ -74,7 +74,7 @@
}
Collection collection = this.field_70170_p.func_96441_U().func_96520_a(IScoreObjectiveCriteria.field_96642_c);
@@ -849,6 +866,7 @@
@@ -850,6 +867,7 @@
{
if (p_71064_1_ != null)
{

2
patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch
View file

@ -23,7 +23,7 @@
+ WeightedRandomChestContent.func_177630_a(p_180709_2_, ChestGenHooks.getItems(DUNGEON_CHEST, p_180709_2_), (TileEntityChest)tileentity1, ChestGenHooks.getCount(DUNGEON_CHEST, p_180709_2_));
}
break label197;
break label100;
@@ -184,6 +186,12 @@
private String func_76543_b(Random p_76543_1_)