From 44c8314a9ac5216ed0fc8b49ffddd1907772a524 Mon Sep 17 00:00:00 2001 From: psxlover Date: Thu, 13 Sep 2012 16:35:11 +0300 Subject: [PATCH 1/3] Updated the build xml to download the required jars for the "getMethod". Also made it copy the localization files. --- README.md | 15 +++++++------ build.xml | 64 +++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 45d7de3e..f9bdfa33 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,11 @@ features or change existing behaivour, please discuss it with Sengir or Krapht b 1. Ensure that `Apache Ant` (found [here](http://ant.apache.org/)) is installed correctly on your system. * Linux users will need the latest version of astyle installed as well. 1. Create a base directory for the build -1. Clone the Buildcraft repository into `basedir/src/` +1. Clone the Buildcraft repository into `basedir/BuildCraft/` + * Optional: Copy BuildCraft localization repository into `basedir/BuildCraft-Localization` 1. Copy the minecraft bin dir and minecraft_server.jar into `basedir/jars/` -1. Navigate to basedir/src in a shell and run `ant clean package` (this will take 2-5 minutes) -1. The compiled and obfuscated jars will be in basedir/build/dist +1. Navigate to basedir/Buildcraft in a shell and run `ant clean package` (this will take 2-5 minutes) +1. The compiled and obfuscated jar will be in basedir/build/dist Your directory structure should look like this: *** @@ -26,10 +27,12 @@ Your directory structure should look like this: \- bin |- minecraft.jar |- ... - \- src - |- buildcraft_client - |- buildcraft_server + \- BuildCraft + |- buildcraft_resources + |- common |- ... + \- BuildCraft-Localization + |- lang *** diff --git a/build.xml b/build.xml index 289167f1..2c79aadf 100644 --- a/build.xml +++ b/build.xml @@ -1,17 +1,10 @@ - - - - - - - - - + + @@ -22,13 +15,16 @@ - + + + + @@ -37,14 +33,39 @@ - + + + - + + + + + + + + + + + + + + + + + + + + + + + + -
+ responseDataFile="${download.dir}/minecraftforge-src-${forge.version}.zip"> +
@@ -82,7 +103,7 @@ - + @@ -114,20 +135,27 @@ - + - + + + + + + + + - + From c4dc51895f599b7215330a69394d493179534320 Mon Sep 17 00:00:00 2001 From: psxlover Date: Fri, 14 Sep 2012 02:28:02 +0300 Subject: [PATCH 2/3] Refactored build.xml --- build.xml | 291 +++++++++++++++++++------------- buildcraft_resources/mcmod.info | 12 +- 2 files changed, 177 insertions(+), 126 deletions(-) diff --git a/build.xml b/build.xml index 2c79aadf..3970f1fb 100644 --- a/build.xml +++ b/build.xml @@ -1,164 +1,215 @@ - - + + - - - + + + - - + + - - + + - - + + - + - - - - + + + - + + + + + + + + - + - + - - - + + + - - - + + + + + - - + + + - - + + + - - - + + - - - + + - + + - - - - - - - - + + - - -
- + + - - - - - + + + - - - - - + + + - - - + - - - - + + - - - + - - - - + - - - + + - - - - - - - - - + + + + + + + + - + +
+ - + - - - - + + + + + + + + + - - - + + + + + - - - - + + + + - - - + + + + + - - - - + + + - - - - + + + + - - - - - - + + + - + + + + + + + + + + - + - + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildcraft_resources/mcmod.info b/buildcraft_resources/mcmod.info index f68f2571..91b08bad 100644 --- a/buildcraft_resources/mcmod.info +++ b/buildcraft_resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "BuildCraft|Core", "name": "BuildCraft", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more!", - "version": "", + "version": "@VERSION@", "credits": "Created by SpaceToad", "logoFile": "/gfx/buildcraft/logo.png", "mcversion": "", @@ -20,7 +20,7 @@ "modid": "BuildCraft|Builders", "name": "BC Builders", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Builders Component)", - "version": "", + "version": "@VERSION@", "credits": "Created by SpaceToad", "logoFile": "/gfx/buildcraft/logo.png", "mcversion": "", @@ -37,7 +37,7 @@ "modid": "BuildCraft|Energy", "name": "BC Energy", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Energy Component)", - "version": "", + "version": "@VERSION@", "credits": "Created by SpaceToad", "logoFile": "/gfx/buildcraft/logo.png", "mcversion": "", @@ -54,7 +54,7 @@ "modid": "BuildCraft|Factory", "name": "BC Factory", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Factory Component)", - "version": "", + "version": "@VERSION@", "credits": "Created by SpaceToad", "logoFile": "/gfx/buildcraft/logo.png", "mcversion": "", @@ -71,7 +71,7 @@ "modid": "BuildCraft|Silicon", "name": "BC Silicon", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Silicon Component)", - "version": "", + "version": "@VERSION@", "credits": "Created by SpaceToad", "logoFile": "/gfx/buildcraft/logo.png", "mcversion": "", @@ -88,7 +88,7 @@ "modid": "BuildCraft|Transport", "name": "BC Transport", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Transport Component)", - "version": "", + "version": "@VERSION@", "credits": "Created by SpaceToad", "logoFile": "/gfx/buildcraft/logo.png", "mcversion": "", From 9c257bd434e24ead025d26f85342030ed1f49b4d Mon Sep 17 00:00:00 2001 From: psxlover Date: Fri, 14 Sep 2012 02:58:38 +0300 Subject: [PATCH 3/3] Forgot to change the command in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9bdfa33..c944f6a1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ features or change existing behaivour, please discuss it with Sengir or Krapht b 1. Clone the Buildcraft repository into `basedir/BuildCraft/` * Optional: Copy BuildCraft localization repository into `basedir/BuildCraft-Localization` 1. Copy the minecraft bin dir and minecraft_server.jar into `basedir/jars/` -1. Navigate to basedir/Buildcraft in a shell and run `ant clean package` (this will take 2-5 minutes) +1. Navigate to basedir/Buildcraft in a shell and run `ant` (this will take 2-5 minutes) 1. The compiled and obfuscated jar will be in basedir/build/dist Your directory structure should look like this: