Skip to content

Commit 3f02322

Browse files
committed
Updated MCP mapings
1 parent 65b3742 commit 3f02322

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+812
-413
lines changed

forge/conf/fields.csv

Lines changed: 429 additions & 126 deletions
Large diffs are not rendered by default.

forge/conf/methods.csv

Lines changed: 179 additions & 88 deletions
Large diffs are not rendered by default.

forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected static void bindTessellator(int texture, int subID)
117117
{
118118
renderTextures.add(key);
119119
tess.startDrawingQuads();
120-
tess.setTranslationD(defaultTessellator.xOffset, defaultTessellator.yOffset, defaultTessellator.zOffset);
120+
tess.setTranslation(defaultTessellator.xOffset, defaultTessellator.yOffset, defaultTessellator.zOffset);
121121
}
122122
Tessellator.instance = tess;
123123
}

forge/patches/minecraft/net/minecraft/src/Block.java.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import java.util.ArrayList;
88
import java.util.Random;
99

10-
@@ -449,7 +450,7 @@
10+
@@ -397,7 +398,7 @@
1111

12-
public boolean func_48205_p()
12+
public boolean hasTileEntity()
1313
{
1414
- return this.isBlockContainer;
15-
+ return hasTileEntity(0);
15+
+ return hasTileEntity(0);
1616
}
1717

1818
/**
19-
@@ -470,7 +471,7 @@
19+
@@ -418,7 +419,7 @@
2020
*/
2121
public float getBlockBrightness(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
2222
{
@@ -25,7 +25,7 @@
2525
}
2626

2727
/**
28-
@@ -478,7 +479,7 @@
28+
@@ -426,7 +427,7 @@
2929
*/
3030
public int getMixedBrightnessForBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
3131
{
@@ -34,7 +34,7 @@
3434
}
3535

3636
/**
37-
@@ -635,11 +636,14 @@
37+
@@ -583,11 +584,14 @@
3838
}
3939

4040
/**
@@ -51,7 +51,7 @@
5151
}
5252

5353
/**
54-
@@ -659,16 +663,12 @@
54+
@@ -607,16 +611,12 @@
5555
{
5656
int var8 = this.quantityDroppedWithBonus(par7, par1World.rand);
5757

@@ -71,7 +71,7 @@
7171
}
7272
}
7373
}
74-
@@ -981,7 +981,7 @@
74+
@@ -929,7 +929,7 @@
7575
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
7676
par2EntityPlayer.addExhaustion(0.025F);
7777

@@ -80,7 +80,7 @@
8080
{
8181
ItemStack var8 = this.createStackedBlock(par6);
8282

83-
@@ -1099,6 +1099,376 @@
83+
@@ -1046,6 +1046,376 @@
8484
*/
8585
public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {}
8686

forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000
22
+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000
3-
@@ -497,23 +497,23 @@
3+
@@ -496,23 +496,23 @@
44
{
55
return true;
66
}

forge/patches/minecraft/net/minecraft/src/BlockFire.java.patch

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
var9 = -50;
5858
}
5959

60-
- this.func_48211_a(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7);
61-
- this.func_48211_a(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7);
62-
- this.func_48211_a(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7);
63-
- this.func_48211_a(par1World, par2, par3 + 1, par4, 250 + var9, par5Random, var7);
64-
- this.func_48211_a(par1World, par2, par3, par4 - 1, 300 + var9, par5Random, var7);
65-
- this.func_48211_a(par1World, par2, par3, par4 + 1, 300 + var9, par5Random, var7);
60+
- this.tryToCatchBlockOnFire(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7);
61+
- this.tryToCatchBlockOnFire(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7);
62+
- this.tryToCatchBlockOnFire(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7);
63+
- this.tryToCatchBlockOnFire(par1World, par2, par3 + 1, par4, 250 + var9, par5Random, var7);
64+
- this.tryToCatchBlockOnFire(par1World, par2, par3, par4 - 1, 300 + var9, par5Random, var7);
65+
- this.tryToCatchBlockOnFire(par1World, par2, par3, par4 + 1, 300 + var9, par5Random, var7);
6666
+ this.tryToCatchBlockOnFire(par1World, par2 + 1, par3, par4, 300 + var9, par5Random, var7, 4);
6767
+ this.tryToCatchBlockOnFire(par1World, par2 - 1, par3, par4, 300 + var9, par5Random, var7, 5);
6868
+ this.tryToCatchBlockOnFire(par1World, par2, par3 - 1, par4, 250 + var9, par5Random, var7, 1);
@@ -72,18 +72,20 @@
7272

7373
for (int var10 = par2 - 1; var10 <= par2 + 1; ++var10)
7474
{
75-
@@ -204,9 +204,21 @@
75+
@@ -203,10 +203,22 @@
76+
}
7677
}
7778
}
78-
79+
-
80+
+
7981
+ /** Deprecated for a side-sensitive version */
8082
+ @Deprecated
81-
private void func_48211_a(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7)
83+
private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7)
8284
{
8385
- int var8 = this.abilityToCatchFire[par1World.getBlockId(par2, par3, par4)];
8486
+ tryToCatchBlockOnFire(par1World, par2, par3, par4, par5, par6Random, par7, 0);
8587
+ }
86-
+
88+
+
8789
+ private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7, int face)
8890
+ {
8991
+ int var8 = 0;

forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- ../src_base/minecraft/net/minecraft/src/BlockPistonBase.java 0000-00-00 00:00:00.000000000 -0000
22
+++ ../src_work/minecraft/net/minecraft/src/BlockPistonBase.java 0000-00-00 00:00:00.000000000 -0000
3-
@@ -370,7 +370,7 @@
3+
@@ -369,7 +369,7 @@
44
return false;
55
}
66

forge/patches/minecraft/net/minecraft/src/Chunk.java.patch

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,24 @@
5454
{
5555
TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
5656

57-
@@ -830,33 +821,31 @@
57+
@@ -829,34 +820,33 @@
58+
{
5859
ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
5960
TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
60-
61+
+
6162
+ if (var5 != null && var5.isInvalid())
6263
+ {
6364
+ chunkTileEntityMap.remove(var4);
6465
+ var5 = null;
6566
+ }
66-
+
67+
6768
if (var5 == null)
6869
{
6970
int var6 = this.getBlockID(par1, par2, par3);
7071
-
71-
- if (var6 <= 0 || !Block.blocksList[var6].func_48205_p())
72+
- if (var6 <= 0 || !Block.blocksList[var6].hasTileEntity())
7273
+ int meta = getBlockMetadata(par1, par2, par3);
74+
+
7375
+ if (var6 <= 0 || Block.blocksList[var6] == null || !Block.blocksList[var6].hasTileEntity(meta))
7476
{
7577
return null;
@@ -98,7 +100,7 @@
98100
}
99101

100102
/**
101-
@@ -871,7 +860,7 @@
103+
@@ -871,7 +861,7 @@
102104

103105
if (this.isChunkLoaded)
104106
{
@@ -107,7 +109,7 @@
107109
}
108110
}
109111

110-
@@ -886,8 +875,14 @@
112+
@@ -886,8 +876,14 @@
111113
par4TileEntity.yCoord = par2;
112114
par4TileEntity.zCoord = this.zPosition * 16 + par3;
113115

@@ -123,7 +125,7 @@
123125
par4TileEntity.validate();
124126
this.chunkTileEntityMap.put(var5, par4TileEntity);
125127
}
126-
@@ -1201,6 +1196,16 @@
128+
@@ -1205,6 +1201,16 @@
127129

128130
public void func_48494_a(byte[] par1ArrayOfByte, int par2, int par3, boolean par4)
129131
{
@@ -140,7 +142,7 @@
140142
int var5 = 0;
141143
int var6;
142144

143-
@@ -1304,6 +1309,29 @@
145+
@@ -1308,6 +1314,29 @@
144146
TileEntity var9 = (TileEntity)var10.next();
145147
var9.updateContainingBlockInfo();
146148
}
@@ -170,7 +172,7 @@
170172
}
171173

172174
public BiomeGenBase func_48490_a(int par1, int par2, WorldChunkManager par3WorldChunkManager)
173-
@@ -1407,4 +1435,18 @@
175+
@@ -1411,4 +1440,18 @@
174176
}
175177
}
176178
}

forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
+ {
5151
+ continue;
5252
+ }
53-
var10.setBrightness(var12.getEntityBrightnessForRender(par2));
53+
var10.setBrightness(var12.getBrightnessForRender(par2));
5454
var12.renderParticle(var10, par2, var3, var7, var4, var5, var6);
5555
}
5656

@@ -65,7 +65,7 @@
6565
+ for (int y = 0; y < entry.effects.size(); y++)
6666
+ {
6767
+ EntityFX entryfx = (EntityFX)entry.effects.get(y);
68-
+ tessallator.setBrightness(entryfx.getEntityBrightnessForRender(par2));
68+
+ tessallator.setBrightness(entryfx.getBrightnessForRender(par2));
6969
+ entryfx.renderParticle(tessallator, par2, var3, var7, var4, var5, var6);
7070
+ }
7171
+ tessallator.draw();

forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- ../src_base/minecraft/net/minecraft/src/Enchantment.java 0000-00-00 00:00:00.000000000 -0000
22
+++ ../src_work/minecraft/net/minecraft/src/Enchantment.java 0000-00-00 00:00:00.000000000 -0000
3-
@@ -192,4 +192,14 @@
3+
@@ -191,4 +191,14 @@
44
String var2 = StatCollector.translateToLocal(this.getName());
55
return var2 + " " + StatCollector.translateToLocal("enchantment.level." + par1);
66
}

0 commit comments

Comments
 (0)