diff --git a/forge/build.bat b/forge/build.bat index 68e257b97e..a1bbcca96f 100755 --- a/forge/build.bat +++ b/forge/build.bat @@ -1,11 +1,15 @@ -cd .. +@cd .. -rmdir /S /Q src -mkdir src +@rmdir /S /Q src +@mkdir src xcopy /Y /E src_work\* src\ - xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net xcopy /Y /E forge\forge_common\net\* src\minecraft\net xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net -cmd /C recompile.bat +@cd forge +@cmd /C inject_version.bat ../src/minecraft/net/minecraft/src/forge/ForgeHooks.java +@cmd /C inject_version.bat ../src/minecraft_server/net/minecraft/src/forge/ForgeHooks.java +@cd .. + +@echo | call recompile.bat diff --git a/forge/build.sh b/forge/build.sh index 44f2afaa54..bac689442a 100755 --- a/forge/build.sh +++ b/forge/build.sh @@ -10,6 +10,11 @@ cp -a forge/forge_client/src/net/* src_forge/minecraft/net/ cp -a forge/forge_common/net/* src_forge/minecraft/net/ cp -a forge/forge_common/net/* src_forge/minecraft_server/net/ +cd forge +./inject_version.sh ../src_forge/minecraft/net/minecraft/src/forge/ForgeHooks.java +./inject_version.sh ../src_forge/minecraft_server/net/minecraft/src/forge/ForgeHooks.java +cd .. + cp -a src_forge src ./recompile.sh diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 1663350f2d..cf7fcf9fb9 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -300,12 +300,13 @@ public class ForgeHooks { } - public static final int majorVersion=1; - public static final int minorVersion=3; - public static final int revisionVersion=1; + public static final int majorVersion=0; + public static final int minorVersion=0; + public static final int revisionVersion=0; + public static final int buildVersion=0; static { - System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion); - ModLoader.getLogger().info(String.format("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion)); + System.out.printf("MinecraftForge v%d.%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion, buildVersion); + ModLoader.getLogger().info(String.format("MinecraftForge v%d.%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion, buildVersion)); } static boolean toolInit=false; diff --git a/forge/inject_version.bat b/forge/inject_version.bat new file mode 100644 index 0000000000..e9e72fdbc2 --- /dev/null +++ b/forge/inject_version.bat @@ -0,0 +1,20 @@ +@echo off +setlocal enableextensions enabledelayedexpansion +FOR /F "tokens=1-4" %%A IN (version.txt) DO ( + set major=%%A + set minor=%%B + set revision=%%C + set build=%%D +) +set file=%* + +echo Injecting Revision !major!.!minor!.!revision!.!build! %file% + +set PATH=.\bin;%PATH% +sed s/majorVersion=0/majorVersion=!major!/ !file!.tmp + +mv "!file!.tmp" "!file!" diff --git a/forge/inject_version.sh b/forge/inject_version.sh new file mode 100644 index 0000000000..4aa41ae455 --- /dev/null +++ b/forge/inject_version.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +target=$1 +read major minor rev build $target.tmp + +mv $target.tmp $target \ No newline at end of file diff --git a/forge/install/install.cmd b/forge/install/install.cmd index d9a1968c51..ecea3b638c 100755 --- a/forge/install/install.cmd +++ b/forge/install/install.cmd @@ -3,7 +3,7 @@ echo off echo MinecraftForge Windows Setup Program echo: -set PATH=%PATH%;%SystemDir%\system32;%SystemRoot%\System32 +@set PATH=%PATH%;%SystemDir%\system32;%SystemRoot%\System32 pushd .. >nul @@ -11,8 +11,8 @@ xcopy /Y /E /I forge\conf\* conf if exist runtime\bin\fernflower.jar move runtime\bin\fernflower.jar runtime\bin\fernflower.jar-backup -cmd /C cleanup.bat -cmd /C decompile.bat +echo | call cleanup.bat +echo | call decompile.bat if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar diff --git a/forge/package.sh b/forge/package.sh index e7e059d5a0..0ecc4cc63d 100755 --- a/forge/package.sh +++ b/forge/package.sh @@ -1,10 +1,11 @@ -version=$1 +read major minor revision build nul rmdir /S /Q src_base rmdir /S /Q src_work - cmd /C decompile.bat + @echo | cmd /C decompile.bat pushd src >nul del minecraft\net\minecraft\src\MLProp.java @@ -17,7 +17,7 @@ pushd .. >nul del ..\forge\modLoaderMP-win.patch popd >nul - cmd /C updatemd5.bat + @echo | cmd /C updatemd5.bat mkdir src_base mkdir src_work diff --git a/forge/version.txt b/forge/version.txt new file mode 100644 index 0000000000..a9555cf7c1 --- /dev/null +++ b/forge/version.txt @@ -0,0 +1 @@ +1 3 1 0 \ No newline at end of file