diff --git a/forge/fml-src-2.2.78.153.zip b/forge/fml-src-2.2.105.175.zip similarity index 53% rename from forge/fml-src-2.2.78.153.zip rename to forge/fml-src-2.2.105.175.zip index 8f1177d1b2..80a2ab61be 100644 Binary files a/forge/fml-src-2.2.78.153.zip and b/forge/fml-src-2.2.105.175.zip differ diff --git a/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 19992db965..f91441fa6c 100644 --- a/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/Minecraft.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1956,86 +1956,54 @@ +@@ -1960,86 +1960,54 @@ */ public void usePortal(int par1) { @@ -32,24 +32,24 @@ var3 *= var7; var5 *= var7; - World var9; -+ World var9 = new World(theWorld, pNew); - +- - if (this.thePlayer.dimension == -1) -+ if (this.thePlayer.isEntityAlive()) - { +- { - this.thePlayer.setLocationAndAngles(var3, this.thePlayer.posY, var5, this.thePlayer.rotationYaw, this.thePlayer.rotationPitch); - - if (this.thePlayer.isEntityAlive()) - { - this.theWorld.updateEntityWithOptionalForce(this.thePlayer, false); - } -- ++ World var9 = new World(theWorld, pNew); + - var9 = null; - var9 = new World(this.theWorld, WorldProvider.getProviderForDimension(this.thePlayer.dimension)); - this.changeWorld(var9, "Entering the Nether", this.thePlayer); - } - else if (this.thePlayer.dimension == 0) -- { ++ if (this.thePlayer.isEntityAlive()) + { - if (this.thePlayer.isEntityAlive()) - { - this.thePlayer.setLocationAndAngles(var3, this.thePlayer.posY, var5, this.thePlayer.rotationYaw, this.thePlayer.rotationPitch); @@ -111,7 +111,7 @@ } } -@@ -2320,6 +2288,11 @@ +@@ -2324,6 +2292,11 @@ { this.usePortal(0); } @@ -123,7 +123,7 @@ ChunkCoordinates var4 = null; ChunkCoordinates var5 = null; -@@ -2587,6 +2560,7 @@ +@@ -2591,6 +2564,7 @@ var0.addData("java_version", System.getProperty("java.version")); var0.addData("opengl_version", GL11.glGetString(GL11.GL_VERSION)); var0.addData("opengl_vendor", GL11.glGetString(GL11.GL_VENDOR)); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index bc421b58bf..3cb4582d18 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -1,15 +1,15 @@ --- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,6 +3,8 @@ - import java.util.Iterator; - import java.util.List; +@@ -7,6 +7,8 @@ + import cpw.mods.fml.common.FMLCommonHandler; + import cpw.mods.fml.common.TickType; +import net.minecraft.src.forge.*; + public abstract class EntityPlayer extends EntityLiving { /** Inventory of the player */ -@@ -210,6 +212,7 @@ +@@ -215,6 +217,7 @@ } else { @@ -17,7 +17,7 @@ if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0) { this.updateItemUse(var1, 5); -@@ -618,7 +621,16 @@ +@@ -624,7 +627,16 @@ */ public EntityItem dropOneItem() { @@ -35,7 +35,7 @@ } /** -@@ -684,14 +696,22 @@ +@@ -690,14 +702,22 @@ /** * Returns how strong the player is against the specified block at this moment @@ -60,7 +60,7 @@ { var3 = var2 + (float)(var4 * var4 + 1); } -@@ -978,12 +998,22 @@ +@@ -984,12 +1004,22 @@ */ protected void damageEntity(DamageSource par1DamageSource, int par2) { @@ -84,7 +84,7 @@ par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); this.addExhaustion(par1DamageSource.getHungerDamage()); this.health -= par2; -@@ -1014,6 +1044,10 @@ +@@ -1020,6 +1050,10 @@ */ public void useCurrentItemOnEntity(Entity par1Entity) { @@ -95,7 +95,7 @@ if (!par1Entity.interact(this)) { ItemStack var2 = this.getCurrentEquippedItem(); -@@ -1044,7 +1078,9 @@ +@@ -1050,7 +1084,9 @@ */ public void destroyCurrentEquippedItem() { @@ -105,7 +105,7 @@ } /** -@@ -1073,6 +1109,15 @@ +@@ -1079,6 +1115,15 @@ */ public void attackTargetEntityWithCurrentItem(Entity par1Entity) { @@ -121,7 +121,7 @@ if (par1Entity.canAttackWithItem()) { int var2 = this.inventory.getDamageVsEntity(par1Entity); -@@ -1215,6 +1260,12 @@ +@@ -1221,6 +1266,12 @@ */ public EnumStatus sleepInBedAt(int par1, int par2, int par3) { @@ -134,7 +134,7 @@ if (!this.worldObj.isRemote) { if (this.isPlayerSleeping() || !this.isEntityAlive()) -@@ -1254,6 +1305,11 @@ +@@ -1260,6 +1311,11 @@ { int var9 = this.worldObj.getBlockMetadata(par1, par2, par3); int var5 = BlockBed.getDirection(var9); @@ -146,7 +146,7 @@ float var10 = 0.5F; float var7 = 0.5F; -@@ -1323,11 +1379,12 @@ +@@ -1329,11 +1385,12 @@ this.resetHeight(); ChunkCoordinates var4 = this.playerLocation; ChunkCoordinates var5 = this.playerLocation; @@ -162,7 +162,7 @@ if (var5 == null) { -@@ -1364,7 +1421,9 @@ +@@ -1370,7 +1427,9 @@ */ private boolean isInBed() { @@ -173,7 +173,7 @@ } /** -@@ -1379,13 +1438,15 @@ +@@ -1385,13 +1444,15 @@ var2.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); var2.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -191,7 +191,7 @@ return var3; } } -@@ -1397,8 +1458,11 @@ +@@ -1403,8 +1464,11 @@ { if (this.playerLocation != null) { @@ -205,7 +205,7 @@ switch (var2) { -@@ -1688,6 +1752,7 @@ +@@ -1694,6 +1758,7 @@ return 101; } } @@ -213,7 +213,7 @@ } return var3; -@@ -1860,4 +1925,30 @@ +@@ -1866,4 +1931,30 @@ } public void func_50009_aI() {} diff --git a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index c247a8276e..c961262afb 100644 --- a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -1,14 +1,14 @@ --- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000 -@@ -8,6 +8,7 @@ - import java.util.ArrayList; +@@ -9,6 +9,7 @@ import java.util.Collections; + import java.util.EnumSet; import java.util.HashMap; +import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Random; -@@ -45,11 +46,13 @@ +@@ -47,11 +48,13 @@ import net.minecraft.src.ThreadServerApplication; import net.minecraft.src.ThreadServerSleep; import net.minecraft.src.Vec3D; @@ -22,7 +22,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IServer { -@@ -70,9 +73,10 @@ +@@ -72,9 +75,10 @@ public PropertyManager propertyManagerObj; /** The server world manager. */ @@ -35,7 +35,7 @@ /** the server config manager for this server */ public ServerConfigurationManager configManager; -@@ -100,7 +104,7 @@ +@@ -102,7 +106,7 @@ /** A list containing all the commands entered. */ private List commands = Collections.synchronizedList(new ArrayList()); @@ -44,7 +44,7 @@ /** True if the server is in online mode. */ public boolean onlineMode; -@@ -130,6 +134,8 @@ +@@ -132,6 +136,8 @@ public long[] field_48082_x = new long[100]; private RConThreadQuery rconQueryThread; private RConThreadMain rconMainThread; @@ -53,7 +53,7 @@ public MinecraftServer() { -@@ -164,6 +170,7 @@ +@@ -166,6 +172,7 @@ this.allowFlight = this.propertyManagerObj.getBooleanProperty("allow-flight", false); this.motd = this.propertyManagerObj.getStringProperty("motd", "A Minecraft Server"); this.motd.replace('\u00a7', '$'); @@ -61,7 +61,7 @@ InetAddress var2 = null; if (this.hostname.length() > 0) -@@ -196,9 +203,11 @@ +@@ -198,9 +205,11 @@ FMLServerHandler.instance().onLoadComplete(); this.configManager = new ServerConfigurationManager(this); @@ -73,7 +73,7 @@ long var3 = System.nanoTime(); String var5 = this.propertyManagerObj.getStringProperty("level-name", "world"); String var6 = this.propertyManagerObj.getStringProperty("level-seed", ""); -@@ -266,53 +275,36 @@ +@@ -268,53 +277,36 @@ logger.info("Converting map!"); par1ISaveFormat.convertMapFormat(par2Str, new ConvertProgressUpdater(this)); } @@ -143,7 +143,7 @@ ChunkCoordinates var15 = var14.getSpawnPoint(); for (int var16 = -var22; var16 <= var22 && this.serverRunning; var16 += 16) -@@ -373,9 +365,9 @@ +@@ -375,9 +367,9 @@ { logger.info("Saving chunks"); @@ -155,7 +155,7 @@ var2.saveWorld(true, (IProgressUpdate)null); var2.func_30006_w(); } -@@ -393,13 +385,14 @@ +@@ -395,13 +387,14 @@ this.configManager.savePlayerStates(); } @@ -172,7 +172,7 @@ } } } -@@ -442,7 +435,7 @@ +@@ -444,7 +437,7 @@ var3 += var7; var1 = var5; @@ -181,7 +181,7 @@ { this.doTick(); var3 = 0L; -@@ -544,13 +537,13 @@ +@@ -547,13 +540,13 @@ Vec3D.initialize(); ++this.deathTime; @@ -198,7 +198,7 @@ if (this.deathTime % 20 == 0) { -@@ -571,15 +564,15 @@ +@@ -574,15 +567,15 @@ } } @@ -217,7 +217,7 @@ } for (var9 = 0; var9 < this.playersOnline.size(); ++var9) -@@ -694,7 +687,8 @@ +@@ -697,7 +690,8 @@ */ public WorldServer getWorldManager(int par1) { @@ -227,7 +227,7 @@ } /** -@@ -702,7 +696,7 @@ +@@ -705,7 +699,7 @@ */ public EntityTracker getEntityTracker(int par1) { @@ -236,11 +236,11 @@ } /** -@@ -872,7 +866,7 @@ +@@ -875,7 +869,7 @@ */ public String getServerBrand() { -- return "vanilla"; +- return "fml"; + return "forge"; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 4a9e767142..bb076c3404 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -1,8 +1,8 @@ --- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,6 +3,14 @@ - import java.util.Iterator; - import java.util.List; +@@ -7,6 +7,14 @@ + import cpw.mods.fml.common.FMLCommonHandler; + import cpw.mods.fml.common.TickType; +import net.minecraft.src.forge.ArmorProperties; +import net.minecraft.src.forge.ForgeHooks; @@ -15,7 +15,7 @@ public abstract class EntityPlayer extends EntityLiving { /** Inventory of the player */ -@@ -177,6 +185,7 @@ +@@ -182,6 +190,7 @@ } else { @@ -23,7 +23,7 @@ if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0) { this.updateItemUse(var1, 5); -@@ -366,6 +375,10 @@ +@@ -372,6 +381,10 @@ */ protected void closeScreen() { @@ -34,7 +34,7 @@ this.craftingInventory = this.inventorySlots; } -@@ -549,7 +562,16 @@ +@@ -555,7 +568,16 @@ */ public EntityItem dropOneItem() { @@ -52,7 +52,7 @@ } /** -@@ -615,10 +637,18 @@ +@@ -621,10 +643,18 @@ /** * Returns how strong the player is against the specified block at this moment @@ -72,7 +72,7 @@ float var3 = var2; int var4 = EnchantmentHelper.getEfficiencyModifier(this.inventory); -@@ -909,12 +939,22 @@ +@@ -915,12 +945,22 @@ */ protected void damageEntity(DamageSource par1DamageSource, int par2) { @@ -96,7 +96,7 @@ par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); this.addExhaustion(par1DamageSource.getHungerDamage()); this.health -= par2; -@@ -945,6 +985,10 @@ +@@ -951,6 +991,10 @@ */ public void useCurrentItemOnEntity(Entity par1Entity) { @@ -107,7 +107,7 @@ if (!par1Entity.interact(this)) { ItemStack var2 = this.getCurrentEquippedItem(); -@@ -975,7 +1019,9 @@ +@@ -981,7 +1025,9 @@ */ public void destroyCurrentEquippedItem() { @@ -117,7 +117,7 @@ } /** -@@ -1004,6 +1050,16 @@ +@@ -1010,6 +1056,16 @@ */ public void attackTargetEntityWithCurrentItem(Entity par1Entity) { @@ -134,7 +134,7 @@ if (par1Entity.canAttackWithItem()) { int var2 = this.inventory.getDamageVsEntity(par1Entity); -@@ -1142,6 +1198,12 @@ +@@ -1148,6 +1204,12 @@ */ public EnumStatus sleepInBedAt(int par1, int par2, int par3) { @@ -147,7 +147,7 @@ if (!this.worldObj.isRemote) { if (this.isPlayerSleeping() || !this.isEntityAlive()) -@@ -1181,6 +1243,11 @@ +@@ -1187,6 +1249,11 @@ { int var9 = this.worldObj.getBlockMetadata(par1, par2, par3); int var5 = BlockBed.getDirection(var9); @@ -159,7 +159,7 @@ float var10 = 0.5F; float var7 = 0.5F; -@@ -1250,11 +1317,12 @@ +@@ -1256,11 +1323,12 @@ this.resetHeight(); ChunkCoordinates var4 = this.playerLocation; ChunkCoordinates var5 = this.playerLocation; @@ -175,7 +175,7 @@ if (var5 == null) { -@@ -1291,7 +1359,9 @@ +@@ -1297,7 +1365,9 @@ */ private boolean isInBed() { @@ -186,7 +186,7 @@ } /** -@@ -1306,13 +1376,15 @@ +@@ -1312,13 +1382,15 @@ var2.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); var2.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -204,7 +204,7 @@ return var3; } } -@@ -1719,4 +1791,45 @@ +@@ -1725,4 +1797,45 @@ } public void func_50022_L() {}