diff --git a/build.xml b/build.xml index eff40159e7..3afc5bdbd1 100644 --- a/build.xml +++ b/build.xml @@ -1,11 +1,11 @@ - The Forge Mod Loader @@ -86,7 +86,6 @@ - @@ -207,7 +206,7 @@ - + @@ -243,7 +242,6 @@ - Moving old patched sources at ${patch.mcp.srcdir} out of the way @@ -254,6 +252,7 @@ + Creating clean patched references at ${patch.mcp.srcdir} @@ -263,7 +262,7 @@ Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML-Server and FML-Client projects - + Moving old patched sources at ${mcp.home}/src-work out of the way @@ -272,19 +271,33 @@ - + - + - + + + + + + + + + + + + A patch is out of date. Update your patches! + + + diff --git a/eclipse/FML-Client/.classpath b/eclipse/FML-Client/.classpath index ae16cdb736..bd2fe28db5 100644 --- a/eclipse/FML-Client/.classpath +++ b/eclipse/FML-Client/.classpath @@ -4,24 +4,24 @@ - + - + - + - - - - + + + + diff --git a/eclipse/FML-Client/.project b/eclipse/FML-Client/.project index 5f864284d6..77812bb3f3 100644 --- a/eclipse/FML-Client/.project +++ b/eclipse/FML-Client/.project @@ -15,6 +15,11 @@ org.eclipse.jdt.core.javanature + + build.xml + 1 + MCP_LOC/FML/build.xml + client 2 diff --git a/eclipse/simpletestmod/.classpath b/eclipse/simpletestmod/.classpath index 331ad7823c..294bff6e8c 100644 --- a/eclipse/simpletestmod/.classpath +++ b/eclipse/simpletestmod/.classpath @@ -1,7 +1,7 @@ - + diff --git a/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs b/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs index 7341ab1683..8000cd6ca6 100644 --- a/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs +++ b/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index 57602128fa..af2d92afee 100644 --- a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -9,7 +9,15 @@ import net.minecraft.src.AnvilSaveConverter; import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.CallableMCS5; -@@ -350,6 +352,8 @@ +@@ -53,6 +55,7 @@ + + public abstract class MinecraftServer implements ICommandSender, IPlayerUsage, Runnable + { ++ fish; + public static Logger field_6038_a = Logger.getLogger("Minecraft"); + private static MinecraftServer field_55095_w = null; + private final ISaveFormat field_56220_l; +@@ -350,6 +353,8 @@ { long var1 = System.currentTimeMillis();