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

For for updated mappings.

Browse source
This commit is contained in:
LexManos 2011-12-09 04:40:32 +00:00
parent 17c9f9bf9b
commit 1931d4fc09
5 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
View file

@ -8,15 +8,7 @@
import java.io.PrintStream; import java.io.PrintStream;
import java.util.*; import java.util.*;
@@ -348,6 +349,7 @@ @@ -390,7 +391,7 @@
}
int i2 = xPosition * 16 + i;
int j2 = zPosition * 16 + k;
+
blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff);
if(l1 != 0)
{
@@ -390,7 +392,7 @@
TileEntity tileentity = getChunkBlockTileEntity(i, j, k); TileEntity tileentity = getChunkBlockTileEntity(i, j, k);
if(tileentity == null) if(tileentity == null)
{ {
@ -25,7 +17,7 @@
worldObj.setBlockTileEntity(i, j, k, tileentity); worldObj.setBlockTileEntity(i, j, k, tileentity);
} }
if(tileentity != null) if(tileentity != null)
@@ -398,14 +400,6 @@ @@ -398,14 +399,6 @@
tileentity.func_35144_b(); tileentity.func_35144_b();
} }
} }
@ -40,17 +32,15 @@
} }
isModified = true; isModified = true;
return true; return true;
@@ -427,10 +421,13 @@ @@ -430,7 +423,11 @@
} blocks[i << worldObj.xShift | k << worldObj.heightShift | j] = (byte)(byte0 & 0xff);
int l1 = xPosition * 16 + i;
int i2 = zPosition * 16 + k;
+
blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff);
if(k1 != 0) if(k1 != 0)
{ {
- Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); - Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
+ if (!worldObj.multiplayerWorld) + if (!worldObj.multiplayerWorld)
+ {
+ Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); + Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
+ }
+ removeChunkBlockTileEntity(i, j, k); + removeChunkBlockTileEntity(i, j, k);
} }
data.setNibble(i, j, k, 0); data.setNibble(i, j, k, 0);

8
forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
View file

@ -41,14 +41,14 @@
+ f += i * i + 1; + f += i * i + 1;
+ } + }
+ +
+ if(isPotionActive(Potion.potionDigSpeed)) + if(isPotionActive(Potion.digSpeed))
+ { + {
+ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; + f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F;
+ } + }
+ +
+ if(isPotionActive(Potion.potionDigSlow)) + if(isPotionActive(Potion.digSlowdown))
+ { + {
+ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; + f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F;
+ } + }
+ +
+ if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory)) + if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory))

10
forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch
View file

@ -17,16 +17,16 @@
GL11.glPushMatrix(); GL11.glPushMatrix();
- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID);
+ +
+ if (customRenderer != null) { + if (customRenderer != null) {
+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); + GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
+ ForgeHooksClient.overrideTexture (itemstack.getItem()); + ForgeHooksClient.overrideTexture (itemstack.getItem());
+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); + ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F));
+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) + } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
{ {
GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); + ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]);
renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); renderBlocksInstance.renderBlockAsItem(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F);
} else } else
{ {
if(itemstack.itemID < 256) if(itemstack.itemID < 256)

2
forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch
View file

@ -99,7 +99,7 @@
+ ForgeHooksClient.overrideTexture (Block.blocksList[i]); + ForgeHooksClient.overrideTexture (Block.blocksList[i]);
Block block = Block.blocksList[j1]; Block block = Block.blocksList[j1];
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslatef(l - 2, i1 + 3, -3F + field_40268_b); GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel);
@@ -215,9 +274,11 @@ @@ -215,9 +274,11 @@
if(i < 256) if(i < 256)
{ {

2
forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 --- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000
@@ -175,6 +175,9 @@ @@ -175,6 +175,9 @@
private String field_39006_bR; private String potionInfo;
private String itemName; private String itemName;
+ // FORGE: To disable repair recipes. + // FORGE: To disable repair recipes.