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

Update patches for AT changes.

This commit is contained in:
Lex Manos 2013-12-31 13:03:45 -08:00
parent b31fbe528a
commit ea0be720a1
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/minecraft/net/minecraft/block/Block.java.patch
View File

@ -74,7 +74,7 @@
+ return hasTileEntity(0); + return hasTileEntity(0);
} }
protected final void func_149676_a(float p_149676_1_, float p_149676_2_, float p_149676_3_, float p_149676_4_, float p_149676_5_, float p_149676_6_) public final void func_149676_a(float p_149676_1_, float p_149676_2_, float p_149676_3_, float p_149676_4_, float p_149676_5_, float p_149676_6_)
@@ -500,13 +523,13 @@ @@ -500,13 +523,13 @@
public int func_149677_c(IBlockAccess p_149677_1_, int p_149677_2_, int p_149677_3_, int p_149677_4_) public int func_149677_c(IBlockAccess p_149677_1_, int p_149677_2_, int p_149677_3_, int p_149677_4_)
{ {

18
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View File

@ -72,7 +72,7 @@
if (p_147108_1_ instanceof GuiMainMenu) if (p_147108_1_ instanceof GuiMainMenu)
{ {
this.gameSettings.showDebugInfo = false; this.gameSettings.showDebugInfo = false;
@@ -1338,7 +1352,7 @@ @@ -1337,7 +1351,7 @@
if (this.thePlayer.isCurrentToolAdventureModeExempt(i, j, k)) if (this.thePlayer.isCurrentToolAdventureModeExempt(i, j, k))
{ {
@ -81,7 +81,7 @@
this.thePlayer.swingItem(); this.thePlayer.swingItem();
} }
} }
@@ -1419,11 +1433,12 @@ @@ -1418,11 +1432,12 @@
int j = this.objectMouseOver.blockY; int j = this.objectMouseOver.blockY;
int k = this.objectMouseOver.blockZ; int k = this.objectMouseOver.blockZ;
@ -96,7 +96,7 @@
{ {
flag = false; flag = false;
this.thePlayer.swingItem(); this.thePlayer.swingItem();
@@ -1450,7 +1465,8 @@ @@ -1449,7 +1464,8 @@
{ {
ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem(); ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem();
@ -106,7 +106,7 @@
{ {
this.entityRenderer.itemRenderer.resetEquippedProgress2(); this.entityRenderer.itemRenderer.resetEquippedProgress2();
} }
@@ -1652,6 +1668,8 @@ @@ -1651,6 +1667,8 @@
while (Mouse.next()) while (Mouse.next())
{ {
@ -115,7 +115,7 @@
i = Mouse.getEventButton(); i = Mouse.getEventButton();
if (isRunningOnMac && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) if (isRunningOnMac && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157)))
@@ -2121,6 +2139,11 @@ @@ -2120,6 +2138,11 @@
// JAVADOC METHOD $$ func_71353_a // JAVADOC METHOD $$ func_71353_a
public void loadWorld(WorldClient par1WorldClient, String par2Str) public void loadWorld(WorldClient par1WorldClient, String par2Str)
{ {
@ -127,7 +127,7 @@
if (par1WorldClient == null) if (par1WorldClient == null)
{ {
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
@@ -2133,6 +2156,18 @@ @@ -2132,6 +2155,18 @@
if (this.theIntegratedServer != null) if (this.theIntegratedServer != null)
{ {
this.theIntegratedServer.initiateShutdown(); this.theIntegratedServer.initiateShutdown();
@ -146,7 +146,7 @@
} }
this.theIntegratedServer = null; this.theIntegratedServer = null;
@@ -2288,113 +2323,10 @@ @@ -2287,113 +2322,10 @@
if (this.objectMouseOver != null) if (this.objectMouseOver != null)
{ {
boolean flag = this.thePlayer.capabilities.isCreativeMode; boolean flag = this.thePlayer.capabilities.isCreativeMode;
@ -262,7 +262,7 @@
if (flag) if (flag)
{ {
j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem; j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem;
@@ -2564,9 +2496,16 @@ @@ -2563,9 +2495,16 @@
par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize())); par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize()));
} }
@ -279,7 +279,7 @@
for (int i = 16384; i > 0; i >>= 1) 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); GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
@@ -2574,6 +2513,7 @@ @@ -2573,6 +2512,7 @@
if (j != 0) if (j != 0)
{ {

2
patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch
View File

@ -10,7 +10,7 @@
public class RenderBlocks public class RenderBlocks
{ {
@@ -336,9 +338,9 @@ @@ -336,9 +338,9 @@
private boolean func_147773_v(Block p_147773_1_, int p_147773_2_, int p_147773_3_, int p_147773_4_) public boolean func_147773_v(Block p_147773_1_, int p_147773_2_, int p_147773_3_, int p_147773_4_)
{ {
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
- int l = this.field_147845_a.getBlockMetadata(p_147773_2_, p_147773_3_, p_147773_4_); - int l = this.field_147845_a.getBlockMetadata(p_147773_2_, p_147773_3_, p_147773_4_);