From 65e154416864bf9c37cf2abab3bd49230fd0d45d Mon Sep 17 00:00:00 2001 From: Eloraam Date: Mon, 19 Sep 2011 01:44:40 +0000 Subject: [PATCH] A bunch of little patches to make it actually build for 1.8.1. --- minecraft.patch | 155 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 110 insertions(+), 45 deletions(-) diff --git a/minecraft.patch b/minecraft.patch index 4451d547be..0c45727278 100644 --- a/minecraft.patch +++ b/minecraft.patch @@ -152,7 +152,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChes } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor.java ../src_work/minecraft/net/minecraft/src/BlockDoor.java --- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 17:54:16.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-18 21:33:35.000000000 -0400 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; @@ -167,7 +167,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor } else { - return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); -++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); ++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k); } } @@ -518,7 +518,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve } diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java --- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 18:09:41.000000000 -0400 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-18 21:33:44.000000000 -0400 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -534,7 +534,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres { boolean flag = false; - if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID) -+ if(!world.isBlockSolidOnSide(i, j - 1, k,1)) ++ if(!world.isBlockSolidOnSide(i, j - 1, k,1) + && world.getBlockId(i, j - 1, k) != Block.fence.blockID) { flag = true; @@ -618,8 +618,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } else diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java --- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 18:13:57.000000000 -0400 -@@ -53,7 +53,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-18 21:37:57.000000000 -0400 +@@ -3,6 +3,7 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.*; + + import java.util.*; + +@@ -53,7 +54,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) { @@ -628,7 +636,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds } private void updateAndPropagateCurrentStrength(World world, int i, int j, int k) -@@ -451,6 +451,10 @@ +@@ -451,6 +452,10 @@ { return false; } @@ -1449,8 +1457,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon } else diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java --- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 19:22:49.000000000 -0400 -@@ -91,7 +91,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-18 21:36:47.000000000 -0400 +@@ -4,6 +4,9 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.IUseItemFirst; ++import net.minecraft.src.forge.ForgeHooks; ++ + import net.minecraft.client.Minecraft; + + // Referenced classes of package net.minecraft.src: +@@ -91,7 +94,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -1459,7 +1477,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon { sendBlockRemoved(i, j, k, l); } else -@@ -137,7 +137,7 @@ +@@ -137,7 +140,7 @@ return; } Block block = Block.blocksList[i1]; @@ -1468,7 +1486,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(field_9441_h % 4F == 0.0F && block != null) { mc.sndManager.playSound(block.stepSound.stepSoundDir2(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F); -@@ -204,6 +204,13 @@ +@@ -204,6 +207,13 @@ { syncCurrentPlayItem(); netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem())); @@ -1482,7 +1500,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -223,7 +230,11 @@ +@@ -223,7 +233,11 @@ return flag; } else { @@ -1497,8 +1515,17 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java --- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 19:27:32.000000000 -0400 -@@ -42,7 +42,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-18 21:38:41.000000000 -0400 +@@ -3,6 +3,8 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; ++import net.minecraft.src.forge.IUseItemFirst; ++import net.minecraft.src.forge.ForgeHooks; + + import net.minecraft.client.Minecraft; + +@@ -42,7 +44,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); ItemStack itemstack = mc.thePlayer.getCurrentEquippedItem(); @@ -1507,7 +1534,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(itemstack != null) { itemstack.onDestroyBlock(i1, i, j, k, mc.thePlayer); -@@ -71,7 +71,7 @@ +@@ -71,7 +73,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); } @@ -1516,7 +1543,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon { sendBlockRemoved(i, j, k, l); } -@@ -102,7 +102,7 @@ +@@ -102,7 +104,7 @@ return; } Block block = Block.blocksList[i1]; @@ -1525,7 +1552,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon if(field_1069_h % 4F == 0.0F && block != null) { mc.sndManager.playSound(block.stepSound.stepSoundDir2(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F); -@@ -165,6 +165,12 @@ +@@ -165,6 +167,12 @@ public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -1538,7 +1565,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -175,7 +181,11 @@ +@@ -175,7 +183,11 @@ return false; } else { @@ -1666,8 +1693,19 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo private int cloudOffsetX; diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java --- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 19:41:51.000000000 -0400 -@@ -47,10 +47,36 @@ ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-18 21:35:01.000000000 -0400 +@@ -4,6 +4,10 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; ++ + import java.util.Random; + import org.lwjgl.opengl.GL11; + +@@ -47,10 +51,36 @@ } GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); @@ -1705,7 +1743,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f4 = 0.25F; int j = Block.blocksList[itemstack.itemID].getRenderType(); if(j == 1 || j == 19 || j == 12 || j == 2) -@@ -80,9 +106,11 @@ +@@ -80,9 +110,11 @@ if(itemstack.itemID < 256) { loadTexture("/terrain.png"); @@ -1717,7 +1755,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte } Tessellator tessellator = Tessellator.instance; float f5 = (float)((i % 16) * 16 + 0) / 256F; -@@ -129,10 +157,37 @@ +@@ -129,10 +161,37 @@ public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) { @@ -1756,7 +1794,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -161,9 +216,11 @@ +@@ -161,9 +220,11 @@ if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1770,8 +1808,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f = (float)(k1 >> 16 & 0xff) / 255F; diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPlayer.java ../src_work/minecraft/net/minecraft/src/RenderPlayer.java --- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 17:42:58.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 19:43:11.000000000 -0400 -@@ -34,7 +34,14 @@ ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-18 21:37:36.000000000 -0400 +@@ -4,6 +4,7 @@ + + package net.minecraft.src; + ++import net.minecraft.src.forge.IArmorTextureProvider; + import net.minecraft.client.Minecraft; + import org.lwjgl.opengl.GL11; + +@@ -34,7 +35,14 @@ if(item instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)item; @@ -1808,8 +1854,16 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft ItemStack itemstack1 = craftMatrix.getStackInSlot(i); diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellator.java ../src_work/minecraft/net/minecraft/src/Tessellator.java --- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 19:59:43.000000000 -0400 -@@ -13,8 +13,7 @@ ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-18 21:38:26.000000000 -0400 +@@ -5,6 +5,7 @@ + package net.minecraft.src; + + import java.nio.*; ++import java.util.*; + import org.lwjgl.opengl.*; + + // Referenced classes of package net.minecraft.src: +@@ -13,8 +14,7 @@ public class Tessellator { @@ -1819,7 +1873,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat vertexCount = 0; hasColor = false; hasTexture = false; -@@ -24,21 +23,10 @@ +@@ -24,21 +24,10 @@ addedVertices = 0; isColorDisabled = false; isDrawing = false; @@ -1844,7 +1898,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void draw() -@@ -48,12 +36,20 @@ +@@ -48,12 +37,20 @@ throw new IllegalStateException("Not tesselating!"); } isDrawing = false; @@ -1869,7 +1923,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat if(useVBO) { vboIndex = (vboIndex + 1) % vboCount; -@@ -121,10 +117,10 @@ +@@ -121,10 +118,10 @@ GL11.glEnableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(drawMode == 7 && convertQuadsToTriangles) { @@ -1882,7 +1936,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } GL11.glDisableClientState(32884 /*GL_VERTEX_ARRAY_EXT*/); if(hasTexture) -@@ -146,6 +142,10 @@ +@@ -146,6 +143,10 @@ GL11.glDisableClientState(32885 /*GL_NORMAL_ARRAY_EXT*/); } } @@ -1893,7 +1947,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat reset(); } -@@ -265,6 +265,15 @@ +@@ -265,6 +266,15 @@ public void addVertex(double d, double d1, double d2) { @@ -1909,7 +1963,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat addedVertices++; if(drawMode == 7 && convertQuadsToTriangles && addedVertices % 4 == 0) { -@@ -314,11 +323,6 @@ +@@ -314,11 +324,6 @@ rawBuffer[rawBufferIndex + 2] = Float.floatToRawIntBits((float)(d2 + zOffset)); rawBufferIndex += 8; vertexCount++; @@ -1921,7 +1975,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat } public void setColorOpaque_I(int i) -@@ -367,10 +371,7 @@ +@@ -367,10 +372,7 @@ private static boolean convertQuadsToTriangles = false; private static boolean tryVBO = false; @@ -1933,7 +1987,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -384,17 +385,42 @@ +@@ -384,17 +386,43 @@ private int rawBufferIndex; private int addedVertices; private boolean isColorDisabled; @@ -1950,6 +2004,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat - private boolean isDrawing; - private boolean useVBO; - private IntBuffer vertexBuffers; ++ public boolean isDrawing; private int vboIndex; - private int vboCount; - private int bufferSize; @@ -3279,8 +3334,18 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It return itemstack; diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java --- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 20:54:16.000000000 -0400 -@@ -66,7 +66,8 @@ ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-18 21:40:02.000000000 -0400 +@@ -3,7 +3,8 @@ + // Decompiler options: packimports(3) braces deadcode + + package net.minecraft.src; +- ++import net.minecraft.src.forge.ForgeHooks; ++import net.minecraft.src.forge.IUseItemFirst; + + // Referenced classes of package net.minecraft.src: + // EntityPlayer, PlayerCapabilities, World, Block, +@@ -66,7 +67,8 @@ if(j != 0) { Block block = Block.blocksList[j]; @@ -3290,7 +3355,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(f >= 1.0F) { field_22050_k = false; -@@ -93,7 +94,7 @@ +@@ -93,7 +95,7 @@ { Block.blocksList[i1].onBlockClicked(thisWorld, i, j, k, thisPlayer); } @@ -3299,7 +3364,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { blockHarvessted(i, j, k); } else -@@ -113,7 +114,7 @@ +@@ -113,7 +115,7 @@ if(i1 != 0) { Block block = Block.blocksList[i1]; @@ -3308,7 +3373,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It if(f >= 0.7F) { blockHarvessted(i, j, k); -@@ -164,7 +165,7 @@ +@@ -164,7 +166,7 @@ thisPlayer.destroyCurrentEquippedItem(); } } @@ -3317,7 +3382,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It { Block.blocksList[l].harvestBlock(thisWorld, thisPlayer, i, j, k, i1); } -@@ -188,6 +189,7 @@ +@@ -188,6 +190,7 @@ if(itemstack1.stackSize == 0) { entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = null; @@ -3325,7 +3390,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It } return true; } else -@@ -198,6 +200,11 @@ +@@ -198,6 +201,11 @@ public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l) { @@ -3337,7 +3402,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It int i1 = world.getBlockId(i, j, k); if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer)) { -@@ -217,7 +224,11 @@ +@@ -217,7 +225,11 @@ return flag; } else { @@ -3472,7 +3537,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ti TileEntity tileentity = null; diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java --- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-18 17:42:59.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-18 21:13:31.000000000 -0400 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-18 21:39:35.000000000 -0400 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3527,7 +3592,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo private int func_35241_e(int i, int j, int k, int l, int i1, int j1) { - int k1 = Block.lightValue[i1]; -+ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(world,j,k,l); ++ int k1 = (i1==0)?0:Block.blocksList[i1].getLightValue(this,j,k,l); int l1 = getSavedLightValue(EnumSkyBlock.Block, j - 1, k, l) - j1; int i2 = getSavedLightValue(EnumSkyBlock.Block, j + 1, k, l) - j1; int j2 = getSavedLightValue(EnumSkyBlock.Block, j, k - 1, l) - j1;