Updated FML to 486:

02b54ca8: Add a modid on the mods list, should make it easier to do things like forge chunkloading config
70670f2f: Fix build eclipse extractor task
b9fa3fc9: Add in storage, detection and validation of the ItemID array between client and server
5e5d8206: Fixing id map generation - should validate correctly now
f9fc06a8: Remade python dist as 32-bit.
93d47a1c: Reenabled replacement of the eclipse folder.
This commit is contained in:
LexManos 2012-12-10 15:53:30 -08:00
parent 9ab56779f9
commit 03f1418924
5 changed files with 15 additions and 14 deletions

Binary file not shown.

Binary file not shown.

View file

@ -110,7 +110,7 @@
} }
if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning()) if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning())
@@ -645,13 +632,15 @@ @@ -653,13 +640,15 @@
this.theProfiler.startSection("levels"); this.theProfiler.startSection("levels");
int var1; int var1;
@ -131,7 +131,7 @@
this.theProfiler.startSection(var4.getWorldInfo().getWorldName()); this.theProfiler.startSection(var4.getWorldInfo().getWorldName());
this.theProfiler.startSection("pools"); this.theProfiler.startSection("pools");
var4.getWorldVec3Pool().clear(); var4.getWorldVec3Pool().clear();
@@ -698,9 +687,11 @@ @@ -706,9 +695,11 @@
this.theProfiler.endSection(); this.theProfiler.endSection();
} }
@ -146,7 +146,7 @@
this.theProfiler.endStartSection("connection"); this.theProfiler.endStartSection("connection");
this.getNetworkThread().networkTick(); this.getNetworkThread().networkTick();
this.theProfiler.endStartSection("players"); this.theProfiler.endStartSection("players");
@@ -754,7 +745,13 @@ @@ -762,7 +753,13 @@
*/ */
public WorldServer worldServerForDimension(int par1) public WorldServer worldServerForDimension(int par1)
{ {
@ -161,7 +161,7 @@
} }
@SideOnly(Side.SERVER) @SideOnly(Side.SERVER)
@@ -863,7 +860,7 @@ @@ -871,7 +868,7 @@
public String getServerModName() public String getServerModName()
{ {
@ -170,7 +170,7 @@
} }
/** /**
@@ -1125,6 +1122,7 @@ @@ -1133,6 +1130,7 @@
if (var2 != null) if (var2 != null)
{ {

View file

@ -1,6 +1,6 @@
--- ../src_base/common/net/minecraft/src/Item.java --- ../src_base/common/net/minecraft/src/Item.java
+++ ../src_work/common/net/minecraft/src/Item.java +++ ../src_work/common/net/minecraft/src/Item.java
@@ -209,16 +209,24 @@ @@ -212,17 +212,25 @@
/** full name of item from language file */ /** full name of item from language file */
private String itemName; private String itemName;
@ -18,6 +18,7 @@
} }
itemsList[256 + par1] = this; itemsList[256 + par1] = this;
GameData.newItemAdded(this);
+ +
+ if (!(this instanceof ItemBlock)) + if (!(this instanceof ItemBlock))
+ { + {
@ -26,7 +27,7 @@
} }
/** /**
@@ -604,6 +612,10 @@ @@ -608,6 +616,10 @@
float var18 = var15 * var16; float var18 = var15 * var16;
float var20 = var14 * var16; float var20 = var14 * var16;
double var21 = 5.0D; double var21 = 5.0D;
@ -37,7 +38,7 @@
Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21); Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21);
return par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3); return par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3);
} }
@@ -678,4 +690,279 @@ @@ -682,4 +694,279 @@
{ {
StatList.initStats(); StatList.initStats();
} }

View file

@ -1,6 +1,6 @@
--- ../src_base/minecraft/net/minecraft/client/Minecraft.java --- ../src_base/minecraft/net/minecraft/client/Minecraft.java
+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java +++ ../src_work/minecraft/net/minecraft/client/Minecraft.java
@@ -124,6 +124,9 @@ @@ -128,6 +128,9 @@
import net.minecraft.src.WorldInfo; import net.minecraft.src.WorldInfo;
import net.minecraft.src.WorldRenderer; import net.minecraft.src.WorldRenderer;
import net.minecraft.src.WorldSettings; import net.minecraft.src.WorldSettings;
@ -10,7 +10,7 @@
import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLException;
import org.lwjgl.Sys; import org.lwjgl.Sys;
@@ -1260,7 +1263,7 @@ @@ -1266,7 +1269,7 @@
if (this.thePlayer.canCurrentToolHarvestBlock(var3, var4, var5)) if (this.thePlayer.canCurrentToolHarvestBlock(var3, var4, var5))
{ {
@ -19,7 +19,7 @@
this.thePlayer.swingItem(); this.thePlayer.swingItem();
} }
} }
@@ -1326,7 +1329,8 @@ @@ -1332,7 +1335,8 @@
{ {
int var8 = var3 != null ? var3.stackSize : 0; int var8 = var3 != null ? var3.stackSize : 0;
@ -29,7 +29,7 @@
{ {
var2 = false; var2 = false;
this.thePlayer.swingItem(); this.thePlayer.swingItem();
@@ -1352,7 +1356,8 @@ @@ -1358,7 +1362,8 @@
{ {
ItemStack var9 = this.thePlayer.inventory.getCurrentItem(); ItemStack var9 = this.thePlayer.inventory.getCurrentItem();
@ -39,7 +39,7 @@
{ {
this.entityRenderer.itemRenderer.func_78445_c(); this.entityRenderer.itemRenderer.func_78445_c();
} }
@@ -2026,6 +2031,18 @@ @@ -2047,6 +2052,18 @@
if (this.theIntegratedServer != null) if (this.theIntegratedServer != null)
{ {
this.theIntegratedServer.initiateShutdown(); this.theIntegratedServer.initiateShutdown();
@ -58,7 +58,7 @@
} }
this.theIntegratedServer = null; this.theIntegratedServer = null;
@@ -2335,95 +2352,12 @@ @@ -2356,95 +2373,12 @@
if (this.objectMouseOver != null) if (this.objectMouseOver != null)
{ {
boolean var1 = this.thePlayer.capabilities.isCreativeMode; boolean var1 = this.thePlayer.capabilities.isCreativeMode;