Skip to content

Commit e73cbd0

Browse files
LexManosLexManos
committed
Update to 1.4.4
1 parent 9556833 commit e73cbd0

35 files changed

+361
-368
lines changed

‎common/forge_at.cfg‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# RailLogic.getNAdjacentTracks
33
public all.a(Lall;)I #MD:RailLogic/func_73650_a
44
# Tessellator
5-
public-f bah.a #FD:Tessellator/field_78398_a #instance
6-
public bah.u #FD:Tessellator/field_78409_u #drawMode
7-
public bah.v #FD:Tessellator/field_78408_v #xOffset
8-
public bah.w #FD:Tessellator/field_78407_w #yOffset
9-
public bah.x #FD:Tessellator/field_78417_x #zOffset
10-
public bah.z #FD:Tessellator/field_78415_z #isDrawing
5+
public-f bao.a #FD:Tessellator/field_78398_a #instance
6+
public bao.u #FD:Tessellator/field_78409_u #drawMode
7+
public bao.v #FD:Tessellator/field_78408_v #xOffset
8+
public bao.w #FD:Tessellator/field_78407_w #yOffset
9+
public bao.x #FD:Tessellator/field_78417_x #zOffset
10+
public bao.z #FD:Tessellator/field_78415_z #isDrawing
1111
# ItemPickaxe
1212
public ut.<init>(ILul;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
1313
public+f ut.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
@@ -23,16 +23,16 @@ public tu.cl #FD:ItemTool/field_77865_bY #damageVsEntity
2323
# EntityEnderman
2424
public qd.d #FD:EntityEnderman/field_70827_d #carriableBlocks
2525
# RenderGlobal
26-
public bad.h #FD:RenderGlobal/field_72769_h #theWorld
27-
public bad.i #FD:RenderGlobal/field_72770_i #renderEngine
28-
public bad.q #FD:RenderGlobal/field_72777_q #mc
29-
public bad.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
30-
public bad.E #FD:RenderGlobal/field_72738_E #damagedBlocks
26+
public bak.h #FD:RenderGlobal/field_72769_h #theWorld
27+
public bak.i #FD:RenderGlobal/field_72770_i #renderEngine
28+
public bak.q #FD:RenderGlobal/field_72777_q #mc
29+
public bak.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
30+
public bak.E #FD:RenderGlobal/field_72738_E #damagedBlocks
3131
# SoundManager
32-
public bed.a #FD:SoundManager/field_77381_a #sndSystem
33-
public bed.b #FD:SoundManager/field_77379_b #soundPoolSounds
34-
public bed.c #FD:SoundManager/field_77380_c #soundPoolStreaming
35-
public bed.d #FD:SoundManager/field_77377_d #soundPoolMusic
32+
public bek.a #FD:SoundManager/field_77381_a #sndSystem
33+
public bek.b #FD:SoundManager/field_77379_b #soundPoolSounds
34+
public bek.c #FD:SoundManager/field_77380_c #soundPoolStreaming
35+
public bek.d #FD:SoundManager/field_77377_d #soundPoolMusic
3636
# EntityMinecart
3737
protected py.* #FD:EntityMinecart/* # All private -> protected
3838
public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
@@ -49,7 +49,7 @@ public amj.s()Lamj; #MD:Block/func_71875_q #setBlockUnbreakable
4949
public amj.b(Z)Lamj; #MD:Block/func_71907_b #setTickRandomly
5050
public amj.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
5151
# NetServerHandler
52-
public iu.g #FD:NetServerHandler/field_72572_g #playerInAirTime
52+
public iv.g #FD:NetServerHandler/field_72572_g #playerInAirTime
5353
# TileEntity
5454
public anq.k #FD:TileEntity/field_70331_k #worldObj
5555
# BlockLeavesBase
@@ -65,9 +65,9 @@ public all.a(Lall;)I #MD:RailLogic/func_73650_a #getNAdjacentTiles
6565
public qx.a(Lpx;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
6666
public qx.i()V #MD:EntityPlayer/func_71053_j #closeScreen
6767
# EntityPlayerMP
68-
public ayh.a(Lpx;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
68+
public ayk.a(Lpx;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
6969
# World Gen Chests Related
70-
public im.T #FD:WorldServer/field_73069_S #bonusChestContent
70+
public in.T #FD:WorldServer/field_73069_S #bonusChestContent
7171
public aci.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
7272
public adm.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
7373
public adn.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
@@ -79,17 +79,17 @@ public afh.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestCon
7979
# AnvilChunkLoader.chunkSaveLocation
8080
default aaf.d #FD:AnvilChunkLoader/field_75825_d
8181
# ChunkProviderServer.currentChunkLoader
82-
default il.e #FD:ChunkProviderServer/field_73247_e
82+
default im.e #FD:ChunkProviderServer/field_73247_e
8383
# PlayerManager
84-
default ij.a(IIZ)Lik; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
84+
default ik.a(IIZ)Lil; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
8585
# World
8686
public-f xv.C #FD:World/field_72982_D #villageCollectionObj
8787
public xv.H #FD:World/field_72993_I #activeChunkSet
8888
# EntityLiving
89-
public mc.bc #FD:EntityLiving/field_70728_aV #experienceValue
89+
public md.bc #FD:EntityLiving/field_70728_aV #experienceValue
9090
# GuiFlatPresets
91-
public atw.a(Ljava/lang/String;ILyr;Ljava/util/List;[Lace;)V #MD:GuiFlatPresets/func_82294_a
92-
public atw.a(Ljava/lang/String;ILyr;[Lace;)V #MD:GuiFlatPresets/func_82297_a
91+
public atz.a(Ljava/lang/String;ILyr;Ljava/util/List;[Lace;)V #MD:GuiFlatPresets/func_82294_a
92+
public atz.a(Ljava/lang/String;ILyr;[Lace;)V #MD:GuiFlatPresets/func_82297_a
9393
# BiomeGenBase
9494
public yr.*() #MD:BiomeGenBase/* #Everything protected->public
9595
# MapGenVillage

‎fml-src-4.3.2.436.zip‎ renamed to ‎fml-src-4.4.2.440.zip‎

871 KB
Binary file not shown.

‎patches/common/net/minecraft/server/MinecraftServer.java.patch‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,23 +95,26 @@
9595
this.setDifficultyForAllWorlds(this.getDifficulty());
9696
this.initialWorldChunkLoad();
9797
}
98-
@@ -433,7 +413,9 @@
99-
for (int var3 = 0; var3 < var2; ++var3)
98+
@@ -431,7 +411,9 @@
99+
for (int var1 = 0; var1 < this.worldServers.length; ++var1)
100100
{
101-
WorldServer var4 = var1[var3];
102-
+ MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(var4));
103-
var4.flush();
104-
+ DimensionManager.setWorld(var4.provider.dimensionId, null);
101+
WorldServer var2 = this.worldServers[var1];
102+
+ MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(var2));
103+
var2.flush();
104+
+ DimensionManager.setWorld(var2.provider.dimensionId, null);
105105
}
106106

107107
if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning())
108-
@@ -646,13 +628,13 @@
109-
{
108+
@@ -645,13 +627,15 @@
110109
this.theProfiler.startSection("levels");
110+
int var1;
111111

112-
- for (int var1 = 0; var1 < this.worldServers.length; ++var1)
113-
+ for (Integer id : DimensionManager.getIDs())
114-
{
112+
- for (var1 = 0; var1 < this.worldServers.length; ++var1)
113+
- {
114+
+ Integer[] ids = DimensionManager.getIDs();
115+
+ for (int x = 0; x < ids.length; x++)
116+
+ {
117+
+ int id = ids[x];
115118
long var2 = System.nanoTime();
116119

117120
- if (var1 == 0 || this.getAllowNether())
@@ -123,7 +126,7 @@
123126
this.theProfiler.startSection(var4.getWorldInfo().getWorldName());
124127
this.theProfiler.startSection("pools");
125128
var4.getWorldVec3Pool().clear();
126-
@@ -699,9 +681,11 @@
129+
@@ -698,9 +682,11 @@
127130
this.theProfiler.endSection();
128131
}
129132

@@ -138,7 +141,7 @@
138141
this.theProfiler.endStartSection("connection");
139142
this.getNetworkThread().networkTick();
140143
this.theProfiler.endStartSection("players");
141-
@@ -757,7 +741,13 @@
144+
@@ -754,7 +740,13 @@
142145
*/
143146
public WorldServer worldServerForDimension(int par1)
144147
{
@@ -153,7 +156,7 @@
153156
}
154157

155158
@SideOnly(Side.SERVER)
156-
@@ -866,7 +856,7 @@
159+
@@ -863,7 +855,7 @@
157160

158161
public String getServerModName()
159162
{
@@ -162,7 +165,7 @@
162165
}
163166

164167
/**
165-
@@ -1128,6 +1118,7 @@
168+
@@ -1125,6 +1117,7 @@
166169

167170
if (var2 != null)
168171
{

‎patches/common/net/minecraft/src/AnvilChunkLoader.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader
1111
{
1212
private List chunksToRemove = new ArrayList();
13-
@@ -97,6 +100,7 @@
13+
@@ -93,6 +96,7 @@
1414
var5 = this.readChunkFromNBT(par1World, par4NBTTagCompound.getCompoundTag("Level"));
1515
}
1616

1717
+ MinecraftForge.EVENT_BUS.post(new ChunkDataEvent.Load(var5, par4NBTTagCompound));
1818
return var5;
1919
}
2020
}
21-
@@ -112,6 +116,7 @@
21+
@@ -108,6 +112,7 @@
2222
var3.setTag("Level", var4);
2323
this.writeChunkToNBT(par2Chunk, par1World, var4);
2424
this.func_75824_a(par2Chunk.getChunkCoordIntPair(), var3);

‎patches/common/net/minecraft/src/BlockRedstoneWire.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- ../src_base/common/net/minecraft/src/BlockRedstoneWire.java
22
+++ ../src_work/common/net/minecraft/src/BlockRedstoneWire.java
3-
@@ -556,7 +556,7 @@
3+
@@ -554,7 +554,7 @@
44
}
55
else if (var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID)
66
{

‎patches/common/net/minecraft/src/BlockTorch.java.patch‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,31 +58,31 @@
5858
{
5959
var10 = 1;
6060
}
61-
@@ -121,19 +127,19 @@
62-
*/
63-
public void onBlockAdded(World par1World, int par2, int par3, int par4)
61+
@@ -123,19 +129,19 @@
6462
{
65-
- if (par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true))
66-
+ if (par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true))
67-
{
68-
par1World.setBlockMetadataWithNotify(par2, par3, par4, 1);
69-
}
70-
- else if (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true))
71-
+ else if (par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true))
72-
{
73-
par1World.setBlockMetadataWithNotify(par2, par3, par4, 2);
74-
}
75-
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true))
76-
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true))
77-
{
78-
par1World.setBlockMetadataWithNotify(par2, par3, par4, 3);
79-
}
80-
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true))
81-
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true))
63+
if (par1World.getBlockMetadata(par2, par3, par4) == 0)
8264
{
83-
par1World.setBlockMetadataWithNotify(par2, par3, par4, 4);
84-
}
85-
@@ -156,22 +162,22 @@
65+
- if (par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true))
66+
+ if (par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true))
67+
{
68+
par1World.setBlockMetadataWithNotify(par2, par3, par4, 1);
69+
}
70+
- else if (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true))
71+
+ else if (par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true))
72+
{
73+
par1World.setBlockMetadataWithNotify(par2, par3, par4, 2);
74+
}
75+
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true))
76+
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true))
77+
{
78+
par1World.setBlockMetadataWithNotify(par2, par3, par4, 3);
79+
}
80+
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true))
81+
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true))
82+
{
83+
par1World.setBlockMetadataWithNotify(par2, par3, par4, 4);
84+
}
85+
@@ -159,22 +165,22 @@
8686
int var6 = par1World.getBlockMetadata(par2, par3, par4);
8787
boolean var7 = false;
8888

‎patches/common/net/minecraft/src/Chunk.java.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -301,23 +301,23 @@
301301
par4TileEntity.validate();
302302
this.chunkTileEntityMap.put(var5, par4TileEntity);
303303
}
304-
@@ -966,6 +1025,7 @@
305-
List var4 = var1[var3];
306-
this.worldObj.addLoadedEntities(var4);
304+
@@ -963,6 +1022,7 @@
305+
{
306+
this.worldObj.addLoadedEntities(this.entityLists[var1]);
307307
}
308308
+ MinecraftForge.EVENT_BUS.post(new ChunkEvent.Load(this));
309309
}
310310

311311
/**
312-
@@ -990,6 +1050,7 @@
313-
List var4 = var5[var3];
314-
this.worldObj.unloadEntities(var4);
312+
@@ -983,6 +1043,7 @@
313+
{
314+
this.worldObj.unloadEntities(this.entityLists[var3]);
315315
}
316316
+ MinecraftForge.EVENT_BUS.post(new ChunkEvent.Unload(this));
317317
}
318318

319319
/**
320-
@@ -1006,8 +1067,8 @@
320+
@@ -999,8 +1060,8 @@
321321
*/
322322
public void getEntitiesWithinAABBForEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB, List par3List)
323323
{
@@ -328,7 +328,7 @@
328328

329329
if (var4 < 0)
330330
{
331-
@@ -1055,8 +1116,8 @@
331+
@@ -1047,8 +1108,8 @@
332332
*/
333333
public void getEntitiesOfTypeWithinAAAB(Class par1Class, AxisAlignedBB par2AxisAlignedBB, List par3List, IEntitySelector par4IEntitySelector)
334334
{
@@ -339,7 +339,7 @@
339339

340340
if (var5 < 0)
341341
{
342-
@@ -1240,6 +1301,15 @@
342+
@@ -1231,6 +1292,15 @@
343343
*/
344344
public void fillChunk(byte[] par1ArrayOfByte, int par2, int par3, boolean par4)
345345
{
@@ -355,7 +355,7 @@
355355
int var5 = 0;
356356
int var6;
357357

358-
@@ -1336,12 +1406,26 @@
358+
@@ -1327,12 +1397,26 @@
359359
}
360360

361361
this.generateHeightMap();
@@ -388,7 +388,7 @@
388388
}
389389
}
390390

391-
@@ -1450,4 +1534,18 @@
391+
@@ -1441,4 +1525,18 @@
392392
}
393393
}
394394
}

‎patches/common/net/minecraft/src/ChunkProviderServer.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
if (var5 == null)
3434
{
35-
@@ -291,6 +298,11 @@
35+
@@ -290,6 +297,11 @@
3636
{
3737
if (!this.currentServer.canNotSave)
3838
{
@@ -44,7 +44,7 @@
4444
for (int var1 = 0; var1 < 100; ++var1)
4545
{
4646
if (!this.chunksToUnload.isEmpty())
47-
@@ -303,6 +315,11 @@
47+
@@ -302,6 +314,11 @@
4848
this.chunksToUnload.remove(var2);
4949
this.loadedChunkHashMap.remove(var2.longValue());
5050
this.loadedChunks.remove(var3);

‎patches/common/net/minecraft/src/ContainerFurnace.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- ../src_base/common/net/minecraft/src/ContainerFurnace.java
22
+++ ../src_work/common/net/minecraft/src/ContainerFurnace.java
3-
@@ -122,7 +122,7 @@
3+
@@ -120,7 +120,7 @@
44
}
55
else if (par2 != 1 && par2 != 0)
66
{

‎patches/common/net/minecraft/src/CraftingManager.java.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--- ../src_base/common/net/minecraft/src/CraftingManager.java
22
+++ ../src_work/common/net/minecraft/src/CraftingManager.java
3-
@@ -266,7 +266,7 @@
3+
@@ -263,7 +263,7 @@
44
}
55
}
66

77
- if (var3 == 2 && var4.itemID == var5.itemID && var4.stackSize == 1 && var5.stackSize == 1 && Item.itemsList[var4.itemID].isDamageable())
88
+ if (var3 == 2 && var4.itemID == var5.itemID && var4.stackSize == 1 && var5.stackSize == 1 && Item.itemsList[var4.itemID].isRepairable())
99
{
10-
Item var13 = Item.itemsList[var4.itemID];
11-
int var14 = var13.getMaxDamage() - var4.getItemDamageForDisplay();
10+
Item var11 = Item.itemsList[var4.itemID];
11+
int var13 = var11.getMaxDamage() - var4.getItemDamageForDisplay();

0 commit comments

Comments
 (0)