From ec961a79fc3b226ecf3751e87b9b60118c13f1e4 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 28 Nov 2012 21:45:16 -0500 Subject: [PATCH 01/13] Update build.xml Enhanced so that it downloads and setups MCP and Forge for you. --- build.xml | 173 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 138 insertions(+), 35 deletions(-) diff --git a/build.xml b/build.xml index 97c6e84c..19de2fe8 100644 --- a/build.xml +++ b/build.xml @@ -1,20 +1,139 @@ - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + @@ -41,42 +160,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + - + \ No newline at end of file From ef51bcb12581c75c5cb9bb593bc182db5709fd44 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 28 Nov 2012 21:45:36 -0500 Subject: [PATCH 02/13] Update build.xml Typo fix. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 19de2fe8..fca94abb 100644 --- a/build.xml +++ b/build.xml @@ -4,7 +4,7 @@ - Date: Wed, 28 Nov 2012 21:46:53 -0500 Subject: [PATCH 03/13] Update build.xml Unnecessary. --- build.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.xml b/build.xml index fca94abb..a8e70653 100644 --- a/build.xml +++ b/build.xml @@ -98,11 +98,6 @@ - - - - - From 610adb7e2700b33944dec097ad8726e5608cab06 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 28 Nov 2012 21:58:17 -0500 Subject: [PATCH 04/13] Fix build.xml Fixed massive derps. --- build.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.xml b/build.xml index a8e70653..c3b9401b 100644 --- a/build.xml +++ b/build.xml @@ -2,11 +2,11 @@ - + - - @@ -116,6 +116,7 @@ + @@ -175,6 +176,7 @@ - + + \ No newline at end of file From e718df4b305455006e57dfadc2e2699807842a0e Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 28 Nov 2012 22:10:07 -0500 Subject: [PATCH 05/13] Update mcp.version 722 --> 723 --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c3b9401b..6fec9fb8 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - + From 627282a52f0caf0e2e3d1baea5af00a7be59a4a6 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 28 Nov 2012 22:12:42 -0500 Subject: [PATCH 06/13] Fix derps More derps! :< --- build.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 6fec9fb8..3123821f 100644 --- a/build.xml +++ b/build.xml @@ -133,25 +133,25 @@ - + - + - + - + - + - + From f0cc3df80e1e7d88b0162ea4313107a988e227fc Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 30 Nov 2012 16:49:58 -0500 Subject: [PATCH 07/13] Revert "Fix derps" This reverts commit 627282a52f0caf0e2e3d1baea5af00a7be59a4a6. --- build.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 3123821f..6fec9fb8 100644 --- a/build.xml +++ b/build.xml @@ -133,25 +133,25 @@ - + - + - + - + - + - + From 9cfa4356517dcfa9e8b263ef67bf4b1430210542 Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 30 Nov 2012 16:50:03 -0500 Subject: [PATCH 08/13] Revert "Update mcp.version" This reverts commit e718df4b305455006e57dfadc2e2699807842a0e. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 6fec9fb8..c3b9401b 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ - + From 034d48ffafa07610e091033799d892c57aef4513 Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 30 Nov 2012 16:50:08 -0500 Subject: [PATCH 09/13] Revert "Fix build.xml" This reverts commit 610adb7e2700b33944dec097ad8726e5608cab06. --- build.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index c3b9401b..a8e70653 100644 --- a/build.xml +++ b/build.xml @@ -2,11 +2,11 @@ - + - + - + @@ -116,7 +116,6 @@ - @@ -176,7 +175,6 @@ - - + \ No newline at end of file From 2535fc9200031c057534de169bcbf232253bc5a5 Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 30 Nov 2012 16:50:11 -0500 Subject: [PATCH 10/13] Revert "Update build.xml" This reverts commit 50a50073c4f019ef6626e5532a3f574648061d4c. --- build.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.xml b/build.xml index a8e70653..fca94abb 100644 --- a/build.xml +++ b/build.xml @@ -98,6 +98,11 @@ + + + + + From d567439ce9591cd05be90d73b8c51600f0b0ec01 Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 30 Nov 2012 16:50:14 -0500 Subject: [PATCH 11/13] Revert "Update build.xml" This reverts commit ef51bcb12581c75c5cb9bb593bc182db5709fd44. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index fca94abb..19de2fe8 100644 --- a/build.xml +++ b/build.xml @@ -4,7 +4,7 @@ - Date: Fri, 30 Nov 2012 16:50:17 -0500 Subject: [PATCH 12/13] Revert "Update build.xml" This reverts commit ec961a79fc3b226ecf3751e87b9b60118c13f1e4. --- build.xml | 175 +++++++++++------------------------------------------- 1 file changed, 36 insertions(+), 139 deletions(-) diff --git a/build.xml b/build.xml index 19de2fe8..97c6e84c 100644 --- a/build.xml +++ b/build.xml @@ -1,139 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - + @@ -160,26 +41,42 @@ - + - - - - + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 40e28c73e92c02d5545e018e2796417079415098 Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 30 Nov 2012 16:55:30 -0500 Subject: [PATCH 13/13] Update README.md Updated README.md. --- README.md | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 40360de2..36f7b004 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ ## Welcome to Equivalent Exchange 3! -Setup MCP was done mostly by Minalien, I just changed it a bit. Some credit goes to BuildCraft's README.md, which I based this README off of. +Setup MCP was done mostly by the people who update the wiki, I just changed it a bit. Some credit goes to BuildCraft's README.md, which I based this README off of. The Minecraft Forums page can be found [here] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3). ### Compiling Equivalent Exchange 3 -IMPORTANT: This is not guaranteed to work as it has not been tested extensively (only done on Linux so far, partly on Windows). +IMPORTANT: This is not guaranteed to work as it has not been tested extensively (Linux and Windows tested). ____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ #### Prerequisites (Tested for Windows 7 ONLY!) -1. Download and install the Java JDK [here](http://www.oracle.com/technetwork/java/javase/downloads/jdk7u9-downloads-1859576.html). Just scroll down. +1. Download and install the Java JDK [here](http://www.oracle.com/technetwork/java/javase/downloads/index.html). Click the one that says `Java Platform (JDK) #u#`, and follow instructions. * Go to `Control Panel\System and Security\System`, and click on `Advanced System Settings` on the left-hand side. * Click on `Environment Variables`. * Under `System Variables`, click `New`. @@ -15,7 +15,7 @@ ________________________________________________________________________________ * For `Variable Value`, input something similar to `;C:\Program Files (x86)\Java\jdk1.7.0_09` exactly as shown to the end.(or wherever your Java JDK installation is), and click `Ok`. * Scroll down to a variable named `Path`, and double-click on it. * Append `;C:\Program Files (x86)\Java\jdk1.7.0_09\bin` (or wherever your Java JDK installation is \bin), and click `Ok`. -2. Download and Apache Ant [here] (http://ant.apache.org). +2. Download Apache Ant [here] (http://ant.apache.org). * Unzip the files anywhere you want, eg `C:\Program Files (x86)\Ant`. * Again, go to `Environment Variables` just like you did for the Java JDK. * Under `System Variables`, click `New`. @@ -25,35 +25,32 @@ ________________________________________________________________________________ * Append `;C:\Ant\apache-ant-1.8.4\bin` exactly as shown to the end (or your Ant directory \apache-ant-1.8.4\bin). 3. Download and install Github [here] (http://windows.github.com/). * Create an account. - * Go back to the Equivalent-Exchange-3 directory [here] (http://github.com/pahimar/Equivalent-Exchange-3). - * Click `Clone to Windows` near the top-left of the page. + * Scroll to the top of this page, login at the top-right, and then click `Clone to Windows` near the top-left of the page.. * You should see Github flash and `pahimar/Equivalent-Exchange-3` appear. (The local repository defaults to `C:\Users\(username)\Documents\GitHub\Equivalent-Exchange-3`, you can change it if you want but then you have to find it again on Github). 4. Create an empty directory for EE3 development. This directory is refernced as `mcdev` from now on. It can be where you cloned EE3, but it'll be a little messy. -5. You are now ready to Setup MCP! +5. You are now ready to setup MCP! #### Setup MCP (Linux and Windows 7 tested) -1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp723.zip. Install MCP dependencies as listed on the website if neccessary. +1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases), e.g. mcp723.zip. Install MCP dependencies as listed on the website if neccessary. 2. Inside `mcdev`, create a directory named `mcp` and unzip the MCP .zip file into it. + * To verify, check if a file name `CHANGELOG` exists inside `mcp`. +3. Get an unmodded copy of minecraft's `bin` folder. Currently EE3 runs on 1.4.5 but that might have changed. -3. To verify, check if a file name `CHANGELOG` exists inside the `mcp` directory. +4. From your `.minecraft` directory (on Windows, defaults to `%appdata%\.minecraft`), copy the `bin` and the `resources` (not sure if necessary) directory to the `jars` directory inside `mcp`. (Forge might do this for you, not confirmed.) -4. Get a clean (unmodded!) copy of minecraft's `bin` folder. Currently EE3 runs on 1.4.5 but that might have changed. +5. Get an unmodded copy of `minecraft_server.jar` and also place it into `jars`. (Forge might do this for you) -5. From your `.minecraft` directory (on Windows, defaults to `%appdata%\.minecraft`), copy the `bin` and the `resources` (I don't think you need resources on Windows 7) directory to the `jars` directory inside `mcp`. (I actually believe Forge's installation might do it for you) +6. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp` so that `mcp\forge\install.sh` exists. You need at least Forge 6.4.0, best way is to get it from [here] (http://files.minecraftforge.net/). -6. Get a clean (unmodded!) copy of `minecraft_server.jar` and also place it into `jars`. (Forge might do this for you) +7. Execute `install.sh` (Linux and Mac) or `install.cmd` (Windows), both found in `mcdev\mcp\forge`. On Linux you might have to `chmod +x` `install.sh` before you can execute it. On some system configurations you need to execute `install.sh` from within the `forge` directory whereas on others it doesn't matter. Just check the output for error messages to find out what you need to do. -7. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp` so that `mcp/forge/install.sh` exists. You need at least Forge 6.4.0, best way is to get it from [here] (http://files.minecraftforge.net/). +#### Setup EE3 (Some tested for Linux, tested fully for Windows) +1. Inside `mcdev`, create a directory named `source`. -8. Execute `install.sh` (Linux and Mac?) or `install.cmd` (Windows), both found in `mcdev/mcp/forge`. On Linux you might have to `chmod +x` `install.sh` before you can execute it. On some system configurations you need to execute `install.sh` from within the `forge` directory whereas on others it doesn't matter. Just check the output for error messages to find out what you need to do. - -#### Setup EE3 (Some tested for Linux, some for Windows) -1. Inside `mcdev`, create a directory named `source`. If you're doing this from the default clone directory, make two folders: `source` and `Equivalent-Exchange-3`. Copy and paste the original files into `Equivalent-Exchange-3`, and then move that into `source`. - -2. If you haven't already, move/clone `Equivalent-Exchange-3` into `source`. +2. Move/clone `Equivalent-Exchange-3` into `source`. 3. Right now, you should have a directory that looks something like: @@ -61,31 +58,31 @@ ________________________________________________________________________________ mcdev \-mcp - \-mcp stuff blablabla (should have CHANGELOG). + \-complicated mcp stuff (should have CHANGELOG). \-forge \-jars \-source \-Equivalent-Exchange-3 - \-EE3's files, including build.xml. + \-EE3's files, (should have build.xml). *** 4. Inside `Equivalent-Exchange-3`, create a new file called `build.properties`. * Open it up, and type into it the following: * `dir.development=../../` - * `dir.share=Shared` (or what you want it to be) + * `dir.share=Shared` (or what you want it to be-optional) * `dir.release=Releases` (what you want it to be) - * `release.minecraft.version=1.4.5` (as of 11/21) + * `release.minecraft.version=1.4.5` (as of 11/30) * `release.mod.version=pre2` (or whatever version # want it to be) 5. [FOR WINDOWS] Open up `cmd` by typing `cmd` in Run. -6. [FOR WINDOWS] Navigate to `mcdev\source` by executing `cd mcdev's location\source`. - -7. Inside `sources\Equivalent-Exchange-3` execute `ant release`. If you've done everything right, `BUILD SUCCESSFUL` is displayed. If not, you probably did something wrong. - -8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.5\pre2` (or whatever you put into `build.properties` for `dir.release`, `release.minecraft.version`, and `release.mod.version`). You should see a .jar named `ee3-universal-pre2.jar` (or whatever you put into `release.mod.version`). +6. [FOR WINDOWS] Navigate to `mcdev\source\Equivalent-Exchange-3` by executing `cd mcdev's location\source\Equivalent-Exchange-3`. +7. Execute `ant release`. This will generally take around 5-15 minutes, depending on your computer. If you've done everything right, `BUILD SUCCESSFUL` is displayed after it finishes. + * If you see `BUILD FAILED`, check the error output (it should be right around `BUILD FAILED`), fix everything, and try again. +8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.5\pre2` (This might be different according to what you put in build.properties). + * You should see a .jar named `ee3-universal-pre2.jar` (Again, might be different). 9. Copy the jar into your Minecraft mods folder, and play Minecraft! -### To Update EE3 (For Windows Only?) +### To Update EE3 (For Windows/Mac?) 1. Check to see if pahimar updated EE3 since you last compiled. If he/she did, follow these instructions. 2. Open Github.