diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2dc96cc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "thaumcraft-api"] + path = thaumcraft-api + url = https://github.com/Azanor/thaumcraft-api +[submodule "thaumcraft/api"] + path = thaumcraft/api + url = https://github.com/Azanor/thaumcraft-api diff --git a/build.gradle b/build.gradle index 9c35e09..6f9bdff 100644 --- a/build.gradle +++ b/build.gradle @@ -24,19 +24,30 @@ repositories { apply plugin: 'forge' -version = "1.7.10-2.1.23" +ext.version_mod = "${project.version_major}.${project.version_minor}.${project.version_rev}" +version = project.version_mc + "-" + project.version_mod group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "magicbees" minecraft { - version = "1.7.10-10.13.2.1230" + version = project.version_mc + "-" + project.version_forge assetDir = "eclipse/assets" + + replace '@VERSION@', project.version_mod + replace '@MCVERSION@', project.version_mc +} + +sourceSets { + main { + java { + srcDir "./thaumcraft/api" + } + } } dependencies { - compile files("/libs/Thaumcraft-1.7.10-4.2.3.5.jar") - compile 'net.sengir.forestry:forestry_1.7.10:3.4.0.7:dev' - compile files("/libs/BloodMagic-1.7.10-1.3.1-7.jar") + compile "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:dev" + compile files("/libs/BloodMagic-${project.version_mc}-${project.version_bloodmagic}.jar") } processResources diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..642a9fd --- /dev/null +++ b/gradle.properties @@ -0,0 +1,9 @@ +version_major=2 +version_minor=1 +version_rev=24 + +version_forestry=3.4.0.7 +version_bloodmagic=1.3.1-7 + +version_mc=1.7.10 +version_forge=10.13.2.1230 \ No newline at end of file diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index 8f12982..69f0be6 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -78,7 +78,8 @@ public class MagicBees CraftingManager.setupCrafting(); CraftingManager.registerLiquidContainers(); - VersionInfo.doVersionCheck(); + // Version check file is MIA. + //VersionInfo.doVersionCheck(); LogHelper.info("Postinit completed"); } diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index 9fbf528..e3f3bd2 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -18,7 +18,6 @@ public class VersionInfo { public static final String ModName = "MagicBees"; public static final String Version = "@VERSION@"; - public static final String Build = "@BUILD_NUMBER@"; public static final String MCVersion = "@MCVERSION@"; public static final String VersionURL = "http://bit.ly/magicbeesVersionInfo"; public static final String GUI_FACTORY_CLASS = "magicbees.client.gui.GuiFactory"; diff --git a/thaumcraft/api b/thaumcraft/api new file mode 160000 index 0000000..4120e66 --- /dev/null +++ b/thaumcraft/api @@ -0,0 +1 @@ +Subproject commit 4120e665c9c3d88324baa3676283d7fb8ba25f1c